diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-05 18:44:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-05 18:44:09 +1100 |
| commit | d6ca648a63278ada1f70733ffe922f3559c6aaa4 (patch) | |
| tree | 4ba52846ecef7faffab6fa2c985041975d5ed153 | |
| parent | e02350816d45b47bf3502ac0b9d656a5075b20f4 (diff) | |
Add linux-next specific files for 20091005next-20091005
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 141 | ||||
| -rw-r--r-- | Next/Trees | 143 | ||||
| -rw-r--r-- | Next/merge.log | 2450 | ||||
| -rw-r--r-- | Next/quilt-import.log | 105 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2840 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..64aac961161f --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,141 @@ +Name SHA1 +---- ---- +origin 374576a8b6f865022c0fd1ca62396889b23d66dd +fixes df5281a73b4ba568ed0d266efc417856524c1e86 +arm-current d25ef8b86e6a58f5476bf6e4a8da730b335f68fa +m68k-current 9848484fad9ddeb18f18f02f9ecdcd330ac9a216 +powerpc-merge 09dd3fc19c09f79115267361ecd7d5c5d2c27a3a +sparc-current 7eebda60d57a0862a410f45122c73b8bbe6e260c +scsi-rc-fixes c7922a911c42c5a8bdee6cc75eb6bd66937d4217 +net-current 6053bbf7bbdbb2c94547f830ad07636c17d7024e +sound-current 7fa9742bf7f918293c0b3ffd84167fccbdd42765 +pci-current ab86e5765d41a5eb4239a1c04d613db87bea5ed8 +wireless-current e16c1bb67a0010b5bad26ddc3e691655fd7456e3 +kbuild-current 7406174d14bc2b2d06d59a50cf810e7513297761 +driver-core.current 17d857be649a21ca90008c6dc425d849fa83db5c +tty.current 17d857be649a21ca90008c6dc425d849fa83db5c +usb.current 17d857be649a21ca90008c6dc425d849fa83db5c +cpufreq-current f0adb134d8dc9993a9998dc50845ec4f6ff4fadc +input-current fde1132374c9ba7da98a73b9a3c150dca6cf8502 +md-current 4b3df5668c8ebaebd8d66a5a94374be3e3b2ef0c +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 4c6ab3ee4cdb86cbd4e9400dd22fad7701cbe795 +ide-curent 7fa07729e439a6184bd824746d06a49cca553f15 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 +davinci 85609c1ccda64af7d7c277469183f20e4f3b69c3 +pxa 52a7a1cec88acdaf3f8b36a6b1fe904f6eca7ee5 +thumb-2 4fb3c2e2ab3549308a1b1663296d165e45d72ba5 +avr32 2c731afd139a76d790862d33857654fea6ac2a1f +blackfin 2941aeaac3600ffd6c4e4c516ca242467728c1cd +cris 24924ece4482d5466ffcd0affedce63816c88e53 +ia64 17d857be649a21ca90008c6dc425d849fa83db5c +m68k b25ef35f34a9837e1133b3ef5fab8058155cc69f +m68knommu ddfcb0dff21dc06f00ce01da6f76b038e16f2b2a +microblaze 5c2ce903f2828e776bb09f73c0d3b2b7cda9ead8 +mips 4fa78c6123f21a399d48566c282c5eccf4296923 +parisc 1e0d061b462e48f9b1609a29aed9a5abcf65833e +powerpc 94a8d5caba74211ec76dac80fc6e2d5c391530df +4xx 94a8d5caba74211ec76dac80fc6e2d5c391530df +galak 1dcd8ffc81e80a170625883f63f6a5db3cd0428d +s390 a3771397ab449d4427fb35f9b5cdd0c3b3240199 +sh f16bf3e2e4076d4c20d9344d51fc6c4e43542e97 +sparc 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +cifs 0d9df2515dbceb67d343c0f10fd3ff218380d524 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 1bbc620d779b180bdad5cc43fd2c910e0554fb04 +ext3 2844ce2c309ef2a28c41d1f6e2b4c50bc13e0a8f +ext4 fbbf69456619de5d251cb9f1df609069178c62d5 +fatfs 817b33d38f81c8736d39283c35c886ae4668f1af +fuse 79a9d99434b104c562f30f21b75317667f444793 +gfs2 5d9e40c70ed2e0e9dc29539f7c94cca930f7a123 +jfs 4a19fb11a90fdbbcb3bc02effa036230d035ca28 +nfs a99bbaf5ee6bad1aca0c88ea65ec6e5373e86184 +nfsd ddc04fd4d5163aee9ebdb38a56c365b602e2b7b7 +nilfs2 374576a8b6f865022c0fd1ca62396889b23d66dd +ocfs2 b80474b432913f73cce8db001e9fa3104f9b79ee +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +udf cbc8cc33529b0e0e55ae0ff077b8cb0b71d54c7a +v9fs 47d425b937566337d4a7afdf01040a3006781007 +ubifs 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 +xfs 9ef96da6ec5e1b4cf7eb8e30852cd88ec7d5fdc0 +vfs aa7dfb8954ccf49e026ba13d12991a4eb7defb96 +pci 76baeebf7df493703eeb4428eac015bdb7fabda6 +hid 9a5a01da98c5f71447fbb57cff54085bc45ef5a1 +i2c 073ca0d7cd9974c0033a079551d5ad045bc474b4 +jdelvare-hwmon f730807d48520089c284361bed6f7d4681636a16 +kernel-doc 374576a8b6f865022c0fd1ca62396889b23d66dd +v4l-dvb f25140438ef7ccdab2a53598ab8c974a29c35195 +quota dee865656f2d8b866f8ac22c60d6363b914e9f12 +kbuild bbae701f7f258b051ed199ef71c5e85e683c0fb8 +kconfig 48586218b6515b9bd70694e3cd8c901a6a6ee69c +ide 7fa07729e439a6184bd824746d06a49cca553f15 +libata d15d6e6cc340566d53d953ffdec2c9e96816fa52 +infiniband 1a616e1568d5ac080ee0b13e3135a906288dca40 +acpi c7db7ba5fc84e76044f403efbbba3af5fb01d19b +ieee1394 211a641770c2ae191c9589fee69a8fb67f67fffd +ubi 17d857be649a21ca90008c6dc425d849fa83db5c +kvm 853d977d5029da9ea1affd9ec3dceca885c45596 +dlm 1329e3f2c898cfabb6ed236d3fb8c1725197af53 +scsi 0efe5e32c8729ef44b00d9a7203e4c99a6378b27 +async_tx 1f6672d44c1ae7408b43c06170ec34eb0a0e9b9f +net 4142e0d1def2c0176c27fd2e810243045a62eb6d +wireless 785b59aa3453d7b70359aec515cf6387476728cd +mtd 794d579ae17a7ec8028e4844096059c19431a96c +crypto 81bd5f6c966cf2f137c2759dfc78abdffcff055e +sound 140fd7183f172ce946d15f2eae0b8fe5d8349fd7 +cpufreq f0adb134d8dc9993a9998dc50845ec4f6ff4fadc +rr ee1bf14af7e4167b542bac8ae21d94397b32ca64 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input 9de48cc300fb10f7d9faa978670becf5e352462a +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 6a0afdf58d40200abd0c717261d1bc4c49195c2f +device-mapper a9df52d9ceedbd2480466fcda1a408d41de83640 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery f056878332a91ed984a116bad4e7d49aefff9e6e +leds 982392f9f4c0eaee4afbbd00d21a10e03b4d6be7 +backlight 1aabce812a1bb9efbaddd26ea0d4c7c039bd113c +kgdb 98517d8f092cceea77ab93f15437c182b5615d9e +slab abeafb875f1d79482cf35cdcbd80b0fa7fcb3ef3 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 4b3df5668c8ebaebd8d66a5a94374be3e3b2ef0c +mfd 75f2ba8f0006440e720e47ae14c917e07c452d72 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm f0ed1f655aa0375e2abba84cc4e8e6c853d48555 +voltage 9585e115088c9f1bdf0de8f184acafbc0af80ce9 +security-testing 23acb98de5a4109a60b5fe3f0439389218b039d7 +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 049211d10e644fb36c8582336c9d5a917123bd98 +uwb 0396c215f301e92677d1e9a064b405e31501dc1d +watchdog 17d857be649a21ca90008c6dc425d849fa83db5c +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu e0fc7e0b4b5e69616f10a894ab9afff3c64be74e +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd ea18ac73702ec44ff3f7a1a02f8cf2d016ed68c8 +jc_docs 6c19efb46aacf2c5043ad210b888ee58ffb848c0 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 13b3a1be2ed4d23e5afca4cf4f6e94f8e8bacbd3 +audit def57543418a5f47debae28a0a9dea2effc11692 +omap eb3f0670d7321efaf364fc40a96fdf5a2a7014f9 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend 0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c +bluetooth 7e7430908c3ccaf71f0851050c8ccaf9ecfb3b56 +fsnotify cf71f3cf1697ab9ad9064635e23fecd57af2c327 +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +drbd f86c2f3e3ca3fdd73c6c4da101d5fda6d3156415 +kmemleak df58bee21ed218cb7dfb561a590b1bd2a99531cf +tip 2adf705f068ed058284342b795c531ddc2bc06ad +oprofile 8b5050255f993dda5e7b5908ab71d1cafc731bd1 +percpu 3cbeae2f737fb8a02fca462bd7dd720378bdc11b +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 428bc597508e482cdea17b11b7b08eabd6b924a6 +hwpoison 465fdd97cbe16ef8727221857e96ef62dd352017 +driver-core 17d857be649a21ca90008c6dc425d849fa83db5c +tty 17d857be649a21ca90008c6dc425d849fa83db5c +usb 17d857be649a21ca90008c6dc425d849fa83db5c +staging e9413871ada20970997872b8e87f0146d287244a +scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..e7942e92d62b --- /dev/null +++ b/Next/Trees @@ -0,0 +1,143 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +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/ +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#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +thumb-2 git git://linux-arm.org/linux-2.6.git#thumb-2 +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 +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 +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 +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 +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/ +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +quota git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6.git#for_next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +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 +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 +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +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 +kmemleak git git://linux-arm.org/linux-2.6.git#kmemleak +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +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 +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 +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-driver-core/ +tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-tty/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-usb/ +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-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..ab4711dc9c66 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2450 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 817b33d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 +Merging origin/master +$ git merge origin/master +Updating 817b33d..374576a +Fast forward + .../ABI/testing/sysfs-bus-pci-devices-cciss | 28 + + Documentation/SubmittingPatches | 2 +- + Documentation/arm/tcm.txt | 10 +- + Documentation/connector/cn_test.c | 2 +- + Documentation/connector/connector.txt | 8 +- + Documentation/hwmon/ltc4215 | 7 +- + Documentation/hwmon/ltc4245 | 7 +- + Documentation/i2c/instantiating-devices | 2 +- + Documentation/{i2c/chips => misc-devices}/eeprom | 0 + Documentation/{i2c/chips => misc-devices}/max6875 | 6 +- + .../networking/timestamping/timestamping.c | 2 +- + Documentation/sound/alsa/HD-Audio-Models.txt | 1 + + Documentation/w1/masters/ds2482 | 6 +- + MAINTAINERS | 36 +- + Makefile | 2 +- + arch/arm/common/sa1111.c | 25 +- + arch/arm/configs/h3600_defconfig | 1 - + arch/arm/configs/iop33x_defconfig | 554 +++++-- + arch/arm/include/asm/glue.h | 26 +- + arch/arm/include/asm/hardware/iop3xx.h | 1 + + arch/arm/include/asm/smp_plat.h | 16 + + arch/arm/include/asm/unistd.h | 1 + + arch/arm/kernel/entry-armv.S | 18 +- + arch/arm/kernel/entry-common.S | 11 +- + arch/arm/kernel/head-common.S | 4 +- + arch/arm/kernel/smp.c | 13 +- + arch/arm/kernel/smp_twd.c | 4 +- + arch/arm/kernel/traps.c | 5 +- + arch/arm/mach-bcmring/core.c | 2 - + arch/arm/mach-davinci/board-dm365-evm.c | 1 - + arch/arm/mach-integrator/pci_v3.c | 2 +- + arch/arm/mach-iop32x/include/mach/iop32x.h | 2 - + arch/arm/mach-iop33x/include/mach/iop33x.h | 2 - + arch/arm/mach-ns9xxx/clock.c | 2 +- + arch/arm/mach-sa1100/Kconfig | 5 - + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-u300/gpio.c | 10 + + arch/arm/mach-u300/include/mach/gpio.h | 1 + + arch/arm/mm/Kconfig | 57 +- + arch/arm/mm/Makefile | 4 + + arch/arm/mm/fault.c | 53 +- + arch/arm/mm/mmap.c | 2 +- + arch/arm/mm/mmu.c | 39 +- + arch/arm/mm/pabort-legacy.S | 19 + + arch/arm/mm/pabort-v6.S | 19 + + arch/arm/mm/pabort-v7.S | 20 + + arch/arm/mm/proc-arm1020.S | 2 +- + arch/arm/mm/proc-arm1020e.S | 2 +- + arch/arm/mm/proc-arm1022.S | 2 +- + arch/arm/mm/proc-arm1026.S | 2 +- + arch/arm/mm/proc-arm6_7.S | 4 +- + arch/arm/mm/proc-arm720.S | 2 +- + arch/arm/mm/proc-arm740.S | 2 +- + arch/arm/mm/proc-arm7tdmi.S | 2 +- + arch/arm/mm/proc-arm920.S | 2 +- + arch/arm/mm/proc-arm922.S | 2 +- + arch/arm/mm/proc-arm925.S | 2 +- + arch/arm/mm/proc-arm926.S | 2 +- + arch/arm/mm/proc-arm940.S | 2 +- + arch/arm/mm/proc-arm946.S | 2 +- + arch/arm/mm/proc-arm9tdmi.S | 2 +- + arch/arm/mm/proc-fa526.S | 2 +- + arch/arm/mm/proc-feroceon.S | 2 +- + arch/arm/mm/proc-mohawk.S | 2 +- + arch/arm/mm/proc-sa110.S | 2 +- + arch/arm/mm/proc-sa1100.S | 2 +- + arch/arm/mm/proc-v6.S | 2 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/mm/proc-xsc3.S | 2 +- + arch/arm/mm/proc-xscale.S | 2 +- + arch/arm/plat-iop/pci.c | 3 +- + arch/arm/plat-iop/time.c | 2 +- + arch/arm/plat-s3c24xx/include/plat/mci.h | 3 + + arch/blackfin/mach-bf561/coreb.c | 2 +- + arch/cris/arch-v10/drivers/sync_serial.c | 2 +- + arch/cris/arch-v32/drivers/mach-fs/gpio.c | 2 +- + arch/m32r/include/asm/io.h | 7 + + arch/m32r/kernel/m32r_ksyms.c | 6 - + arch/m32r/kernel/time.c | 9 + + arch/m32r/kernel/traps.c | 4 +- + arch/m32r/lib/delay.c | 4 + + arch/m32r/mm/discontig.c | 5 +- + arch/m32r/mm/mmu.S | 12 +- + arch/m68k/include/asm/hardirq_mm.h | 12 +- + arch/mn10300/include/asm/uaccess.h | 73 +- + arch/mn10300/unit-asb2303/include/unit/clock.h | 6 +- + arch/mn10300/unit-asb2305/include/unit/clock.h | 6 +- + arch/powerpc/kvm/timing.c | 2 +- + arch/powerpc/platforms/cell/spufs/file.c | 2 +- + arch/powerpc/platforms/pseries/dtl.c | 2 +- + arch/x86/include/asm/checksum_32.h | 3 +- + arch/x86/xen/debugfs.c | 2 +- + block/blk-barrier.c | 45 +- + block/blk-core.c | 21 +- + block/blk-merge.c | 2 +- + block/blk-settings.c | 34 +- + block/blk-sysfs.c | 11 +- + block/cfq-iosched.c | 63 +- + block/compat_ioctl.c | 13 + + block/genhd.c | 4 +- + block/ioctl.c | 17 +- + drivers/acpi/Kconfig | 12 + + drivers/acpi/Makefile | 2 + + drivers/acpi/acpi_pad.c | 514 ++++++ + drivers/acpi/dock.c | 16 +- + drivers/acpi/ec.c | 56 +- + drivers/acpi/proc.c | 2 + + drivers/acpi/processor_core.c | 7 - + drivers/acpi/scan.c | 7 +- + drivers/acpi/video.c | 2 +- + drivers/block/DAC960.c | 156 +- + drivers/block/cciss.c | 755 +++++++--- + drivers/block/cciss.h | 12 +- + drivers/block/cpqarray.c | 63 +- + drivers/char/apm-emulation.c | 2 +- + drivers/char/bfin-otp.c | 2 +- + drivers/char/cyclades.c | 2 +- + drivers/char/dtlk.c | 1 + + drivers/char/ipmi/ipmi_devintf.c | 1 + + drivers/char/ipmi/ipmi_msghandler.c | 1 + + drivers/char/serial167.c | 7 +- + drivers/char/tty_ldisc.c | 7 +- + drivers/char/vt_ioctl.c | 6 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- + drivers/connector/cn_queue.c | 12 +- + drivers/connector/connector.c | 22 +- + drivers/firewire/core-cdev.c | 1 + + drivers/gpio/gpiolib.c | 2 +- + drivers/hid/hidraw.c | 1 + + drivers/hwmon/fschmd.c | 2 +- + drivers/hwmon/ltc4215.c | 47 +- + drivers/hwmon/ltc4245.c | 131 +-- + drivers/i2c/busses/i2c-amd756.c | 2 +- + drivers/i2c/busses/i2c-amd8111.c | 4 +- + drivers/i2c/busses/i2c-i801.c | 4 +- + drivers/i2c/busses/i2c-isch.c | 2 +- + drivers/i2c/busses/i2c-piix4.c | 4 +- + drivers/i2c/busses/i2c-sis96x.c | 2 +- + drivers/i2c/busses/i2c-viapro.c | 2 +- + drivers/infiniband/core/ucm.c | 1 + + drivers/infiniband/core/user_mad.c | 1 + + drivers/infiniband/core/uverbs_main.c | 1 + + drivers/input/evdev.c | 1 + + drivers/input/input.c | 3 +- + drivers/input/joydev.c | 1 + + drivers/input/misc/uinput.c | 1 + + drivers/input/mousedev.c | 1 + + drivers/isdn/divert/divert_procfs.c | 1 + + drivers/leds/leds-pca9532.c | 3 - + drivers/lguest/lguest_user.c | 2 +- + drivers/macintosh/therm_adt746x.c | 4 +- + drivers/macintosh/therm_pm72.c | 4 +- + drivers/macintosh/windfarm_lm75_sensor.c | 4 +- + drivers/macintosh/windfarm_max6690_sensor.c | 4 +- + drivers/macintosh/windfarm_smu_sat.c | 4 +- + drivers/md/dm-log-userspace-transfer.c | 6 +- + drivers/md/dm.c | 16 +- + drivers/media/dvb/dvb-core/dmxdev.c | 3 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 1 + + drivers/media/dvb/firewire/firedtv-ci.c | 2 +- + drivers/media/radio/radio-cadet.c | 1 + + drivers/media/video/cpia.c | 1 + + drivers/mfd/ab3100-core.c | 4 +- + drivers/mfd/ucb1400_core.c | 1 + + drivers/misc/eeprom/max6875.c | 29 +- + drivers/misc/phantom.c | 2 +- + drivers/misc/sgi-gru/grufile.c | 3 +- + drivers/mmc/core/debugfs.c | 2 +- + drivers/mmc/core/sdio_cis.c | 65 +- + drivers/mmc/host/Kconfig | 41 + + drivers/mmc/host/mmci.c | 2 - + drivers/mmc/host/s3cmci.c | 608 ++++++-- + drivers/mmc/host/s3cmci.h | 14 +- + drivers/mtd/mtd_blkdevs.c | 19 +- + drivers/net/3c59x.c | 77 +- + drivers/net/Kconfig | 7 + + drivers/net/Makefile | 1 + + drivers/net/bcm63xx_enet.c | 2 +- + drivers/net/benet/be.h | 1 + + drivers/net/benet/be_cmds.c | 3 +- + drivers/net/benet/be_cmds.h | 3 +- + drivers/net/benet/be_main.c | 23 +- + drivers/net/bonding/bond_sysfs.c | 1 + + drivers/net/cnic.c | 3 +- + drivers/net/cnic_if.h | 4 +- + drivers/net/e1000e/netdev.c | 13 +- + drivers/net/hamradio/mkiss.c | 4 +- + drivers/net/igb/igb_main.c | 13 +- + drivers/net/iseries_veth.c | 2 +- + drivers/net/ixgbe/ixgbe_82598.c | 2 +- + drivers/net/ixgbe/ixgbe_common.c | 232 ++- + drivers/net/ixgbe/ixgbe_ethtool.c | 4 + + drivers/net/ixgbe/ixgbe_main.c | 52 +- + drivers/net/ixgbe/ixgbe_type.h | 9 + + drivers/net/ks8851_mll.c | 1697 ++++++++++++++++++++ + drivers/net/meth.c | 2 +- + drivers/net/qlge/qlge.h | 18 +- + drivers/net/qlge/qlge_main.c | 26 +- + drivers/net/sgiseeq.c | 2 +- + drivers/net/skge.c | 16 +- + drivers/net/skge.h | 2 + + drivers/net/sky2.c | 7 +- + drivers/net/sky2.h | 2 + + drivers/net/tg3.h | 1 - + drivers/net/virtio_net.c | 2 +- + drivers/net/wireless/Kconfig | 13 +- + drivers/net/wireless/ath/ar9170/phy.c | 6 +- + drivers/net/wireless/b43/pio.c | 60 +- + drivers/net/wireless/mac80211_hwsim.c | 3 + + drivers/net/wireless/rt2x00/rt73usb.c | 1 + + drivers/pcmcia/sa1100_assabet.c | 2 +- + drivers/pcmcia/sa1100_neponset.c | 2 +- + drivers/platform/x86/sony-laptop.c | 127 +- + drivers/s390/cio/qdio_debug.c | 2 +- + drivers/s390/cio/qdio_perf.c | 2 +- + drivers/scsi/sg.c | 43 +- + drivers/serial/8250.c | 7 +- + drivers/serial/Kconfig | 2 +- + drivers/serial/icom.c | 54 +- + drivers/serial/sa1100.c | 2 +- + drivers/serial/serial_txx9.c | 39 +- + drivers/sfi/sfi_core.c | 17 +- + drivers/spi/Makefile | 2 +- + drivers/spi/{mxc_spi.c => spi_imx.c} | 383 +++--- + drivers/spi/spidev.c | 2 +- + drivers/staging/dst/dcore.c | 9 +- + drivers/staging/iio/light/tsl2561.c | 4 - + drivers/staging/pohmelfs/config.c | 5 +- + drivers/usb/class/usbtmc.c | 2 +- + drivers/usb/gadget/inode.c | 1 + + drivers/usb/gadget/printer.c | 2 +- + drivers/usb/host/whci/debug.c | 6 +- + drivers/usb/misc/rio500.c | 3 +- + drivers/uwb/uwb-debug.c | 6 +- + drivers/video/uvesafb.c | 5 +- + drivers/w1/masters/ds2482.c | 35 +- + drivers/w1/w1_netlink.c | 2 +- + drivers/xen/xenfs/xenbus.c | 1 + + fs/afs/cache.h | 12 - + fs/afs/internal.h | 2 +- + fs/anon_inodes.c | 2 + + fs/bio.c | 49 +- + fs/btrfs/acl.c | 6 +- + fs/btrfs/btrfs_inode.h | 8 + + fs/btrfs/ctree.h | 27 +- + fs/btrfs/disk-io.c | 10 +- + fs/btrfs/extent-tree.c | 391 ++++- + fs/btrfs/extent_io.c | 92 +- + fs/btrfs/extent_io.h | 13 +- + fs/btrfs/file.c | 35 +- + fs/btrfs/inode.c | 239 +++- + fs/btrfs/ioctl.c | 62 +- + fs/btrfs/ordered-data.c | 93 +- + fs/btrfs/ordered-data.h | 4 - + fs/btrfs/super.c | 2 + + fs/btrfs/transaction.c | 10 + + fs/btrfs/volumes.c | 4 +- + fs/btrfs/xattr.c | 2 +- + fs/coda/psdev.c | 1 + + fs/ext4/Kconfig | 14 - + fs/ext4/inode.c | 28 +- + fs/ext4/super.c | 31 - + fs/jbd2/journal.c | 2 +- + fs/nfsd/nfsctl.c | 2 +- + fs/nilfs2/dir.c | 2 +- + fs/nilfs2/file.c | 2 +- + fs/nilfs2/mdt.c | 2 +- + fs/nilfs2/nilfs.h | 4 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/cluster/netdebug.c | 4 +- + fs/ocfs2/dlm/dlmdebug.c | 8 +- + fs/ocfs2/super.c | 2 +- + fs/omfs/dir.c | 2 +- + fs/omfs/file.c | 2 +- + fs/omfs/omfs.h | 4 +- + fs/partitions/check.c | 12 +- + fs/select.c | 1 + + include/asm-generic/gpio.h | 1 + + include/linux/blkdev.h | 48 +- + include/linux/blktrace_api.h | 2 + + include/linux/cgroup.h | 2 +- + include/linux/connector.h | 11 +- + include/linux/fs.h | 6 +- + include/linux/genhd.h | 21 +- + include/linux/poll.h | 2 +- + include/linux/res_counter.h | 6 +- + include/trace/events/block.h | 33 + + kernel/cgroup.c | 15 +- + kernel/kprobes.c | 4 +- + kernel/module.c | 7 +- + kernel/rcutree_trace.c | 10 +- + kernel/res_counter.c | 18 +- + kernel/sched.c | 2 +- + kernel/time/timer_list.c | 2 +- + kernel/time/timer_stats.c | 2 +- + kernel/trace/blktrace.c | 39 + + lib/vsprintf.c | 2 +- + mm/memcontrol.c | 127 +- + mm/rmap.c | 4 +- + mm/swapfile.c | 12 +- + net/core/pktgen.c | 6 +- + net/ipv4/af_inet.c | 1 + + net/ipv4/ip_output.c | 1 + + net/ipv4/tcp.c | 4 +- + net/ipv4/tcp_output.c | 11 +- + net/ipv4/udp.c | 1 + + net/mac80211/tx.c | 5 +- + net/rfkill/core.c | 1 + + samples/tracepoints/tracepoint-sample.c | 2 +- + security/integrity/ima/ima_fs.c | 10 +- + sound/aoa/codecs/tas.c | 9 + + sound/mips/hal2.c | 2 +- + sound/mips/sgio2audio.c | 2 +- + sound/pci/ctxfi/ctatc.c | 4 +- + sound/pci/echoaudio/echoaudio.c | 30 +- + sound/pci/echoaudio/mia.c | 1 + + sound/pci/hda/hda_intel.c | 1 + + sound/pci/hda/patch_analog.c | 139 ++ + sound/pci/hda/patch_conexant.c | 12 +- + sound/pci/hda/patch_realtek.c | 244 ++- + sound/pci/hda/patch_sigmatel.c | 20 +- + sound/pci/intel8x0.c | 12 + + sound/ppc/keywest.c | 14 +- + sound/soc/blackfin/Kconfig | 98 +- + sound/soc/blackfin/bf5xx-i2s.c | 8 +- + sound/soc/blackfin/bf5xx-tdm.c | 8 +- + sound/soc/davinci/davinci-i2s.c | 37 +- + sound/soc/davinci/davinci-mcasp.c | 80 +- + sound/soc/davinci/davinci-mcasp.h | 7 +- + sound/soc/davinci/davinci-pcm.c | 13 +- + sound/soc/davinci/davinci-pcm.h | 1 - + sound/soc/pxa/Kconfig | 2 +- + sound/usb/usbmixer.c | 23 +- + virt/kvm/kvm_main.c | 2 +- + 334 files changed, 7052 insertions(+), 2602 deletions(-) + rename Documentation/{i2c/chips => misc-devices}/eeprom (100%) + rename Documentation/{i2c/chips => misc-devices}/max6875 (94%) + create mode 100644 arch/arm/include/asm/smp_plat.h + create mode 100644 arch/arm/mm/pabort-legacy.S + create mode 100644 arch/arm/mm/pabort-v6.S + create mode 100644 arch/arm/mm/pabort-v7.S + create mode 100644 drivers/acpi/acpi_pad.c + create mode 100644 drivers/net/ks8851_mll.c + rename drivers/spi/{mxc_spi.c => spi_imx.c} (55%) + delete mode 100644 fs/afs/cache.h +Merging fixes/fixes +$ git merge fixes/fixes +Merge made by recursive. + arch/powerpc/kvm/timing.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Merge made by recursive. + arch/sparc/kernel/perf_event.c | 371 ++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 357 insertions(+), 14 deletions(-) +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/sg.c +Merge made by recursive. + Documentation/scsi/hptiop.txt | 21 +- + MAINTAINERS | 15 + + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- + drivers/s390/scsi/zfcp_aux.c | 33 +- + drivers/s390/scsi/zfcp_ccw.c | 40 +- + drivers/s390/scsi/zfcp_cfdc.c | 17 +- + drivers/s390/scsi/zfcp_ext.h | 2 +- + drivers/s390/scsi/zfcp_fsf.c | 22 +- + drivers/scsi/Kconfig | 11 + + drivers/scsi/Makefile | 2 + + drivers/scsi/be2iscsi/Kconfig | 8 + + drivers/scsi/be2iscsi/Makefile | 8 + + drivers/scsi/be2iscsi/be.h | 183 ++ + drivers/scsi/be2iscsi/be_cmds.c | 523 +++ + drivers/scsi/be2iscsi/be_cmds.h | 877 +++++ + drivers/scsi/be2iscsi/be_iscsi.c | 638 ++++ + drivers/scsi/be2iscsi/be_iscsi.h | 75 + + drivers/scsi/be2iscsi/be_main.c | 3390 ++++++++++++++++++++ + drivers/scsi/be2iscsi/be_main.h | 837 +++++ + drivers/scsi/be2iscsi/be_mgmt.c | 321 ++ + drivers/scsi/be2iscsi/be_mgmt.h | 249 ++ + drivers/scsi/bfa/Makefile | 15 + + drivers/scsi/bfa/bfa_callback_priv.h | 57 + + drivers/scsi/bfa/bfa_cb_ioim_macros.h | 205 ++ + drivers/scsi/bfa/bfa_cee.c | 492 +++ + drivers/scsi/bfa/bfa_core.c | 402 +++ + drivers/scsi/bfa/bfa_csdebug.c | 58 + + drivers/scsi/bfa/bfa_fcpim.c | 175 + + drivers/scsi/bfa/bfa_fcpim_priv.h | 188 ++ + drivers/scsi/bfa/bfa_fcport.c | 1671 ++++++++++ + drivers/scsi/bfa/bfa_fcs.c | 182 ++ + drivers/scsi/bfa/bfa_fcs_lport.c | 940 ++++++ + drivers/scsi/bfa/bfa_fcs_port.c | 68 + + drivers/scsi/bfa/bfa_fcs_uf.c | 105 + + drivers/scsi/bfa/bfa_fcxp.c | 782 +++++ + drivers/scsi/bfa/bfa_fcxp_priv.h | 138 + + drivers/scsi/bfa/bfa_fwimg_priv.h | 31 + + drivers/scsi/bfa/bfa_hw_cb.c | 142 + + drivers/scsi/bfa/bfa_hw_ct.c | 162 + + drivers/scsi/bfa/bfa_intr.c | 218 ++ + drivers/scsi/bfa/bfa_intr_priv.h | 115 + + drivers/scsi/bfa/bfa_ioc.c | 2382 ++++++++++++++ + drivers/scsi/bfa/bfa_ioc.h | 259 ++ + drivers/scsi/bfa/bfa_iocfc.c | 872 +++++ + drivers/scsi/bfa/bfa_iocfc.h | 168 + + drivers/scsi/bfa/bfa_iocfc_q.c | 44 + + drivers/scsi/bfa/bfa_ioim.c | 1311 ++++++++ + drivers/scsi/bfa/bfa_itnim.c | 1088 +++++++ + drivers/scsi/bfa/bfa_log.c | 346 ++ + drivers/scsi/bfa/bfa_log_module.c | 451 +++ + drivers/scsi/bfa/bfa_lps.c | 782 +++++ + drivers/scsi/bfa/bfa_lps_priv.h | 38 + + drivers/scsi/bfa/bfa_module.c | 90 + + drivers/scsi/bfa/bfa_modules_priv.h | 43 + + drivers/scsi/bfa/bfa_os_inc.h | 222 ++ + drivers/scsi/bfa/bfa_port.c | 460 +++ + drivers/scsi/bfa/bfa_port_priv.h | 90 + + drivers/scsi/bfa/bfa_priv.h | 113 + + drivers/scsi/bfa/bfa_rport.c | 911 ++++++ + drivers/scsi/bfa/bfa_rport_priv.h | 45 + + drivers/scsi/bfa/bfa_sgpg.c | 231 ++ + drivers/scsi/bfa/bfa_sgpg_priv.h | 79 + + drivers/scsi/bfa/bfa_sm.c | 38 + + drivers/scsi/bfa/bfa_timer.c | 90 + + drivers/scsi/bfa/bfa_trcmod_priv.h | 66 + + drivers/scsi/bfa/bfa_tskim.c | 689 ++++ + drivers/scsi/bfa/bfa_uf.c | 345 ++ + drivers/scsi/bfa/bfa_uf_priv.h | 47 + + drivers/scsi/bfa/bfad.c | 1182 +++++++ + drivers/scsi/bfa/bfad_attr.c | 649 ++++ + drivers/scsi/bfa/bfad_attr.h | 65 + + drivers/scsi/bfa/bfad_drv.h | 295 ++ + drivers/scsi/bfa/bfad_fwimg.c | 95 + + drivers/scsi/bfa/bfad_im.c | 1230 +++++++ + drivers/scsi/bfa/bfad_im.h | 150 + + drivers/scsi/bfa/bfad_im_compat.h | 46 + + drivers/scsi/bfa/bfad_intr.c | 214 ++ + drivers/scsi/bfa/bfad_ipfc.h | 42 + + drivers/scsi/bfa/bfad_os.c | 50 + + drivers/scsi/bfa/bfad_tm.h | 59 + + drivers/scsi/bfa/bfad_trcmod.h | 52 + + drivers/scsi/bfa/fab.c | 62 + + drivers/scsi/bfa/fabric.c | 1278 ++++++++ + drivers/scsi/bfa/fcbuild.c | 1449 +++++++++ + drivers/scsi/bfa/fcbuild.h | 273 ++ + drivers/scsi/bfa/fcpim.c | 844 +++++ + drivers/scsi/bfa/fcptm.c | 68 + + drivers/scsi/bfa/fcs.h | 30 + + drivers/scsi/bfa/fcs_auth.h | 37 + + drivers/scsi/bfa/fcs_fabric.h | 61 + + drivers/scsi/bfa/fcs_fcpim.h | 44 + + drivers/scsi/bfa/fcs_fcptm.h | 45 + + drivers/scsi/bfa/fcs_fcxp.h | 29 + + drivers/scsi/bfa/fcs_lport.h | 117 + + drivers/scsi/bfa/fcs_ms.h | 35 + + drivers/scsi/bfa/fcs_port.h | 32 + + drivers/scsi/bfa/fcs_rport.h | 61 + + drivers/scsi/bfa/fcs_trcmod.h | 56 + + drivers/scsi/bfa/fcs_uf.h | 32 + + drivers/scsi/bfa/fcs_vport.h | 39 + + drivers/scsi/bfa/fdmi.c | 1223 +++++++ + drivers/scsi/bfa/include/aen/bfa_aen.h | 92 + + drivers/scsi/bfa/include/aen/bfa_aen_adapter.h | 31 + + drivers/scsi/bfa/include/aen/bfa_aen_audit.h | 31 + + drivers/scsi/bfa/include/aen/bfa_aen_ethport.h | 35 + + drivers/scsi/bfa/include/aen/bfa_aen_ioc.h | 37 + + drivers/scsi/bfa/include/aen/bfa_aen_itnim.h | 33 + + drivers/scsi/bfa/include/aen/bfa_aen_lport.h | 51 + + drivers/scsi/bfa/include/aen/bfa_aen_port.h | 57 + + drivers/scsi/bfa/include/aen/bfa_aen_rport.h | 37 + + drivers/scsi/bfa/include/bfa.h | 177 + + drivers/scsi/bfa/include/bfa_fcpim.h | 159 + + drivers/scsi/bfa/include/bfa_fcptm.h | 47 + + drivers/scsi/bfa/include/bfa_svc.h | 324 ++ + drivers/scsi/bfa/include/bfa_timer.h | 53 + + drivers/scsi/bfa/include/bfi/bfi.h | 174 + + drivers/scsi/bfa/include/bfi/bfi_boot.h | 34 + + drivers/scsi/bfa/include/bfi/bfi_cbreg.h | 305 ++ + drivers/scsi/bfa/include/bfi/bfi_cee.h | 119 + + drivers/scsi/bfa/include/bfi/bfi_ctreg.h | 611 ++++ + drivers/scsi/bfa/include/bfi/bfi_fabric.h | 92 + + drivers/scsi/bfa/include/bfi/bfi_fcpim.h | 301 ++ + drivers/scsi/bfa/include/bfi/bfi_fcxp.h | 71 + + drivers/scsi/bfa/include/bfi/bfi_ioc.h | 202 ++ + drivers/scsi/bfa/include/bfi/bfi_iocfc.h | 177 + + drivers/scsi/bfa/include/bfi/bfi_lport.h | 89 + + drivers/scsi/bfa/include/bfi/bfi_lps.h | 96 + + drivers/scsi/bfa/include/bfi/bfi_port.h | 115 + + drivers/scsi/bfa/include/bfi/bfi_pport.h | 184 ++ + drivers/scsi/bfa/include/bfi/bfi_rport.h | 104 + + drivers/scsi/bfa/include/bfi/bfi_uf.h | 52 + + drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h | 36 + + drivers/scsi/bfa/include/cna/cee/bfa_cee.h | 77 + + drivers/scsi/bfa/include/cna/port/bfa_port.h | 69 + + drivers/scsi/bfa/include/cna/pstats/ethport_defs.h | 36 + + drivers/scsi/bfa/include/cna/pstats/phyport_defs.h | 218 ++ + drivers/scsi/bfa/include/cs/bfa_checksum.h | 60 + + drivers/scsi/bfa/include/cs/bfa_debug.h | 44 + + drivers/scsi/bfa/include/cs/bfa_log.h | 184 ++ + drivers/scsi/bfa/include/cs/bfa_perf.h | 34 + + drivers/scsi/bfa/include/cs/bfa_plog.h | 162 + + drivers/scsi/bfa/include/cs/bfa_q.h | 81 + + drivers/scsi/bfa/include/cs/bfa_sm.h | 69 + + drivers/scsi/bfa/include/cs/bfa_trc.h | 176 + + drivers/scsi/bfa/include/cs/bfa_wc.h | 68 + + drivers/scsi/bfa/include/defs/bfa_defs_adapter.h | 82 + + drivers/scsi/bfa/include/defs/bfa_defs_aen.h | 73 + + drivers/scsi/bfa/include/defs/bfa_defs_audit.h | 38 + + drivers/scsi/bfa/include/defs/bfa_defs_auth.h | 112 + + drivers/scsi/bfa/include/defs/bfa_defs_boot.h | 71 + + drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 159 + + drivers/scsi/bfa/include/defs/bfa_defs_driver.h | 40 + + drivers/scsi/bfa/include/defs/bfa_defs_ethport.h | 98 + + drivers/scsi/bfa/include/defs/bfa_defs_fcpim.h | 45 + + drivers/scsi/bfa/include/defs/bfa_defs_im_common.h | 32 + + drivers/scsi/bfa/include/defs/bfa_defs_im_team.h | 72 + + drivers/scsi/bfa/include/defs/bfa_defs_ioc.h | 152 + + drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h | 310 ++ + drivers/scsi/bfa/include/defs/bfa_defs_ipfc.h | 70 + + drivers/scsi/bfa/include/defs/bfa_defs_itnim.h | 126 + + drivers/scsi/bfa/include/defs/bfa_defs_led.h | 35 + + drivers/scsi/bfa/include/defs/bfa_defs_lport.h | 68 + + drivers/scsi/bfa/include/defs/bfa_defs_mfg.h | 58 + + drivers/scsi/bfa/include/defs/bfa_defs_pci.h | 41 + + drivers/scsi/bfa/include/defs/bfa_defs_pm.h | 33 + + drivers/scsi/bfa/include/defs/bfa_defs_pom.h | 56 + + drivers/scsi/bfa/include/defs/bfa_defs_port.h | 245 ++ + drivers/scsi/bfa/include/defs/bfa_defs_pport.h | 383 +++ + drivers/scsi/bfa/include/defs/bfa_defs_qos.h | 99 + + drivers/scsi/bfa/include/defs/bfa_defs_rport.h | 199 ++ + drivers/scsi/bfa/include/defs/bfa_defs_status.h | 255 ++ + drivers/scsi/bfa/include/defs/bfa_defs_tin.h | 118 + + drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h | 43 + + drivers/scsi/bfa/include/defs/bfa_defs_types.h | 30 + + drivers/scsi/bfa/include/defs/bfa_defs_version.h | 22 + + drivers/scsi/bfa/include/defs/bfa_defs_vf.h | 74 + + drivers/scsi/bfa/include/defs/bfa_defs_vport.h | 91 + + drivers/scsi/bfa/include/fcb/bfa_fcb.h | 33 + + drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h | 76 + + drivers/scsi/bfa/include/fcb/bfa_fcb_port.h | 113 + + drivers/scsi/bfa/include/fcb/bfa_fcb_rport.h | 80 + + drivers/scsi/bfa/include/fcb/bfa_fcb_vf.h | 47 + + drivers/scsi/bfa/include/fcb/bfa_fcb_vport.h | 47 + + drivers/scsi/bfa/include/fcs/bfa_fcs.h | 73 + + drivers/scsi/bfa/include/fcs/bfa_fcs_auth.h | 82 + + drivers/scsi/bfa/include/fcs/bfa_fcs_fabric.h | 112 + + drivers/scsi/bfa/include/fcs/bfa_fcs_fcpim.h | 131 + + drivers/scsi/bfa/include/fcs/bfa_fcs_fdmi.h | 63 + + drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h | 226 ++ + drivers/scsi/bfa/include/fcs/bfa_fcs_rport.h | 104 + + drivers/scsi/bfa/include/fcs/bfa_fcs_vport.h | 63 + + drivers/scsi/bfa/include/log/bfa_log_fcs.h | 28 + + drivers/scsi/bfa/include/log/bfa_log_hal.h | 30 + + drivers/scsi/bfa/include/log/bfa_log_linux.h | 44 + + drivers/scsi/bfa/include/log/bfa_log_wdrv.h | 36 + + drivers/scsi/bfa/include/protocol/ct.h | 492 +++ + drivers/scsi/bfa/include/protocol/fc.h | 1105 +++++++ + drivers/scsi/bfa/include/protocol/fc_sp.h | 224 ++ + drivers/scsi/bfa/include/protocol/fcp.h | 186 ++ + drivers/scsi/bfa/include/protocol/fdmi.h | 163 + + drivers/scsi/bfa/include/protocol/pcifw.h | 75 + + drivers/scsi/bfa/include/protocol/scsi.h | 1648 ++++++++++ + drivers/scsi/bfa/include/protocol/types.h | 42 + + drivers/scsi/bfa/loop.c | 422 +++ + drivers/scsi/bfa/lport_api.c | 291 ++ + drivers/scsi/bfa/lport_priv.h | 82 + + drivers/scsi/bfa/ms.c | 759 +++++ + drivers/scsi/bfa/n2n.c | 105 + + drivers/scsi/bfa/ns.c | 1243 +++++++ + drivers/scsi/bfa/plog.c | 184 ++ + drivers/scsi/bfa/rport.c | 2618 +++++++++++++++ + drivers/scsi/bfa/rport_api.c | 180 ++ + drivers/scsi/bfa/rport_ftrs.c | 375 +++ + drivers/scsi/bfa/scn.c | 482 +++ + drivers/scsi/bfa/vfapi.c | 292 ++ + drivers/scsi/bfa/vport.c | 891 +++++ + drivers/scsi/bnx2i/bnx2i.h | 2 + + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 2 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 - + drivers/scsi/hptiop.c | 37 +- + drivers/scsi/hptiop.h | 3 +- + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/libiscsi.c | 6 +- + drivers/scsi/lpfc/lpfc_scsi.c | 15 +- + drivers/scsi/mpt2sas/Kconfig | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2.h | 103 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 200 ++- + drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 334 ++ + drivers/scsi/mpt2sas/mpi/mpi2_init.h | 18 +- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 65 +- + drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 134 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 446 ++- + drivers/scsi/mpt2sas/mpt2sas_base.h | 106 +- + drivers/scsi/mpt2sas/mpt2sas_config.c | 22 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 61 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 568 +++- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 26 +- + drivers/scsi/mvsas/mv_defs.h | 4 + + drivers/scsi/mvsas/mv_init.c | 4 + + drivers/scsi/pmcraid.c | 58 +- + drivers/scsi/qla2xxx/qla_mid.c | 6 +- + drivers/scsi/scsi.c | 11 +- + drivers/scsi/scsi_debug.c | 139 +- + drivers/scsi/scsi_error.c | 3 + + drivers/scsi/scsi_transport_fc.c | 2 + + drivers/scsi/sd.c | 140 +- + drivers/scsi/sd.h | 9 +- + drivers/scsi/sd_dif.c | 65 - + drivers/scsi/sg.c | 10 +- + drivers/scsi/sr.c | 22 +- + drivers/scsi/st.c | 3 - + include/scsi/libiscsi.h | 3 +- + include/scsi/scsi.h | 3 + + include/scsi/scsi_cmnd.h | 4 - + include/scsi/scsi_host.h | 15 +- + 259 files changed, 58442 insertions(+), 666 deletions(-) + create mode 100644 drivers/scsi/be2iscsi/Kconfig + create mode 100644 drivers/scsi/be2iscsi/Makefile + create mode 100644 drivers/scsi/be2iscsi/be.h + create mode 100644 drivers/scsi/be2iscsi/be_cmds.c + create mode 100644 drivers/scsi/be2iscsi/be_cmds.h + create mode 100644 drivers/scsi/be2iscsi/be_iscsi.c + create mode 100644 drivers/scsi/be2iscsi/be_iscsi.h + create mode 100644 drivers/scsi/be2iscsi/be_main.c + create mode 100644 drivers/scsi/be2iscsi/be_main.h + create mode 100644 drivers/scsi/be2iscsi/be_mgmt.c + create mode 100644 drivers/scsi/be2iscsi/be_mgmt.h + create mode 100644 drivers/scsi/bfa/Makefile + create mode 100644 drivers/scsi/bfa/bfa_callback_priv.h + create mode 100644 drivers/scsi/bfa/bfa_cb_ioim_macros.h + create mode 100644 drivers/scsi/bfa/bfa_cee.c + create mode 100644 drivers/scsi/bfa/bfa_core.c + create mode 100644 drivers/scsi/bfa/bfa_csdebug.c + create mode 100644 drivers/scsi/bfa/bfa_fcpim.c + create mode 100644 drivers/scsi/bfa/bfa_fcpim_priv.h + create mode 100644 drivers/scsi/bfa/bfa_fcport.c + create mode 100644 drivers/scsi/bfa/bfa_fcs.c + create mode 100644 drivers/scsi/bfa/bfa_fcs_lport.c + create mode 100644 drivers/scsi/bfa/bfa_fcs_port.c + create mode 100644 drivers/scsi/bfa/bfa_fcs_uf.c + create mode 100644 drivers/scsi/bfa/bfa_fcxp.c + create mode 100644 drivers/scsi/bfa/bfa_fcxp_priv.h + create mode 100644 drivers/scsi/bfa/bfa_fwimg_priv.h + create mode 100644 drivers/scsi/bfa/bfa_hw_cb.c + create mode 100644 drivers/scsi/bfa/bfa_hw_ct.c + create mode 100644 drivers/scsi/bfa/bfa_intr.c + create mode 100644 drivers/scsi/bfa/bfa_intr_priv.h + create mode 100644 drivers/scsi/bfa/bfa_ioc.c + create mode 100644 drivers/scsi/bfa/bfa_ioc.h + create mode 100644 drivers/scsi/bfa/bfa_iocfc.c + create mode 100644 drivers/scsi/bfa/bfa_iocfc.h + create mode 100644 drivers/scsi/bfa/bfa_iocfc_q.c + create mode 100644 drivers/scsi/bfa/bfa_ioim.c + create mode 100644 drivers/scsi/bfa/bfa_itnim.c + create mode 100644 drivers/scsi/bfa/bfa_log.c + create mode 100644 drivers/scsi/bfa/bfa_log_module.c + create mode 100644 drivers/scsi/bfa/bfa_lps.c + create mode 100644 drivers/scsi/bfa/bfa_lps_priv.h + create mode 100644 drivers/scsi/bfa/bfa_module.c + create mode 100644 drivers/scsi/bfa/bfa_modules_priv.h + create mode 100644 drivers/scsi/bfa/bfa_os_inc.h + create mode 100644 drivers/scsi/bfa/bfa_port.c + create mode 100644 drivers/scsi/bfa/bfa_port_priv.h + create mode 100644 drivers/scsi/bfa/bfa_priv.h + create mode 100644 drivers/scsi/bfa/bfa_rport.c + create mode 100644 drivers/scsi/bfa/bfa_rport_priv.h + create mode 100644 drivers/scsi/bfa/bfa_sgpg.c + create mode 100644 drivers/scsi/bfa/bfa_sgpg_priv.h + create mode 100644 drivers/scsi/bfa/bfa_sm.c + create mode 100644 drivers/scsi/bfa/bfa_timer.c + create mode 100644 drivers/scsi/bfa/bfa_trcmod_priv.h + create mode 100644 drivers/scsi/bfa/bfa_tskim.c + create mode 100644 drivers/scsi/bfa/bfa_uf.c + create mode 100644 drivers/scsi/bfa/bfa_uf_priv.h + create mode 100644 drivers/scsi/bfa/bfad.c + create mode 100644 drivers/scsi/bfa/bfad_attr.c + create mode 100644 drivers/scsi/bfa/bfad_attr.h + create mode 100644 drivers/scsi/bfa/bfad_drv.h + create mode 100644 drivers/scsi/bfa/bfad_fwimg.c + create mode 100644 drivers/scsi/bfa/bfad_im.c + create mode 100644 drivers/scsi/bfa/bfad_im.h + create mode 100644 drivers/scsi/bfa/bfad_im_compat.h + create mode 100644 drivers/scsi/bfa/bfad_intr.c + create mode 100644 drivers/scsi/bfa/bfad_ipfc.h + create mode 100644 drivers/scsi/bfa/bfad_os.c + create mode 100644 drivers/scsi/bfa/bfad_tm.h + create mode 100644 drivers/scsi/bfa/bfad_trcmod.h + create mode 100644 drivers/scsi/bfa/fab.c + create mode 100644 drivers/scsi/bfa/fabric.c + create mode 100644 drivers/scsi/bfa/fcbuild.c + create mode 100644 drivers/scsi/bfa/fcbuild.h + create mode 100644 drivers/scsi/bfa/fcpim.c + create mode 100644 drivers/scsi/bfa/fcptm.c + create mode 100644 drivers/scsi/bfa/fcs.h + create mode 100644 drivers/scsi/bfa/fcs_auth.h + create mode 100644 drivers/scsi/bfa/fcs_fabric.h + create mode 100644 drivers/scsi/bfa/fcs_fcpim.h + create mode 100644 drivers/scsi/bfa/fcs_fcptm.h + create mode 100644 drivers/scsi/bfa/fcs_fcxp.h + create mode 100644 drivers/scsi/bfa/fcs_lport.h + create mode 100644 drivers/scsi/bfa/fcs_ms.h + create mode 100644 drivers/scsi/bfa/fcs_port.h + create mode 100644 drivers/scsi/bfa/fcs_rport.h + create mode 100644 drivers/scsi/bfa/fcs_trcmod.h + create mode 100644 drivers/scsi/bfa/fcs_uf.h + create mode 100644 drivers/scsi/bfa/fcs_vport.h + create mode 100644 drivers/scsi/bfa/fdmi.c + create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen.h + create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_adapter.h + create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_audit.h + create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_ethport.h + create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_ioc.h + create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_itnim.h + create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_lport.h + create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_port.h + create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_rport.h + create mode 100644 drivers/scsi/bfa/include/bfa.h + create mode 100644 drivers/scsi/bfa/include/bfa_fcpim.h + create mode 100644 drivers/scsi/bfa/include/bfa_fcptm.h + create mode 100644 drivers/scsi/bfa/include/bfa_svc.h + create mode 100644 drivers/scsi/bfa/include/bfa_timer.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_boot.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_cbreg.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_cee.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_ctreg.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_fabric.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_fcpim.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_fcxp.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_ioc.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_iocfc.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_lport.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_lps.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_port.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_pport.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_rport.h + create mode 100644 drivers/scsi/bfa/include/bfi/bfi_uf.h + create mode 100644 drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h + create mode 100644 drivers/scsi/bfa/include/cna/cee/bfa_cee.h + create mode 100644 drivers/scsi/bfa/include/cna/port/bfa_port.h + create mode 100644 drivers/scsi/bfa/include/cna/pstats/ethport_defs.h + create mode 100644 drivers/scsi/bfa/include/cna/pstats/phyport_defs.h + create mode 100644 drivers/scsi/bfa/include/cs/bfa_checksum.h + create mode 100644 drivers/scsi/bfa/include/cs/bfa_debug.h + create mode 100644 drivers/scsi/bfa/include/cs/bfa_log.h + create mode 100644 drivers/scsi/bfa/include/cs/bfa_perf.h + create mode 100644 drivers/scsi/bfa/include/cs/bfa_plog.h + create mode 100644 drivers/scsi/bfa/include/cs/bfa_q.h + create mode 100644 drivers/scsi/bfa/include/cs/bfa_sm.h + create mode 100644 drivers/scsi/bfa/include/cs/bfa_trc.h + create mode 100644 drivers/scsi/bfa/include/cs/bfa_wc.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_adapter.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_aen.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_audit.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_auth.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_boot.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_cee.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_driver.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_ethport.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_fcpim.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_common.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_team.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_ioc.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_ipfc.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_itnim.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_led.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_lport.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_mfg.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pci.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pm.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pom.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_port.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pport.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_qos.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_rport.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_status.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_tin.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_types.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_version.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_vf.h + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_vport.h + create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb.h + create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h + create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_port.h + create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_rport.h + create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_vf.h + create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_vport.h + create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs.h + create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_auth.h + create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_fabric.h + create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_fcpim.h + create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_fdmi.h + create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h + create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_rport.h + create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_vport.h + create mode 100644 drivers/scsi/bfa/include/log/bfa_log_fcs.h + create mode 100644 drivers/scsi/bfa/include/log/bfa_log_hal.h + create mode 100644 drivers/scsi/bfa/include/log/bfa_log_linux.h + create mode 100644 drivers/scsi/bfa/include/log/bfa_log_wdrv.h + create mode 100644 drivers/scsi/bfa/include/protocol/ct.h + create mode 100644 drivers/scsi/bfa/include/protocol/fc.h + create mode 100644 drivers/scsi/bfa/include/protocol/fc_sp.h + create mode 100644 drivers/scsi/bfa/include/protocol/fcp.h + create mode 100644 drivers/scsi/bfa/include/protocol/fdmi.h + create mode 100644 drivers/scsi/bfa/include/protocol/pcifw.h + create mode 100644 drivers/scsi/bfa/include/protocol/scsi.h + create mode 100644 drivers/scsi/bfa/include/protocol/types.h + create mode 100644 drivers/scsi/bfa/loop.c + create mode 100644 drivers/scsi/bfa/lport_api.c + create mode 100644 drivers/scsi/bfa/lport_priv.h + create mode 100644 drivers/scsi/bfa/ms.c + create mode 100644 drivers/scsi/bfa/n2n.c + create mode 100644 drivers/scsi/bfa/ns.c + create mode 100644 drivers/scsi/bfa/plog.c + create mode 100644 drivers/scsi/bfa/rport.c + create mode 100644 drivers/scsi/bfa/rport_api.c + create mode 100644 drivers/scsi/bfa/rport_ftrs.c + create mode 100644 drivers/scsi/bfa/scn.c + create mode 100644 drivers/scsi/bfa/vfapi.c + create mode 100644 drivers/scsi/bfa/vport.c + create mode 100644 drivers/scsi/mpt2sas/mpi/mpi2_history.txt +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 +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Auto-merging Makefile +Merge made by recursive. + Makefile | 13 ++++++------- + include/linux/kernel.h | 6 ++++++ + scripts/Kbuild.include | 2 +- + scripts/Makefile.lib | 2 +- + scripts/checkkconfigsymbols.sh | 4 ++-- + scripts/headers_install.pl | 2 +- + scripts/mkcompile_h | 12 +++++++++--- + scripts/package/Makefile | 11 ++++++++++- + scripts/package/mkspec | 2 +- + 9 files changed, 37 insertions(+), 17 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +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 +Merge made by recursive. + drivers/crypto/padlock-sha.c | 14 ++++++++++++-- + 1 files changed, 12 insertions(+), 2 deletions(-) +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 +Already up-to-date. +Merging davinci/for-next +$ git merge davinci/for-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging thumb-2/thumb-2 +$ git merge thumb-2/thumb-2 +Merge made by recursive. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/boards/atngw100/mrmt.c | 1 + + arch/avr32/boards/atngw100/setup.c | 5 ---- + arch/avr32/mach-at32ap/at32ap700x.c | 35 ++++++++++++++------------ + arch/avr32/mach-at32ap/include/mach/board.h | 1 + + arch/avr32/mach-at32ap/include/mach/cpu.h | 2 + + 5 files changed, 23 insertions(+), 21 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Merge made by recursive. + arch/blackfin/Kconfig | 10 +++-- + arch/blackfin/kernel/time.c | 63 +------------------------------ + arch/blackfin/mach-bf548/boards/ezkit.c | 1 - + 3 files changed, 8 insertions(+), 66 deletions(-) +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Resolved 'drivers/rtc/Kconfig' using previous resolution. +Auto-merging drivers/rtc/Kconfig +CONFLICT (content): Merge conflict in drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d0770c3] Merge remote branch 'm68k/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/rtc/Kconfig | 19 +++ + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 511 insertions(+), 0 deletions(-) + create mode 100644 drivers/rtc/rtc-msm6242.c + create mode 100644 drivers/rtc/rtc-rp5c01.c +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68k/include/asm/processor.h | 2 ++ + arch/m68k/include/asm/ptrace.h | 12 ++++++++++++ + arch/m68knommu/kernel/ptrace.c | 18 +++++++++++++++--- + 3 files changed, 29 insertions(+), 3 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Merge made by recursive. + arch/microblaze/kernel/entry.S | 2 ++ + arch/microblaze/kernel/hw_exception_handler.S | 2 +- + arch/microblaze/kernel/process.c | 2 ++ + 3 files changed, 5 insertions(+), 1 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Resolved 'arch/mips/Kconfig' using previous resolution. +Resolved 'arch/mips/bcm63xx/Makefile' using previous resolution. +Resolved 'arch/mips/bcm63xx/boards/board_bcm963xx.c' using previous resolution. +Renaming arch/mips/configs/fulong_defconfig->arch/mips/configs/fuloong2e_defconfig +Auto-merging arch/mips/configs/fuloong2e_defconfig +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging arch/mips/Makefile +Auto-merging arch/mips/alchemy/common/time.c +Auto-merging arch/mips/bcm63xx/Makefile +CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile +Auto-merging arch/mips/bcm63xx/boards/board_bcm963xx.c +CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c +Auto-merging arch/mips/kernel/kspd.c +Auto-merging arch/mips/kernel/rtlx.c +Auto-merging arch/mips/kernel/scall32-o32.S +Auto-merging arch/mips/kernel/scall64-64.S +Auto-merging arch/mips/kernel/smtc.c +Auto-merging arch/mips/kernel/vmlinux.lds.S +Auto-merging arch/mips/kernel/vpe.c +CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree. +CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree. +CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree. +Auto-merging arch/mips/mm/init.c +Auto-merging arch/mips/pci/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c +arch/mips/Kconfig: needs merge +arch/mips/bcm63xx/Makefile: needs merge +arch/mips/bcm63xx/boards/board_bcm963xx.c: needs merge +arch/mips/lemote/lm2e/Makefile: needs merge +arch/mips/lemote/lm2e/pci.c: needs merge +arch/mips/lemote/lm2e/prom.c: needs merge +rm 'arch/mips/lemote/lm2e/Makefile' +rm 'arch/mips/lemote/lm2e/pci.c' +rm 'arch/mips/lemote/lm2e/prom.c' +$ git commit -v -a +[master c7041b0] Merge remote branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/mips/lemote/lm2e/early_printk.c | 41 ++++++++++++++++++++++++++++++++++ + 1 files changed, 41 insertions(+), 0 deletions(-) + create mode 100644 arch/mips/lemote/lm2e/early_printk.c +Merging parisc/next +$ git merge parisc/next +Resolved 'arch/parisc/include/asm/thread_info.h' using previous resolution. +Resolved 'arch/parisc/kernel/entry.S' using previous resolution. +Resolved 'arch/parisc/kernel/signal.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/parisc/Kconfig +Auto-merging arch/parisc/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h +Auto-merging arch/parisc/kernel/entry.S +CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S +Auto-merging arch/parisc/kernel/module.c +Auto-merging arch/parisc/kernel/signal.c +CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bd4d433] Merge remote branch 'parisc/next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/elf.h | 1 + + arch/parisc/include/asm/hardirq.h | 20 +-- + arch/parisc/include/asm/ptrace.h | 38 +++- + arch/parisc/include/asm/syscall.h | 40 +++ + arch/parisc/include/asm/thread_info.h | 10 +- + arch/parisc/kernel/asm-offsets.c | 4 +- + arch/parisc/kernel/entry.S | 29 +- + arch/parisc/kernel/irq.c | 5 - + arch/parisc/kernel/module.c | 2 +- + arch/parisc/kernel/ptrace.c | 457 +++++++++++++++++++++++++++++++-- + arch/parisc/kernel/signal.c | 4 + + arch/parisc/kernel/syscall.S | 22 +- + 14 files changed, 560 insertions(+), 74 deletions(-) + create mode 100644 arch/parisc/include/asm/syscall.h +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/delay.h | 7 +- + arch/s390/include/asm/elf.h | 12 +++ + arch/s390/include/asm/ptrace.h | 4 + + arch/s390/include/asm/uaccess.h | 2 + + arch/s390/include/asm/ucontext.h | 15 ++++ + arch/s390/kernel/compat_signal.c | 35 ++++++++- + arch/s390/kernel/compat_wrapper.S | 2 +- + arch/s390/kernel/ftrace.c | 3 - + arch/s390/kernel/module.c | 3 + + arch/s390/kernel/ptrace.c | 70 +++++++++++++++++ + arch/s390/kernel/setup.c | 15 +++- + arch/s390/kernel/swsusp_asm64.S | 26 +++++-- + arch/s390/kernel/vdso.c | 16 ++-- + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/s390/lib/delay.c | 27 ++++--- + arch/s390/lib/uaccess_mvcos.c | 12 ++-- + arch/s390/lib/uaccess_pt.c | 147 ++++++++++++----------------------- + arch/s390/lib/uaccess_std.c | 14 ++-- + arch/s390/mm/fault.c | 118 ++++++++++++++++------------ + arch/s390/mm/pgtable.c | 10 ++- + drivers/s390/char/raw3270.c | 2 + + drivers/s390/cio/blacklist.c | 13 +-- + drivers/s390/cio/chp.c | 2 +- + drivers/s390/cio/device.c | 4 +- + drivers/s390/cio/device.h | 1 + + drivers/s390/cio/device_fsm.c | 35 +++++++-- + drivers/s390/crypto/zcrypt_pcixcc.c | 13 ++- + include/linux/elf.h | 1 + + lib/Kconfig.debug | 7 +- + 29 files changed, 391 insertions(+), 226 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/boards/board-magicpanelr2.c | 2 - + arch/sh/boards/mach-dreamcast/setup.c | 2 - + arch/sh/boards/mach-ecovec24/setup.c | 44 ++++++++++++++++++++++++++++++++- + arch/sh/kernel/cpu/sh3/entry.S | 2 - + arch/sh/kernel/io_generic.c | 3 ++ + arch/sh/kernel/machvec.c | 3 ++ + arch/sh/kernel/sh_ksyms_32.c | 1 + + arch/sh/kernel/traps_32.c | 4 +- + 8 files changed, 52 insertions(+), 9 deletions(-) +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 cifs/master +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. + fs/ecryptfs/Kconfig | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging fs/ext3/super.c +Merge made by recursive. + Documentation/filesystems/ext3.txt | 16 ++++++++++++---- + fs/ext3/super.c | 13 ++++++++++++- + 2 files changed, 24 insertions(+), 5 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/glock.c | 10 +++- + fs/gfs2/ops_fstype.c | 135 +++++++++++++++++++++++++++++++++++++++++++------ + fs/gfs2/super.c | 16 +++--- + fs/gfs2/super.h | 2 +- + 4 files changed, 135 insertions(+), 28 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +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. + Documentation/filesystems/nfs41-server.txt | 9 ++++- + fs/nfsd/export.c | 22 ++++++++-- + fs/nfsd/nfs4state.c | 3 +- + fs/nfsd/nfsproc.c | 1 + + fs/nfsd/vfs.c | 62 ++++++++++++++++----------- + 5 files changed, 66 insertions(+), 31 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +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 +Merge made by recursive. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/hid-core.c | 8 +++++--- + drivers/hid/hid-twinhan.c | 4 ++-- + drivers/hid/usbhid/hid-core.c | 9 ++++----- + 3 files changed, 11 insertions(+), 10 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Renaming Documentation/i2c/chips/max6875->Documentation/misc-devices/max6875 +Auto-merging Documentation/misc-devices/max6875 +Removing Documentation/i2c/busses/i2c-voodoo3 +Removing drivers/i2c/busses/i2c-voodoo3.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 9 - + Documentation/i2c/busses/i2c-voodoo3 | 62 ------- + drivers/i2c/Kconfig | 1 + + drivers/i2c/busses/Kconfig | 16 -- + drivers/i2c/busses/Makefile | 3 - + drivers/i2c/busses/i2c-ali1535.c | 2 +- + drivers/i2c/busses/i2c-ali15x3.c | 2 +- + drivers/i2c/busses/i2c-iop3xx.c | 6 - + drivers/i2c/busses/i2c-mv64xxx.c | 3 - + drivers/i2c/busses/i2c-powermac.c | 8 +- + drivers/i2c/busses/i2c-sis5595.c | 2 +- + drivers/i2c/busses/i2c-sis630.c | 2 +- + drivers/i2c/busses/i2c-voodoo3.c | 248 ---------------------------- + drivers/i2c/i2c-core.c | 12 +- + drivers/net/sfc/sfe4001.c | 4 +- + include/linux/i2c.h | 3 +- + 16 files changed, 20 insertions(+), 363 deletions(-) + delete mode 100644 Documentation/i2c/busses/i2c-voodoo3 + delete mode 100644 drivers/i2c/busses/i2c-voodoo3.c +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/w83627hf | 29 ++++++++++++- + drivers/hwmon/sht15.c | 7 +++- + drivers/hwmon/w83627hf.c | 96 ++++++++++++++++++----------------------- + 3 files changed, 75 insertions(+), 57 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + drivers/media/common/tuners/tuner-xc2028.c | 20 +- + drivers/media/common/tuners/tuner-xc2028.h | 2 + + 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 | 630 +++++++++++ + 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 | 1573 ++++++++++++++++++++++++++++ + drivers/staging/tm6000/tm6000.h | 279 +++++ + include/linux/videodev2.h | 1 + + 18 files changed, 5360 insertions(+), 3 deletions(-) + 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 quota/for_next +$ git merge quota/for_next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Auto-merging Makefile +Removing arch/sh/include/asm/.gitignore +Auto-merging kernel/trace/trace.c +Auto-merging scripts/mkcompile_h +Merge made by recursive. + .gitignore | 6 -- + Documentation/kbuild/kconfig.txt | 3 +- + Kbuild | 4 +- + Makefile | 68 ++++------------------ + arch/alpha/boot/bootp.c | 2 +- + arch/alpha/boot/bootpz.c | 2 +- + arch/alpha/boot/main.c | 2 +- + arch/alpha/include/asm/asm-offsets.h | 1 + + arch/arm/Makefile | 14 +---- + arch/arm/include/asm/asm-offsets.h | 1 + + arch/arm/include/asm/mach-types.h | 1 + + arch/arm/tools/Makefile | 2 +- + arch/arm/tools/gen-mach-types | 2 +- + arch/avr32/include/asm/asm-offsets.h | 1 + + arch/blackfin/include/asm/asm-offsets.h | 1 + + arch/cris/arch-v32/kernel/head.S | 1 - + arch/cris/include/asm/asm-offsets.h | 1 + + arch/cris/kernel/asm-offsets.c | 1 - + arch/cris/kernel/vmlinux.lds.S | 1 - + arch/frv/include/asm/asm-offsets.h | 1 + + arch/frv/kernel/setup.c | 2 +- + arch/h8300/include/asm/asm-offsets.h | 1 + + arch/ia64/Makefile | 2 +- + arch/ia64/include/asm/asm-offsets.h | 1 + + arch/ia64/include/asm/irq.h | 2 +- + arch/ia64/kernel/Makefile | 7 +-- + arch/ia64/kvm/asm-offsets.c | 1 - + arch/m68k/include/asm/asm-offsets.h | 1 + + arch/m68k/kernel/head.S | 2 +- + arch/microblaze/include/asm/asm-offsets.h | 1 + + arch/mips/include/asm/asm-offsets.h | 1 + + arch/mn10300/include/asm/asm-offsets.h | 1 + + arch/parisc/include/asm/asm-offsets.h | 1 + + arch/powerpc/include/asm/asm-offsets.h | 1 + + arch/powerpc/platforms/52xx/efika.c | 2 +- + arch/powerpc/platforms/amigaone/setup.c | 2 +- + arch/powerpc/platforms/chrp/setup.c | 2 +- + arch/powerpc/platforms/powermac/bootx_init.c | 2 +- + arch/s390/include/asm/asm-offsets.h | 1 + + arch/sh/Makefile | 10 +-- + arch/sh/include/asm/.gitignore | 1 - + arch/sh/include/asm/asm-offsets.h | 1 + + arch/sh/include/asm/machvec.h | 2 +- + arch/sh/tools/Makefile | 4 +- + arch/sh/tools/gen-mach-types | 2 +- + arch/sparc/include/asm/asm-offsets.h | 1 + + arch/um/Makefile | 2 +- + arch/um/include/asm/asm-offsets.h | 1 + + arch/x86/boot/header.S | 2 +- + arch/x86/boot/version.c | 4 +- + arch/x86/include/asm/asm-offsets.h | 1 + + arch/xtensa/include/asm/asm-offsets.h | 1 + + drivers/accessibility/braille/braille_console.c | 1 - + drivers/hid/hid-lg.h | 2 - + drivers/platform/x86/compal-laptop.c | 1 - + drivers/staging/panel/panel.c | 2 +- + include/linux/mmdebug.h | 2 - + include/linux/mmzone.h | 2 +- + include/linux/page-flags.h | 2 +- + include/linux/vermagic.h | 2 +- + init/Makefile | 6 +- + init/version.c | 4 +- + kernel/bounds.c | 2 +- + kernel/kexec.c | 2 +- + kernel/trace/trace.c | 2 +- + scripts/basic/fixdep.c | 10 ++-- + scripts/kconfig/confdata.c | 2 +- + scripts/mkcompile_h | 2 +- + 68 files changed, 85 insertions(+), 139 deletions(-) + create mode 100644 arch/alpha/include/asm/asm-offsets.h + create mode 100644 arch/arm/include/asm/asm-offsets.h + create mode 100644 arch/arm/include/asm/mach-types.h + create mode 100644 arch/avr32/include/asm/asm-offsets.h + create mode 100644 arch/blackfin/include/asm/asm-offsets.h + create mode 100644 arch/cris/include/asm/asm-offsets.h + create mode 100644 arch/frv/include/asm/asm-offsets.h + create mode 100644 arch/h8300/include/asm/asm-offsets.h + create mode 100644 arch/ia64/include/asm/asm-offsets.h + create mode 100644 arch/m68k/include/asm/asm-offsets.h + create mode 100644 arch/microblaze/include/asm/asm-offsets.h + create mode 100644 arch/mips/include/asm/asm-offsets.h + create mode 100644 arch/mn10300/include/asm/asm-offsets.h + create mode 100644 arch/parisc/include/asm/asm-offsets.h + create mode 100644 arch/powerpc/include/asm/asm-offsets.h + create mode 100644 arch/s390/include/asm/asm-offsets.h + delete mode 100644 arch/sh/include/asm/.gitignore + create mode 100644 arch/sh/include/asm/asm-offsets.h + create mode 100644 arch/sparc/include/asm/asm-offsets.h + create mode 100644 arch/um/include/asm/asm-offsets.h + create mode 100644 arch/x86/include/asm/asm-offsets.h + create mode 100644 arch/xtensa/include/asm/asm-offsets.h +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Auto-merging drivers/char/Kconfig +Auto-merging drivers/char/Makefile +Auto-merging include/linux/Kbuild +Merge made by recursive. + Documentation/Makefile | 3 +- + Documentation/ummunotify/Makefile | 7 + + Documentation/ummunotify/ummunotify.txt | 150 ++++++++ + Documentation/ummunotify/umn-test.c | 200 +++++++++++ + drivers/char/Kconfig | 12 + + drivers/char/Makefile | 1 + + drivers/char/ummunotify.c | 566 +++++++++++++++++++++++++++++++ + include/linux/Kbuild | 1 + + include/linux/ummunotify.h | 121 +++++++ + 9 files changed, 1060 insertions(+), 1 deletions(-) + create mode 100644 Documentation/ummunotify/Makefile + create mode 100644 Documentation/ummunotify/ummunotify.txt + create mode 100644 Documentation/ummunotify/umn-test.c + create mode 100644 drivers/char/ummunotify.c + create mode 100644 include/linux/ummunotify.h +Merging acpi/test +$ git merge acpi/test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + Documentation/debugging-via-ohci1394.txt | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Merge made by recursive. + arch/ia64/include/asm/kvm.h | 1 + + arch/ia64/include/asm/kvm_host.h | 1 - + arch/ia64/kvm/Makefile | 2 +- + arch/ia64/kvm/kvm-ia64.c | 11 +- + arch/powerpc/kvm/powerpc.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/x86/include/asm/kvm.h | 1 + + arch/x86/include/asm/kvm_host.h | 12 +- + arch/x86/kvm/Makefile | 3 +- + arch/x86/kvm/emulate.c | 154 +++++++- + arch/x86/kvm/i8254.c | 2 - + arch/x86/kvm/i8259.c | 44 ++- + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/lapic.c | 7 +- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/svm.c | 105 +++--- + arch/x86/kvm/vmx.c | 153 ++++---- + arch/x86/kvm/x86.c | 64 ++-- + include/linux/kvm_host.h | 50 +++- + virt/kvm/assigned-dev.c | 818 ++++++++++++++++++++++++++++++++++++++ + virt/kvm/eventfd.c | 2 - + virt/kvm/ioapic.c | 80 +++- + virt/kvm/ioapic.h | 5 + + virt/kvm/irq_comm.c | 214 ++++++---- + virt/kvm/kvm_main.c | 804 +------------------------------------- + 25 files changed, 1395 insertions(+), 1145 deletions(-) + create mode 100644 virt/kvm/assigned-dev.c +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 +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Auto-merging drivers/net/wireless/ath/ar9170/phy.c +Auto-merging drivers/net/wireless/ath/ath5k/reg.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-1000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-6000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-debugfs.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Merge made by recursive. + drivers/net/wireless/ath/Kconfig | 8 + + drivers/net/wireless/ath/Makefile | 9 +- + drivers/net/wireless/ath/ar9170/ar9170.h | 4 +- + drivers/net/wireless/ath/ar9170/cmd.c | 3 +- + drivers/net/wireless/ath/ar9170/cmd.h | 1 + + drivers/net/wireless/ath/ar9170/hw.h | 2 + + drivers/net/wireless/ath/ar9170/mac.c | 15 +- + drivers/net/wireless/ath/ar9170/main.c | 30 +- + drivers/net/wireless/ath/ar9170/phy.c | 99 +++- + drivers/net/wireless/ath/ath.h | 35 ++ + drivers/net/wireless/ath/ath5k/ath5k.h | 38 +- + drivers/net/wireless/ath/ath5k/attach.c | 31 +- + drivers/net/wireless/ath/ath5k/base.c | 70 ++- + drivers/net/wireless/ath/ath5k/base.h | 12 - + drivers/net/wireless/ath/ath5k/initvals.c | 4 +- + drivers/net/wireless/ath/ath5k/pcu.c | 181 +----- + drivers/net/wireless/ath/ath5k/reg.h | 8 +- + drivers/net/wireless/ath/ath5k/reset.c | 15 +- + drivers/net/wireless/ath/ath9k/Kconfig | 8 + + drivers/net/wireless/ath/ath9k/Makefile | 27 +- + drivers/net/wireless/ath/ath9k/ahb.c | 19 +- + drivers/net/wireless/ath/ath9k/ani.c | 141 +++-- + drivers/net/wireless/ath/ath9k/ath9k.h | 72 +-- + drivers/net/wireless/ath/ath9k/beacon.c | 100 ++-- + drivers/net/wireless/ath/ath9k/btcoex.c | 383 +++++-------- + drivers/net/wireless/ath/ath9k/btcoex.h | 64 +-- + drivers/net/wireless/ath/ath9k/calib.c | 391 +++++++------ + drivers/net/wireless/ath/ath9k/calib.h | 2 + + drivers/net/wireless/ath/ath9k/debug.c | 58 +- + drivers/net/wireless/ath/ath9k/debug.h | 36 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 8 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 9 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 90 ++-- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 97 ++-- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 183 +++++-- + drivers/net/wireless/ath/ath9k/hw.c | 584 ++++++++++---------- + drivers/net/wireless/ath/ath9k/hw.h | 63 ++- + drivers/net/wireless/ath/ath9k/initvals.h | 72 ++- + drivers/net/wireless/ath/ath9k/mac.c | 149 +++-- + drivers/net/wireless/ath/ath9k/mac.h | 10 - + drivers/net/wireless/ath/ath9k/main.c | 791 +++++++++++++++++++------- + drivers/net/wireless/ath/ath9k/pci.c | 37 +- + drivers/net/wireless/ath/ath9k/phy.c | 50 +- + drivers/net/wireless/ath/ath9k/phy.h | 1 + + drivers/net/wireless/ath/ath9k/rc.c | 33 +- + drivers/net/wireless/ath/ath9k/recv.c | 62 ++- + drivers/net/wireless/ath/ath9k/reg.h | 5 +- + drivers/net/wireless/ath/ath9k/virtual.c | 22 +- + drivers/net/wireless/ath/ath9k/xmit.c | 113 ++-- + drivers/net/wireless/ath/debug.c | 32 + + drivers/net/wireless/ath/debug.h | 77 +++ + drivers/net/wireless/ath/hw.c | 126 ++++ + drivers/net/wireless/ath/reg.h | 27 + + drivers/net/wireless/b43/phy_lp.c | 6 + + drivers/net/wireless/iwlwifi/Kconfig | 1 - + drivers/net/wireless/iwlwifi/iwl-1000.c | 31 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 2 + + drivers/net/wireless/iwlwifi/iwl-4965.c | 22 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 67 ++- + drivers/net/wireless/iwlwifi/iwl-6000.c | 241 ++++++++- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 464 ++++++++-------- + drivers/net/wireless/iwlwifi/iwl-agn.c | 110 +++- + drivers/net/wireless/iwlwifi/iwl-calib.c | 66 ++- + drivers/net/wireless/iwlwifi/iwl-commands.h | 12 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 166 +++--- + drivers/net/wireless/iwlwifi/iwl-core.h | 15 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 23 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 15 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 48 ++- + drivers/net/wireless/iwlwifi/iwl-led.h | 12 + + drivers/net/wireless/iwlwifi/iwl-power.c | 3 + + drivers/net/wireless/iwlwifi/iwl-scan.c | 1 - + drivers/net/wireless/iwlwifi/iwl-tx.c | 2 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 12 +- + include/linux/nl80211.h | 2 + + net/wireless/nl80211.c | 2 + + 77 files changed, 3548 insertions(+), 2289 deletions(-) + create mode 100644 drivers/net/wireless/ath/debug.c + create mode 100644 drivers/net/wireless/ath/debug.h + create mode 100644 drivers/net/wireless/ath/hw.c + create mode 100644 drivers/net/wireless/ath/reg.h +Merging mtd/master +$ git merge mtd/master +Auto-merging drivers/mtd/maps/Kconfig +Merge made by recursive. + arch/arm/mach-nomadik/board-nhk8815.c | 11 ++-- + drivers/mtd/devices/m25p80.c | 7 ++- + drivers/mtd/maps/Kconfig | 1 + + drivers/mtd/maps/gpio-addr-flash.c | 5 +- + drivers/mtd/maps/sa1100-flash.c | 4 +- + drivers/mtd/nand/nand_base.c | 6 ++ + include/linux/mtd/bbm.h | 35 ++++++------ + include/linux/mtd/flashchip.h | 7 +++ + include/linux/mtd/nand.h | 93 +------------------------------- + include/linux/mtd/onenand.h | 19 +------ + 10 files changed, 51 insertions(+), 137 deletions(-) +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Removing include/sound/sscape_ioctl.h +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 8 +- + arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h | 2 + + include/sound/Kbuild | 1 - + include/sound/ak4113.h | 321 ++++++ + include/sound/ak4114.h | 12 +- + include/sound/ak4xxx-adda.h | 5 +- + include/sound/soc-dai.h | 13 +- + include/sound/soc-dapm.h | 7 + + include/sound/sscape_ioctl.h | 21 - + sound/i2c/other/Makefile | 3 +- + sound/i2c/other/ak4113.c | 639 ++++++++++++ + sound/i2c/other/ak4xxx-adda.c | 136 ++- + sound/isa/Kconfig | 12 +- + sound/isa/sscape.c | 525 ++++------ + sound/pci/hda/hda_intel.c | 16 +- + sound/pci/hda/patch_realtek.c | 137 +-- + sound/pci/ice1712/Makefile | 2 +- + sound/pci/ice1712/ice1712.c | 12 + + sound/pci/ice1712/ice1712.h | 14 +- + sound/pci/ice1712/ice1724.c | 103 ++- + sound/pci/ice1712/juli.c | 24 +- + sound/pci/ice1712/quartet.c | 1130 +++++++++++++++++++++ + sound/pci/ice1712/quartet.h | 10 + + sound/pci/oxygen/Makefile | 3 +- + sound/pci/oxygen/cs2000.h | 83 ++ + sound/pci/oxygen/hifier.c | 61 +- + sound/pci/oxygen/oxygen.c | 248 ++++- + sound/pci/oxygen/oxygen.h | 5 + + sound/pci/oxygen/oxygen_lib.c | 29 +- + sound/pci/oxygen/oxygen_mixer.c | 52 +- + sound/pci/oxygen/oxygen_pcm.c | 19 +- + sound/pci/oxygen/virtuoso.c | 1105 +-------------------- + sound/pci/oxygen/xonar.h | 50 + + sound/pci/oxygen/xonar_cs43xx.c | 434 ++++++++ + sound/pci/oxygen/xonar_hdmi.c | 128 +++ + sound/pci/oxygen/xonar_lib.c | 132 +++ + sound/pci/oxygen/xonar_pcm179x.c | 1115 ++++++++++++++++++++ + sound/soc/atmel/playpaq_wm8510.c | 2 +- + sound/soc/blackfin/bf5xx-ad1836.c | 7 + + sound/soc/blackfin/bf5xx-ad1938.c | 9 +- + sound/soc/blackfin/bf5xx-i2s.c | 15 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 9 +- + sound/soc/blackfin/bf5xx-tdm.c | 45 +- + sound/soc/blackfin/bf5xx-tdm.h | 11 + + sound/soc/codecs/Kconfig | 8 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ak4671.c | 825 +++++++++++++++ + sound/soc/codecs/ak4671.h | 156 +++ + sound/soc/codecs/wm8350.c | 2 +- + sound/soc/codecs/wm8400.c | 3 +- + sound/soc/codecs/wm8510.c | 4 +- + sound/soc/codecs/wm8580.c | 4 +- + sound/soc/codecs/wm8711.c | 659 ++++++++++++ + sound/soc/codecs/wm8711.h | 42 + + sound/soc/codecs/wm8753.c | 4 +- + sound/soc/codecs/wm8900.c | 4 +- + sound/soc/codecs/wm8940.c | 4 +- + sound/soc/codecs/wm8960.c | 4 +- + sound/soc/codecs/wm8974.c | 4 +- + sound/soc/codecs/wm8990.c | 4 +- + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm9713.c | 4 +- + sound/soc/davinci/Kconfig | 4 +- + sound/soc/davinci/davinci-evm.c | 7 +- + sound/soc/imx/mx27vis_wm8974.c | 2 +- + sound/soc/pxa/magician.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 20 +- + sound/soc/pxa/zylonite.c | 5 +- + sound/soc/s3c24xx/Kconfig | 9 + + sound/soc/s3c24xx/Makefile | 2 + + sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 8 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 8 +- + sound/soc/s3c24xx/s3c-i2s-v2.c | 30 +- + sound/soc/s3c24xx/s3c64xx-i2s.c | 19 +- + sound/soc/s3c24xx/s3c64xx-i2s.h | 1 + + sound/soc/s3c24xx/smdk64xx_wm8580.c | 273 +++++ + sound/soc/soc-cache.c | 46 +- + sound/soc/soc-core.c | 32 +- + sound/soc/soc-dapm.c | 19 +- + sound/usb/usx2y/us122l.c | 75 ++- + 80 files changed, 7209 insertions(+), 1805 deletions(-) + create mode 100644 include/sound/ak4113.h + delete mode 100644 include/sound/sscape_ioctl.h + create mode 100644 sound/i2c/other/ak4113.c + create mode 100644 sound/pci/ice1712/quartet.c + create mode 100644 sound/pci/ice1712/quartet.h + create mode 100644 sound/pci/oxygen/cs2000.h + create mode 100644 sound/pci/oxygen/xonar.h + create mode 100644 sound/pci/oxygen/xonar_cs43xx.c + create mode 100644 sound/pci/oxygen/xonar_hdmi.c + create mode 100644 sound/pci/oxygen/xonar_lib.c + create mode 100644 sound/pci/oxygen/xonar_pcm179x.c + create mode 100644 sound/soc/codecs/ak4671.c + create mode 100644 sound/soc/codecs/ak4671.h + create mode 100644 sound/soc/codecs/wm8711.c + create mode 100644 sound/soc/codecs/wm8711.h + create mode 100644 sound/soc/s3c24xx/smdk64xx_wm8580.c +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. + drivers/block/virtio_blk.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +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 +Auto-merging MAINTAINERS +Auto-merging block/blk-core.c +Auto-merging drivers/staging/dst/dcore.c +Auto-merging include/linux/blkdev.h +Merge made by recursive. + .../blockdev/drbd/DRBD-8.3-data-packets.svg | 588 +++ + Documentation/blockdev/drbd/DRBD-data-packets.svg | 459 ++ + Documentation/blockdev/drbd/README.txt | 16 + + Documentation/blockdev/drbd/conn-states-8.dot | 18 + + Documentation/blockdev/drbd/disk-states-8.dot | 16 + + .../drbd/drbd-connection-state-overview.dot | 85 + + Documentation/blockdev/drbd/node-states-8.dot | 14 + + MAINTAINERS | 13 + + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/drbd/Kconfig | 71 + + drivers/block/drbd/Makefile | 5 + + drivers/block/drbd/drbd_actlog.c | 1424 +++++++ + drivers/block/drbd/drbd_bitmap.c | 1327 ++++++ + drivers/block/drbd/drbd_int.h | 2251 ++++++++++ + drivers/block/drbd/drbd_main.c | 3700 ++++++++++++++++ + drivers/block/drbd/drbd_nl.c | 2355 +++++++++++ + drivers/block/drbd/drbd_proc.c | 265 ++ + drivers/block/drbd/drbd_receiver.c | 4427 ++++++++++++++++++++ + drivers/block/drbd/drbd_req.c | 1120 +++++ + drivers/block/drbd/drbd_req.h | 326 ++ + drivers/block/drbd/drbd_strings.c | 113 + + drivers/block/drbd/drbd_vli.h | 351 ++ + drivers/block/drbd/drbd_worker.c | 1512 +++++++ + drivers/block/drbd/drbd_wrappers.h | 91 + + include/linux/drbd.h | 349 ++ + include/linux/drbd_limits.h | 137 + + include/linux/drbd_nl.h | 137 + + include/linux/drbd_tag_magic.h | 83 + + include/linux/lru_cache.h | 294 ++ + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/lru_cache.c | 560 +++ + 33 files changed, 22115 insertions(+), 0 deletions(-) + create mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/README.txt + create mode 100644 Documentation/blockdev/drbd/conn-states-8.dot + create mode 100644 Documentation/blockdev/drbd/disk-states-8.dot + create mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot + create mode 100644 Documentation/blockdev/drbd/node-states-8.dot + create mode 100644 drivers/block/drbd/Kconfig + create mode 100644 drivers/block/drbd/Makefile + create mode 100644 drivers/block/drbd/drbd_actlog.c + create mode 100644 drivers/block/drbd/drbd_bitmap.c + create mode 100644 drivers/block/drbd/drbd_int.h + create mode 100644 drivers/block/drbd/drbd_main.c + create mode 100644 drivers/block/drbd/drbd_nl.c + create mode 100644 drivers/block/drbd/drbd_proc.c + create mode 100644 drivers/block/drbd/drbd_receiver.c + create mode 100644 drivers/block/drbd/drbd_req.c + create mode 100644 drivers/block/drbd/drbd_req.h + create mode 100644 drivers/block/drbd/drbd_strings.c + create mode 100644 drivers/block/drbd/drbd_vli.h + create mode 100644 drivers/block/drbd/drbd_worker.c + create mode 100644 drivers/block/drbd/drbd_wrappers.h + create mode 100644 include/linux/drbd.h + create mode 100644 include/linux/drbd_limits.h + create mode 100644 include/linux/drbd_nl.h + create mode 100644 include/linux/drbd_tag_magic.h + create mode 100644 include/linux/lru_cache.h + create mode 100644 lib/lru_cache.c +$ git revert 6a0afdf58d40200abd0c717261d1bc4c49195c2f +Finished one revert. +[master f87eae1] Revert "drbd: remove tracing bits" + 11 files changed, 1021 insertions(+), 3 deletions(-) + create mode 100644 drivers/block/drbd/drbd_tracing.c + create mode 100644 drivers/block/drbd/drbd_tracing.h +$ git revert ab8fafc2e1ecc0090f2c78902d3b992eec8b11f8 +Finished one revert. +[master ea7ffd0] Revert "dropping unneeded include autoconf.h" + 7 files changed, 7 insertions(+), 0 deletions(-) +$ git revert b411b3637fa71fce9cf2acf0639009500f5892fe +Finished one revert. +[master 190d288] Revert "The DRBD driver" + 35 files changed, 0 insertions(+), 23140 deletions(-) + delete mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg + delete mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg + delete mode 100644 Documentation/blockdev/drbd/README.txt + delete mode 100644 Documentation/blockdev/drbd/conn-states-8.dot + delete mode 100644 Documentation/blockdev/drbd/disk-states-8.dot + delete mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot + delete mode 100644 Documentation/blockdev/drbd/node-states-8.dot + delete mode 100644 drivers/block/drbd/Kconfig + delete mode 100644 drivers/block/drbd/Makefile + delete mode 100644 drivers/block/drbd/drbd_actlog.c + delete mode 100644 drivers/block/drbd/drbd_bitmap.c + delete mode 100644 drivers/block/drbd/drbd_int.h + delete mode 100644 drivers/block/drbd/drbd_main.c + delete mode 100644 drivers/block/drbd/drbd_nl.c + delete mode 100644 drivers/block/drbd/drbd_proc.c + delete mode 100644 drivers/block/drbd/drbd_receiver.c + delete mode 100644 drivers/block/drbd/drbd_req.c + delete mode 100644 drivers/block/drbd/drbd_req.h + delete mode 100644 drivers/block/drbd/drbd_strings.c + delete mode 100644 drivers/block/drbd/drbd_tracing.c + delete mode 100644 drivers/block/drbd/drbd_tracing.h + delete mode 100644 drivers/block/drbd/drbd_vli.h + delete mode 100644 drivers/block/drbd/drbd_worker.c + delete mode 100644 drivers/block/drbd/drbd_wrappers.h + delete mode 100644 include/linux/drbd.h + delete mode 100644 include/linux/drbd_limits.h + delete mode 100644 include/linux/drbd_nl.h + delete mode 100644 include/linux/drbd_tag_magic.h + delete mode 100644 include/linux/lru_cache.h + delete mode 100644 lib/lru_cache.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Recorded preimage for 'drivers/md/dm-log-userspace-transfer.c' +Auto-merging drivers/md/dm-log-userspace-transfer.c +CONFLICT (content): Merge conflict in drivers/md/dm-log-userspace-transfer.c +Auto-merging drivers/md/dm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/md/dm-log-userspace-transfer.c'. +[master 9e3c08d] Merge branch 'quilt/device-mapper' +$ git diff -M --stat --summary HEAD^.. + drivers/md/dm-exception-store.c | 36 ++++++-------------- + drivers/md/dm-exception-store.h | 10 +++--- + drivers/md/dm-ioctl.c | 4 +- + drivers/md/dm-log-userspace-base.c | 2 +- + drivers/md/dm-snap-persistent.c | 62 +++++++++++++++++------------------- + drivers/md/dm-snap.c | 46 ++++++++++++++++++-------- + drivers/md/dm.c | 11 +++++- + 7 files changed, 89 insertions(+), 82 deletions(-) +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 +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 9 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-ss4200.c | 552 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 562 insertions(+), 0 deletions(-) + create mode 100644 drivers/leds/leds-ss4200.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + Documentation/laptops/thinkpad-acpi.txt | 51 +++++++----------------------- + drivers/platform/x86/thinkpad_acpi.c | 24 ++++++++++++++- + drivers/video/backlight/lcd.c | 2 +- + 3 files changed, 36 insertions(+), 41 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging include/linux/sched.h +Auto-merging kernel/softlockup.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 12 ++++++++---- + include/linux/sched.h | 4 ++++ + kernel/kgdb.c | 31 +++++++++++++++++++++++-------- + kernel/softlockup.c | 16 ++++++++++++++++ + 4 files changed, 51 insertions(+), 12 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging include/linux/rcupdate.h +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +Merge made by recursive. + Documentation/vm/slqbinfo.c | 1047 ++++++++++++ + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 301 ++++ + init/Kconfig | 8 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3791 +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 5194 insertions(+), 13 deletions(-) + create mode 100644 Documentation/vm/slqbinfo.c + create mode 100644 include/linux/rcu_types.h + create mode 100644 include/linux/slqb_def.h + create mode 100644 mm/slqb.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 1 + + drivers/regulator/max8660.c | 510 +++++++++++++++++++++++++++++++++++++ + drivers/regulator/wm831x-dcdc.c | 207 ++++++++++++++-- + include/linux/mfd/wm831x/pdata.h | 17 ++ + include/linux/regulator/max8660.h | 57 ++++ + 6 files changed, 781 insertions(+), 18 deletions(-) + create mode 100644 drivers/regulator/max8660.c + create mode 100644 include/linux/regulator/max8660.h +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + drivers/char/tpm/tpm.c | 5 ++--- + security/selinux/hooks.c | 6 +++--- + 2 files changed, 5 insertions(+), 6 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/parisc-agp.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Merge made by recursive. + drivers/pci/dmar.c | 13 ++++++- + drivers/pci/intel-iommu.c | 82 ++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 89 insertions(+), 6 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merging fs/exofs/super.c +Merge made by recursive. + Documentation/filesystems/00-INDEX | 2 + + Documentation/filesystems/exofs.txt | 23 ++++++------ + drivers/scsi/osd/osd_initiator.c | 22 ++++++++--- + drivers/scsi/osd/osd_uld.c | 65 +++++++++++++++++++++++++++++++++- + fs/exofs/inode.c | 13 +++++-- + fs/exofs/super.c | 11 ++++++ + include/scsi/osd_initiator.h | 53 +++++++++++++++++++++++----- + include/scsi/osd_sense.h | 3 ++ + 8 files changed, 159 insertions(+), 33 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging sound/pci/ice1712/juli.c +Merge made by recursive. + Documentation/timers/hpet.txt | 2 +- + arch/parisc/kernel/perf.c | 2 +- + arch/powerpc/kernel/vdso.c | 2 +- + arch/powerpc/oprofile/op_model_cell.c | 2 +- + drivers/ata/pata_cs5535.c | 2 +- + drivers/char/tty_ioctl.c | 2 +- + drivers/isdn/i4l/isdn_net.c | 2 +- + drivers/md/dm-crypt.c | 2 +- + drivers/media/dvb/dvb-core/dvb_net.c | 2 +- + drivers/net/tokenring/ibmtr.c | 2 +- + drivers/net/wireless/orinoco/hermes_dld.c | 4 ++-- + drivers/rtc/rtc-ds1511.c | 4 ++-- + drivers/scsi/3w-9xxx.c | 2 +- + drivers/scsi/3w-xxxx.c | 2 +- + drivers/scsi/nsp32.c | 2 +- + drivers/uwb/neh.c | 2 +- + drivers/video/omap/lcd_ams_delta.c | 4 ++-- + drivers/video/omap/lcd_mipid.c | 4 ++-- + drivers/watchdog/sb_wdog.c | 4 ++-- + net/sched/act_api.c | 2 +- + sound/pci/ice1712/juli.c | 2 +- + 21 files changed, 26 insertions(+), 26 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/mach-omap1/board-fsample.c | 18 +- + arch/arm/mach-omap1/board-perseus2.c | 18 +- + arch/arm/mach-omap1/clock.c | 24 ++-- + arch/arm/mach-omap1/io.c | 45 ++---- + arch/arm/mach-omap1/irq.c | 32 +--- + arch/arm/mach-omap1/mcbsp.c | 32 ++-- + arch/arm/mach-omap1/mux.c | 70 +++----- + arch/arm/mach-omap1/pm.c | 100 ++++++------ + arch/arm/mach-omap1/pm.h | 53 +++--- + arch/arm/mach-omap1/serial.c | 13 +- + arch/arm/mach-omap1/sleep.S | 22 ++-- + arch/arm/plat-omap/devices.c | 22 ++-- + arch/arm/plat-omap/gpio.c | 227 +++++++------------------ + arch/arm/plat-omap/include/mach/entry-macro.S | 8 +- + arch/arm/plat-omap/include/mach/hardware.h | 2 +- + arch/arm/plat-omap/include/mach/irqs.h | 229 ++++++++----------------- + arch/arm/plat-omap/include/mach/mcbsp.h | 6 +- + arch/arm/plat-omap/include/mach/mux.h | 100 +++-------- + arch/arm/plat-omap/include/mach/omap7xx.h | 104 +++++++++++ + arch/arm/plat-omap/include/mach/uncompress.h | 3 +- + arch/arm/plat-omap/io.c | 14 +- + arch/arm/plat-omap/usb.c | 10 +- + drivers/spi/omap_uwire.c | 8 +- + 23 files changed, 480 insertions(+), 680 deletions(-) + create mode 100644 arch/arm/plat-omap/include/mach/omap7xx.h +Merging quilt/aoe +$ git merge quilt/aoe +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 drivers/acpi/scan.c +Removing kernel/power/swsusp.c +Merge made by recursive. + drivers/acpi/glue.c | 3 + + drivers/acpi/scan.c | 1 + + drivers/base/core.c | 4 + + drivers/base/power/Makefile | 2 +- + drivers/base/power/common.c | 283 ++++++++++++++++ + drivers/base/power/main.c | 674 ++++++++++++++++++++++++++++++++++++--- + drivers/base/power/power.h | 37 ++- + drivers/base/power/runtime.c | 4 - + drivers/base/power/sysfs.c | 47 +++ + drivers/pci/pci.c | 1 + + drivers/pci/pcie/portdrv_core.c | 1 + + include/linux/device.h | 11 + + include/linux/freezer.h | 2 +- + include/linux/pm.h | 13 +- + include/linux/pm_link.h | 30 ++ + kernel/freezer.c | 2 +- + kernel/power/Kconfig | 14 + + kernel/power/Makefile | 2 +- + kernel/power/hibernate.c | 37 ++- + kernel/power/main.c | 31 ++- + kernel/power/process.c | 13 +- + kernel/power/swap.c | 109 ++++++- + kernel/power/swsusp.c | 188 ----------- + 23 files changed, 1236 insertions(+), 273 deletions(-) + create mode 100644 drivers/base/power/common.c + create mode 100644 include/linux/pm_link.h + delete mode 100644 kernel/power/swsusp.c +$ git reset --hard HEAD^ +HEAD is now at f72ebfd Merge branch 'quilt/aoe' +Merging refs/next/20091002/suspend +$ git merge refs/next/20091002/suspend +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging fs/compat.c +Auto-merging fs/exec.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/open.c +Auto-merging fs/read_write.c +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/audit.c +Auto-merging kernel/audit_watch.c +Auto-merging kernel/auditsc.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 7 + + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/nfsd/vfs.c | 4 +- + fs/notify/dnotify/dnotify.c | 8 +- + fs/notify/fsnotify.c | 16 ++- + fs/notify/group.c | 50 +----- + fs/notify/inode_mark.c | 24 ++- + fs/notify/inotify/inotify_fsnotify.c | 59 ++++++- + fs/notify/inotify/inotify_user.c | 219 ++++++++++++++------- + fs/notify/notification.c | 161 +++++++++------- + fs/open.c | 2 +- + fs/read_write.c | 8 +- + include/linux/fsnotify.h | 44 +++-- + include/linux/fsnotify_backend.h | 30 ++-- + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 ++- + kernel/audit_tree.c | 223 ++++++++++++---------- + kernel/audit_watch.c | 294 ++++++++++++++++------------ + kernel/auditfilter.c | 39 ++--- + kernel/auditsc.c | 9 +- + 23 files changed, 726 insertions(+), 522 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Auto-merging drivers/net/irda/irda-usb.c +Merge made by recursive. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Auto-merging MAINTAINERS +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +Merge made by recursive. + 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 +Auto-merging MAINTAINERS +Merge made by recursive. + .../blockdev/drbd/DRBD-8.3-data-packets.svg | 588 +++ + Documentation/blockdev/drbd/DRBD-data-packets.svg | 459 ++ + Documentation/blockdev/drbd/README.txt | 16 + + Documentation/blockdev/drbd/conn-states-8.dot | 18 + + Documentation/blockdev/drbd/disk-states-8.dot | 16 + + .../drbd/drbd-connection-state-overview.dot | 85 + + Documentation/blockdev/drbd/node-states-8.dot | 14 + + MAINTAINERS | 13 + + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/drbd/Kconfig | 82 + + drivers/block/drbd/Makefile | 8 + + drivers/block/drbd/drbd_actlog.c | 1484 +++++++ + drivers/block/drbd/drbd_bitmap.c | 1327 ++++++ + drivers/block/drbd/drbd_int.h | 2258 ++++++++++ + drivers/block/drbd/drbd_main.c | 3734 ++++++++++++++++ + drivers/block/drbd/drbd_nl.c | 2364 +++++++++++ + drivers/block/drbd/drbd_proc.c | 265 ++ + drivers/block/drbd/drbd_receiver.c | 4455 ++++++++++++++++++++ + drivers/block/drbd/drbd_req.c | 1131 +++++ + drivers/block/drbd/drbd_req.h | 326 ++ + drivers/block/drbd/drbd_strings.c | 113 + + drivers/block/drbd/drbd_tracing.c | 752 ++++ + drivers/block/drbd/drbd_tracing.h | 87 + + drivers/block/drbd/drbd_vli.h | 351 ++ + drivers/block/drbd/drbd_worker.c | 1528 +++++++ + drivers/block/drbd/drbd_wrappers.h | 91 + + include/linux/drbd.h | 349 ++ + include/linux/drbd_limits.h | 137 + + include/linux/drbd_nl.h | 137 + + include/linux/drbd_tag_magic.h | 83 + + include/linux/lru_cache.h | 294 ++ + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/lru_cache.c | 560 +++ + 35 files changed, 23133 insertions(+), 0 deletions(-) + create mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/README.txt + create mode 100644 Documentation/blockdev/drbd/conn-states-8.dot + create mode 100644 Documentation/blockdev/drbd/disk-states-8.dot + create mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot + create mode 100644 Documentation/blockdev/drbd/node-states-8.dot + create mode 100644 drivers/block/drbd/Kconfig + create mode 100644 drivers/block/drbd/Makefile + create mode 100644 drivers/block/drbd/drbd_actlog.c + create mode 100644 drivers/block/drbd/drbd_bitmap.c + create mode 100644 drivers/block/drbd/drbd_int.h + create mode 100644 drivers/block/drbd/drbd_main.c + create mode 100644 drivers/block/drbd/drbd_nl.c + create mode 100644 drivers/block/drbd/drbd_proc.c + create mode 100644 drivers/block/drbd/drbd_receiver.c + create mode 100644 drivers/block/drbd/drbd_req.c + create mode 100644 drivers/block/drbd/drbd_req.h + create mode 100644 drivers/block/drbd/drbd_strings.c + create mode 100644 drivers/block/drbd/drbd_tracing.c + create mode 100644 drivers/block/drbd/drbd_tracing.h + create mode 100644 drivers/block/drbd/drbd_vli.h + create mode 100644 drivers/block/drbd/drbd_worker.c + create mode 100644 drivers/block/drbd/drbd_wrappers.h + create mode 100644 include/linux/drbd.h + create mode 100644 include/linux/drbd_limits.h + create mode 100644 include/linux/drbd_nl.h + create mode 100644 include/linux/drbd_tag_magic.h + create mode 100644 include/linux/lru_cache.h + create mode 100644 lib/lru_cache.c +$ git reset --hard HEAD^ +HEAD is now at 68e718a Merge remote branch 'hwlat/for-linus' +Merging kmemleak/kmemleak +$ git merge kmemleak/kmemleak +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging include/linux/kernel.h +Auto-merging include/linux/rcupdate.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Removing tools/perf/util/module.c +Removing tools/perf/util/module.h +Merge made by recursive. + Documentation/kernel-parameters.txt | 1 + + arch/x86/Kconfig | 9 +- + arch/x86/Kconfig.cpu | 3 +- + arch/x86/ia32/ia32entry.S | 36 ++- + arch/x86/include/asm/hpet.h | 7 +- + arch/x86/include/asm/msr.h | 4 +- + arch/x86/include/asm/string_32.h | 9 + + arch/x86/include/asm/uaccess_32.h | 25 ++- + arch/x86/include/asm/uaccess_64.h | 19 +- + arch/x86/kernel/acpi/boot.c | 1 + + arch/x86/kernel/apic/io_apic.c | 49 ++- + arch/x86/kernel/early_printk.c | 5 +- + arch/x86/kernel/hpet.c | 60 ++-- + arch/x86/kernel/i386_ksyms_32.c | 2 + + arch/x86/kernel/tsc.c | 8 +- + arch/x86/kernel/x8664_ksyms_64.c | 2 +- + arch/x86/lib/Makefile | 6 +- + arch/x86/lib/copy_user_64.S | 4 +- + arch/x86/lib/msr.c | 46 +-- + arch/x86/lib/usercopy_32.c | 10 +- + drivers/pci/intr_remapping.c | 89 ++++- + drivers/pci/intr_remapping.h | 7 + + fs/proc/array.c | 11 + + include/linux/clocksource.h | 1 - + include/linux/compiler-gcc4.h | 5 + + include/linux/compiler.h | 8 + + include/linux/dmar.h | 10 + + include/linux/hardirq.h | 24 ++ + include/linux/hpet.h | 2 + + include/linux/kernel.h | 2 - + include/linux/net.h | 1 + + include/linux/poison.h | 16 +- + include/linux/ratelimit.h | 30 +- + include/linux/rcupdate.h | 24 +- + include/linux/rcutiny.h | 103 +++++ + include/linux/rcutree.h | 13 +- + include/linux/timex.h | 5 +- + init/Kconfig | 9 + + init/main.c | 1 - + kernel/Makefile | 1 + + kernel/cpuset.c | 8 +- + kernel/hrtimer.c | 2 - + kernel/irq/manage.c | 2 +- + kernel/panic.c | 3 +- + kernel/perf_event.c | 34 +-- + kernel/printk.c | 1 + + kernel/rcupdate.c | 142 +------- + kernel/rcutiny.c | 281 ++++++++++++++ + kernel/rcutorture.c | 4 +- + kernel/rcutree.c | 326 +++++++++++------ + kernel/rcutree.h | 86 ++++- + kernel/rcutree_plugin.h | 103 ++++-- + kernel/rcutree_trace.c | 4 +- + kernel/sysctl.c | 3 + + kernel/trace/ftrace.c | 4 + + kernel/trace/kmemtrace.c | 2 +- + lib/ratelimit.c | 39 +- + net/core/sysctl_net_core.c | 2 + + net/core/utils.c | 2 + + tools/perf/Documentation/perf-timechart.txt | 3 + + tools/perf/Makefile | 9 +- + tools/perf/builtin-annotate.c | 438 ++------------------- + tools/perf/builtin-report.c | 550 ++------------------------- + tools/perf/builtin-sched.c | 34 +-- + tools/perf/builtin-timechart.c | 10 +- + tools/perf/builtin-top.c | 88 ++--- + tools/perf/builtin-trace.c | 28 -- + tools/perf/util/cache.h | 6 +- + tools/perf/util/callchain.h | 2 +- + tools/perf/util/color.h | 6 +- + tools/perf/util/debug.h | 4 + + tools/perf/util/event.h | 9 +- + tools/perf/util/exec_cmd.h | 6 +- + tools/perf/util/header.h | 6 +- + tools/perf/util/help.h | 6 +- + tools/perf/util/hist.c | 164 ++++++++ + tools/perf/util/hist.h | 47 +++ + tools/perf/util/levenshtein.h | 6 +- + tools/perf/util/module.c | 545 -------------------------- + tools/perf/util/module.h | 53 --- + tools/perf/util/parse-events.h | 6 +- + tools/perf/util/parse-options.h | 6 +- + tools/perf/util/quote.h | 6 +- + tools/perf/util/run-command.h | 6 +- + tools/perf/util/sigchain.h | 6 +- + tools/perf/util/sort.c | 276 ++++++++++++++ + tools/perf/util/sort.h | 90 +++++ + tools/perf/util/strbuf.h | 6 +- + tools/perf/util/string.h | 6 +- + tools/perf/util/strlist.h | 6 +- + tools/perf/util/svghelper.c | 14 +- + tools/perf/util/svghelper.h | 6 +- + tools/perf/util/symbol.c | 447 +++++++++++++++------- + tools/perf/util/symbol.h | 26 +- + tools/perf/util/thread.c | 129 ++++--- + tools/perf/util/thread.h | 21 +- + tools/perf/util/trace-event.h | 6 +- + tools/perf/util/types.h | 6 +- + tools/perf/util/values.h | 6 +- + 99 files changed, 2435 insertions(+), 2376 deletions(-) + create mode 100644 include/linux/rcutiny.h + create mode 100644 kernel/rcutiny.c + create mode 100644 tools/perf/util/hist.c + create mode 100644 tools/perf/util/hist.h + delete mode 100644 tools/perf/util/module.c + delete mode 100644 tools/perf/util/module.h + create mode 100644 tools/perf/util/sort.c + create mode 100644 tools/perf/util/sort.h +Merging oprofile/for-next +$ git merge oprofile/for-next +Auto-merging kernel/trace/ring_buffer.c +Merge made by recursive. +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging kernel/rcutorture.c +Auto-merging mm/Makefile +Removing mm/allocpercpu.c +Merge made by recursive. + arch/ia64/Kconfig | 3 - + arch/ia64/include/asm/meminit.h | 2 +- + arch/ia64/include/asm/pgtable.h | 3 +- + arch/ia64/kernel/acpi.c | 33 ++-- + arch/ia64/kernel/setup.c | 23 +-- + arch/ia64/kernel/vmlinux.lds.S | 11 +- + arch/ia64/mm/contig.c | 99 ++++++-- + arch/ia64/mm/discontig.c | 124 +++++++++- + arch/ia64/mm/init.c | 4 +- + arch/x86/include/asm/percpu.h | 78 ++++++ + crypto/cryptd.c | 2 +- + drivers/dma/dmaengine.c | 36 +-- + drivers/infiniband/hw/ehca/ehca_irq.c | 3 +- + drivers/net/chelsio/sge.c | 5 +- + drivers/net/loopback.c | 2 +- + drivers/net/veth.c | 7 +- + fs/ext4/mballoc.c | 2 +- + fs/nfs/iostat.h | 24 +-- + fs/xfs/xfs_mount.c | 12 +- + include/asm-generic/percpu.h | 5 + + include/linux/percpu.h | 424 +++++++++++++++++++++++++++++++-- + include/linux/vmstat.h | 10 +- + include/net/neighbour.h | 7 +- + include/net/netfilter/nf_conntrack.h | 4 +- + include/net/snmp.h | 50 ++--- + kernel/module.c | 150 ------------ + kernel/rcutorture.c | 8 +- + mm/Makefile | 4 - + mm/allocpercpu.c | 177 -------------- + mm/percpu.c | 7 +- + 30 files changed, 767 insertions(+), 552 deletions(-) + delete mode 100644 mm/allocpercpu.c +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Merge made by recursive. + lib/checksum.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Already up-to-date. +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging quilt/staging +$ git merge quilt/staging +Removing drivers/staging/agnx/Kconfig +Removing drivers/staging/agnx/Makefile +Removing drivers/staging/agnx/TODO +Removing drivers/staging/agnx/agnx.h +Removing drivers/staging/agnx/debug.h +Removing drivers/staging/agnx/pci.c +Removing drivers/staging/agnx/phy.c +Removing drivers/staging/agnx/phy.h +Removing drivers/staging/agnx/rf.c +Removing drivers/staging/agnx/sta.c +Removing drivers/staging/agnx/sta.h +Removing drivers/staging/agnx/table.c +Removing drivers/staging/agnx/table.h +Removing drivers/staging/agnx/xmit.c +Removing drivers/staging/agnx/xmit.h +Merge made by recursive. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/agnx/Kconfig | 5 - + drivers/staging/agnx/Makefile | 8 - + drivers/staging/agnx/TODO | 22 - + drivers/staging/agnx/agnx.h | 156 ---- + drivers/staging/agnx/debug.h | 416 ---------- + drivers/staging/agnx/pci.c | 635 -------------- + drivers/staging/agnx/phy.c | 960 ---------------------- + drivers/staging/agnx/phy.h | 409 --------- + drivers/staging/agnx/rf.c | 893 -------------------- + drivers/staging/agnx/sta.c | 218 ----- + drivers/staging/agnx/sta.h | 222 ----- + drivers/staging/agnx/table.c | 168 ---- + drivers/staging/agnx/table.h | 10 - + drivers/staging/agnx/xmit.c | 836 ------------------- + drivers/staging/agnx/xmit.h | 250 ------ + drivers/staging/comedi/comedi_compat32.c | 22 +- + drivers/staging/comedi/comedi_compat32.h | 4 +- + drivers/staging/comedi/comedidev.h | 60 +- + drivers/staging/comedi/drivers.c | 2 +- + drivers/staging/comedi/drivers/8253.h | 3 +- + drivers/staging/comedi/drivers/8255.c | 23 +- + drivers/staging/comedi/drivers/acl7225b.c | 9 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 53 +- + drivers/staging/comedi/drivers/adl_pci7296.c | 19 +- + drivers/staging/comedi/drivers/adl_pci7432.c | 32 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 18 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 2 +- + drivers/staging/comedi/drivers/dmm32at.c | 2 +- + drivers/staging/comedi/drivers/dt2814.c | 2 +- + drivers/staging/comedi/drivers/dt282x.c | 4 +- + drivers/staging/comedi/drivers/mite.c | 231 +++--- + drivers/staging/comedi/drivers/mite.h | 7 - + drivers/staging/comedi/drivers/ni_at_ao.c | 6 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 90 +-- + drivers/staging/comedi/drivers/ni_labpc.h | 52 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 18 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/comedi/drivers/rtd520.c | 2 +- + drivers/staging/comedi/drivers/s626.c | 2 +- + drivers/staging/comedi/drivers/skel.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 4 +- + drivers/staging/comedi/drivers/vmk80xx.c | 24 +- + drivers/staging/winbond/wbusb.c | 33 +- + 48 files changed, 388 insertions(+), 5557 deletions(-) + delete mode 100644 drivers/staging/agnx/Kconfig + delete mode 100644 drivers/staging/agnx/Makefile + delete mode 100644 drivers/staging/agnx/TODO + delete mode 100644 drivers/staging/agnx/agnx.h + delete mode 100644 drivers/staging/agnx/debug.h + delete mode 100644 drivers/staging/agnx/pci.c + delete mode 100644 drivers/staging/agnx/phy.c + delete mode 100644 drivers/staging/agnx/phy.h + delete mode 100644 drivers/staging/agnx/rf.c + delete mode 100644 drivers/staging/agnx/sta.c + delete mode 100644 drivers/staging/agnx/sta.h + delete mode 100644 drivers/staging/agnx/table.c + delete mode 100644 drivers/staging/agnx/table.h + delete mode 100644 drivers/staging/agnx/xmit.c + delete mode 100644 drivers/staging/agnx/xmit.h +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +$ git am -3 ../patches/0001-sparc-using-HZ-needs-an-include-of-linux-param.h.patch +Applying: sparc: using HZ needs an include of linux/param.h diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..2edd87c12eb7 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,105 @@ +Importing driver-core.current based on 2.6.32-rc1 +Unchanged quilt series driver-core.current +Importing tty.current based on quilt/driver-core.current +Unchanged quilt series tty.current +Importing usb.current based on quilt/tty.current +Unchanged quilt series usb.current +Importing i2c based on 2.6.32-rc1-git6 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 8a0382f6fceaf0c6479e582e1054f36333ea3d24 +HEAD is now at 8a0382f Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-move-legacy-documentation.patch +misc-eeprom-max6875-no-detect.patch +w1-ds2482-no-detect.patch +hwmon-ltc4215-ltc4245-no-detect.patch +leds-pca9532-no-i2c-insmod.patch +iio-tsl2561-no-i2c-insmod.patch +mfd-ab3100-no-i2c-insmod.patch +i2c-update-sysfs-path-to-adapter.patch +i2c-hide-acpi-error-on-probe.patch +i2c-macintosh-probe-can-fail.patch +i2c-powermac-multiple-msg-not-supported.patch +i2c-voodoo3-delete.patch +i2c-prevent-priority-inversion-on-top-of-bus-lock.patch +i2c-no-I2C_M_REV_DIR_ADDR.patch +i2c-add-missing-devinit.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 49fced8...073ca0d master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.32-rc1-git1 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on origin/master + quilt series is empty +$ git update-ref refs/heads/quilt/kernel-doc 374576a8b6f865022c0fd1ca62396889b23d66dd +Importing rr based on v2.6.32-rc1 +Unchanged quilt series rr +Importing device-mapper based on block/for-next +$ cd ../quilt-tmp +$ git reset --hard 6a0afdf58d40200abd0c717261d1bc4c49195c2f +HEAD is now at 6a0afdf drbd: remove tracing bits +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-log-fix-cn_ulog_callback-declaration.patch +dm-log-userspace-fix-incorrect-luid-cast-in-userspace_ctr.patch +dm-snapshot-free-exception-store-on-init-failure.patch +dm-add-missing-del_gendisk-to-alloc_dev-error-path.patch +dm-dec_pending-needs-locking-to-save-error-value.patch +dm-snapshot-require-non-zero-chunk-size-by-end-of-ctr.patch +dm-snapshot-allow-chunk-size-to-be-less-than-page-size.patch +dm-snapshot-use-unsigned-integer-chunk-size.patch +dm-ioctl-prefer-strlcpy-over-strncpy.patch +dm-snapshot-avoid-else-clause-in-persistent_read_metadata.patch +dm-snapshot-simplify-sector_to_chunk-expression.patch +dm-snapshot-abstract-minimum_chunk_size-fn.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/device-mapper +From ../quilt-tmp + + bb93666...a9df52d master -> quilt/device-mapper (forced update) +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/usb.current +Unchanged quilt series driver-core +Importing tty based on quilt/driver-core +Unchanged quilt series tty +Importing usb based on quilt/tty +Unchanged quilt series usb +Importing staging based on quilt/usb +$ cd ../quilt-tmp +$ git reset --hard 17d857be649a21ca90008c6dc425d849fa83db5c +HEAD is now at 17d857b Linux 2.6.32-rc1 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging +staging-remove-agnx-driver.patch +staging-w35und-fix-beacon_int-breakage.patch +staging-comedi-8253-fix-coding-style-error.patch +staging-comedi-8255-fix-coding-style-error.patch +staging-comedi-drivers.c-checkpatch-fix.patch +staging-comedi-adl_pci6208-code-styling-fix.patch +staging-comedi-ni_labpc.h-fixed-line-lengths-of-some-trailing-comments.patch +staging-comedi-ni_labbc_cs-cleaned-up-debug-define-a-bit.patch +staging-comedi-ni_labpc_cs-removed-null-initialization-of-static.patch +staging-comedi-ni_labpc_cs-added-mandatory-whitespace-to-comparison.patch +staging-comedi-ni_labpc_cs-removed-null-check-from-kfree.patch +staging-comedi-ni_labpc_cs-wrapped-long-comments.patch +staging-comedi-comedi_compat32-fixed-checkpatch.pl-issues.patch +staging-comedi-comedidev.h-fixed-checkpatch.pl-issues.patch +staging-comedi-ni_at_ao.c-fix-coding-style-error.patch +staging-comedi-mite.c-fix-coding-style.patch +staging-comedi-mite.h-deletion-of-unused-functions.patch +staging-comedi-ni_atmio16d-fix-formating-errors.patch +staging-comedi-ni_atmio16d-brace-fixes.patch +staging-comedi-nt_atmio16d-space-and-tab-fixes.patch +staging-comedi-ni_atmio16d-printk-fixups.patch +staging-comedi-vmk80xx-cleanup-formatting.patch +staging-comedi-comedi_compat32.h-fixed-checkpatch.pl-issues.patch +staging-comedi-acl7225b.c-codingstyle-printk-fixups.patch +staging-comedi-adl_pci7296-codingstyle-cleanup.patch +staging-comedi-adl_pci7432-coding-style-cleanup.patch +staging-comedi-amplc_pc263.c-fix-coding-style-issues.patch +staging-comedi-amplc_pc263.c-more-coding-style-fixes.patch +staging-comedi-trivial-fix-of-a-very-frequent-spelling-mistake.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging +From ../quilt-tmp + + c93ed50...e941387 master -> quilt/staging (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..870241ed2127 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20091005 |