diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-09 15:19:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-09 15:19:40 +1100 |
| commit | 5e4055568c3bd26d185e6966a2467213351aed57 (patch) | |
| tree | 736ea886bb6cf809faa934abac5aafc2e5525940 | |
| parent | 1b653d050465f8e8ab2dc43f34b331892137eee7 (diff) | |
Add linux-next specific files for 20090109next-20090109
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 131 | ||||
| -rw-r--r-- | Next/Trees | 133 | ||||
| -rw-r--r-- | Next/merge.log | 2660 | ||||
| -rw-r--r-- | Next/quilt-import.log | 79 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3004 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..5cc86e0eb83d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,131 @@ +Name SHA1 +---- ---- +origin 85da1fb545e5fe51c35e0576f71780cc557f4277 +arm-current 97b5fe8e28d78779e35ac283bacb9eceffd5b4a3 +m68k-current fe0bdec68b77020281dc814805edfe594ae89e0f +powerpc-merge b58602a4bac012b5f4fc12fe6b46ab237b610d5d +sparc-current 9e42d0cf5020aaf217433cad1a224745241d212a +scsi-rc-fixes 508859405e33797342d42cda3e731464c2bcd7a8 +net-current 56cf391a9462a4897ea660a6af3662dda5ae8c84 +sound-current 167968199089435c63ad1140ccfb8c6179274a0a +pci-current ede6f5aea054d3fb67c78857f7abdee602302043 +wireless-current 3298a7388c00227e736d1037328788073c80c7b4 +kbuild-current acd3e0a851291d46046bfddd7dc1eec1bc319b50 +driver-core.current 9e42d0cf5020aaf217433cad1a224745241d212a +usb.current 9e42d0cf5020aaf217433cad1a224745241d212a +cpufreq-current bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e +input-current 9334e90d5ac5ee1fa6d8b75acb7c64a8907787d1 +md-current 4044ba58dd15cb01797c4fd034f39ef4a75f7cc3 +audit-current c05a63c58c2884c4db00308ba5eb0dbac2fb5ac9 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm bdbb861f75c2bd94480316d3318dff280f4f5ce4 +avr32 52435bfc665716fdf9a02f0d08e7ce50ddb9bf45 +blackfin 06af15e086e39a5a2a2413973a64af8e10122f28 +cris 0db42c6b23ce26b05b235dbe2e0aa096db194e33 +ia64 8b1fae4e4200388b64dd88065639413cb3f1051c +m68k 5f79b5812d9a8e5c12396ff83542fd184b89b1c3 +m68knommu 7680a920c75b242adaedf3d93b7f6d253db56792 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc ae16489eb1175066c8f3008fc3c0396c525e1906 +powerpc 5886188dc7ba9a76babcd37452f44079a9a77f71 +4xx b58602a4bac012b5f4fc12fe6b46ab237b610d5d +galak 6fd8be4bf72879b3039654388e985cabf8449af5 +pxa 9a8585e138d7d6285d50ab3cf3cce4fdb9d4dbd1 +s390 d80178ad0a4fe6869803f4580430932bc0b039bf +sh f82a7712036b96cd82a26f54a51a6ba22db00af1 +sparc 6680598b44ed3c0052d155522eb21fc5a00de5f3 +x86 226cf6bc3b83a3c3d2434c9b9061021a302b0c9f +xtensa 8903709b054a8dafe4e8c6d9a6444034d7aba36f +driver-core 04164b0a76f3b0f0b9a46eef90541ab7f7aac18e +usb 04164b0a76f3b0f0b9a46eef90541ab7f7aac18e +tip-core fdbc0450df12cc9cb397f3497db4b0cad7c1a8ff +cpus4096 3869f98858df8674d9aca87de54717837c2a09dc +ftrace f5d94186ca202693152770ebd93cf1b36076e338 +genirq 1faa44855f8f1e9b2cd46e9227ad23c3301556c1 +safe-poison-pointers 286c12f72ad295bbc27cfe67b0922bfc09732af7 +sched d9be28ea9110c596a05bd2d56afa94251bd19818 +stackprotector a9de18eb761f7c1c860964b2e5addc1a35c7e861 +timers 74541be1cd6480943f84ae9116bfad1c90f1d3c0 +pci f6dc1e5e3d4b523e1616b43beddb04e4fb1d376a +device-mapper 6de1a7190f206b2f78297ac30935f76b8d30af99 +hid 7fb6132e2333b627243829f530758dd8e4c34963 +i2c 8cfc7f9c005313ecd4e98ad1feb391d8dfce9ed2 +jdelvare-hwmon cdf1b9e6ab87095df67d5f1d68432b16888dfae6 +kernel-doc 7591103c08abade60aeddb432ed0686ddd0de1c6 +v4l-dvb b16f1dafdccdfc4758b49d2b522cf8842b52566f +jfs d69e83d99cf87e3328c47bb54684360e32aef17d +kbuild b67ff8ce122f3353bd741db48ce1756c12fb5f2d +ide e998f2694c269c84085f6c6ee0450b1b4e50c689 +libata 0fe40ff891faa940e539bd5a92c4a5dd9ae49b0b +nfs 9e42d0cf5020aaf217433cad1a224745241d212a +xfs 0a8c5395f90f06d128247844b2515c8bf3f2826b +infiniband f8f01f8005f9c05e2e5d1e00d01f423c9681f433 +acpi c7b84be7611b447a1a70ff4313f21a2b40bb9705 +nfsd ecebc78f007260eb302f1ded84dea925beeef648 +ieee1394 faefafff7d07a1aacbe6c2db2f8dd375afcfdfbd +ubi f2863c54f30cccb50661697a6e4bdcd0ad0b0a6c +kvm 247232698a0ad73e01c72a1827b35b3629acf2bd +dlm c7be761a8163d2f1ac0b606c21e4316b7abc5af7 +scsi ffda8c7dc492e2170bb263f7c56f286992ceb54b +ocfs2 658871c538a02965b428957da2fa15cef5840971 +ext4 4b905671d2ea09fd48fed72c581df17e40823f39 +async_tx b9bdcbba010c2e49c8f837ea7a49fe006b636f41 +udf 0f675c1b6ef06b8f08c2a78ad99efd4e50c2603d +net 3c92ec8ae91ecf59d88c798301833d7cf83f2179 +mtd a808ad3b0d28411e2838117c5b2ae680ae42483c +wireless 9cf7f247bd0cd21e475c71a4e018bb612ef02aab +crypto 0ee4a96902dd7858e65f378c86f428a0355bd841 +vfs fd217f4d70172c526478f2bc76859e909fdfa674 +sound 5b9b7024b21e4cb52de091133b847a4695c1b5b0 +cpufreq 187d9f4ed4fc089f1f25a875fb485e27626972f9 +v9fs f1d9e4586e79e1fc7b26d1c567599a904013f199 +rr 3db9b863fa5cd6c65da4248d896654c6c81345a1 +cifs 63fee6b561987705045237a62d7481fe2c48e3c7 +mmc 418f19ea17a99421b22a64e101e14b6a16bed66d +gfs2 bae882b5e7b0245dc458010b0a8d62b2de0fe213 +input e941da3110422c4e57c3d05759fb9475b28f45f6 +bkl-removal 877d79ef6ad6a67bb8582b7013e0d6f56a77e5ba +ubifs 8e5033adc78ff4fbeab7052134e7af1f6ff04187 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block d3f761104b097738932afcc310fbbbbfb007ef92 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 26b06189dcf12e67f3552327ae2ba5e3053730fe +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery ed8c3174dd227031d1f3b9fa4fbb512f8f623434 +leds ce70a24575414d615f6a7a05caf9b7e8f91a1b6f +backlight d00ba726725c6f41e43df00f83e484ba8f9fac5c +kgdb 0136574e061924dc236a611f28e881a12ab6822a +slab 3c506efd7e0f615bd9603ce8c06bc4a896952599 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 4044ba58dd15cb01797c4fd034f39ef4a75f7cc3 +kmemcheck 72accebb513bcb4ab345719135baf5d242464dac +generic-ipi 6a94cb73064c952255336cc57731904174b2c58f +mfd 3f874b6643e189d3d07618928ceed0013d71593e +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm a75f28419a7efff611a81293d41d0e2137d7591e +voltage f109021f68dbc2dc80a27def4ea8c29b0c266bcd +security-testing c8334dc8fb6413b363df3e1419e287f5b25bce32 +lblnet ede6f5aea054d3fb67c78857f7abdee602302043 +ttydev 7afb3a948b2ae0818a69f6c434aa8ea283184544 +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +oprofile 5ac9919ca2707f800e80657eadf9afc719807afd +fastboot 6a94cb73064c952255336cc57731904174b2c58f +sparseirq ac8931efd29418a669d66831a818e2ff736e4e82 +iommu 322957b8ca8c9d2e18c93f88527e84ce6960ad39 +uwb a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c +watchdog fadaa8bb141555ae7055feb1a861b5bbfc3524d0 +proc 230e40fbda242544389a5428a2efac568178ddfe +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 0b4e7781aee2f03a6f9577a4268c96d6072be59d +cpu_alloc c905c8806c7df091085a66bab590c3ee499b86cc +cputime c742b31c03f37c5c499178f09f57381aa6c70131 +osd 5fad3378bd56a3b2863e8da681d1d18462a30682 +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +fuse 5d9ec854bfb6f1e122b1d96b344164a71eac5be8 +jc_docs 2884f00b94be73a6a7875bada739bf9bb2f9a1b6 +nommu cb6ff208076b5f434db1b8c983429269d719cef5 +trivial 8903709b054a8dafe4e8c6d9a6444034d7aba36f +audit b3985e2bf6ce51ae943208af4bd336287fb34ed6 +squashfs fc55584175589b70f4c30cb594f09f4bd6ad5d40 +staging 04164b0a76f3b0f0b9a46eef90541ab7f7aac18e +scsi-post-merge 238c6d54830c624f34ac9cf123ac04aebfca5013 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..7fc51fe16c76 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,133 @@ +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 +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-x86-next +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-timers-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/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 +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +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 +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-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 +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 +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next +fastboot git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next +sparseirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-iommu-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +proc git git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git#proc +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 +cpu_alloc git git://git.kernel.org/pub/scm/linux/kernel/git/christoph/work.git#cpu_alloc +cputime git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-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 +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 +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/ +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..7e115bca7e5d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2660 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 8903709 xtensa: introduce swab.h +Merging origin/master +$ git merge origin/master +Updating 8903709..85da1fb +Fast forward + CREDITS | 17 + + Documentation/DocBook/networking.tmpl | 8 + + Documentation/PCI/pci.txt | 3 +- + Documentation/cgroups/cgroups.txt | 9 +- + Documentation/controllers/memcg_test.txt | 342 ++ + Documentation/controllers/memory.txt | 135 +- + Documentation/hwmon/abituguru-datasheet | 4 +- + Documentation/kbuild/kbuild.txt | 7 + + Documentation/kbuild/modules.txt | 4 +- + Documentation/kernel-parameters.txt | 43 + + Documentation/powerpc/dts-bindings/fsl/board.txt | 32 +- + Documentation/scsi/scsi_fc_transport.txt | 4 +- + Documentation/usb/power-management.txt | 22 +- + Documentation/w1/masters/00-INDEX | 2 + + Documentation/w1/masters/mxc-w1 | 11 + + Documentation/w1/w1.netlink | 164 +- + Documentation/wimax/README.i2400m | 260 ++ + Documentation/wimax/README.wimax | 81 + + MAINTAINERS | 93 +- + Makefile | 1 + + arch/alpha/kernel/pci.c | 18 - + arch/alpha/kernel/pci_impl.h | 13 +- + arch/alpha/kernel/sys_dp264.c | 2 +- + arch/alpha/kernel/sys_eiger.c | 2 +- + arch/alpha/kernel/sys_miata.c | 2 +- + arch/alpha/kernel/sys_noritake.c | 2 +- + arch/alpha/kernel/sys_ruffian.c | 2 +- + arch/alpha/kernel/sys_sable.c | 2 +- + arch/arm/include/asm/mach/pci.h | 2 +- + arch/arm/kernel/bios32.c | 27 - + arch/arm/mach-integrator/pci.c | 11 +- + arch/arm/plat-mxc/include/mach/usb.h | 23 + + arch/arm/plat-omap/usb.c | 32 - + arch/mips/pci/pci-ip27.c | 6 - + arch/mips/pci/pci.c | 24 +- + arch/powerpc/Kconfig | 5 +- + arch/powerpc/boot/Makefile | 2 +- + arch/powerpc/boot/dts/mpc836x_mds.dts | 43 +- + arch/powerpc/boot/dts/mpc836x_rdk.dts | 19 +- + arch/powerpc/boot/dts/mpc8641_hpcn.dts | 56 +- + arch/powerpc/boot/dts/sequoia.dts | 2 +- + arch/powerpc/boot/install.sh | 14 +- + arch/powerpc/configs/85xx/mpc8572_ds_defconfig | 43 +- + arch/powerpc/include/asm/ioctls.h | 2 + + arch/powerpc/include/asm/kexec.h | 55 - + arch/powerpc/include/asm/ps3.h | 2 + + arch/powerpc/include/asm/qe.h | 37 +- + arch/powerpc/include/asm/qe_ic.h | 21 +- + arch/powerpc/include/asm/spu.h | 2 +- + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/kernel/cacheinfo.c | 837 ++++ + arch/powerpc/kernel/cacheinfo.h | 8 + + arch/powerpc/kernel/pci-common.c | 71 +- + arch/powerpc/kernel/pci_64.c | 9 +- + arch/powerpc/kernel/ppc_ksyms.c | 1 + + arch/powerpc/kernel/prom.c | 14 +- + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/prom_parse.c | 7 +- + arch/powerpc/kernel/sysfs.c | 300 +-- + arch/powerpc/mm/mmu_decl.h | 6 +- + arch/powerpc/mm/numa.c | 62 +- + arch/powerpc/mm/pgtable_32.c | 3 +- + arch/powerpc/mm/tlb_nohash.c | 3 +- + arch/powerpc/oprofile/cell/pr_util.h | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_common.c | 2 +- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 9 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 5 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 81 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 6 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 1 - + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 2 - + arch/powerpc/platforms/83xx/mpc83xx.h | 1 + + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 7 + + arch/powerpc/platforms/85xx/smp.c | 1 + + arch/powerpc/platforms/Kconfig | 11 + + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/platforms/cell/beat_htab.c | 21 +- + arch/powerpc/platforms/cell/beat_udbg.c | 4 +- + .../powerpc/platforms/cell/cbe_cpufreq_pervasive.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 2 +- + arch/powerpc/platforms/cell/io-workarounds.c | 4 +- + arch/powerpc/platforms/cell/iommu.c | 4 +- + arch/powerpc/platforms/cell/spufs/spufs.h | 2 +- + arch/powerpc/platforms/iseries/Kconfig | 5 +- + arch/powerpc/platforms/iseries/setup.c | 11 + + arch/powerpc/platforms/pasemi/cpufreq.c | 2 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 2 +- + arch/powerpc/platforms/powermac/pci.c | 2 + + arch/powerpc/platforms/powermac/time.c | 11 +- + arch/powerpc/platforms/ps3/device-init.c | 37 + + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/fsl_pci.c | 7 +- + arch/powerpc/sysdev/fsl_soc.h | 5 + + arch/powerpc/sysdev/qe_lib/Kconfig | 3 +- + arch/powerpc/sysdev/qe_lib/gpio.c | 195 + + arch/powerpc/sysdev/simple_gpio.c | 155 + + arch/powerpc/sysdev/simple_gpio.h | 12 + + arch/sh/drivers/pci/ops-cayman.c | 9 +- + arch/sh/drivers/pci/pci.c | 22 +- + arch/sparc/include/asm/timer_64.h | 2 +- + arch/sparc/include/asm/types.h | 2 +- + arch/sparc/kernel/ds.c | 34 +- + arch/sparc/kernel/iommu.c | 2 +- + arch/sparc/kernel/ldc.c | 23 +- + arch/sparc/kernel/mdesc.c | 14 +- + arch/sparc/kernel/of_device_64.c | 2 +- + arch/sparc/kernel/pci.c | 2 +- + arch/sparc/kernel/pci_common.c | 2 +- + arch/sparc/kernel/pci_msi.c | 4 +- + arch/sparc/kernel/pci_schizo.c | 2 +- + arch/sparc/kernel/pci_sun4v.c | 2 +- + arch/sparc/kernel/power.c | 2 +- + arch/sparc/kernel/prom_irqtrans.c | 2 +- + arch/sparc/kernel/psycho_common.c | 14 +- + arch/sparc/kernel/smp_64.c | 4 +- + arch/sparc/kernel/sun4m_smp.c | 5 +- + arch/sparc/kernel/time_64.c | 12 +- + arch/sparc/kernel/traps_64.c | 20 +- + arch/sparc/kernel/unaligned_64.c | 8 +- + arch/sparc/kernel/vio.c | 4 +- + arch/sparc/kernel/viohs.c | 6 +- + arch/sparc/mm/fault_32.c | 3 +- + arch/sparc/mm/init_64.c | 48 +- + arch/x86/kernel/cpu/cpufreq/longhaul.c | 2 +- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/mm/init_32.c | 2 + + arch/x86/mm/init_64.c | 2 + + arch/x86/mm/numa_32.c | 4 +- + arch/x86/pci/acpi.c | 7 +- + arch/x86/pci/common.c | 12 +- + arch/x86/pci/i386.c | 4 +- + arch/x86/pci/init.c | 3 +- + arch/x86/pci/irq.c | 54 +- + arch/x86/pci/visws.c | 20 +- + drivers/Makefile | 1 + + drivers/acpi/pci_root.c | 20 + + drivers/ata/libata-core.c | 96 +- + drivers/atm/iphase.c | 6 +- + drivers/base/topology.c | 1 + + drivers/block/sunvdc.c | 8 +- + drivers/block/ub.c | 11 +- + drivers/char/Kconfig | 1 + + drivers/char/hvc_beat.c | 4 +- + drivers/char/hw_random/n2-drv.c | 2 +- + drivers/char/pty.c | 2 +- + drivers/char/tpm/tpm_nsc.c | 35 +- + drivers/char/vt.c | 3 +- + drivers/firmware/dcdbas.c | 9 +- + drivers/firmware/dcdbas.h | 2 + + drivers/firmware/memmap.c | 6 +- + drivers/gpu/drm/drm_crtc.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 4 +- + drivers/hid/usbhid/hid-core.c | 9 +- + drivers/i2c/chips/Kconfig | 12 - + drivers/i2c/chips/Makefile | 1 - + drivers/infiniband/hw/nes/nes_cm.c | 2 +- + drivers/isdn/hardware/eicon/debuglib.h | 2 +- + drivers/isdn/hardware/eicon/os_4bri.c | 2 +- + drivers/isdn/hardware/eicon/os_bri.c | 2 +- + drivers/isdn/hardware/eicon/os_pri.c | 2 +- + drivers/media/common/tuners/tda8290.c | 6 +- + drivers/media/dvb/dm1105/Kconfig | 1 + + drivers/media/dvb/dvb-core/dvb_frontend.c | 26 +- + drivers/media/dvb/dvb-usb/anysee.c | 2 +- + drivers/media/dvb/frontends/cx24116.c | 2 +- + drivers/media/dvb/frontends/lgdt3304.c | 10 +- + drivers/media/dvb/frontends/s921_module.c | 2 +- + drivers/media/dvb/frontends/stb0899_algo.c | 4 +- + drivers/media/dvb/frontends/stb0899_drv.c | 6 +- + drivers/media/dvb/ttpci/budget-ci.c | 4 +- + drivers/media/video/cx88/Kconfig | 5 + + drivers/media/video/cx88/Makefile | 3 +- + drivers/media/video/cx88/cx88-dvb.c | 46 + + drivers/media/video/cx88/cx88-i2c.c | 24 +- + drivers/media/video/cx88/cx88-mpeg.c | 30 +- + drivers/media/video/cx88/cx88.h | 4 +- + drivers/media/video/em28xx/em28xx-cards.c | 5 +- + drivers/media/video/em28xx/em28xx-core.c | 2 +- + drivers/media/video/em28xx/em28xx-input.c | 2 +- + drivers/media/video/gspca/m5602/m5602_s5k83a.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/media/video/pxa_camera.c | 4 +- + drivers/media/video/pxa_camera.h | 95 - + drivers/media/video/usbvideo/ibmcam.c | 2 +- + drivers/media/video/usbvideo/konicawc.c | 2 +- + drivers/media/video/usbvideo/ultracam.c | 2 +- + drivers/media/video/usbvision/usbvision-video.c | 3 +- + drivers/media/video/v4l2-device.c | 4 +- + drivers/media/video/videobuf-dma-sg.c | 3 +- + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 1 + + drivers/misc/dell-laptop.c | 436 +++ + drivers/mtd/devices/Kconfig | 7 + + drivers/mtd/devices/Makefile | 1 + + drivers/mtd/devices/ps3vram.c | 768 ++++ + drivers/mtd/ubi/kapi.c | 2 +- + drivers/net/Kconfig | 2 + + drivers/net/Makefile | 1 + + drivers/net/e1000e/netdev.c | 2 +- + drivers/net/sfc/falcon.c | 4 +- + drivers/net/sunvnet.c | 8 +- + drivers/net/usb/kaweth.c | 6 +- + drivers/net/usb/pegasus.c | 12 +- + drivers/net/wimax/Kconfig | 17 + + drivers/net/wimax/Makefile | 5 + + drivers/net/wimax/i2400m/Kconfig | 49 + + drivers/net/wimax/i2400m/Makefile | 29 + + drivers/net/wimax/i2400m/control.c | 1291 +++++++ + drivers/net/wimax/i2400m/debug-levels.h | 45 + + drivers/net/wimax/i2400m/debugfs.c | 392 ++ + drivers/net/wimax/i2400m/driver.c | 728 ++++ + drivers/net/wimax/i2400m/fw.c | 1095 ++++++ + drivers/net/wimax/i2400m/i2400m-sdio.h | 132 + + drivers/net/wimax/i2400m/i2400m-usb.h | 264 ++ + drivers/net/wimax/i2400m/i2400m.h | 755 ++++ + drivers/net/wimax/i2400m/netdev.c | 524 +++ + drivers/net/wimax/i2400m/op-rfkill.c | 207 + + drivers/net/wimax/i2400m/rx.c | 534 +++ + drivers/net/wimax/i2400m/sdio-debug-levels.h | 22 + + drivers/net/wimax/i2400m/sdio-fw.c | 224 ++ + drivers/net/wimax/i2400m/sdio-rx.c | 255 ++ + drivers/net/wimax/i2400m/sdio-tx.c | 153 + + drivers/net/wimax/i2400m/sdio.c | 511 +++ + drivers/net/wimax/i2400m/tx.c | 817 ++++ + drivers/net/wimax/i2400m/usb-debug-levels.h | 42 + + drivers/net/wimax/i2400m/usb-fw.c | 340 ++ + drivers/net/wimax/i2400m/usb-notif.c | 269 ++ + drivers/net/wimax/i2400m/usb-rx.c | 417 ++ + drivers/net/wimax/i2400m/usb-tx.c | 229 ++ + drivers/net/wimax/i2400m/usb.c | 591 +++ + drivers/net/wireless/ath5k/dma.c | 2 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- + drivers/parisc/dino.c | 4 +- + drivers/parisc/iosapic.c | 3 +- + drivers/pci/Kconfig | 9 + + drivers/pci/Makefile | 2 + + drivers/pci/access.c | 226 +- + drivers/pci/bus.c | 87 +- + drivers/pci/hotplug/Makefile | 3 + + drivers/pci/hotplug/acpi_pcihp.c | 69 + + drivers/pci/hotplug/acpiphp.h | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 117 +- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 6 +- + drivers/pci/hotplug/cpqphp_pci.c | 2 +- + drivers/pci/hotplug/fakephp.c | 1 + + drivers/pci/hotplug/pciehp.h | 15 +- + drivers/pci/hotplug/pciehp_acpi.c | 141 + + drivers/pci/hotplug/pciehp_core.c | 1 + + drivers/pci/hotplug/pciehp_ctrl.c | 26 +- + drivers/pci/hotplug/pciehp_hpc.c | 329 +-- + drivers/pci/irq.c | 2 +- + drivers/pci/msi.c | 31 +- + drivers/pci/pci-acpi.c | 82 +- + drivers/pci/pci-driver.c | 420 ++- + drivers/pci/pci-stub.c | 47 + + drivers/pci/pci-sysfs.c | 95 +- + drivers/pci/pci.c | 513 ++- + drivers/pci/pci.h | 34 +- + drivers/pci/pcie/aer/aerdrv_acpi.c | 1 - + drivers/pci/pcie/aer/aerdrv_errprint.c | 2 +- + drivers/pci/pcie/aspm.c | 165 +- + drivers/pci/pcie/portdrv_bus.c | 32 +- + drivers/pci/pcie/portdrv_core.c | 240 +- + drivers/pci/pcie/portdrv_pci.c | 21 +- + drivers/pci/probe.c | 40 +- + drivers/pci/proc.c | 18 +- + drivers/pci/quirks.c | 112 +- + drivers/pci/setup-bus.c | 5 +- + drivers/pci/setup-res.c | 24 +- + drivers/rtc/rtc-ds1307.c | 154 +- + drivers/s390/block/dasd_3990_erp.c | 2 +- + drivers/s390/block/dasd_int.h | 2 +- + drivers/s390/char/tape_3590.c | 2 +- + drivers/s390/cio/cio.c | 2 +- + drivers/s390/cio/qdio_main.c | 2 +- + drivers/sbus/char/display7seg.c | 2 +- + drivers/scsi/Kconfig | 1 + + drivers/scsi/scsi_scan.c | 3 + + drivers/scsi/sd.c | 109 +- + drivers/serial/Kconfig | 19 +- + drivers/serial/Makefile | 1 + + drivers/serial/nwpserial.c | 475 +++ + drivers/serial/of_serial.c | 19 + + drivers/staging/comedi/drivers.c | 2 +- + drivers/staging/epl/Edrv8139.c | 60 +- + drivers/staging/epl/EplSdoAsySequ.c | 2 +- + drivers/staging/frontier/alphatrack.c | 12 +- + drivers/staging/frontier/tranzport.c | 22 +- + drivers/staging/go7007/go7007-v4l2.c | 3 +- + drivers/staging/meilhaus/me0600_ext_irq.c | 4 +- + drivers/staging/meilhaus/me1400_ext_irq.c | 2 +- + drivers/staging/meilhaus/me1600_ao.c | 4 +- + drivers/staging/meilhaus/me4600_ai.c | 8 +- + drivers/staging/meilhaus/me4600_ao.c | 6 +- + drivers/staging/meilhaus/me4600_ext_irq.c | 2 +- + drivers/staging/meilhaus/me6000_ao.c | 20 +- + drivers/staging/meilhaus/me8100_di.c | 6 +- + drivers/staging/meilhaus/me8200_di.c | 4 +- + drivers/staging/meilhaus/me8200_do.c | 2 +- + drivers/staging/meilhaus/medebug.h | 10 +- + drivers/staging/otus/80211core/cagg.c | 2 +- + drivers/staging/otus/80211core/pub_zfw.h | 2 +- + drivers/staging/otus/80211core/struct.h | 2 +- + drivers/staging/otus/oal_marc.h | 12 +- + drivers/staging/rt2860/2860_main_dev.c | 2 +- + drivers/staging/rt2860/common/ba_action.c | 18 +- + drivers/staging/rt2860/common/cmm_data.c | 2 +- + drivers/staging/rt2860/common/cmm_data_2860.c | 6 +- + drivers/staging/rt2860/common/cmm_info.c | 2 +- + drivers/staging/rt2860/common/dfs.c | 4 +- + drivers/staging/rt2860/common/rtmp_init.c | 18 +- + drivers/staging/rt2860/common/spectrum.c | 44 +- + drivers/staging/rt2860/rt_ate.c | 32 +- + drivers/staging/rt2860/rt_linux.c | 18 +- + drivers/staging/rt2860/rt_linux.h | 2 +- + drivers/staging/rt2860/rt_profile.c | 12 +- + drivers/staging/rt2860/rtmp_def.h | 2 +- + drivers/staging/rt2860/sta_ioctl.c | 36 +- + drivers/staging/rt2870/2870_main_dev.c | 6 +- + drivers/staging/rt2870/common/2870_rtmp_init.c | 4 +- + drivers/staging/rt2870/common/ba_action.c | 18 +- + drivers/staging/rt2870/common/cmm_data.c | 2 +- + drivers/staging/rt2870/common/cmm_info.c | 2 +- + drivers/staging/rt2870/common/dfs.c | 4 +- + drivers/staging/rt2870/common/rtmp_init.c | 20 +- + drivers/staging/rt2870/common/rtusb_bulk.c | 4 +- + drivers/staging/rt2870/common/spectrum.c | 44 +- + drivers/staging/rt2870/rt_ate.c | 30 +- + drivers/staging/rt2870/rt_linux.c | 18 +- + drivers/staging/rt2870/rt_linux.h | 2 +- + drivers/staging/rt2870/rt_main_dev.c | 2 +- + drivers/staging/rt2870/rt_profile.c | 12 +- + drivers/staging/rt2870/rtmp_def.h | 2 +- + drivers/staging/rt2870/sta_ioctl.c | 36 +- + drivers/staging/rt2870/tmp60 | 36 +- + drivers/staging/rt2870/tmp61 | 36 +- + drivers/staging/rtl8187se/ieee80211.h | 2 +- + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 2 +- + .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 2 +- + .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 2 +- + .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 2 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 2 +- + .../rtl8187se/ieee80211/ieee80211_softmac.c | 8 +- + .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 2 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 8 +- + drivers/staging/rtl8187se/r8180_core.c | 12 +- + drivers/staging/rtl8187se/r8180_rtl8225z2.c | 4 +- + drivers/staging/rtl8187se/r8180_wx.c | 14 +- + drivers/usb/Kconfig | 2 + + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/class/cdc-wdm.c | 3 +- + drivers/usb/class/usbtmc.c | 9 +- + drivers/usb/core/devio.c | 7 +- + drivers/usb/core/driver.c | 181 +- + drivers/usb/core/endpoint.c | 4 +- + drivers/usb/core/generic.c | 10 +- + drivers/usb/core/hcd-pci.c | 201 +- + drivers/usb/core/hcd.c | 20 +- + drivers/usb/core/hcd.h | 16 +- + drivers/usb/core/hub.c | 142 +- + drivers/usb/core/message.c | 164 +- + drivers/usb/core/sysfs.c | 49 +- + drivers/usb/core/urb.c | 43 +- + drivers/usb/core/usb.c | 79 +- + drivers/usb/core/usb.h | 24 +- + drivers/usb/gadget/Kconfig | 43 +- + drivers/usb/gadget/Makefile | 2 + + drivers/usb/gadget/ci13xxx_udc.c | 2830 ++++++++++++++ + drivers/usb/gadget/ci13xxx_udc.h | 195 + + drivers/usb/gadget/epautoconf.c | 2 +- + drivers/usb/gadget/file_storage.c | 177 +- + drivers/usb/gadget/fsl_qe_udc.c | 12 +- + drivers/usb/gadget/gadget_chips.h | 8 +- + drivers/usb/gadget/goku_udc.c | 2 +- + drivers/usb/gadget/imx_udc.c | 1516 ++++++++ + drivers/usb/gadget/imx_udc.h | 344 ++ + drivers/usb/gadget/m66592-udc.c | 9 +- + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/gadget/omap_udc.c | 4 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 - + drivers/usb/gadget/s3c2410_udc.c | 34 +- + drivers/usb/host/Kconfig | 13 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-dbg.c | 8 +- + drivers/usb/host/ehci-hub.c | 27 +- + drivers/usb/host/ehci-pci.c | 12 +- + drivers/usb/host/ehci-ppc-of.c | 45 +- + drivers/usb/host/ehci.h | 34 + + drivers/usb/host/isp1760-hcd.c | 13 +- + drivers/usb/host/isp1760-hcd.h | 1 - + drivers/usb/host/isp1760-if.c | 116 +- + drivers/usb/host/ohci-hcd.c | 12 +- + drivers/usb/host/ohci-pci.c | 6 +- + drivers/usb/host/ohci-pnx4008.c | 85 +- + drivers/usb/host/ohci-ppc-of.c | 25 + + drivers/usb/host/ohci-tmio.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 3985 ++++++++++++++++++++ + drivers/usb/host/oxu210hp.h | 447 +++ + drivers/usb/host/pci-quirks.c | 14 +- + drivers/usb/host/r8a66597-hcd.c | 8 +- + drivers/usb/host/uhci-hcd.c | 2 + + drivers/usb/image/microtek.c | 11 +- + drivers/usb/misc/berry_charge.c | 5 + + drivers/usb/misc/emi26.c | 2 +- + drivers/usb/misc/usbtest.c | 2 - + drivers/usb/mon/Kconfig | 13 +- + drivers/usb/mon/Makefile | 3 +- + drivers/usb/musb/Kconfig | 12 +- + drivers/usb/musb/Makefile | 8 + + drivers/usb/musb/blackfin.c | 320 ++ + drivers/usb/musb/blackfin.h | 52 + + drivers/usb/musb/davinci.c | 18 +- + drivers/usb/musb/musb_core.c | 84 +- + drivers/usb/musb/musb_core.h | 73 +- + drivers/usb/musb/musb_gadget.c | 2 +- + drivers/usb/musb/musb_host.c | 45 +- + drivers/usb/musb/musb_io.h | 26 +- + drivers/usb/musb/musb_regs.h | 397 ++- + drivers/usb/musb/musbhsdma.c | 84 +- + drivers/usb/musb/musbhsdma.h | 149 + + drivers/usb/musb/omap2430.c | 15 +- + drivers/usb/musb/tusb6010.c | 7 +- + drivers/usb/otg/Kconfig | 54 + + drivers/usb/otg/Makefile | 15 + + drivers/usb/otg/gpio_vbus.c | 335 ++ + drivers/{i2c/chips => usb/otg}/isp1301_omap.c | 0 + drivers/usb/otg/otg.c | 65 + + drivers/usb/otg/twl4030-usb.c | 721 ++++ + drivers/usb/serial/Kconfig | 17 + + drivers/usb/serial/Makefile | 2 + + drivers/usb/serial/digi_acceleport.c | 28 +- + drivers/usb/serial/garmin_gps.c | 2 +- + drivers/usb/serial/ipw.c | 4 +- + drivers/usb/serial/iuu_phoenix.c | 38 +- + drivers/usb/serial/mos7840.c | 38 +- + drivers/usb/serial/opticon.c | 358 ++ + drivers/usb/serial/option.c | 11 +- + drivers/usb/serial/siemens_mpi.c | 77 + + drivers/usb/serial/spcp8x5.c | 20 +- + drivers/usb/serial/usb_debug.c | 2 +- + drivers/usb/storage/Kconfig | 11 +- + drivers/usb/storage/Makefile | 3 +- + drivers/usb/storage/dpcm.c | 86 - + drivers/usb/storage/dpcm.h | 32 - + drivers/usb/storage/libusual.c | 7 + + drivers/usb/storage/option_ms.c | 147 + + drivers/usb/storage/option_ms.h | 4 + + drivers/usb/storage/protocol.c | 24 +- + drivers/usb/storage/protocol.h | 3 +- + drivers/usb/storage/scsiglue.c | 43 + + drivers/usb/storage/sddr09.c | 43 + + drivers/usb/storage/sddr09.h | 5 +- + drivers/usb/storage/transport.c | 219 +- + drivers/usb/storage/transport.h | 2 - + drivers/usb/storage/unusual_devs.h | 354 +- + drivers/usb/storage/usb.c | 106 +- + drivers/usb/storage/usb.h | 5 +- + drivers/usb/wusbcore/rh.c | 2 +- + drivers/w1/masters/Kconfig | 6 + + drivers/w1/masters/Makefile | 2 + + drivers/w1/masters/mxc_w1.c | 211 ++ + drivers/w1/w1.h | 1 + + drivers/w1/w1_io.c | 26 +- + drivers/w1/w1_netlink.c | 261 ++- + drivers/w1/w1_netlink.h | 16 +- + drivers/xen/Kconfig | 24 + + drivers/xen/Makefile | 2 + + drivers/xen/xenbus/xenbus_client.c | 3 +- + drivers/xen/xenbus/xenbus_probe.c | 28 +- + drivers/xen/xenbus/xenbus_xs.c | 1 + + drivers/xen/xenfs/Makefile | 3 + + drivers/xen/xenfs/super.c | 64 + + drivers/xen/xenfs/xenbus.c | 593 +++ + drivers/xen/xenfs/xenfs.h | 6 + + firmware/.gitignore | 1 - + firmware/Makefile | 10 +- + fs/binfmt_elf.c | 12 + + fs/coda/sysctl.c | 5 +- + fs/dcache.c | 14 +- + fs/debugfs/file.c | 32 + + fs/dquot.c | 2 + + fs/ext2/ialloc.c | 8 +- + fs/ext2/inode.c | 2 - + fs/ext2/ioctl.c | 3 +- + fs/ext2/super.c | 10 +- + fs/ext3/ialloc.c | 8 +- + fs/ext3/ioctl.c | 3 +- + fs/ext3/namei.c | 4 - + fs/ext3/super.c | 10 +- + fs/ext4/extents.c | 2 +- + fs/ext4/namei.c | 4 - + fs/inode.c | 20 +- + fs/jbd/commit.c | 15 + + fs/jbd/transaction.c | 39 +- + fs/lockd/clntproc.c | 7 +- + fs/lockd/host.c | 170 +- + fs/lockd/mon.c | 569 +++- + fs/lockd/svc.c | 72 +- + fs/lockd/svc4proc.c | 13 +- + fs/lockd/svcproc.c | 13 +- + fs/lockd/svcsubs.c | 1 - + fs/lockd/xdr.c | 5 +- + fs/lockd/xdr4.c | 5 +- + fs/nfsd/auth.c | 4 +- + fs/nfsd/nfs4callback.c | 3 - + fs/nfsd/nfs4proc.c | 5 + + fs/nfsd/nfs4recover.c | 2 +- + fs/nfsd/nfs4state.c | 79 +- + fs/nfsd/nfs4xdr.c | 2 - + fs/nfsd/nfsctl.c | 479 +++- + fs/nfsd/nfsfh.c | 36 +- + fs/nfsd/nfsproc.c | 1 + + fs/nfsd/vfs.c | 34 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/dlmglue.c | 4 +- + fs/ocfs2/file.c | 2 +- + fs/proc/vmcore.c | 2 - + fs/romfs/inode.c | 12 +- + fs/splice.c | 1 + + fs/super.c | 10 + + include/linux/Kbuild | 2 + + include/linux/async.h | 25 + + include/linux/auxvec.h | 6 +- + include/linux/cgroup.h | 61 +- + include/linux/cpuset.h | 10 +- + include/linux/debugfs.h | 2 + + include/linux/ext2_fs.h | 24 + + include/linux/ext2_fs_sb.h | 4 +- + include/linux/ext3_fs.h | 24 + + include/linux/ext3_fs_sb.h | 4 +- + include/linux/fs.h | 5 + + include/linux/ioport.h | 11 +- + include/linux/jbd.h | 15 + + include/linux/kernel.h | 6 + + include/linux/lockd/lockd.h | 68 +- + include/linux/lockd/sm_inter.h | 48 - + include/linux/lockd/xdr.h | 15 +- + include/linux/magic.h | 1 + + include/linux/memcontrol.h | 154 +- + include/linux/mm_inline.h | 22 +- + include/linux/mmzone.h | 24 +- + include/linux/nfs4.h | 2 + + include/linux/nfsd/nfsd.h | 1 - + include/linux/nfsd/nfsfh.h | 4 + + include/linux/nwpserial.h | 18 + + include/linux/oxu210hp.h | 7 + + include/linux/page_cgroup.h | 52 +- + include/linux/pci-acpi.h | 23 +- + include/linux/pci.h | 90 +- + include/linux/pci_hotplug.h | 2 + + include/linux/pci_regs.h | 76 +- + include/linux/pid.h | 18 + + include/linux/pid_namespace.h | 6 +- + include/linux/qnx4_fs.h | 4 +- + include/linux/qnxtypes.h | 5 +- + include/linux/res_counter.h | 8 +- + include/linux/serial_core.h | 3 + + include/linux/sunrpc/svc.h | 5 +- + include/linux/swap.h | 25 +- + include/linux/usb.h | 30 +- + include/linux/usb/association.h | 22 +- + include/linux/usb/gpio_vbus.h | 30 + + include/linux/usb/musb.h | 5 + + include/linux/usb/otg.h | 1 + + include/linux/usb_usual.h | 7 +- + include/linux/wimax.h | 234 ++ + include/linux/wimax/Kbuild | 1 + + include/linux/wimax/debug.h | 453 +++ + include/linux/wimax/i2400m.h | 512 +++ + include/net/wimax.h | 520 +++ + include/xen/xenbus.h | 2 - + init/Kconfig | 142 +- + init/do_mounts.c | 2 + + init/main.c | 5 +- + ipc/mqueue.c | 3 +- + kernel/Makefile | 3 +- + kernel/async.c | 321 ++ + kernel/cgroup.c | 276 +- + kernel/cpuset.c | 251 +- + kernel/fork.c | 4 +- + kernel/irq/autoprobe.c | 5 + + kernel/module.c | 2 + + kernel/ns_cgroup.c | 2 - + kernel/pid.c | 6 + + kernel/res_counter.c | 42 +- + kernel/resource.c | 61 +- + kernel/sched.c | 5 + + kernel/sched_fair.c | 2 - + lib/sort.c | 30 +- + mm/filemap.c | 2 +- + mm/memcontrol.c | 1846 ++++++++-- + mm/memory.c | 28 +- + mm/migrate.c | 42 +- + mm/oom_kill.c | 10 +- + mm/page_alloc.c | 8 +- + mm/page_cgroup.c | 207 +- + mm/shmem.c | 20 +- + mm/swap.c | 33 +- + mm/swap_state.c | 4 + + mm/swapfile.c | 24 +- + mm/vmscan.c | 197 +- + net/Kconfig | 2 + + net/Makefile | 1 + + net/ipv6/route.c | 2 +- + net/ipv6/sysctl_net_ipv6.c | 2 +- + net/netlink/genetlink.c | 1 + + net/sched/sch_sfq.c | 2 +- + net/sctp/auth.c | 2 +- + net/sunrpc/cache.c | 20 +- + net/sunrpc/stats.c | 6 +- + net/sunrpc/svc.c | 14 +- + net/sunrpc/svc_xprt.c | 58 +- + net/sunrpc/svcauth.c | 14 +- + net/sunrpc/svcauth_unix.c | 12 +- + net/sunrpc/svcsock.c | 30 +- + net/wimax/Kconfig | 38 + + net/wimax/Makefile | 13 + + net/wimax/debug-levels.h | 42 + + net/wimax/debugfs.c | 90 + + net/wimax/id-table.c | 142 + + net/wimax/op-msg.c | 421 +++ + net/wimax/op-reset.c | 143 + + net/wimax/op-rfkill.c | 532 +++ + net/wimax/stack.c | 599 +++ + net/wimax/wimax-internal.h | 91 + + scripts/.gitignore | 1 + + scripts/Makefile | 3 +- + scripts/bootgraph.pl | 16 +- + scripts/config | 150 + + {firmware => scripts}/ihex2fw.c | 0 + scripts/tags.sh | 18 +- + security/device_cgroup.c | 5 +- + security/smack/smackfs.c | 2 +- + sound/soc/au1x/dbdma2.c | 2 +- + sound/soc/davinci/davinci-pcm.c | 2 +- + sound/sparc/cs4231.c | 2 +- + 639 files changed, 41341 insertions(+), 5823 deletions(-) + create mode 100644 Documentation/controllers/memcg_test.txt + create mode 100644 Documentation/w1/masters/mxc-w1 + create mode 100644 Documentation/wimax/README.i2400m + create mode 100644 Documentation/wimax/README.wimax + create mode 100644 arch/arm/plat-mxc/include/mach/usb.h + create mode 100644 arch/powerpc/kernel/cacheinfo.c + create mode 100644 arch/powerpc/kernel/cacheinfo.h + create mode 100644 arch/powerpc/sysdev/simple_gpio.c + create mode 100644 arch/powerpc/sysdev/simple_gpio.h + delete mode 100644 drivers/media/video/pxa_camera.h + create mode 100644 drivers/misc/dell-laptop.c + create mode 100644 drivers/mtd/devices/ps3vram.c + create mode 100644 drivers/net/wimax/Kconfig + create mode 100644 drivers/net/wimax/Makefile + create mode 100644 drivers/net/wimax/i2400m/Kconfig + create mode 100644 drivers/net/wimax/i2400m/Makefile + create mode 100644 drivers/net/wimax/i2400m/control.c + create mode 100644 drivers/net/wimax/i2400m/debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/debugfs.c + create mode 100644 drivers/net/wimax/i2400m/driver.c + create mode 100644 drivers/net/wimax/i2400m/fw.c + create mode 100644 drivers/net/wimax/i2400m/i2400m-sdio.h + create mode 100644 drivers/net/wimax/i2400m/i2400m-usb.h + create mode 100644 drivers/net/wimax/i2400m/i2400m.h + create mode 100644 drivers/net/wimax/i2400m/netdev.c + create mode 100644 drivers/net/wimax/i2400m/op-rfkill.c + create mode 100644 drivers/net/wimax/i2400m/rx.c + create mode 100644 drivers/net/wimax/i2400m/sdio-debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/sdio-fw.c + create mode 100644 drivers/net/wimax/i2400m/sdio-rx.c + create mode 100644 drivers/net/wimax/i2400m/sdio-tx.c + create mode 100644 drivers/net/wimax/i2400m/sdio.c + create mode 100644 drivers/net/wimax/i2400m/tx.c + create mode 100644 drivers/net/wimax/i2400m/usb-debug-levels.h + create mode 100644 drivers/net/wimax/i2400m/usb-fw.c + create mode 100644 drivers/net/wimax/i2400m/usb-notif.c + create mode 100644 drivers/net/wimax/i2400m/usb-rx.c + create mode 100644 drivers/net/wimax/i2400m/usb-tx.c + create mode 100644 drivers/net/wimax/i2400m/usb.c + create mode 100644 drivers/pci/hotplug/pciehp_acpi.c + create mode 100644 drivers/pci/pci-stub.c + create mode 100644 drivers/serial/nwpserial.c + create mode 100644 drivers/usb/gadget/ci13xxx_udc.c + create mode 100644 drivers/usb/gadget/ci13xxx_udc.h + create mode 100644 drivers/usb/gadget/imx_udc.c + create mode 100644 drivers/usb/gadget/imx_udc.h + create mode 100644 drivers/usb/host/oxu210hp-hcd.c + create mode 100644 drivers/usb/host/oxu210hp.h + create mode 100644 drivers/usb/musb/blackfin.c + create mode 100644 drivers/usb/musb/blackfin.h + create mode 100644 drivers/usb/musb/musbhsdma.h + create mode 100644 drivers/usb/otg/Kconfig + create mode 100644 drivers/usb/otg/Makefile + create mode 100644 drivers/usb/otg/gpio_vbus.c + rename drivers/{i2c/chips => usb/otg}/isp1301_omap.c (100%) + create mode 100644 drivers/usb/otg/otg.c + create mode 100644 drivers/usb/otg/twl4030-usb.c + create mode 100644 drivers/usb/serial/opticon.c + create mode 100644 drivers/usb/serial/siemens_mpi.c + delete mode 100644 drivers/usb/storage/dpcm.c + delete mode 100644 drivers/usb/storage/dpcm.h + create mode 100644 drivers/usb/storage/option_ms.c + create mode 100644 drivers/usb/storage/option_ms.h + create mode 100644 drivers/w1/masters/mxc_w1.c + create mode 100644 drivers/xen/xenfs/Makefile + create mode 100644 drivers/xen/xenfs/super.c + create mode 100644 drivers/xen/xenfs/xenbus.c + create mode 100644 drivers/xen/xenfs/xenfs.h + create mode 100644 include/linux/async.h + delete mode 100644 include/linux/lockd/sm_inter.h + create mode 100644 include/linux/nwpserial.h + create mode 100644 include/linux/oxu210hp.h + create mode 100644 include/linux/usb/gpio_vbus.h + create mode 100644 include/linux/wimax.h + create mode 100644 include/linux/wimax/Kbuild + create mode 100644 include/linux/wimax/debug.h + create mode 100644 include/linux/wimax/i2400m.h + create mode 100644 include/net/wimax.h + create mode 100644 kernel/async.c + create mode 100644 net/wimax/Kconfig + create mode 100644 net/wimax/Makefile + create mode 100644 net/wimax/debug-levels.h + create mode 100644 net/wimax/debugfs.c + create mode 100644 net/wimax/id-table.c + create mode 100644 net/wimax/op-msg.c + create mode 100644 net/wimax/op-reset.c + create mode 100644 net/wimax/op-rfkill.c + create mode 100644 net/wimax/stack.c + create mode 100644 net/wimax/wimax-internal.h + create mode 100755 scripts/config + rename {firmware => scripts}/ihex2fw.c (100%) +Merging arm-current/master +$ git merge arm-current/master +Removed arch/arm/configs/clps7500_defconfig +Auto-merged drivers/serial/Kconfig +Merge made by recursive. + arch/arm/configs/clps7500_defconfig | 801 -------------------------- + arch/arm/kernel/isa.c | 1 + + arch/arm/mach-at91/at91cap9.c | 1 + + arch/arm/mach-at91/at91rm9200.c | 1 + + arch/arm/mach-at91/at91sam9260.c | 1 + + arch/arm/mach-at91/at91sam9261.c | 1 + + arch/arm/mach-at91/at91sam9263.c | 1 + + arch/arm/mach-at91/at91sam9rl.c | 1 + + arch/arm/mach-at91/board-sam9rlek.c | 1 + + arch/arm/mach-clps711x/edb7211-mm.c | 1 - + arch/arm/mach-clps711x/fortunet.c | 1 - + arch/arm/mach-davinci/devices.c | 1 + + arch/arm/mach-davinci/include/mach/gpio.h | 1 + + arch/arm/mach-footbridge/common.c | 9 +- + arch/arm/mach-footbridge/common.h | 1 + + arch/arm/mach-footbridge/dc21285.c | 23 +- + arch/arm/mach-footbridge/isa-irq.c | 2 + + arch/arm/mach-h720x/h7202-eval.c | 1 + + arch/arm/mach-kirkwood/common.c | 1 + + arch/arm/mach-kirkwood/pcie.c | 1 + + arch/arm/mach-ks8695/devices.c | 1 + + arch/arm/mach-msm/devices.c | 1 + + arch/arm/mach-mv78xx0/pcie.c | 1 + + arch/arm/mach-mx2/devices.c | 1 + + arch/arm/mach-mx3/devices.c | 1 + + arch/arm/mach-netx/fb.c | 2 + + arch/arm/mach-netx/time.c | 2 +- + arch/arm/mach-netx/xc.c | 1 + + arch/arm/mach-omap1/mcbsp.c | 1 + + arch/arm/mach-omap2/mcbsp.c | 1 + + arch/arm/mach-orion5x/pci.c | 1 + + arch/arm/mach-pnx4008/gpio.c | 1 + + arch/arm/mach-pnx4008/i2c.c | 1 + + arch/arm/mach-pxa/e350.c | 1 + + arch/arm/mach-pxa/e400.c | 1 + + arch/arm/mach-pxa/e740.c | 1 + + arch/arm/mach-pxa/e750.c | 53 ++ + arch/arm/mach-pxa/e800.c | 1 + + arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 2 - + arch/arm/mach-realview/platsmp.c | 1 + + arch/arm/mach-s3c2410/include/mach/gpio.h | 1 + + arch/arm/mach-s3c2410/include/mach/irqs.h | 4 - + arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +- + arch/arm/mach-s3c6400/include/mach/irqs.h | 4 - + arch/arm/plat-omap/i2c.c | 1 + + arch/arm/plat-s3c/dev-fb.c | 1 + + arch/arm/plat-s3c/dev-i2c0.c | 1 + + arch/arm/plat-s3c/dev-i2c1.c | 1 + + arch/arm/plat-s3c24xx/gpiolib.c | 18 + + arch/arm/plat-s3c24xx/pwm.c | 2 + + arch/arm/plat-s3c64xx/include/plat/irqs.h | 2 +- + drivers/amba/bus.c | 3 +- + drivers/input/mouse/pxa930_trkball.c | 4 +- + drivers/serial/Kconfig | 2 +- + drivers/video/amba-clcd.c | 1 + + 55 files changed, 141 insertions(+), 832 deletions(-) + delete mode 100644 arch/arm/configs/clps7500_defconfig +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. +Merging net-current/master +$ git merge net-current/master +Removed drivers/net/acenic_firmware.h +Merge made by recursive. + drivers/ieee1394/eth1394.c | 54 +- + drivers/ieee1394/eth1394.h | 1 - + drivers/isdn/hysdn/hysdn_net.c | 77 +- + drivers/isdn/i4l/isdn_net.c | 69 +- + drivers/media/dvb/dvb-core/dvb_net.c | 57 +- + drivers/message/fusion/mptlan.c | 44 +- + drivers/misc/sgi-xp/xpnet.c | 68 +- + drivers/net/Kconfig | 2 +- + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/amd8111e.c | 35 +- + drivers/net/appletalk/ipddp.c | 25 +- + drivers/net/atp.c | 32 +- + drivers/net/b44.c | 29 +- + drivers/net/bnx2x_main.c | 3 + + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/cassini.c | 29 +- + drivers/net/de600.c | 14 +- + drivers/net/de620.c | 17 +- + drivers/net/e100.c | 289 +- + drivers/net/ehea/ehea_phyp.c | 16 +- + drivers/net/enc28j60.c | 18 +- + drivers/net/epic100.c | 21 +- + drivers/net/fealnx.c | 21 +- + drivers/net/gianfar.c | 8 +- + drivers/net/hp100.c | 32 +- + drivers/net/ibmveth.c | 4 +- + drivers/net/ibmveth.h | 10 +- + drivers/net/ipg.c | 23 +- + drivers/net/irda/ali-ircc.c | 45 +- + drivers/net/irda/ali-ircc.h | 1 - + drivers/net/irda/au1000_ircc.h | 1 - + drivers/net/irda/au1k_ir.c | 9 - + drivers/net/irda/donauboe.h | 1 - + drivers/net/irda/irda-usb.c | 28 +- + drivers/net/irda/irda-usb.h | 1 - + drivers/net/irda/kingsun-sir.c | 20 +- + drivers/net/irda/ks959-sir.c | 22 +- + drivers/net/irda/ksdazzle-sir.c | 26 +- + drivers/net/irda/mcs7780.c | 49 +- + drivers/net/irda/mcs7780.h | 2 - + drivers/net/irda/nsc-ircc.c | 45 +- + drivers/net/irda/nsc-ircc.h | 1 - + drivers/net/irda/pxaficp_ir.c | 52 +- + drivers/net/irda/sa1100_ir.c | 46 +- + drivers/net/irda/sir-dev.h | 1 - + drivers/net/irda/sir_dev.c | 26 +- + drivers/net/irda/smsc-ircc2.c | 38 +- + drivers/net/irda/stir4200.c | 44 +- + drivers/net/irda/via-ircc.c | 47 +- + drivers/net/irda/via-ircc.h | 1 - + drivers/net/irda/vlsi_ir.c | 78 +- + drivers/net/irda/vlsi_ir.h | 1 - + drivers/net/irda/w83977af_ir.c | 35 +- + drivers/net/irda/w83977af_ir.h | 1 - + drivers/net/mlx4/en_params.c | 6 +- + drivers/net/mlx4/en_tx.c | 59 +- + drivers/net/mlx4/mlx4_en.h | 5 + + drivers/net/natsemi.c | 29 +- + drivers/net/ns83820.c | 4 +- + drivers/net/pcnet32.c | 32 +- + drivers/net/plip.c | 13 +- + drivers/net/r6040.c | 27 +- + drivers/net/sb1000.c | 16 +- + drivers/net/sis190.c | 28 +- + drivers/net/slip.c | 28 +- + drivers/net/starfire.c | 34 +- + drivers/net/sundance.c | 23 +- + drivers/net/sungem.c | 22 +- + drivers/net/sunhme.c | 26 +- + drivers/net/tlan.c | 26 +- + drivers/net/tulip/de2104x.c | 19 +- + drivers/net/tulip/de4x5.c | 20 +- + drivers/net/tulip/dmfe.c | 62 +- + drivers/net/tulip/tulip_core.c | 27 +- + drivers/net/tulip/uli526x.c | 63 +- + drivers/net/tulip/winbond-840.c | 23 +- + drivers/net/tulip/xircom_cb.c | 43 +- + drivers/net/typhoon.c | 22 +- + drivers/net/usb/dm9601.c | 29 +- + drivers/net/usb/kaweth.c | 23 +- + drivers/net/usb/pegasus.c | 21 +- + drivers/net/virtio_net.c | 20 +- + drivers/net/wimax/i2400m/usb.c | 6 + + drivers/net/xen-netfront.c | 17 +- + drivers/s390/net/qeth_l2_main.c | 27 +- + drivers/s390/net/qeth_l3_main.c | 53 +- + drivers/usb/gadget/f_phonet.c | 12 +- + drivers/usb/gadget/u_ether.c | 16 +- + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 2 - + drivers/uwb/i1480/i1480u-wlp/lc.c | 17 +- + drivers/uwb/i1480/i1480u-wlp/netdev.c | 9 - + drivers/uwb/i1480/i1480u-wlp/rx.c | 8 +- + drivers/uwb/i1480/i1480u-wlp/tx.c | 6 +- + firmware/Makefile | 2 + + firmware/WHENCE | 12 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + include/linux/can/core.h | 2 +- + include/linux/if_vlan.h | 19 + + include/linux/netdevice.h | 6 + + include/net/protocol.h | 3 + + include/net/wimax.h | 3 + + net/8021q/vlan_core.c | 111 +- + net/8021q/vlan_dev.c | 14 + + net/appletalk/aarp.c | 5 +- + net/bluetooth/bnep/bnep.h | 1 - + net/bluetooth/bnep/core.c | 12 +- + net/bluetooth/bnep/netdev.c | 33 +- + net/can/af_can.c | 15 +- + net/can/bcm.c | 12 +- + net/can/raw.c | 15 +- + net/core/dev.c | 82 +- + net/dsa/slave.c | 51 +- + net/ipv4/tcp.c | 2 + + net/ipv6/af_inet6.c | 107 +- + net/ipv6/tcp_ipv6.c | 45 +- + net/phonet/pep-gprs.c | 12 +- + net/sched/sch_teql.c | 20 +- + net/wimax/Kconfig | 14 + + net/wimax/id-table.c | 8 +- + net/wimax/op-rfkill.c | 2 +- + net/wireless/wext.c | 4 +- + 123 files changed, 1821 insertions(+), 10905 deletions(-) + delete mode 100644 drivers/net/acenic_firmware.h + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex +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 +Merge made by recursive. + scripts/config | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Merge made by recursive. + drivers/md/bitmap.c | 11 +- + drivers/md/faulty.c | 3 +- + drivers/md/linear.c | 3 +- + drivers/md/md.c | 416 +++++++++++++++++++++++++++++++------------- + drivers/md/multipath.c | 3 +- + drivers/md/raid0.c | 178 ++++++++++---------- + drivers/md/raid1.c | 11 +- + drivers/md/raid10.c | 3 +- + drivers/md/raid5.c | 8 +- + fs/block_dev.c | 14 ++ + include/linux/raid/md_k.h | 20 ++- + include/linux/raid/md_p.h | 2 + + include/linux/raid/raid0.h | 10 +- + 13 files changed, 435 insertions(+), 247 deletions(-) +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Auto-merged drivers/char/tty_audit.c +CONFLICT (content): Merge conflict in drivers/char/tty_audit.c +Auto-merged drivers/char/tty_io.c +Auto-merged include/linux/audit.h +Auto-merged include/linux/tty.h +Auto-merged kernel/auditsc.c +CONFLICT (content): Merge conflict in kernel/auditsc.c +Auto-merged kernel/fork.c +Resolved 'drivers/char/tty_audit.c' using previous resolution. +Resolved 'kernel/auditsc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 93f5381: Merge commit 'audit-current/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v10/arch/byteorder.h | 10 ++++++---- + arch/cris/include/arch-v32/arch/byteorder.h | 6 ++++-- + arch/cris/include/asm/byteorder.h | 20 ++++---------------- + 3 files changed, 14 insertions(+), 22 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Removed drivers/video/c2p.c +Merge made by recursive. + arch/m68k/amiga/amiints.c | 12 ++- + arch/m68k/amiga/cia.c | 4 +- + arch/m68k/amiga/config.c | 3 +- + arch/m68k/apollo/config.c | 7 +- + arch/m68k/atari/atakeyb.c | 10 +- + arch/m68k/atari/stdma.c | 5 +- + arch/m68k/atari/time.c | 5 +- + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/hp300/time.c | 3 +- + arch/m68k/kernel/.gitignore | 1 + + arch/m68k/kernel/entry.S | 2 +- + arch/m68k/kernel/setup.c | 11 +- + arch/m68k/kernel/signal.c | 15 +++ + arch/m68k/kernel/vmlinux-sun3.lds | 1 + + arch/m68k/mac/baboon.c | 3 +- + arch/m68k/mac/config.c | 12 -- + arch/m68k/mac/debug.c | 1 - + arch/m68k/mac/iop.c | 10 +- + arch/m68k/mac/macints.c | 15 +-- + arch/m68k/mac/misc.c | 1 - + arch/m68k/mac/oss.c | 25 +++-- + arch/m68k/mac/psc.c | 12 ++- + arch/m68k/mac/via.c | 35 +++-- + arch/m68k/math-emu/fp_log.c | 1 - + arch/m68k/mm/init.c | 4 +- + arch/m68k/mm/motorola.c | 7 +- + arch/m68k/mvme147/config.c | 6 +- + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 3 - + arch/m68k/sun3/config.c | 8 +- + arch/m68k/sun3/mmu_emu.c | 1 - + arch/m68k/sun3/sun3ints.c | 9 +- + arch/m68k/sun3x/config.c | 1 - + drivers/block/amiflop.c | 40 +++---- + drivers/char/amiserial.c | 36 +++++- + drivers/char/ser_a2232.c | 12 ++- + drivers/char/vme_scc.c | 166 ++++++++++++++++++++----- + drivers/dio/dio-sysfs.c | 19 ++- + drivers/dio/dio.c | 18 +++- + drivers/video/Makefile | 4 +- + drivers/video/amifb.c | 6 +- + drivers/video/atafb.c | 112 +++++++---------- + drivers/video/c2p.c | 232 ----------------------------------- + drivers/video/c2p.h | 11 +- + drivers/video/c2p_core.h | 153 +++++++++++++++++++++++ + drivers/video/c2p_iplan2.c | 153 +++++++++++++++++++++++ + drivers/video/c2p_planar.c | 156 +++++++++++++++++++++++ + drivers/video/console/fbcon.c | 38 ------ + drivers/zorro/.gitignore | 2 + + drivers/zorro/zorro-sysfs.c | 20 ++-- + drivers/zorro/zorro.c | 23 +++- + drivers/zorro/zorro.h | 2 +- + include/asm-m68k/unistd.h | 4 +- + include/linux/dio.h | 2 +- + sound/oss/dmasound/dmasound_atari.c | 5 +- + sound/oss/dmasound/dmasound_q40.c | 16 ++- + 56 files changed, 912 insertions(+), 553 deletions(-) + create mode 100644 arch/m68k/kernel/.gitignore + delete mode 100644 drivers/video/c2p.c + create mode 100644 drivers/video/c2p_core.h + create mode 100644 drivers/video/c2p_iplan2.c + create mode 100644 drivers/video/c2p_planar.c + create mode 100644 drivers/zorro/.gitignore +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +Auto-merged drivers/parisc/dino.c +Merge made by recursive. + arch/parisc/Makefile | 2 +- + arch/parisc/include/asm/byteorder.h | 37 ++++++------------ + arch/parisc/include/asm/checksum.h | 2 +- + arch/parisc/include/asm/io.h | 12 +---- + arch/parisc/include/asm/mmu_context.h | 13 ++++-- + arch/parisc/include/asm/processor.h | 4 +- + arch/parisc/include/asm/uaccess.h | 2 + + arch/parisc/kernel/drivers.c | 40 ++++++++++++++++--- + arch/parisc/kernel/hpmc.S | 8 +++- + arch/parisc/kernel/irq.c | 11 +++-- + arch/parisc/kernel/pdc_cons.c | 2 +- + arch/parisc/kernel/perf.c | 4 +- + arch/parisc/kernel/processor.c | 68 +++++++++++++++++---------------- + arch/parisc/kernel/setup.c | 11 +---- + arch/parisc/kernel/smp.c | 32 +++++++-------- + arch/parisc/kernel/time.c | 4 +- + arch/parisc/kernel/topology.c | 4 +- + arch/parisc/kernel/traps.c | 9 +++- + arch/parisc/kernel/unwind.c | 2 +- + arch/parisc/lib/iomap.c | 2 +- + arch/parisc/lib/memcpy.c | 2 +- + arch/parisc/mm/fault.c | 58 +++++++++++++++------------- + drivers/parisc/asp.c | 3 +- + drivers/parisc/ccio-dma.c | 4 +- + drivers/parisc/dino.c | 4 +- + drivers/parisc/hppb.c | 2 +- + drivers/parisc/lasi.c | 5 +- + drivers/parisc/lba_pci.c | 2 +- + drivers/parisc/sba_iommu.c | 9 +--- + drivers/parisc/wax.c | 3 +- + drivers/rtc/rtc-parisc.c | 3 +- + 31 files changed, 191 insertions(+), 173 deletions(-) +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 +Auto-merged arch/powerpc/kernel/asm-offsets.c +Auto-merged arch/powerpc/mm/mmu_decl.h +Merge made by recursive. + arch/powerpc/boot/dts/mpc8544ds.dts | 4 +- + arch/powerpc/boot/dts/mpc8572ds.dts | 4 +- + arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 2 +- + arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 2 +- + arch/powerpc/include/asm/qe.h | 19 ++++- + arch/powerpc/kernel/asm-offsets.c | 7 ++ + arch/powerpc/kernel/head_fsl_booke.S | 6 +- + arch/powerpc/mm/fsl_booke_mmu.c | 9 +-- + arch/powerpc/mm/mmu_decl.h | 11 ++- + arch/powerpc/platforms/fsl_uli1575.c | 1 + + arch/powerpc/sysdev/fsl_pci.c | 107 ++++++++++++++++------- + 11 files changed, 117 insertions(+), 55 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Merge made by recursive. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/posix_types.h | 4 ---- + arch/s390/include/asm/ptrace.h | 7 +++++-- + arch/s390/kernel/vdso32/gettimeofday.S | 4 ---- + drivers/s390/char/Kconfig | 2 +- + 4 files changed, 6 insertions(+), 11 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/boards/Kconfig | 6 +- + arch/sh/boards/board-ap325rxa.c | 53 ++++- + arch/sh/boards/board-magicpanelr2.c | 23 ++- + arch/sh/boards/mach-highlander/Kconfig | 2 +- + arch/sh/boards/mach-migor/setup.c | 171 +++++++-------- + arch/sh/boards/mach-rsk/Kconfig | 2 +- + arch/sh/boards/mach-rsk/devices-rsk7203.c | 24 +- + arch/sh/boards/mach-x3proto/setup.c | 1 + + arch/sh/configs/ap325rxa_defconfig | 21 ++- + arch/sh/configs/magicpanelr2_defconfig | 21 ++- + arch/sh/configs/rsk7203_defconfig | 21 ++- + arch/sh/include/asm/gpio.h | 70 ++++--- + arch/sh/include/asm/posix_types_32.h | 8 +- + arch/sh/include/asm/posix_types_64.h | 8 +- + arch/sh/kernel/gpio.c | 338 ++++++++++++++++++----------- + arch/sh/kernel/process_64.c | 2 - + arch/sh/kernel/traps_32.c | 1 + + arch/sh/mm/ioremap_64.c | 2 +- + drivers/serial/sh-sci.h | 2 +- + 19 files changed, 470 insertions(+), 306 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Already uptodate! +Merge made by recursive. +Merging xtensa/master +$ git merge xtensa/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Merge made by recursive. + drivers/misc/enclosure.c | 8 +++--- + drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/hosts.c | 6 +--- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_dump.c | 2 +- + drivers/scsi/libsas/sas_port.c | 2 +- + drivers/scsi/raid_class.c | 3 +- + drivers/scsi/scsi_debug.c | 4 +- + drivers/scsi/scsi_ioctl.c | 3 +- + drivers/scsi/scsi_scan.c | 7 ++--- + drivers/scsi/scsi_sysfs.c | 12 +++----- + drivers/scsi/scsi_transport_fc.c | 18 ++++++------ + drivers/scsi/scsi_transport_iscsi.c | 11 +++----- + drivers/scsi/scsi_transport_sas.c | 42 +++++++++++++++-------------- + drivers/scsi/scsi_transport_srp.c | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/ses.c | 2 +- + include/linux/init.h | 1 + + init/main.c | 9 ++++++ + lib/kobject.c | 50 +++++++++++++++++++++++++++++++++++ + 22 files changed, 123 insertions(+), 69 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Already up-to-date. +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/x86/kernel/apic.c +Auto-merged arch/x86/kernel/cpu/common.c +Auto-merged arch/x86/kernel/cpuid.c +Auto-merged arch/x86/kernel/io_apic.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/setup_percpu.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged kernel/rcuclassic.c +CONFLICT (content): Merge conflict in kernel/rcuclassic.c +Auto-merged kernel/sched.c +Auto-merged kernel/time/tick-sched.c +Resolved 'kernel/rcuclassic.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 14b0634: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/smp.h | 32 +++++++- + arch/x86/kernel/cpu/common.c | 26 +++++- + arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 23 ++++-- + arch/x86/kernel/microcode_core.c | 83 ++++++++++---------- + arch/x86/kernel/setup_percpu.c | 25 ++++++- + arch/x86/kernel/smp.c | 17 +++- + arch/x86/kernel/smpboot.c | 128 ++++++++++++++++--------------- + 7 files changed, 210 insertions(+), 124 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged init/main.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 +++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysrq.txt | 2 + + Documentation/vm/kmemtrace.txt | 126 ++++ + MAINTAINERS | 6 + + arch/x86/kvm/Kconfig | 3 +- + drivers/char/sysrq.c | 2 +- + include/linux/slab_def.h | 68 ++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 53 ++- + include/trace/kmemtrace.h | 75 +++ + init/main.c | 2 + + kernel/relay.c | 4 +- + kernel/trace/Kconfig | 21 + + kernel/trace/Makefile | 3 + + kernel/trace/ftrace.c | 4 +- + kernel/trace/kmemtrace.c | 350 +++++++++++ + kernel/trace/trace.c | 741 ++---------------------- + kernel/trace/trace.h | 61 ++- + kernel/trace/trace_boot.c | 1 + + kernel/trace/trace_branch.c | 295 ++++++---- + kernel/trace/trace_functions_graph.c | 8 +- + kernel/trace/trace_hw_branches.c | 1 + + kernel/trace/trace_mmiotrace.c | 4 +- + kernel/trace/trace_output.c | 832 +++++++++++++++++++++++++++ + kernel/trace/trace_output.h | 59 ++ + kernel/trace/trace_power.c | 1 + + kernel/trace/trace_selftest.c | 1 - + kernel/trace/trace_stat.c | 243 ++++++++ + mm/slab.c | 71 ++- + mm/slob.c | 37 +- + mm/slub.c | 83 +++- + 32 files changed, 2368 insertions(+), 879 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/trace/kmemtrace.h + create mode 100644 kernel/trace/kmemtrace.c + create mode 100644 kernel/trace/trace_output.c + create mode 100644 kernel/trace/trace_output.h + create mode 100644 kernel/trace/trace_stat.c +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged kernel/irq/chip.c +Merge made by recursive. + kernel/irq/chip.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Already up-to-date. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/magic.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/panic.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/include/asm/pda.h | 4 ++-- + arch/x86/include/asm/system.h | 6 +++++- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged include/linux/clockchips.h +Auto-merged kernel/hrtimer.c +Auto-merged kernel/time/tick-common.c +CONFLICT (content): Merge conflict in kernel/time/tick-common.c +Resolved 'kernel/time/tick-common.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 1d6167b: Merge commit 'timers/auto-timers-next' +$ git diff -M --stat --summary HEAD^.. + include/linux/clockchips.h | 1 + + kernel/hrtimer.c | 34 +++++++++++++++++++++++++++++++++- + kernel/time/tick-common.c | 26 +++++++++++++++++++------- + 3 files changed, 53 insertions(+), 8 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-exception-store.h | 13 ++++- + drivers/md/dm-ioctl.c | 7 ++- + drivers/md/dm-snap-persistent.c | 13 +++-- + drivers/md/dm-snap-transient.c | 14 +++--- + drivers/md/dm-snap.c | 18 +++--- + drivers/md/dm-target.c | 104 +++++++++++--------------------------- + drivers/md/dm.h | 2 +- + include/linux/device-mapper.h | 3 + + 8 files changed, 72 insertions(+), 102 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/Kconfig | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + drivers/hwmon/k8temp.c | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + drivers/media/video/cs5345.c | 1 - + drivers/media/video/em28xx/em28xx-video.c | 41 ++++++++++++++++------------ + drivers/media/video/pwc/pwc-if.c | 1 - + drivers/media/video/saa717x.c | 1 - + drivers/media/video/upd64031a.c | 1 - + drivers/media/video/upd64083.c | 1 - + drivers/media/video/uvc/uvc_ctrl.c | 1 - + drivers/media/video/uvc/uvc_driver.c | 1 - + drivers/media/video/uvc/uvc_queue.c | 1 - + drivers/media/video/uvc/uvc_status.c | 1 - + drivers/media/video/uvc/uvc_video.c | 1 - + 11 files changed, 23 insertions(+), 28 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Merge made by recursive. + Documentation/mips/AU1xxx_IDE.README | 6 +---- + drivers/ide/Kconfig | 5 ---- + drivers/ide/ide-atapi.c | 21 +++++++++++++++- + drivers/ide/ide-disk.c | 2 +- + drivers/ide/ide-io.c | 20 --------------- + drivers/ide/ide-iops.c | 2 +- + drivers/ide/ide-probe.c | 45 +++++++++++---------------------- + drivers/ide/it821x.c | 15 ++++++++++- + drivers/ide/sl82c105.c | 4 --- + drivers/ide/via82cxxx.c | 2 - + include/linux/ide.h | 2 - + include/linux/pci_ids.h | 1 + + 12 files changed, 52 insertions(+), 73 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/ahci.c | 10 ++- + drivers/ata/ata_piix.c | 51 ++++++++---- + drivers/ata/libata-core.c | 5 + + drivers/ata/libata-sff.c | 185 ++++++++++++++++++++++++++++--------------- + drivers/ata/pata_ali.c | 107 ++++++++++++++++--------- + drivers/ata/pata_amd.c | 4 +- + drivers/ata/pata_hpt366.c | 109 ++++++++++--------------- + drivers/ata/pata_hpt3x3.c | 49 ++++++++++- + drivers/ata/pata_mpiix.c | 3 +- + drivers/ata/pata_platform.c | 2 +- + drivers/ata/pata_sil680.c | 4 +- + drivers/ata/sata_sil24.c | 7 -- + include/linux/libata.h | 3 + + 13 files changed, 336 insertions(+), 203 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/amso1100/c2.c | 20 ++++++++++++-------- + drivers/infiniband/hw/amso1100/c2_provider.c | 15 ++++++++------- + drivers/infiniband/hw/nes/nes_nic.c | 22 +++++++++++++--------- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 20 ++++++++++++-------- + 4 files changed, 45 insertions(+), 32 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/feature-removal-schedule.txt +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kernel/acpi/boot.c +Auto-merged arch/x86/kernel/e820.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged drivers/Makefile +Auto-merged drivers/misc/Kconfig +Auto-merged drivers/misc/Makefile +Auto-merged drivers/power/power_supply_sysfs.c +Auto-merged include/acpi/actypes.h +Auto-merged include/linux/power_supply.h +Auto-merged kernel/power/disk.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 8 + + Documentation/kernel-parameters.txt | 5 +- + arch/x86/kernel/acpi/boot.c | 11 + + arch/x86/kernel/acpi/sleep.c | 2 + + arch/x86/kernel/e820.c | 21 ++ + arch/x86/kernel/reboot.c | 2 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/Kconfig | 84 ----- + drivers/acpi/Makefile | 3 - + drivers/acpi/battery.c | 14 +- + drivers/acpi/dispatcher/dsmethod.c | 3 + + drivers/acpi/dispatcher/dsopcode.c | 53 +++- + drivers/acpi/ec.c | 43 ++-- + drivers/acpi/events/evevent.c | 14 +- + drivers/acpi/events/evgpe.c | 36 +- + drivers/acpi/events/evgpeblk.c | 38 ++- + drivers/acpi/events/evmisc.c | 51 ++-- + drivers/acpi/events/evregion.c | 133 ++++---- + drivers/acpi/events/evrgnini.c | 41 +-- + drivers/acpi/events/evsci.c | 10 +- + drivers/acpi/events/evxface.c | 2 +- + drivers/acpi/events/evxfevnt.c | 12 +- + drivers/acpi/executer/exfldio.c | 11 +- + drivers/acpi/hardware/hwsleep.c | 77 ++--- + drivers/acpi/namespace/nsaccess.c | 11 +- + drivers/acpi/namespace/nseval.c | 70 +--- + drivers/acpi/namespace/nspredef.c | 256 ++++++++++++--- + drivers/acpi/namespace/nsutils.c | 8 +- + drivers/acpi/parser/psparse.c | 12 + + drivers/acpi/parser/psxface.c | 33 ++ + drivers/acpi/pci_link.c | 39 +-- + drivers/acpi/sbs.c | 31 +- + drivers/acpi/sleep/main.c | 67 ++++- + drivers/acpi/sleep/proc.c | 53 ++-- + drivers/acpi/tables/tbfadt.c | 38 ++- + drivers/acpi/tables/tbutils.c | 27 ++- + drivers/acpi/utilities/uteval.c | 6 +- + drivers/acpi/utilities/utglobal.c | 3 +- + drivers/acpi/utilities/utxface.c | 11 + + drivers/acpi/video.c | 15 + + drivers/misc/Kconfig | 284 +---------------- + drivers/misc/Makefile | 13 - + drivers/platform/Kconfig | 5 + + drivers/platform/Makefile | 5 + + drivers/platform/x86/Kconfig | 375 +++++++++++++++++++++ + drivers/platform/x86/Makefile | 19 + + drivers/{misc => platform/x86}/acer-wmi.c | 0 + drivers/{misc => platform/x86}/asus-laptop.c | 0 + drivers/{acpi => platform/x86}/asus_acpi.c | 0 + drivers/{misc => platform/x86}/compal-laptop.c | 0 + drivers/{misc => platform/x86}/eeepc-laptop.c | 0 + drivers/{misc => platform/x86}/fujitsu-laptop.c | 0 + drivers/{misc => platform/x86}/hp-wmi.c | 0 + drivers/{misc => platform/x86}/intel_menlow.c | 0 + drivers/{misc => platform/x86}/msi-laptop.c | 0 + drivers/{misc => platform/x86}/panasonic-laptop.c | 0 + drivers/{misc => platform/x86}/sony-laptop.c | 0 + drivers/{misc => platform/x86}/tc1100-wmi.c | 0 + drivers/{misc => platform/x86}/thinkpad_acpi.c | 0 + drivers/{acpi => platform/x86}/toshiba_acpi.c | 0 + drivers/{acpi => platform/x86}/wmi.c | 0 + drivers/power/power_supply_sysfs.c | 2 + + include/acpi/acconfig.h | 6 +- + include/acpi/acexcep.h | 4 +- + include/acpi/acglobal.h | 1 + + include/acpi/aclocal.h | 1 + + include/acpi/acnamesp.h | 5 +- + include/acpi/acpixf.h | 6 +- + include/acpi/actables.h | 2 + + include/acpi/actypes.h | 8 +- + include/linux/acpi.h | 1 + + include/linux/power_supply.h | 2 + + include/linux/suspend.h | 13 + + kernel/power/disk.c | 6 +- + kernel/power/snapshot.c | 370 +++++++++++---------- + kernel/power/swsusp.c | 122 +++++++ + 77 files changed, 1597 insertions(+), 1010 deletions(-) + create mode 100644 drivers/platform/Kconfig + create mode 100644 drivers/platform/Makefile + create mode 100644 drivers/platform/x86/Kconfig + create mode 100644 drivers/platform/x86/Makefile + rename drivers/{misc => platform/x86}/acer-wmi.c (100%) + rename drivers/{misc => platform/x86}/asus-laptop.c (100%) + rename drivers/{acpi => platform/x86}/asus_acpi.c (100%) + rename drivers/{misc => platform/x86}/compal-laptop.c (100%) + rename drivers/{misc => platform/x86}/eeepc-laptop.c (100%) + rename drivers/{misc => platform/x86}/fujitsu-laptop.c (100%) + rename drivers/{misc => platform/x86}/hp-wmi.c (100%) + rename drivers/{misc => platform/x86}/intel_menlow.c (100%) + rename drivers/{misc => platform/x86}/msi-laptop.c (100%) + rename drivers/{misc => platform/x86}/panasonic-laptop.c (100%) + rename drivers/{misc => platform/x86}/sony-laptop.c (100%) + rename drivers/{misc => platform/x86}/tc1100-wmi.c (100%) + rename drivers/{misc => platform/x86}/thinkpad_acpi.c (100%) + rename drivers/{acpi => platform/x86}/toshiba_acpi.c (100%) + rename drivers/{acpi => platform/x86}/wmi.c (100%) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + Documentation/filesystems/nfs-rdma.txt | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/media/dvb/Kconfig +Merge made by recursive. + drivers/firewire/fw-card.c | 68 +-- + drivers/firewire/fw-cdev.c | 355 ++++++---- + drivers/firewire/fw-device.c | 43 +- + drivers/firewire/fw-device.h | 7 +- + drivers/firewire/fw-iso.c | 43 +- + drivers/firewire/fw-ohci.c | 236 ++++---- + drivers/firewire/fw-sbp2.c | 57 +- + drivers/firewire/fw-topology.c | 28 +- + drivers/firewire/fw-topology.h | 13 +- + drivers/firewire/fw-transaction.c | 151 ++--- + drivers/firewire/fw-transaction.h | 123 +--- + drivers/ieee1394/dma.h | 1 + + drivers/ieee1394/ieee1394_core.c | 1 + + drivers/ieee1394/ieee1394_transactions.c | 29 + + drivers/ieee1394/ieee1394_transactions.h | 2 + + drivers/ieee1394/iso.h | 1 + + drivers/ieee1394/nodemgr.c | 10 +- + drivers/ieee1394/nodemgr.h | 18 + + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 + + drivers/media/dvb/firesat/Kconfig | 12 + + drivers/media/dvb/firesat/Makefile | 13 + + drivers/media/dvb/firesat/avc_api.c | 1051 ++++++++++++++++++++++++++++++ + drivers/media/dvb/firesat/avc_api.h | 432 ++++++++++++ + drivers/media/dvb/firesat/cmp.c | 171 +++++ + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 261 ++++++++ + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 191 ++++++ + drivers/media/dvb/firesat/firesat-rc.h | 11 + + drivers/media/dvb/firesat/firesat.h | 227 +++++++ + drivers/media/dvb/firesat/firesat_1394.c | 291 +++++++++ + drivers/media/dvb/firesat/firesat_dvb.c | 276 ++++++++ + drivers/media/dvb/firesat/firesat_fe.c | 245 +++++++ + drivers/media/dvb/firesat/firesat_iso.c | 111 ++++ + include/linux/firewire-cdev.h | 4 +- + 36 files changed, 3911 insertions(+), 593 deletions(-) + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/dvb/firesat/firesat_iso.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/powerpc/kernel/asm-offsets.c +Auto-merged arch/x86/kvm/Kconfig +Merge made by recursive. + arch/ia64/include/asm/kvm.h | 49 ++- + arch/ia64/include/asm/kvm_host.h | 8 +- + arch/ia64/kvm/Kconfig | 4 + + arch/ia64/kvm/kvm-ia64.c | 100 ++++- + arch/ia64/kvm/process.c | 15 - + arch/ia64/kvm/vcpu.c | 39 +-- + arch/ia64/kvm/vtlb.c | 5 - + arch/powerpc/include/asm/kvm.h | 7 + + arch/powerpc/include/asm/kvm_44x.h | 7 + + arch/powerpc/include/asm/kvm_asm.h | 7 +- + arch/powerpc/include/asm/kvm_e500.h | 67 +++ + arch/powerpc/include/asm/kvm_host.h | 21 +- + arch/powerpc/include/asm/kvm_ppc.h | 15 +- + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x.c | 72 +--- + arch/powerpc/kvm/44x_emulate.c | 217 +-------- + arch/powerpc/kvm/44x_tlb.c | 39 ++- + arch/powerpc/kvm/44x_tlb.h | 9 - + arch/powerpc/kvm/Kconfig | 16 + + arch/powerpc/kvm/Makefile | 10 + + arch/powerpc/kvm/booke.c | 50 ++- + arch/powerpc/kvm/booke.h | 35 +- + arch/powerpc/kvm/booke_emulate.c | 266 +++++++++++ + arch/powerpc/kvm/booke_interrupts.S | 5 + + arch/powerpc/kvm/e500.c | 169 +++++++ + arch/powerpc/kvm/e500_emulate.c | 196 ++++++++ + arch/powerpc/kvm/e500_tlb.c | 737 +++++++++++++++++++++++++++++ + arch/powerpc/kvm/e500_tlb.h | 184 ++++++++ + arch/powerpc/kvm/emulate.c | 93 +++-- + arch/powerpc/kvm/powerpc.c | 35 +-- + arch/s390/include/asm/kvm.h | 7 + + arch/s390/include/asm/kvm_host.h | 3 - + arch/s390/kvm/Kconfig | 3 + + arch/s390/kvm/kvm-s390.c | 8 +- + arch/x86/include/asm/kvm.h | 23 + + arch/x86/include/asm/kvm_host.h | 54 ++- + arch/x86/include/asm/msr-index.h | 7 + + arch/x86/include/asm/svm.h | 4 - + arch/x86/include/asm/virtext.h | 2 +- + arch/x86/include/asm/vmx.h | 5 +- + arch/x86/kvm/Kconfig | 4 + + arch/x86/kvm/i8254.c | 23 +- + arch/x86/kvm/i8254.h | 2 + + arch/x86/kvm/kvm_svm.h | 16 +- + arch/x86/kvm/mmu.c | 186 ++++---- + arch/x86/kvm/paging_tmpl.h | 209 ++++----- + arch/x86/kvm/svm.c | 866 +++++++++++++++++++++++++++++++---- + arch/x86/kvm/vmx.c | 303 ++++++++----- + arch/x86/kvm/x86.c | 273 ++++++++---- + arch/x86/kvm/x86_emulate.c | 56 ++- + include/linux/kvm.h | 61 ++- + include/linux/kvm_host.h | 25 +- + include/linux/kvm_types.h | 13 - + virt/kvm/ioapic.c | 6 + + virt/kvm/irq_comm.c | 24 + + virt/kvm/kvm_main.c | 67 +++- + 56 files changed, 3662 insertions(+), 1069 deletions(-) + create mode 100644 arch/powerpc/include/asm/kvm_e500.h + create mode 100644 arch/powerpc/kvm/booke_emulate.c + create mode 100644 arch/powerpc/kvm/e500.c + create mode 100644 arch/powerpc/kvm/e500_emulate.c + create mode 100644 arch/powerpc/kvm/e500_tlb.c + create mode 100644 arch/powerpc/kvm/e500_tlb.h +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/debug_fs.c | 696 ++++++++++++++++++++++++------------------------- + fs/dlm/dlm_internal.h | 2 +- + fs/dlm/lock.c | 26 +- + fs/dlm/lockspace.c | 2 +- + fs/dlm/recover.c | 10 +- + 5 files changed, 357 insertions(+), 379 deletions(-) +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/scsi/scsi_error.c +Auto-merged drivers/scsi/scsi_ioctl.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_ioctl.c +Auto-merged drivers/scsi/scsi_scan.c +Auto-merged drivers/scsi/scsi_transport_fc.c +Auto-merged drivers/scsi/sd.c +CONFLICT (content): Merge conflict in drivers/scsi/sd.c +Recorded preimage for 'drivers/scsi/sd.c' +Resolved 'drivers/scsi/scsi_ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/scsi/sd.c'. +Created commit d395d5c: Merge commit 'scsi/master' +$ git diff -M --stat --summary HEAD^.. + block/blk-map.c | 19 +- + drivers/message/fusion/mptctl.c | 5 +- + drivers/scsi/NCR_D700.c | 2 +- + drivers/scsi/a2091.c | 18 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/cxgb3i/cxgb3i_ddp.c | 1 + + drivers/scsi/gvp11.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 14 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 16 +- + drivers/scsi/lasi700.c | 3 +- + drivers/scsi/libsas/sas_host_smp.c | 12 +- + drivers/scsi/lpfc/lpfc_init.c | 3 +- + drivers/scsi/mvsas.c | 2 +- + drivers/scsi/pcmcia/aha152x_stub.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 26 ++- + drivers/scsi/qla2xxx/qla_dbg.c | 462 +++++++++++++++++++++++++++++---- + drivers/scsi/qla2xxx/qla_dbg.h | 40 +++ + drivers/scsi/qla2xxx/qla_def.h | 33 ++- + drivers/scsi/qla2xxx/qla_dfs.c | 3 +- + drivers/scsi/qla2xxx/qla_fw.h | 294 +++++++++++++++++++++- + drivers/scsi/qla2xxx/qla_gbl.h | 10 +- + drivers/scsi/qla2xxx/qla_gs.c | 9 +- + drivers/scsi/qla2xxx/qla_init.c | 295 ++++++++++++++++++++- + drivers/scsi/qla2xxx/qla_iocb.c | 12 +- + drivers/scsi/qla2xxx/qla_isr.c | 82 ++++-- + drivers/scsi/qla2xxx/qla_mbx.c | 41 ++-- + drivers/scsi/qla2xxx/qla_mid.c | 4 +- + drivers/scsi/qla2xxx/qla_os.c | 139 +++++++---- + drivers/scsi/qla2xxx/qla_sup.c | 263 ++++++------------- + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/scsi/scsi.c | 4 - + drivers/scsi/scsi_error.c | 24 +-- + drivers/scsi/scsi_ioctl.c | 10 +- + drivers/scsi/scsi_lib.c | 117 ++++++--- + drivers/scsi/scsi_transport_fc.c | 21 ++- + drivers/scsi/sd_dif.c | 17 +- + drivers/scsi/sg.c | 2 + + drivers/scsi/sgiwd93.c | 3 +- + drivers/scsi/sim710.c | 4 +- + drivers/scsi/sni_53c710.c | 3 +- + drivers/scsi/st.c | 492 ++++++++++++++++-------------------- + drivers/scsi/st.h | 14 +- + drivers/scsi/zalon.c | 4 +- + fs/bio.c | 36 ++- + include/linux/blkdev.h | 2 + + include/scsi/scsi_transport_fc.h | 1 + + 46 files changed, 1789 insertions(+), 791 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merged fs/ocfs2/cluster/heartbeat.c +Merge made by recursive. + fs/configfs/dir.c | 59 +++++++++++++ + fs/ocfs2/cluster/heartbeat.c | 96 +++++++++++++++++++++- + fs/ocfs2/cluster/heartbeat.h | 3 +- + fs/ocfs2/cluster/nodemanager.c | 9 ++- + fs/ocfs2/ocfs2.h | 1 + + fs/ocfs2/super.c | 176 ++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 340 insertions(+), 4 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at d395d5c Merge commit 'scsi/master' +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/block_dev.c +Auto-merged fs/ext3/namei.c +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/ext4.h +Auto-merged fs/ext4/extents.c +Auto-merged fs/ext4/inode.c +Auto-merged fs/ext4/namei.c +Auto-merged fs/ext4/super.c +Auto-merged fs/jbd2/commit.c +Auto-merged fs/jbd2/journal.c +Auto-merged fs/jbd2/transaction.c +Auto-merged fs/super.c +Auto-merged include/linux/ext3_fs.h +Auto-merged include/linux/ext3_fs_sb.h +Auto-merged include/linux/fs.h +Auto-merged include/linux/jbd2.h +Merge made by recursive. + Documentation/filesystems/ext4.txt | 85 ++++- + block/Kconfig | 6 + + fs/block_dev.c | 15 + + fs/ext3/hash.c | 77 ++++- + fs/ext3/namei.c | 11 +- + fs/ext3/super.c | 33 ++ + fs/ext4/balloc.c | 293 ++++++------------ + fs/ext4/bitmap.c | 5 +- + fs/ext4/dir.c | 10 +- + fs/ext4/ext4.h | 152 +++++++-- + fs/ext4/ext4_extents.h | 5 - + fs/ext4/ext4_i.h | 16 +- + fs/ext4/ext4_jbd2.c | 83 ++++-- + fs/ext4/ext4_jbd2.h | 87 ++++- + fs/ext4/ext4_sb.h | 6 +- + fs/ext4/extents.c | 60 ++-- + fs/ext4/file.c | 3 - + fs/ext4/hash.c | 77 ++++- + fs/ext4/ialloc.c | 324 +++++++++++-------- + fs/ext4/inode.c | 309 +++++++++++++----- + fs/ext4/ioctl.c | 2 +- + fs/ext4/mballoc.c | 629 ++++++++++++++++++++++++++---------- + fs/ext4/mballoc.h | 71 +---- + fs/ext4/migrate.c | 19 +- + fs/ext4/namei.c | 92 +++--- + fs/ext4/resize.c | 113 ++----- + fs/ext4/super.c | 622 ++++++++++++++++++++++------------- + fs/ext4/xattr.c | 25 +- + fs/ioprio.c | 3 +- + fs/jbd2/checkpoint.c | 24 +- + fs/jbd2/commit.c | 58 +++- + fs/jbd2/journal.c | 124 +++----- + fs/jbd2/transaction.c | 60 +++- + fs/super.c | 2 + + include/linux/ext3_fs.h | 28 ++- + include/linux/ext3_fs_sb.h | 1 + + include/linux/fs.h | 2 + + include/linux/ioprio.h | 2 + + include/linux/jbd2.h | 38 ++- + 39 files changed, 2271 insertions(+), 1301 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Renamed arch/avr32/include/asm/atmel-mci.h => include/linux/atmel-mci.h +Auto-merged include/linux/atmel-mci.h +Auto-merged arch/avr32/mach-at32ap/at32ap700x.c +Auto-merged drivers/mmc/host/atmel-mci.c +Auto-merged include/linux/netdevice.h +Auto-merged net/core/dev.c +Auto-merged net/ipv4/tcp.c +Auto-merged net/ipv6/tcp_ipv6.c +Merge made by recursive. + Documentation/crypto/async-tx-api.txt | 96 ++--- + Documentation/dmaengine.txt | 1 + + arch/avr32/mach-at32ap/at32ap700x.c | 15 +- + crypto/async_tx/async_tx.c | 350 +--------------- + drivers/dca/dca-core.c | 2 +- + drivers/dma/Kconfig | 2 - + drivers/dma/dmaengine.c | 778 ++++++++++++++++++++++++--------- + drivers/dma/dmatest.c | 129 ++---- + drivers/dma/dw_dmac.c | 119 +++--- + drivers/dma/fsldma.c | 5 +- + drivers/dma/ioat.c | 92 ++--- + drivers/dma/ioat_dma.c | 18 +- + drivers/dma/iop-adma.c | 30 +-- + drivers/dma/mv_xor.c | 11 +- + drivers/mmc/host/atmel-mci.c | 103 ++---- + include/linux/async_tx.h | 17 +- + include/linux/atmel-mci.h | 6 +- + include/linux/dmaengine.h | 181 +++------ + include/linux/dw_dmac.h | 31 +- + include/linux/netdevice.h | 3 - + include/net/netdma.h | 11 - + net/core/dev.c | 149 +------ + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + 26 files changed, 900 insertions(+), 1260 deletions(-) + create mode 100644 Documentation/dmaengine.txt +Merging udf/for_next +$ git merge udf/for_next +Auto-merged fs/udf/ialloc.c +Auto-merged fs/udf/namei.c +Merge made by recursive. + Documentation/filesystems/udf.txt | 2 + + fs/udf/balloc.c | 113 +++++----- + fs/udf/dir.c | 14 +- + fs/udf/directory.c | 38 ++-- + fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 213 ++++++++++--------- + fs/udf/misc.c | 29 ++-- + fs/udf/namei.c | 86 ++++---- + fs/udf/osta_udf.h | 22 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 139 ++++++++----- + fs/udf/truncate.c | 44 ++-- + fs/udf/udf_i.h | 6 +- + fs/udf/udf_sb.h | 4 + + fs/udf/udfdecl.h | 46 +++-- + fs/udf/udfend.h | 28 ++-- + fs/udf/udftime.c | 6 +- + fs/udf/unicode.c | 41 +++-- + 19 files changed, 663 insertions(+), 590 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Auto-merged drivers/mtd/devices/m25p80.c +CONFLICT (content): Merge conflict in drivers/mtd/devices/m25p80.c +Auto-merged drivers/mtd/devices/mtd_dataflash.c +CONFLICT (content): Merge conflict in drivers/mtd/devices/mtd_dataflash.c +Auto-merged drivers/mtd/maps/physmap.c +Auto-merged drivers/mtd/mtdconcat.c +Auto-merged drivers/mtd/ubi/build.c +Auto-merged include/linux/mtd/mtd.h +Resolved 'drivers/mtd/devices/m25p80.c' using previous resolution. +Resolved 'drivers/mtd/devices/mtd_dataflash.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 5dd31f8: Merge commit 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/powerpc/dts-bindings/4xx/ndfc.txt | 39 ++ + arch/arm/mach-pxa/corgi.c | 54 ++ + arch/arm/mach-pxa/poodle.c | 51 ++ + arch/arm/mach-pxa/spitz.c | 77 +++ + drivers/mtd/Kconfig | 10 + + drivers/mtd/Makefile | 2 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 12 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 8 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 14 +- + drivers/mtd/chips/fwh_lock.h | 4 +- + drivers/mtd/devices/lart.c | 6 +- + drivers/mtd/devices/m25p80.c | 41 +- + drivers/mtd/devices/mtd_dataflash.c | 24 +- + drivers/mtd/ftl.c | 100 ++-- + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/inftlmount.c | 4 +- + drivers/mtd/lpddr/Kconfig | 22 + + drivers/mtd/lpddr/Makefile | 6 + + drivers/mtd/lpddr/lpddr_cmds.c | 796 +++++++++++++++++++++++ + drivers/mtd/lpddr/qinfo_probe.c | 255 ++++++++ + drivers/mtd/maps/Kconfig | 21 +- + drivers/mtd/maps/alchemy-flash.c | 2 +- + drivers/mtd/maps/amd76xrom.c | 4 +- + drivers/mtd/maps/cfi_flagadm.c | 2 +- + drivers/mtd/maps/ck804xrom.c | 4 +- + drivers/mtd/maps/dbox2-flash.c | 2 +- + drivers/mtd/maps/edb7312.c | 2 +- + drivers/mtd/maps/esb2rom.c | 4 +- + drivers/mtd/maps/fortunet.c | 2 +- + drivers/mtd/maps/h720x-flash.c | 2 +- + drivers/mtd/maps/ichxrom.c | 4 +- + drivers/mtd/maps/impa7.c | 2 +- + drivers/mtd/maps/ipaq-flash.c | 2 +- + drivers/mtd/maps/mbx860.c | 2 +- + drivers/mtd/maps/nettel.c | 5 +- + drivers/mtd/maps/octagon-5066.c | 2 +- + drivers/mtd/maps/physmap.c | 41 +- + drivers/mtd/maps/pmcmsp-flash.c | 2 +- + drivers/mtd/maps/redwood.c | 2 +- + drivers/mtd/maps/rpxlite.c | 2 +- + drivers/mtd/maps/sbc8240.c | 2 +- + drivers/mtd/maps/scb2_flash.c | 8 +- + drivers/mtd/maps/sharpsl-flash.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 2 +- + drivers/mtd/maps/uclinux.c | 4 +- + drivers/mtd/maps/vmax301.c | 2 +- + drivers/mtd/maps/wr_sbc82xx_flash.c | 2 +- + drivers/mtd/mtdchar.c | 6 +- + drivers/mtd/mtdconcat.c | 35 +- + drivers/mtd/mtdcore.c | 16 +- + drivers/mtd/mtdoops.c | 9 +- + drivers/mtd/mtdpart.c | 34 +- + drivers/mtd/nand/Kconfig | 7 + + drivers/mtd/nand/alauda.c | 6 +- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/nand_base.c | 25 +- + drivers/mtd/nand/nand_bbt.c | 31 +- + drivers/mtd/nand/nandsim.c | 339 +++++++++-- + drivers/mtd/nand/ndfc.c | 269 ++++---- + drivers/mtd/nand/pxa3xx_nand.c | 6 +- + drivers/mtd/nand/sharpsl.c | 247 ++++---- + drivers/mtd/nftlcore.c | 2 +- + drivers/mtd/nftlmount.c | 4 +- + drivers/mtd/onenand/onenand_base.c | 8 +- + drivers/mtd/rfd_ftl.c | 29 +- + drivers/mtd/ssfdc.c | 7 +- + drivers/mtd/tests/Makefile | 7 + + drivers/mtd/tests/mtd_oobtest.c | 742 +++++++++++++++++++++ + drivers/mtd/tests/mtd_pagetest.c | 632 ++++++++++++++++++ + drivers/mtd/tests/mtd_readtest.c | 253 +++++++ + drivers/mtd/tests/mtd_speedtest.c | 502 ++++++++++++++ + drivers/mtd/tests/mtd_stresstest.c | 330 ++++++++++ + drivers/mtd/tests/mtd_subpagetest.c | 525 +++++++++++++++ + drivers/mtd/tests/mtd_torturetest.c | 530 +++++++++++++++ + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/gluebi.c | 17 +- + fs/jffs2/compr_rubin.c | 120 ++-- + fs/jffs2/erase.c | 5 +- + include/linux/mtd/ftl.h | 38 +- + include/linux/mtd/map.h | 1 + + include/linux/mtd/mtd.h | 75 ++- + include/linux/mtd/nand.h | 7 +- + include/linux/mtd/partitions.h | 6 +- + include/linux/mtd/pfow.h | 159 +++++ + include/linux/mtd/physmap.h | 1 + + include/linux/mtd/qinfo.h | 91 +++ + include/linux/mtd/sharpsl.h | 20 + + 87 files changed, 6127 insertions(+), 678 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/4xx/ndfc.txt + create mode 100644 drivers/mtd/lpddr/Kconfig + create mode 100644 drivers/mtd/lpddr/Makefile + create mode 100644 drivers/mtd/lpddr/lpddr_cmds.c + create mode 100644 drivers/mtd/lpddr/qinfo_probe.c + create mode 100644 drivers/mtd/tests/Makefile + create mode 100644 drivers/mtd/tests/mtd_oobtest.c + create mode 100644 drivers/mtd/tests/mtd_pagetest.c + create mode 100644 drivers/mtd/tests/mtd_readtest.c + create mode 100644 drivers/mtd/tests/mtd_speedtest.c + create mode 100644 drivers/mtd/tests/mtd_stresstest.c + create mode 100644 drivers/mtd/tests/mtd_subpagetest.c + create mode 100644 drivers/mtd/tests/mtd_torturetest.c + create mode 100644 include/linux/mtd/pfow.h + create mode 100644 include/linux/mtd/qinfo.h + create mode 100644 include/linux/mtd/sharpsl.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/pci/hda/patch_analog.c | 5 +++-- + sound/pci/hda/patch_nvhdmi.c | 2 ++ + sound/pci/hda/patch_realtek.c | 5 +++++ + sound/usb/caiaq/caiaq-device.h | 1 + + sound/usb/caiaq/caiaq-midi.c | 32 ++++++++++++++++++-------------- + 5 files changed, 29 insertions(+), 16 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/powerpc/kernel/sysfs.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/sysfs.c +Auto-merged arch/powerpc/platforms/cell/interrupt.c +Auto-merged arch/x86/kernel/cpu/common.c +Auto-merged arch/x86/kvm/svm.c +Auto-merged drivers/cpufreq/cpufreq.c +Auto-merged drivers/firmware/dcdbas.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged init/Kconfig +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/cpu.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged kernel/sched.c +Auto-merged kernel/stop_machine.c +Recorded preimage for 'arch/powerpc/kernel/sysfs.c' +Recorded preimage for 'kernel/module.c' +Resolved 'init/main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 7743f32 Merge commit 'sound/for-next' +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/cifsproto.h | 4 +- + fs/cifs/connect.c | 4 +- + fs/cifs/transport.c | 107 +++++++++------------------------------------------ + 3 files changed, 22 insertions(+), 93 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/mount.h +Merge made by recursive. + fs/gfs2/incore.h | 7 +- + fs/gfs2/locking.c | 82 +++++++++++++++++++++ + fs/gfs2/main.c | 10 +++ + fs/gfs2/mount.c | 111 +++++----------------------- + fs/gfs2/mount.h | 17 ----- + fs/gfs2/ops_address.c | 1 + + fs/gfs2/ops_fstype.c | 13 +++- + fs/gfs2/ops_super.c | 41 ++++++++--- + fs/gfs2/quota.c | 193 +++++++++++++++++++++++++++---------------------- + fs/gfs2/quota.h | 2 + + fs/gfs2/super.h | 26 ++++--- + fs/gfs2/sys.c | 2 - + 12 files changed, 277 insertions(+), 228 deletions(-) + delete mode 100644 fs/gfs2/mount.h +Merging input/next +$ git merge input/next +Already up-to-date. +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged fs/fcntl.c +Auto-merged fs/ioctl.c +CONFLICT (content): Merge conflict in fs/ioctl.c +Resolved 'fs/ioctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 9b43a0c: Merge commit 'bkl-removal/bkl-removal' +$ git diff -M --stat --summary HEAD^.. + drivers/char/rtc.c | 17 ++++------------- + 1 files changed, 4 insertions(+), 13 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Auto-merged drivers/net/e100.c +CONFLICT (content): Merge conflict in drivers/net/e100.c +Auto-merged drivers/net/starfire.c +CONFLICT (content): Merge conflict in drivers/net/starfire.c +Auto-merged drivers/net/tg3.c +CONFLICT (content): Merge conflict in drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Auto-merged drivers/scsi/advansys.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +CONFLICT (content): Merge conflict in firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Removed sound/isa/wavefront/yss225.c +Recorded preimage for 'drivers/net/e100.c' +Recorded preimage for 'firmware/Makefile' +Recorded preimage for 'firmware/WHENCE' +Resolved 'drivers/net/starfire.c' using previous resolution. +Resolved 'drivers/net/tg3.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/e100.c'. +Recorded resolution for 'firmware/Makefile'. +Recorded resolution for 'firmware/WHENCE'. +Created commit 6f0d1f3: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/scsi/advansys.c | 1731 ++----------------- + drivers/scsi/ql1040_fw.h | 2130 ---------------------- + drivers/scsi/ql12160_fw.h | 1811 ------------------- + drivers/scsi/ql1280_fw.h | 2048 --------------------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ------------ + firmware/Makefile | 7 + + firmware/WHENCE | 59 + + firmware/advansys/3550.bin.ihex | 317 ++++ + firmware/advansys/38C0800.bin.ihex | 336 ++++ + firmware/advansys/38C1600.bin.ihex | 398 +++++ + firmware/advansys/mcode.bin.ihex | 147 ++ + firmware/av7110/Boot.S | 109 ++ + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/qlogic/1040.bin.ihex | 2111 ++++++++++++++++++++++ + firmware/qlogic/12160.bin.ihex | 1771 +++++++++++++++++++ + firmware/qlogic/1280.bin.ihex | 2008 +++++++++++++++++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++++++++++ + firmware/yamaha/yss225_registers.bin.ihex | 998 +++++++++++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 ----------------------------- + 30 files changed, 9675 insertions(+), 11717 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +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 | 15 ++- + drivers/leds/Makefile | 2 + + drivers/leds/led-class.c | 24 +++- + drivers/leds/leds-alix2.c | 181 ++++++++++++++++++++ + drivers/leds/leds-ams-delta.c | 33 +---- + drivers/leds/leds-clevo-mail.c | 21 +--- + drivers/leds/leds-fsg.c | 37 +---- + drivers/leds/leds-gpio.c | 36 +---- + drivers/leds/leds-hp-disk.c | 20 +-- + drivers/leds/leds-hp6xx.c | 22 +--- + drivers/leds/leds-net48xx.c | 21 +--- + drivers/leds/leds-pca9532.c | 77 +++++++-- + drivers/leds/leds-s3c24xx.c | 25 +--- + drivers/leds/leds-wm8350.c | 311 ++++++++++++++++++++++++++++++++++ + drivers/leds/leds-wrap.c | 27 +--- + drivers/leds/ledtrig-timer.c | 5 + + drivers/mfd/wm8350-core.c | 3 + + drivers/regulator/wm8350-regulator.c | 91 ++++++++++ + include/linux/leds-pca9532.h | 2 + + include/linux/leds.h | 5 +- + include/linux/mfd/wm8350/pmic.h | 36 ++++ + 21 files changed, 749 insertions(+), 245 deletions(-) + create mode 100644 drivers/leds/leds-alix2.c + create mode 100644 drivers/leds/leds-wm8350.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Removed drivers/video/backlight/corgi_bl.c +Merge made by recursive. + drivers/video/backlight/Kconfig | 15 +-- + drivers/video/backlight/Makefile | 2 +- + drivers/video/backlight/backlight.c | 73 +++++++++---- + drivers/video/backlight/corgi_bl.c | 169 ------------------------------- + drivers/video/backlight/cr_bllcd.c | 18 ++-- + drivers/video/backlight/generic_bl.c | 147 +++++++++++++++++++++++++++ + drivers/video/backlight/hp680_bl.c | 20 ++-- + drivers/video/backlight/mbp_nvidia_bl.c | 1 + + drivers/video/backlight/progear_bl.c | 20 ++-- + drivers/video/backlight/tdo24m.c | 94 ++++++++++++++++-- + drivers/video/backlight/tosa_lcd.c | 27 +++++- + drivers/video/backlight/vgg2432a4.c | 2 +- + include/linux/backlight.h | 16 +++ + include/linux/spi/tdo24m.h | 13 +++ + 14 files changed, 370 insertions(+), 247 deletions(-) + delete mode 100644 drivers/video/backlight/corgi_bl.c + create mode 100644 drivers/video/backlight/generic_bl.c + create mode 100644 include/linux/spi/tdo24m.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- + kernel/kgdb.c | 6 +++--- + 2 files changed, 43 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +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 kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/kernel/traps.c +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged include/linux/gfp.h +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit cbfce56: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 129 ++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 88 +++++ + arch/x86/Makefile | 5 + + arch/x86/include/asm/dma-mapping.h | 2 + + arch/x86/include/asm/pgtable.h | 4 +- + arch/x86/include/asm/pgtable_32.h | 6 + + arch/x86/include/asm/pgtable_64.h | 6 + + arch/x86/include/asm/string_32.h | 8 + + arch/x86/include/asm/string_64.h | 8 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init_32.c | 4 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 + + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/asm-x86/kmemcheck.h | 42 ++ + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 ++++ + include/linux/mm_types.h | 8 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 11 + + mm/Makefile | 1 + + mm/kmemcheck.c | 103 +++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 1982 insertions(+), 104 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merged drivers/Makefile +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-regulator | 136 +++---- + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/regulator.tmpl | 304 +++++++++++++++ + drivers/Makefile | 4 +- + drivers/regulator/core.c | 474 ++++++++++++++--------- + drivers/regulator/da903x.c | 12 +- + include/linux/regulator/consumer.h | 8 +- + include/linux/regulator/driver.h | 37 ++- + include/linux/regulator/machine.h | 41 ++ + 9 files changed, 746 insertions(+), 272 deletions(-) + create mode 100644 Documentation/DocBook/regulator.tmpl +Merging security-testing/next +$ git merge security-testing/next +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged drivers/char/pty.c +Merge made by recursive. + drivers/char/pty.c | 4 +--- + drivers/serial/jsm/jsm_neo.c | 3 --- + drivers/usb/serial/usb-serial.c | 3 --- + 3 files changed, 1 insertions(+), 9 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Merge made by recursive. + arch/x86/oprofile/op_model_amd.c | 149 ++++++----------- + drivers/oprofile/buffer_sync.c | 188 +++++++++------------- + drivers/oprofile/cpu_buffer.c | 316 +++++++++++++++++++++++-------------- + drivers/oprofile/cpu_buffer.h | 89 +++++------ + drivers/oprofile/event_buffer.c | 4 +- + drivers/oprofile/oprof.c | 4 +- + drivers/oprofile/oprof.h | 8 +- + drivers/oprofile/oprofile_files.c | 27 ++-- + include/linux/oprofile.h | 18 ++ + kernel/trace/ring_buffer.c | 8 +- + 10 files changed, 417 insertions(+), 394 deletions(-) +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Already uptodate! +Merge made by recursive. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Auto-merged lib/swiotlb.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merged drivers/usb/wusbcore/rh.c +Merge made by recursive. + drivers/usb/host/whci/asl.c | 9 +++++++-- + drivers/usb/host/whci/hw.c | 15 +++++++++++++++ + drivers/usb/host/whci/pzl.c | 9 +++++++-- + drivers/usb/host/whci/whcd.h | 1 + + drivers/usb/wusbcore/devconnect.c | 1 + + drivers/usb/wusbcore/rh.c | 3 +++ + drivers/uwb/allocator.c | 1 - + drivers/uwb/rsv.c | 17 +++++++++++++---- + 8 files changed, 47 insertions(+), 9 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + arch/powerpc/boot/dts/gef_sbc610.dts | 15 + + arch/powerpc/configs/86xx/gef_sbc610_defconfig | 1 + + drivers/watchdog/Kconfig | 6 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/gef_wdt.c | 330 ++++++++++++++++++++++++ + drivers/watchdog/wm8350_wdt.c | 6 +- + 6 files changed, 356 insertions(+), 3 deletions(-) + create mode 100644 drivers/watchdog/gef_wdt.c +Merging proc/proc +$ git merge proc/proc +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merged drivers/pci/intel-iommu.c +CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c +Auto-merged include/linux/dma_remapping.h +CONFLICT (content): Merge conflict in include/linux/dma_remapping.h +Auto-merged include/linux/intel-iommu.h +Resolved 'drivers/pci/intel-iommu.c' using previous resolution. +Resolved 'include/linux/dma_remapping.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 241f09e: Merge commit 'dwmw2-iommu/master' +$ git diff -M --stat --summary HEAD^.. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merged MAINTAINERS +Auto-merged drivers/scsi/Kconfig +Auto-merged drivers/scsi/scsi_scan.c +Merge made by recursive. + Documentation/devices.txt | 6 + + Documentation/scsi/osd.txt | 198 +++++ + MAINTAINERS | 10 + + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 2 + + drivers/scsi/osd/Kbuild | 45 + + drivers/scsi/osd/Kconfig | 53 ++ + drivers/scsi/osd/Makefile | 37 + + drivers/scsi/osd/osd_debug.h | 30 + + drivers/scsi/osd/osd_initiator.c | 1646 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/osd/osd_ktests.c | 441 ++++++++++ + drivers/scsi/osd/osd_ktests.h | 31 + + drivers/scsi/osd/osd_uld.c | 457 +++++++++++ + drivers/scsi/scsi_scan.c | 1 + + include/linux/major.h | 1 + + include/scsi/osd_attributes.h | 327 ++++++++ + include/scsi/osd_initiator.h | 428 ++++++++++ + include/scsi/osd_protocol.h | 579 ++++++++++++++ + include/scsi/osd_sec.h | 45 + + include/scsi/osd_sense.h | 260 ++++++ + include/scsi/osd_types.h | 40 + + include/scsi/scsi.h | 1 + + 22 files changed, 4640 insertions(+), 0 deletions(-) + create mode 100644 Documentation/scsi/osd.txt + create mode 100644 drivers/scsi/osd/Kbuild + create mode 100644 drivers/scsi/osd/Kconfig + create mode 100755 drivers/scsi/osd/Makefile + create mode 100644 drivers/scsi/osd/osd_debug.h + create mode 100644 drivers/scsi/osd/osd_initiator.c + create mode 100644 drivers/scsi/osd/osd_ktests.c + create mode 100644 drivers/scsi/osd/osd_ktests.h + create mode 100644 drivers/scsi/osd/osd_uld.c + create mode 100644 include/scsi/osd_attributes.h + create mode 100644 include/scsi/osd_initiator.h + create mode 100644 include/scsi/osd_protocol.h + create mode 100644 include/scsi/osd_sec.h + create mode 100644 include/scsi/osd_sense.h + create mode 100644 include/scsi/osd_types.h +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Auto-merged Documentation/RCU/00-INDEX +Merge made by recursive. + Documentation/RCU/00-INDEX | 2 + + Documentation/RCU/rcubarrier.txt | 304 ++++++++++++++++++++++++++++++++++++++ + Documentation/bad_memory.txt | 45 ++++++ + 3 files changed, 351 insertions(+), 0 deletions(-) + create mode 100644 Documentation/RCU/rcubarrier.txt + create mode 100644 Documentation/bad_memory.txt +Merging nommu/master +$ git merge nommu/master +Auto-merged include/linux/mm_types.h +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/sysctl.c +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 88731cb: Merge commit 'nommu/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/nommu-mmap.txt | 31 +- + Documentation/sysctl/vm.txt | 18 + + arch/arm/include/asm/mmu.h | 1 - + arch/arm/mm/dma-mapping.c | 28 +- + arch/blackfin/include/asm/mmu.h | 1 - + arch/blackfin/kernel/ptrace.c | 6 +- + arch/blackfin/kernel/traps.c | 11 +- + arch/frv/kernel/ptrace.c | 11 +- + arch/h8300/include/asm/mmu.h | 1 - + arch/m68knommu/include/asm/mmu.h | 1 - + arch/sh/include/asm/mmu.h | 1 - + fs/binfmt_elf_fdpic.c | 35 +-- + fs/binfmt_flat.c | 34 +- + fs/proc/internal.h | 2 - + fs/proc/meminfo.c | 6 + + fs/proc/nommu.c | 71 ++-- + fs/proc/task_nommu.c | 120 ++++-- + fs/ramfs/file-nommu.c | 21 +- + include/asm-frv/mmu.h | 1 - + include/asm-m32r/mmu.h | 1 - + include/linux/mm.h | 18 +- + include/linux/mm_types.h | 19 +- + init/initramfs.c | 1 + + ipc/shm.c | 12 + + kernel/fork.c | 4 +- + kernel/sysctl.c | 14 + + lib/Kconfig.debug | 7 + + mm/mmap.c | 10 + + mm/nommu.c | 1027 ++++++++++++++++++++++++++------------ + 29 files changed, 992 insertions(+), 521 deletions(-) +Merging trivial/for-next +$ git merge trivial/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Auto-merged MAINTAINERS +Auto-merged fs/Kconfig +Auto-merged fs/Makefile +Merge made by recursive. + Documentation/filesystems/squashfs.txt | 225 ++++++++++++++ + MAINTAINERS | 7 + + fs/Kconfig | 52 ++++ + fs/Makefile | 1 + + fs/squashfs/Makefile | 8 + + fs/squashfs/block.c | 274 +++++++++++++++++ + fs/squashfs/cache.c | 412 ++++++++++++++++++++++++++ + fs/squashfs/dir.c | 235 +++++++++++++++ + fs/squashfs/export.c | 155 ++++++++++ + fs/squashfs/file.c | 502 ++++++++++++++++++++++++++++++++ + fs/squashfs/fragment.c | 98 +++++++ + fs/squashfs/id.c | 94 ++++++ + fs/squashfs/inode.c | 346 ++++++++++++++++++++++ + fs/squashfs/namei.c | 242 +++++++++++++++ + fs/squashfs/squashfs.h | 90 ++++++ + fs/squashfs/squashfs_fs.h | 381 ++++++++++++++++++++++++ + fs/squashfs/squashfs_fs_i.h | 45 +++ + fs/squashfs/squashfs_fs_sb.h | 76 +++++ + fs/squashfs/super.c | 440 ++++++++++++++++++++++++++++ + fs/squashfs/symlink.c | 118 ++++++++ + init/do_mounts_rd.c | 14 + + 21 files changed, 3815 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/squashfs.txt + create mode 100644 fs/squashfs/Makefile + create mode 100644 fs/squashfs/block.c + create mode 100644 fs/squashfs/cache.c + create mode 100644 fs/squashfs/dir.c + create mode 100644 fs/squashfs/export.c + create mode 100644 fs/squashfs/file.c + create mode 100644 fs/squashfs/fragment.c + create mode 100644 fs/squashfs/id.c + create mode 100644 fs/squashfs/inode.c + create mode 100644 fs/squashfs/namei.c + create mode 100644 fs/squashfs/squashfs.h + create mode 100644 fs/squashfs/squashfs_fs.h + create mode 100644 fs/squashfs/squashfs_fs_i.h + create mode 100644 fs/squashfs/squashfs_fs_sb.h + create mode 100644 fs/squashfs/super.c + create mode 100644 fs/squashfs/symlink.c +Merging quilt/staging +$ git merge quilt/staging +Already up-to-date. +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..1031e754d6eb --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,79 @@ +Importing driver-core.current based on 2.6.28-git11 + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core.current 9e42d0cf5020aaf217433cad1a224745241d212a +Importing usb.current based on quilt/driver-core.current + quilt series is empty +$ git update-ref refs/heads/quilt/usb.current 9e42d0cf5020aaf217433cad1a224745241d212a +Importing driver-core based on quilt/usb.current +$ git checkout quilt/driver-core +Switched to branch "quilt/driver-core" +$ git reset --hard 9e42d0cf5020aaf217433cad1a224745241d212a +HEAD is now at 9e42d0c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +bus_id-scsi.patch +warn-when-statically-allocated-kobjects-are-used.patch +Importing usb based on quilt/driver-core + quilt series is empty +$ git update-ref refs/heads/quilt/usb 04164b0a76f3b0f0b9a46eef90541ab7f7aac18e +Importing device-mapper based on v2.6.28-6127-g238c6d5 +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard 238c6d54830c624f34ac9cf123ac04aebfca5013 +HEAD is now at 238c6d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-ioctl-validate-name-length-when-renaming.patch +dm-table-rework-reference-counting-fix.patch +dm-target-use-module-refcount-directly.patch +dm-target-remove-struct-tt_internal.patch +dm-exception-store-separate-type-from-instance.patch +Importing i2c based on 2.6.28-git10 + quilt series is empty +$ git update-ref refs/heads/quilt/i2c 8cfc7f9c005313ecd4e98ad1feb391d8dfce9ed2 +Importing jdelvare-hwmon based on 2.6.28-git10 +$ git checkout quilt/jdelvare-hwmon +Switched to branch "quilt/jdelvare-hwmon" +$ git reset --hard 8cfc7f9c005313ecd4e98ad1feb391d8dfce9ed2 +HEAD is now at 8cfc7f9 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-k8temp-01-warn-about-errata.patch +Unchanged quilt series kernel-doc +Unchanged quilt series ide +Importing rr based on v2.6.28-5716-gfe0bdec +$ git checkout quilt/rr +Switched to branch "quilt/rr" +$ git reset --hard fe0bdec68b77020281dc814805edfe594ae89e0f +HEAD is now at fe0bdec Merge branch 'audit.b61' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +module:remove_config_kmod.patch +module:compare-sym-values-for-export-mark-in-proc-kallsyms.patch +module:print_unload_info-no-proc.patch +module:parisc_fix_loading_failure_of_large_kernel_modules.patch +module:parisc-fix-large-modules.patch +stop_machine:introduce_stop_machine_create_destroy.patch +module:convert_to_stop_machine_create_destroy.patch +misc:work_on_cpu-acpi.patch +misc:work_on_cpu-dcdbas.patch +misc:work_on_cpu-pci.patch +misc:work_on_cpu-powerpc-sysfs.patch +cpualloc:big_percpu_alloc.patch +cpualloc:move-net-to-big_alloc_percpu.patch +cpualloc:remove-alignment-on-cpu_workqueue_struct.patch +cpualloc:remove-percpu_ptr-users.patch +cpualloc:add-align-arg-to-__alloc_percpu.patch +cpualloc:make_the_per_cpu_reserve_configurable.patch +cpualloc:parse-percpu-earlier.patch +cpualloc:generalize-percpu_modalloc-percpu_modfree.patch +cpualloc:expose-module-percpu-allocator.patch +cpualloc:use-module-allocator.patch +cpualloc:documentation.patch +cpualloc:get_cpu_ptr.patch +error: patch failed: arch/alpha/include/asm/percpu.h:71 +error: arch/alpha/include/asm/percpu.h: patch does not apply +error: patch failed: include/asm-generic/percpu.h:82 +error: include/asm-generic/percpu.h: patch does not apply +$ git reset --hard 3db9b863fa5cd6c65da4248d896654c6c81345a1 +HEAD is now at 3db9b86 cpualloc:__percpu-annotation-for-sparse +Unchanged quilt series ttydev +Importing staging based on quilt/usb + quilt series is empty +$ git update-ref refs/heads/quilt/staging 04164b0a76f3b0f0b9a46eef90541ab7f7aac18e diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..168abcbec805 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090109 |