diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-27 15:36:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-27 15:36:20 +1000 |
| commit | d1f13cdbf27e137544a7fe3af74eeee9b9a981e9 (patch) | |
| tree | c5ffa4c0c37a29dc1a573c776063cd7f6a8cfe02 | |
| parent | 8555c449985f01f8cc872187ac924d3a756383e8 (diff) | |
Add linux-next specific files for 20090927next-20090927
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 | 1826 | ||||
| -rw-r--r-- | Next/quilt-import.log | 44 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2155 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..edb6cdb4efea --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,141 @@ +Name SHA1 +---- ---- +origin 0d9df2515dbceb67d343c0f10fd3ff218380d524 +fixes 0049a32b5e685136b7f4ac928b8ae2394e67cfc9 +arm-current 851b147e4411df6a1e7e90e2a609773c277eefd2 +m68k-current 9848484fad9ddeb18f18f02f9ecdcd330ac9a216 +powerpc-merge 09dd3fc19c09f79115267361ecd7d5c5d2c27a3a +sparc-current 87ba00515657eede6077fa195ca6592b98cc31e3 +scsi-rc-fixes 388ce4beb7135722c584b0af18f215e3ec657adf +net-current 99c4a6344f6574c97019ac16e8d54bfe5ad21f2d +sound-current 87bfa1dbfb22aab2bb6c1085c1fe7d56cdd2f044 +pci-current ab86e5765d41a5eb4239a1c04d613db87bea5ed8 +wireless-current 11ebd1bf07fafde8d16562966c96b05b0d4ced9e +kbuild-current de078ef55c74d02ee93d44513da5ee88a089d71d +driver-core.current 7fa07729e439a6184bd824746d06a49cca553f15 +tty.current 7fa07729e439a6184bd824746d06a49cca553f15 +usb.current 28640c0b4caf0d045ffa1dc12e3b46bdfd2bb6e0 +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 2c86963b093c1a0887dfc6b32c6e5ea3a80f2922 +m68k b25ef35f34a9837e1133b3ef5fab8058155cc69f +m68knommu 04bbadcafb69511635def60844d91864515ab0d2 +microblaze 7dadbf4e3c8e757d20b870ef83de051ca294a638 +mips 4fa78c6123f21a399d48566c282c5eccf4296923 +parisc 1e0d061b462e48f9b1609a29aed9a5abcf65833e +powerpc 94a8d5caba74211ec76dac80fc6e2d5c391530df +4xx 94a8d5caba74211ec76dac80fc6e2d5c391530df +galak 1dcd8ffc81e80a170625883f63f6a5db3cd0428d +s390 606037cec2a5528a2a715898568ab7db76a234c9 +sh a79aebfca1e597c1aab4b8e327028f96f5ea9095 +sparc 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +cifs 0d9df2515dbceb67d343c0f10fd3ff218380d524 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs b020771b703493c12cf176bac685fb5a109a5afe +ext3 2844ce2c309ef2a28c41d1f6e2b4c50bc13e0a8f +ext4 e65931326c0b41f1114539ba3c290d8e6bf27d19 +fatfs ed248b290da7297c9b9a3ff180f5eee4db016224 +fuse 79a9d99434b104c562f30f21b75317667f444793 +gfs2 754aadfea6391444edc45500c7ad088478cea252 +jfs 4a19fb11a90fdbbcb3bc02effa036230d035ca28 +nfs 6d7f18f6ea3a13af95bdf507fc54d42b165e1712 +nfsd e5de5519b012f971703e36a962c44e9b02bf591a +nilfs2 7fa07729e439a6184bd824746d06a49cca553f15 +ocfs2 b80474b432913f73cce8db001e9fa3104f9b79ee +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +udf cbc8cc33529b0e0e55ae0ff077b8cb0b71d54c7a +v9fs 47d425b937566337d4a7afdf01040a3006781007 +ubifs 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 +xfs 9ef96da6ec5e1b4cf7eb8e30852cd88ec7d5fdc0 +vfs aa7dfb8954ccf49e026ba13d12991a4eb7defb96 +pci 76baeebf7df493703eeb4428eac015bdb7fabda6 +hid 7fa07729e439a6184bd824746d06a49cca553f15 +i2c 96822ad68720bd1e59831a9c0918b49be983dbdd +jdelvare-hwmon 0dd52d0df02733dfc2d5f3824e41b96492305384 +kernel-doc 0d9df2515dbceb67d343c0f10fd3ff218380d524 +v4l-dvb f25140438ef7ccdab2a53598ab8c974a29c35195 +quota dee865656f2d8b866f8ac22c60d6363b914e9f12 +kbuild bbae701f7f258b051ed199ef71c5e85e683c0fb8 +kconfig 48586218b6515b9bd70694e3cd8c901a6a6ee69c +ide 7fa07729e439a6184bd824746d06a49cca553f15 +libata d15d6e6cc340566d53d953ffdec2c9e96816fa52 +infiniband 1a616e1568d5ac080ee0b13e3135a906288dca40 +acpi 71b5915511026a752e54197865216ae274cea4fc +ieee1394 625f0850a8e27b6a8d6fdb95056f35bc22d92b55 +ubi de75c771b4cc4da963164a538a8448128301bc35 +kvm cba2be0ef98862a68fa25ed03b370829634e6b0e +dlm 1329e3f2c898cfabb6ed236d3fb8c1725197af53 +scsi c235706553aa29980cae9dcb704fef6c5d65fca6 +async_tx 1f6672d44c1ae7408b43c06170ec34eb0a0e9b9f +net 4142e0d1def2c0176c27fd2e810243045a62eb6d +wireless b37fa870c7ccb500c7bf6aabc72cefa757da9791 +mtd c1558b55c55620f54f0f78cb8295947a2a3f6de2 +crypto 81bd5f6c966cf2f137c2759dfc78abdffcff055e +sound 7a2f9e6ee8465aade70ffbf1eb21c5f53575d441 +cpufreq f0adb134d8dc9993a9998dc50845ec4f6ff4fadc +rr 129791616709b8a4bbb75f7bcb1a6f999d7f4d27 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input 9de48cc300fb10f7d9faa978670becf5e352462a +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 1e6697c4add13b3818be445b8e4406947d4824cc +device-mapper 48b17e1d9e1db0aa32cacf082460b5ae14ec8f71 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery f056878332a91ed984a116bad4e7d49aefff9e6e +leds 379661d9780980cb2a2fb49f819e42e9f3aa2a2d +backlight c0bc53a1f7f99030fa14bf4d3f8a94051766fd29 +kgdb 98517d8f092cceea77ab93f15437c182b5615d9e +slab 11b7576bc42afa6096d966c3bc8737a5fe3c848a +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 4b3df5668c8ebaebd8d66a5a94374be3e3b2ef0c +mfd 75f2ba8f0006440e720e47ae14c917e07c452d72 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 210bed8f827471e271f894fb99ee879a5d27cf30 +voltage a724eada8c2a7b62463b73ccf73fd0bb6e928aeb +security-testing 7f366784f5c2b8fc0658b5b374f4c63ee42c789f +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 121264827656f5f06328b17983c796af17dc5949 +uwb 0396c215f301e92677d1e9a064b405e31501dc1d +watchdog f2cf50d6db23539838f2b55f231ee8186e77217a +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 17b6097753e926ca546189463070a7e94e7ea9fa +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd fb48922b3cf64d1b20d13468e4c4bb2988093e18 +jc_docs 6c19efb46aacf2c5043ad210b888ee58ffb848c0 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 36fd2127e6091dd6ca69845d5f29f387a9469da7 +audit def57543418a5f47debae28a0a9dea2effc11692 +omap ebc79c4f8da0f92efa968e0328f32334a2ce80cf +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 +bluetooth 7e7430908c3ccaf71f0851050c8ccaf9ecfb3b56 +fsnotify cf71f3cf1697ab9ad9064635e23fecd57af2c327 +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +drbd 8034f62b3add784fcd657c620399010f6b7cf178 +kmemleak df58bee21ed218cb7dfb561a590b1bd2a99531cf +tip b0402c8f51d42bbc1f1a9315cd3161552a8cb343 +oprofile 8b5050255f993dda5e7b5908ab71d1cafc731bd1 +percpu 851b147e4411df6a1e7e90e2a609773c277eefd2 +sfi c602c65b2f81d14456771d1e3f15d1381f4b7efa +asm-generic 428bc597508e482cdea17b11b7b08eabd6b924a6 +hwpoison 465fdd97cbe16ef8727221857e96ef62dd352017 +driver-core 28640c0b4caf0d045ffa1dc12e3b46bdfd2bb6e0 +tty 28640c0b4caf0d045ffa1dc12e3b46bdfd2bb6e0 +usb e3e26b02648f9f4ed34de39aeda66a4830125c17 +staging 586f9ab894640d4fa23aa71f4c611b7cc6e3f7a6 +scsi-post-merge 15addcb9e65e9b7a9df5978ee7f105ce2afee257 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..eacb7d36ec1d --- /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#drbd +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..4e1a8f2a5590 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1826 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6d7f18f Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block +Merging origin/master +$ git merge origin/master +Updating 6d7f18f..0d9df25 +Fast forward + Documentation/laptops/thinkpad-acpi.txt | 48 +- + arch/alpha/kernel/vmlinux.lds.S | 1 + + arch/arm/kernel/entry-header.S | 2 + + arch/mips/kernel/Makefile | 2 + + arch/mips/kernel/vmlinux.lds.S | 12 +- + arch/sparc/include/asm/vio.h | 2 - + arch/x86/boot/compressed/head_32.S | 3 +- + arch/x86/boot/compressed/head_64.S | 3 +- + arch/x86/boot/compressed/vmlinux.lds.S | 6 +- + arch/x86/include/asm/pgtable_types.h | 1 + + arch/x86/include/asm/topology.h | 10 - + arch/x86/kernel/cpu/mcheck/mce-inject.c | 7 +- + arch/x86/kernel/cpu/mcheck/mce.c | 23 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 67 ++- + arch/x86/kernel/cpu/perf_event.c | 3 + + arch/x86/kernel/early_printk.c | 5 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/traps.c | 6 +- + arch/x86/kernel/tsc_sync.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 79 +-- + arch/x86/mm/Makefile | 3 +- + arch/x86/mm/init.c | 63 -- + arch/x86/mm/pat.c | 7 +- + arch/x86/mm/setup_nx.c | 69 ++ + arch/x86/xen/enlighten.c | 10 +- + drivers/acpi/bus.c | 49 +- + drivers/acpi/scan.c | 705 +++++++----------- + drivers/acpi/video.c | 4 + + drivers/i2c/busses/i2c-scmi.c | 5 +- + drivers/leds/Kconfig | 13 +- + drivers/leds/Makefile | 1 + + drivers/leds/leds-clevo-mail.c | 2 +- + drivers/leds/leds-cobalt-qube.c | 2 +- + drivers/leds/leds-cobalt-raq.c | 4 +- + drivers/leds/leds-gpio.c | 2 +- + drivers/leds/leds-pca9532.c | 12 +- + drivers/leds/leds-wm831x-status.c | 341 +++++++++ + drivers/leds/ledtrig-gpio.c | 28 +- + drivers/macintosh/via-pmu-led.c | 2 +- + drivers/net/can/at91_can.c | 1186 ++++++++++++++++++++++++++++++ + drivers/net/davinci_emac.c | 9 +- + drivers/net/irda/kingsun-sir.c | 1 - + drivers/net/irda/ks959-sir.c | 1 - + drivers/net/irda/ksdazzle-sir.c | 1 - + drivers/net/irda/mcs7780.c | 1 - + drivers/net/virtio_net.c | 229 +++---- + drivers/pci/hotplug/acpiphp_ibm.c | 1 - + drivers/platform/x86/eeepc-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 632 +++++++++++------ + drivers/pnp/pnpacpi/core.c | 21 +- + drivers/scsi/pmcraid.h | 1 - + drivers/usb/misc/sisusbvga/sisusb_init.c | 1 - + drivers/video/backlight/Kconfig | 33 + + drivers/video/backlight/Makefile | 4 + + drivers/video/backlight/adp5520_bl.c | 377 ++++++++++ + drivers/video/backlight/adx_bl.c | 178 +++++ + drivers/video/backlight/backlight.c | 42 ++ + drivers/video/backlight/hp680_bl.c | 2 +- + drivers/video/backlight/lms283gf05.c | 242 ++++++ + drivers/video/backlight/mbp_nvidia_bl.c | 36 + + drivers/video/backlight/wm831x_bl.c | 250 +++++++ + fs/cifs/Kconfig | 1 + + fs/cifs/cifsfs.c | 93 +--- + fs/cifs/cifsglob.h | 21 +- + fs/cifs/cifsproto.h | 11 +- + fs/cifs/cifssmb.c | 1 + + fs/cifs/connect.c | 1 - + fs/cifs/dir.c | 64 +- + fs/cifs/file.c | 137 +++-- + fs/cifs/misc.c | 34 +- + fs/cifs/readdir.c | 4 +- + fs/cifs/transport.c | 50 -- + fs/fs-writeback.c | 6 +- + include/acpi/acpi_bus.h | 22 +- + include/linux/backing-dev.h | 3 +- + include/linux/backlight.h | 7 + + include/linux/ipc.h | 2 - + include/linux/kref.h | 1 - + include/linux/mfd/wm831x/status.h | 34 + + include/linux/nfs_fs.h | 1 - + include/linux/perf_counter.h | 2 +- + include/linux/perf_event.h | 2 +- + include/linux/spi/lms283gf05.h | 28 + + include/linux/tracepoint.h | 2 +- + include/trace/events/workqueue.h | 4 +- + kernel/futex.c | 137 ++-- + kernel/module.c | 1 - + kernel/time/clocksource.c | 4 - + kernel/trace/ftrace.c | 23 +- + kernel/trace/trace.c | 2 +- + kernel/trace/trace_events.c | 7 +- + mm/page-writeback.c | 2 +- + net/ax25/af_ax25.c | 27 +- + tools/perf/.gitignore | 1 + + tools/perf/builtin-stat.c | 18 +- + tools/perf/util/module.c | 96 ++- + tools/perf/util/parse-events.c | 49 +- + tools/perf/util/symbol.c | 17 +- + 99 files changed, 4256 insertions(+), 1517 deletions(-) + create mode 100644 arch/x86/mm/setup_nx.c + create mode 100644 drivers/leds/leds-wm831x-status.c + create mode 100644 drivers/net/can/at91_can.c + create mode 100644 drivers/video/backlight/adp5520_bl.c + create mode 100644 drivers/video/backlight/adx_bl.c + create mode 100644 drivers/video/backlight/lms283gf05.c + create mode 100644 drivers/video/backlight/wm831x_bl.c + create mode 100644 include/linux/mfd/wm831x/status.h + create mode 100644 include/linux/spi/lms283gf05.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 +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +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 +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Resolved 'drivers/usb/host/xhci-hcd.c' using previous resolution. +Resolved 'drivers/usb/host/xhci-mem.c' using previous resolution. +Resolved 'drivers/usb/host/xhci-ring.c' using previous resolution. +Resolved 'drivers/usb/host/xhci.h' using previous resolution. +Auto-merging drivers/usb/host/xhci-hcd.c +CONFLICT (content): Merge conflict in drivers/usb/host/xhci-hcd.c +Auto-merging drivers/usb/host/xhci-mem.c +CONFLICT (content): Merge conflict in drivers/usb/host/xhci-mem.c +Auto-merging drivers/usb/host/xhci-pci.c +Auto-merging drivers/usb/host/xhci-ring.c +CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c +Auto-merging drivers/usb/host/xhci.h +CONFLICT (content): Merge conflict in drivers/usb/host/xhci.h +Auto-merging drivers/usb/serial/option.c +Auto-merging drivers/usb/serial/pl2303.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 32f2ee9] Merge branch 'quilt/usb.current' +$ git diff -M --stat --summary HEAD^.. +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 +Merge made by recursive. + arch/ia64/Kconfig | 4 +- + arch/ia64/include/asm/spinlock.h | 177 ++++++++++++++++---------------- + arch/ia64/include/asm/spinlock_types.h | 2 +- + arch/ia64/kernel/head.S | 89 ---------------- + arch/ia64/kernel/ia64_ksyms.c | 20 ---- + arch/ia64/oprofile/backtrace.c | 20 +---- + 6 files changed, 93 insertions(+), 219 deletions(-) +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 377d095] 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/process.c | 2 ++ + 1 files changed, 2 insertions(+), 0 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/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 +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 674f06e] 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 839d91a] 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/uaccess.h | 2 + + arch/s390/kernel/compat_wrapper.S | 2 +- + arch/s390/kernel/ftrace.c | 3 - + arch/s390/kernel/module.c | 3 + + 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 | 116 ++++++++++++++++------------- + arch/s390/mm/pgtable.c | 10 ++- + drivers/s390/cio/blacklist.c | 13 +-- + drivers/s390/cio/device.c | 4 +- + drivers/s390/cio/device.h | 1 + + drivers/s390/cio/device_fsm.c | 35 +++++++-- + lib/Kconfig.debug | 7 +- + 17 files changed, 203 insertions(+), 201 deletions(-) +Merging sh/master +$ git merge sh/master +Already up-to-date. +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 +Auto-merging fs/ecryptfs/mmap.c +Merge made by recursive. +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 +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Merge made by recursive. +Merging fatfs/master +$ git merge fatfs/master +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/misc.c +Auto-merging fs/nls/nls_base.c +Merge made by recursive. + Documentation/filesystems/vfat.txt | 2 +- + fs/fat/fat.h | 2 +- + fs/fat/inode.c | 18 +++++++++++------- + fs/fat/misc.c | 8 +++++--- + fs/fat/namei_vfat.c | 15 ++++----------- + fs/nls/nls_base.c | 8 ++++---- + 6 files changed, 26 insertions(+), 27 deletions(-) +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/incore.h | 4 ---- + fs/gfs2/ops_fstype.c | 3 +-- + fs/gfs2/recovery.c | 4 +--- + fs/gfs2/sys.c | 24 ------------------------ + 5 files changed, 10 insertions(+), 35 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 +Auto-merging fs/nfs/nfs4xdr.c +Merge made by recursive. + Documentation/filesystems/nfs41-server.txt | 2 +- + fs/nfs/nfs4xdr.c | 23 +++++++++++++++++------ + 2 files changed, 18 insertions(+), 7 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 +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Removing Documentation/i2c/busses/i2c-voodoo3 +Removing drivers/i2c/busses/i2c-voodoo3.c +Auto-merging drivers/leds/leds-pca9532.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 9 - + Documentation/hwmon/ltc4215 | 7 +- + Documentation/hwmon/ltc4245 | 7 +- + Documentation/i2c/busses/i2c-voodoo3 | 62 ----- + Documentation/{i2c/chips => misc-devices}/eeprom | 0 + Documentation/{i2c/chips => misc-devices}/max6875 | 6 +- + Documentation/w1/masters/ds2482 | 6 +- + drivers/hwmon/ltc4215.c | 47 +---- + drivers/hwmon/ltc4245.c | 131 +----------- + drivers/i2c/Kconfig | 1 + + drivers/i2c/busses/Kconfig | 16 -- + drivers/i2c/busses/Makefile | 3 - + drivers/i2c/busses/i2c-voodoo3.c | 248 --------------------- + drivers/i2c/i2c-core.c | 12 +- + drivers/leds/leds-pca9532.c | 3 - + drivers/mfd/ab3100-core.c | 4 +- + drivers/misc/eeprom/max6875.c | 29 +-- + drivers/net/sfc/sfe4001.c | 4 +- + drivers/staging/iio/light/tsl2561.c | 4 - + drivers/w1/masters/ds2482.c | 35 +--- + include/linux/i2c.h | 3 +- + 21 files changed, 46 insertions(+), 591 deletions(-) + delete mode 100644 Documentation/i2c/busses/i2c-voodoo3 + rename Documentation/{i2c/chips => misc-devices}/eeprom (100%) + rename Documentation/{i2c/chips => misc-devices}/max6875 (94%) + delete mode 100644 drivers/i2c/busses/i2c-voodoo3.c +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Already up-to-date. +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 +Removing arch/sh/include/asm/.gitignore +Auto-merging kernel/trace/trace.c +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 +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 8 + + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/Kconfig | 11 + + drivers/acpi/Makefile | 2 + + drivers/acpi/acpi_pad.c | 514 ++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 536 insertions(+), 1 deletions(-) + create mode 100644 drivers/acpi/acpi_pad.c +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/linux/kvm_host.h +Auto-merging virt/kvm/kvm_main.c +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 +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/bnx2i/bnx2i_hwi.c +Auto-merging drivers/scsi/fcoe/libfcoe.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/scsi/sr.c +Merge made by recursive. + Documentation/scsi/hptiop.txt | 21 +- + MAINTAINERS | 7 + + 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 | 10 + + drivers/scsi/Makefile | 1 + + 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/device_handler/scsi_dh_rdac.c | 2 - + drivers/scsi/fcoe/fcoe.c | 1073 ++++++--- + drivers/scsi/fcoe/fcoe.h | 76 +- + drivers/scsi/fcoe/libfcoe.c | 288 ++- + drivers/scsi/fnic/fnic_main.c | 10 +- + drivers/scsi/hptiop.c | 37 +- + drivers/scsi/hptiop.h | 3 +- + drivers/scsi/libfc/Makefile | 4 +- + drivers/scsi/libfc/fc_disc.c | 2 + + drivers/scsi/libfc/fc_elsct.c | 3 +- + drivers/scsi/libfc/fc_exch.c | 361 ++-- + drivers/scsi/libfc/fc_fcp.c | 180 +- + drivers/scsi/libfc/fc_frame.c | 7 +- + drivers/scsi/libfc/fc_libfc.c | 134 + + drivers/scsi/libfc/fc_libfc.h | 112 + + drivers/scsi/libfc/fc_lport.c | 550 +++-- + drivers/scsi/libfc/fc_npiv.c | 161 ++ + drivers/scsi/libfc/fc_rport.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/scsi.c | 11 +- + drivers/scsi/scsi_debug.c | 139 +- + drivers/scsi/scsi_error.c | 3 + + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/scsi_lib_dma.c | 7 +- + 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 +- + include/scsi/Kbuild | 1 + + include/scsi/fc/Kbuild | 4 + + include/scsi/fc/fc_els.h | 6 +- + include/scsi/fc/fc_fs.h | 2 + + include/scsi/fc/fc_gs.h | 2 + + include/scsi/fc/fc_ns.h | 22 + + include/scsi/fc_encode.h | 54 +- + include/scsi/fc_frame.h | 3 + + include/scsi/libfc.h | 200 +-- + include/scsi/libfcoe.h | 89 +- + include/scsi/scsi.h | 3 + + include/scsi/scsi_cmnd.h | 4 - + include/scsi/scsi_host.h | 30 +- + 267 files changed, 53549 insertions(+), 1788 deletions(-) + 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/libfc/fc_libfc.c + create mode 100644 drivers/scsi/libfc/fc_libfc.h + create mode 100644 drivers/scsi/libfc/fc_npiv.c + create mode 100644 drivers/scsi/mpt2sas/mpi/mpi2_history.txt + create mode 100644 include/scsi/fc/Kbuild +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 +Already up-to-date. +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/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 +------ + 9 files changed, 49 insertions(+), 135 deletions(-) +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/pci/hda/hda_intel.c | 1 + + sound/pci/hda/patch_conexant.c | 12 +++++- + 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 - + 9 files changed, 72 insertions(+), 95 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. +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 +Recorded preimage for 'mm/page-writeback.c' +Resolved 'fs/fs-writeback.c' using previous resolution. +Auto-merging fs/buffer.c +Auto-merging fs/fs-writeback.c +CONFLICT (content): Merge conflict in fs/fs-writeback.c +Auto-merging mm/page-writeback.c +CONFLICT (content): Merge conflict in mm/page-writeback.c +Auto-merging mm/shmem.c +Auto-merging mm/vmscan.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'mm/page-writeback.c'. +[master 110b864] Merge remote branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-pci-devices-cciss | 28 + + block/blk-core.c | 1 + + block/blk-settings.c | 4 +- + drivers/block/DAC960.c | 156 ++--- + drivers/block/cciss.c | 753 ++++++++++++++------ + drivers/block/cciss.h | 12 +- + drivers/block/cpqarray.c | 63 +- + include/trace/events/block.h | 33 + + kernel/trace/blktrace.c | 34 + + 9 files changed, 754 insertions(+), 330 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-exception-store.c | 16 ----------- + drivers/md/dm-exception-store.h | 2 +- + drivers/md/dm-ioctl.c | 4 +- + drivers/md/dm-log-userspace-base.c | 2 +- + drivers/md/dm-log-userspace-transfer.c | 3 +- + drivers/md/dm-snap-persistent.c | 46 ++++++++++++++----------------- + drivers/md/dm-snap.c | 10 ++++++- + drivers/md/dm.c | 11 ++++++- + 8 files changed, 44 insertions(+), 50 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 | 551 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 561 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 ++++++++++++++- + 2 files changed, 35 insertions(+), 40 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 | 3775 +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 5178 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 +Auto-merging drivers/gpu/drm/radeon/r100.c +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/video/fbmem.c +Merge made by recursive. + drivers/gpu/drm/drm_crtc.c | 1 + + drivers/gpu/drm/drm_crtc_helper.c | 88 ++++++++++- + drivers/gpu/drm/drm_edid.c | 46 +++++-- + drivers/gpu/drm/drm_fb_helper.c | 234 +++++++++++++++++++++++++++- + drivers/gpu/drm/drm_modes.c | 3 +- + drivers/gpu/drm/i915/intel_fb.c | 5 +- + drivers/gpu/drm/radeon/.gitignore | 3 + + drivers/gpu/drm/radeon/r100.c | 197 +++++++++-------------- + drivers/gpu/drm/radeon/r100_track.h | 69 ++++++++- + drivers/gpu/drm/radeon/r200.c | 79 +++++----- + drivers/gpu/drm/radeon/r300.c | 137 ++++++----------- + drivers/gpu/drm/radeon/r500_reg.h | 3 + + drivers/gpu/drm/radeon/r600.c | 7 + + drivers/gpu/drm/radeon/r600_cs.c | 183 ++++++++++++++++++---- + drivers/gpu/drm/radeon/radeon.h | 37 +++++- + drivers/gpu/drm/radeon/radeon_atombios.c | 9 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 33 ++++- + drivers/gpu/drm/radeon/radeon_cs.c | 103 +++++++++++- + drivers/gpu/drm/radeon/radeon_device.c | 11 +- + drivers/gpu/drm/radeon/radeon_drv.c | 5 - + drivers/gpu/drm/radeon/radeon_fb.c | 26 +++- + drivers/gpu/drm/radeon/radeon_kms.c | 49 ------ + drivers/gpu/drm/radeon/radeon_reg.h | 1 + + drivers/gpu/drm/radeon/rv770.c | 7 + + drivers/video/fbmem.c | 2 +- + include/drm/drm_crtc.h | 14 ++- + include/drm/drm_fb_helper.h | 24 +++ + 27 files changed, 990 insertions(+), 386 deletions(-) + create mode 100644 drivers/gpu/drm/radeon/.gitignore +Merging voltage/for-next +$ git merge voltage/for-next +Already up-to-date. +Merging security-testing/next +$ git merge security-testing/next +Auto-merging drivers/char/tpm/tpm.c +Merge made by recursive. + drivers/char/tpm/tpm.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. +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 ++++++++++++- + 1 files changed, 12 insertions(+), 1 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 | 53 ++++++++++++++++++++++++++++++++++- + 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, 148 insertions(+), 32 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 +Merge made by recursive. + Documentation/timers/hpet.txt | 2 +- + drivers/rtc/rtc-ds1511.c | 4 ++-- + drivers/watchdog/sb_wdog.c | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +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 +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/drbd +$ git merge drbd/drbd +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 | 3735 ++++++++++++++++ + drivers/block/drbd/drbd_nl.c | 2365 +++++++++++ + drivers/block/drbd/drbd_proc.c | 266 ++ + drivers/block/drbd/drbd_receiver.c | 4456 ++++++++++++++++++++ + drivers/block/drbd/drbd_req.c | 1132 +++++ + drivers/block/drbd/drbd_req.h | 327 ++ + 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 | 1529 +++++++ + 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, 23140 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 +Merging kmemleak/kmemleak +$ git merge kmemleak/kmemleak +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Merge made by recursive. + arch/x86/Kconfig | 5 ++ + arch/x86/include/asm/hpet.h | 7 ++- + arch/x86/include/asm/msr.h | 4 +- + arch/x86/kernel/acpi/boot.c | 1 + + arch/x86/kernel/apic/io_apic.c | 49 ++++++++++++++++++---- + arch/x86/kernel/hpet.c | 60 ++++++++++++++++----------- + arch/x86/kernel/tsc.c | 8 +-- + arch/x86/lib/msr.c | 46 ++++++++------------ + drivers/pci/intr_remapping.c | 89 ++++++++++++++++++++++++++++++++++++++-- + drivers/pci/intr_remapping.h | 7 +++ + fs/proc/array.c | 11 +++++ + include/linux/clocksource.h | 1 - + include/linux/dmar.h | 10 ++++ + include/linux/hpet.h | 2 + + include/linux/poison.h | 16 ++++++- + include/linux/timex.h | 5 ++- + kernel/cpuset.c | 8 +--- + kernel/hrtimer.c | 53 ++++++++++++++++-------- + kernel/irq/manage.c | 2 +- + 19 files changed, 280 insertions(+), 104 deletions(-) +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 +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +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 +Recorded preimage for 'arch/x86/kernel/early_printk.c' +Resolved 'drivers/usb/serial/sierra.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/early_printk.c +CONFLICT (content): Merge conflict in arch/x86/kernel/early_printk.c +Auto-merging drivers/usb/Kconfig +Auto-merging drivers/usb/gadget/u_audio.c +Auto-merging drivers/usb/gadget/u_ether.c +Auto-merging drivers/usb/host/ohci-pxa27x.c +Auto-merging drivers/usb/serial/sierra.c +CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/early_printk.c'. +[master fd5c84f] Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/staging +$ git merge quilt/staging +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +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/winbond/wbusb.c | 33 +- + 18 files changed, 17 insertions(+), 5227 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 +Recorded preimage for 'drivers/scsi/pmcraid.h' +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/scsi/Makefile' using previous resolution. +Resolved 'drivers/scsi/fcoe/fcoe.c' using previous resolution. +Resolved 'drivers/scsi/fcoe/fcoe.h' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_elsct.c' using previous resolution. +Resolved 'drivers/scsi/libfc/fc_lport.c' using previous resolution. +Resolved 'drivers/scsi/pmcraid.c' using previous resolution. +Resolved 'include/scsi/fc_encode.h' using previous resolution. +Resolved 'include/scsi/libfc.h' using previous resolution. +Resolved 'kernel/sysctl.c' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/ata/ahci.c +Auto-merging drivers/message/fusion/mptbase.c +Auto-merging drivers/message/fusion/mptbase.h +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/scsi/Makefile +CONFLICT (content): Merge conflict in drivers/scsi/Makefile +Auto-merging drivers/scsi/device_handler/scsi_dh_rdac.c +Auto-merging drivers/scsi/fcoe/fcoe.c +CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.c +Auto-merging drivers/scsi/fcoe/fcoe.h +CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.h +Auto-merging drivers/scsi/fcoe/libfcoe.c +Auto-merging drivers/scsi/libfc/fc_disc.c +Auto-merging drivers/scsi/libfc/fc_elsct.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_elsct.c +Auto-merging drivers/scsi/libfc/fc_exch.c +Auto-merging drivers/scsi/libfc/fc_fcp.c +Auto-merging drivers/scsi/libfc/fc_lport.c +CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c +Auto-merging drivers/scsi/libfc/fc_rport.c +Auto-merging drivers/scsi/pmcraid.c +CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/pmcraid.h +CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.h +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/sg.c +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/libata.h +Auto-merging include/scsi/fc/fc_gs.h +Auto-merging include/scsi/fc_encode.h +CONFLICT (content): Merge conflict in include/scsi/fc_encode.h +Auto-merging include/scsi/libfc.h +CONFLICT (content): Merge conflict in include/scsi/libfc.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/scsi/pmcraid.h'. +[master 25f08f7] Merge remote branch 'scsi-post-merge/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 + + drivers/ata/ahci.c | 54 +- + drivers/message/fusion/mptbase.c | 99 +- + drivers/message/fusion/mptbase.h | 3 + + drivers/scsi/Kconfig | 1 + + drivers/scsi/Makefile | 1 + + 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 | 646 ++++++++ + drivers/scsi/be2iscsi/be_iscsi.h | 75 + + drivers/scsi/be2iscsi/be_main.c | 3393 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/be2iscsi/be_main.h | 833 ++++++++++ + drivers/scsi/be2iscsi/be_mgmt.c | 321 ++++ + drivers/scsi/be2iscsi/be_mgmt.h | 249 +++ + drivers/scsi/qla2xxx/qla_dbg.c | 78 +- + drivers/scsi/qla2xxx/qla_def.h | 5 + + drivers/scsi/qla2xxx/qla_gbl.h | 1 + + drivers/scsi/qla2xxx/qla_os.c | 36 + + include/linux/libata.h | 2 + + 22 files changed, 7332 insertions(+), 72 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 +$ git am -3 ../patches/drop_autoconf.h_from_DRBD_driver +Applying: linux-next: 20090926 - drop autoconf.h from DRBD driver diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..dae22a8a3385 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,44 @@ +Importing driver-core.current based on 2.6.31-git12 +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.31-git17 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 6d7f18f6ea3a13af95bdf507fc54d42b165e1712 +HEAD is now at 6d7f18f Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block +$ 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-voodoo3-delete.patch +i2c-prevent-priority-inversion-on-top-of-bus-lock.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 721fae2...96822ad master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.31-git13 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on origin/master + quilt series is empty +$ git update-ref refs/heads/quilt/kernel-doc 0d9df2515dbceb67d343c0f10fd3ff218380d524 +Importing rr based on v2.6.31-8756-g94e0fb0 +Unchanged quilt series rr +Importing device-mapper based on block/for-next +Unchanged quilt series device-mapper +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 +Unchanged quilt series staging diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..0f0578e927a9 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090927 |