diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-14 16:57:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-14 16:57:43 +1000 |
| commit | 62198036daa4ccc2741775033e79ae8e5d5ebc39 (patch) | |
| tree | a56a481f80421420d80143ce29cd3218f027c70f | |
| parent | ef3f4c2b4b14a13abf4c8b8137c6681cbd6bbb79 (diff) | |
Add linux-next specific files for 20090714next-20090714
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 132 | ||||
| -rw-r--r-- | Next/Trees | 134 | ||||
| -rw-r--r-- | Next/merge.log | 2917 | ||||
| -rw-r--r-- | Next/quilt-import.log | 126 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3310 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c58494dcd845 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,132 @@ +Name SHA1 +---- ---- +origin 4a390e07fc53ce9dd615d7b788e9ecc73f87ad94 +fixes e83c2b0ff325f52dda1aff3572d0e1516216c54b +arm-current 6860107a46c8762d35eb7bf71bcf6c6510793b76 +m68k-current adfe7c69891128f5e238a5e6823709b4bb85b340 +powerpc-merge 34f25476ace556263784ea2f8173e22b25557a13 +sparc-current 8944146daa2c38dd85bc489d1b84fb9abc108837 +scsi-rc-fixes c2cc49a2f8a479dde96a599646d30b6cc9dbed78 +net-current adeab1afb7de89555c69aab5ca21300c14af6369 +sound-current 3ae30796663cc8e144e5b586198b10bc97f1ec38 +pci-current 857fdc53a0a90c3ba7fcf5b1fb4c7a62ae03cf82 +wireless-current 1ce822fa04fd6878f079461a4b8affe4bb5ec27b +kbuild-current 112942353992d95099fb5b71c679ff1046fccfcf +driver-core.current e9b92dc3e909b587eb7b297e31e34801f695d6a5 +usb.current e9b92dc3e909b587eb7b297e31e34801f695d6a5 +cpufreq-current c2cc49a2f8a479dde96a599646d30b6cc9dbed78 +input-current f0a14de2f82dd6aa13e04816da2091c7ed0f77cf +md-current e62e58a5ffdc98ac28d8dbd070c857620d541f99 +audit-current 3a6a6c16be78472a52f6dd7d88913373b42ad0f7 +crypto-current b6f34d44cb341ad32f08717d1a2c418e6053a031 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm b2e0048f91f6db91b4bb1da695725ccc3e87c43b +davinci 5a4d3ecfa957daa4ed6ef76ddd0857c0ef194c58 +pxa d78ff0a50aac6a1bfe445969dd963e6486e49f56 +thumb-2 65d05a106613f02ca08347e73861b5d0c4b3398e +avr32 4024533e60787a5507818b0c0fdb44ddb522cdf5 +blackfin d6879c585b7f8c2f3eb2f7e7beac806af4e9755c +cris 425b6c8c0c495823a7ac8d70d8f4badfa92b3eb3 +ia64 36be9b89c62f9a3791109794a5b7e38e510a67e0 +m68k 9c6948da2e55f787b942946d830eb3018323b7b7 +m68knommu 2c9d18053800597a5575da46eabff06bd3a2d38d +microblaze 63afe541c97c313ed9ff007c9bcfcce1b0bdb4d9 +mips 82e55f64130a74d2c2c4d83695151de4a58ff376 +parisc 7c5371c403abb29f01bc6cff6c5096abdf2dc524 +powerpc 34f25476ace556263784ea2f8173e22b25557a13 +4xx 336ff735425d2709c4bb3f2a55f7565e8170ce7a +galak 66c6b856d8738278a4a6e558d25c90e9950aa112 +s390 d3146bce54f472b6effdafdfc539350c117d0362 +sh 05dd2cd3bb3299540e33ff60c5b401dd88f273bd +sparc b99c6ebe8f53dce1f56f0d483f6a7c23edb19d4c +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +cifs 65bc98b0059360e458aebd208587be44641227c1 +configfs 8af7d5ffe1b6468ed0de1c2bb5335ad40b755ba3 +ext4 3ac831a0593f53c6080f8cafba7655757370081a +fatfs 2bfdd79eaa0043346e773ba5f6cfd811ea31b73d +fuse 37d217f029a56a6d385f99773fb27dfcb51f9a46 +gfs2 24ab330c7c09e715adac3dd0c8e1c7653e8cbb1d +jfs f7c52fd17a7dda42fc9e88c2b2678403419bfe63 +nfs 4a390e07fc53ce9dd615d7b788e9ecc73f87ad94 +nfsd 048f83bbf8a412a027f2863eefcef0fcd2f6fbb4 +nilfs2 e29ac4b4ddd10c4f1fb9849a0e671699f9b52ba0 +ocfs2 812e7a6a43fc34bc8f70c2b80db4ea5997d66ea8 +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +v9fs b9b8e1c85b1d98534a562f601acda8132bfff439 +ubifs 061125476039a9a998878468a6abe235b1cee347 +xfs b56063453881a6d94cf5718c6769de6e35e67753 +reiserfs-bkl cfcb7d059be7c2441b2c3ac56e0015631396ead6 +vfs aa7dfb8954ccf49e026ba13d12991a4eb7defb96 +pci 1ed5ad0627be393c1e84208f79558d22f7441fe6 +hid 16b96fa1555d8731b7850051779b90471d4131e8 +i2c aca63f4b88c3dcbd6f4f8b0a8f7a5ebe3a79d4cc +jdelvare-hwmon 969318aed2e25d77da5ae18438e5739102419efa +kernel-doc 52989765629e7d182b4f146050ebba0abf2cb0b7 +v4l-dvb d39a0b8cf89c9fff9caf6307e2ede5025e045157 +quota d01730d74d2b0155da50d44555001706294014f7 +kbuild 626f380d0b264a1e40237f5a2a3dffc5d14f256e +ide 3503e0acbfab0dbcd24ccadd5fe841f3f8290e81 +libata 10d4be2bbb6c017bcbda80fb342dbade51468bc6 +infiniband 0a5820f5838185ad7228a229fb715e15efcaad9f +acpi 6339022dbf168ec5d08de0190f80cf61feaab4df +ieee1394 ebbb16bffa646f853899ef3fdc0ac7abab888703 +ubi 83c2099f5e1f0a4621ed4f20fc539069c636a24b +kvm 84a3c0818fe9d7a1e34c188d6182793f213a6a66 +dlm 748285ccf7ea76d3d76d0d5f2945ad6fb91f5329 +scsi 8aceba2bc39718e534664e0df20e0e8b39cffc64 +async_tx 97202e4fa244dea23063c899a6df166a09ce50a5 +udf 3391faa4f18e4e33666d3d24e90e3086fcf9b922 +net 8e321c4f72e2fb580a091317ba0fb2941f637ce1 +wireless 5bc38193c1793e240a7e0b93f129606931e35fdb +mtd c276aca46d26aa2347320096f8ecdf5016795c14 +crypto 7ede5a5ba55a696a6e1d8456526e44635e966a81 +sound 5c2d8fcf785459c62e93bea9ceff2ae28108f97c +cpufreq 150b06f7f223cfd0f808737a5243cceca8ea47fa +rr 345957f1cbfd6a21481ff95c9a1ca7c66ec3f516 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input b7788c5ff9e7676dc98ca6dce437ae16b79c6726 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block bdb473bcf205cc30af24a9a2dafe26f2a88f0ef6 +device-mapper bdb473bcf205cc30af24a9a2dafe26f2a88f0ef6 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery ee8076ed3e1cdd0cd1e61318386932669c90b92f +leds a1dd8c617217322614f0465ae347895c4b58e1ab +backlight 1d469c6c38c9deaa1836d2c1955330944719e4ef +kgdb 98ddb33cecfe5752836a3359148ec0469617c8b6 +slab 51dcd55361e41c08bc1fef4e36ac2fa281b4f71e +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md e62e58a5ffdc98ac28d8dbd070c857620d541f99 +mfd a663677bf2f1b964f7bfa656d83a78387bd77f7a +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm f23c20c83d523e5f8cda1f8f7ed52fe6afffbe29 +voltage c8adaf8bd6773353ffba7af0df33670f7c5b8c8a +security-testing 7d45ecafb6792ca68da9517969d37d910601845f +lblnet 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b +ttydev 4a826030412baf29b4833d2c4334461bc0927aaf +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +uwb b81c087f6deb049023e41ce00717202a953f3939 +watchdog 81e4e1ba7ed4a1fdcf0e2ee944f1575010471464 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 147202aa772329a02c6e80bc2b7a6b8dd3deac0b +cputime 27bf8712477db47c891e6198000c985631cd18de +osd bc47df0fa705887242c26c7b040e7cf0170ab1f1 +jc_docs 26593e663e6f2846411f5e030afbf8e6f144cf9e +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 0b1d13e2baf9b8d770aafd656785115f9c708eb0 +audit def57543418a5f47debae28a0a9dea2effc11692 +omap 59a3759d0fe8d969888c741bb33f4946e4d3750d +aoe 1de9e8e70f5acc441550ca75433563d91b269bbe +suspend c54bd90cfa2399f4ca81e28147b3bac732cdbca3 +bluetooth 8ca902d709d75ce6d7634036603fff432c9ed6d8 +edac-amd f6ce2f2eb73cfe872158e4e4530976330eaaf511 +fsnotify 9d4394883505295f4b8428adc74fe8aa0d1d3a5d +irda e0057975e09a85ac92be81e975d0d0a911b1c4c6 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +tip da8f91e1099f3ab471b42944dfac0a39e12e45e1 +percpu 023bf6f1b8bf58dc4da7f0dc1cf4787b0d5297c1 +sfi 69fd92ecb217a4e6c33eccd346f8e81076969ebe +asm-generic 428bc597508e482cdea17b11b7b08eabd6b924a6 +driver-core a2e761f24ad6614cedee7cba61c2381c9053e909 +scsi-post-merge e349792a385ed47390d156155b1a1e19af1bf163 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4d34a4c4e872 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,134 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +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 +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +thumb-2 git git://linux-arm.org/linux-2.6.git#thumb-2 +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/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/fyu/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#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 +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +reiserfs-bkl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#reiserfs/kill-bkl-rc6 +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +quota git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6.git#for_next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#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 +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 +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +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 +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +hwlat git git://git.kernel.org/pub/scm/linux/kernel/git/jcm/linux-2.6-hwlat.git#for-linus +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +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..1f6cbe011d4b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2917 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 7638d53 Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6 +Merging origin/master +$ git merge origin/master +Updating 7638d53..4a390e0 +Fast forward + Documentation/driver-model/driver.txt | 4 +- + MAINTAINERS | 4 +- + arch/mn10300/kernel/sys_mn10300.c | 1 - + arch/sparc/kernel/vio.c | 7 +- + drivers/base/devres.c | 3 + + drivers/base/firmware_class.c | 6 +- + drivers/power/wm97xx_battery.c | 4 +- + drivers/staging/comedi/drivers/jr3_pci.c | 2 + + drivers/staging/comedi/drivers/s626.c | 35 +- + drivers/staging/go7007/s2250-loader.c | 1 + + drivers/staging/meilhaus/TODO | 2 +- + drivers/staging/rspiusb/rspiusb.c | 14 +- + drivers/staging/rt2870/rt2870.h | 1 + + .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 12 +- + drivers/staging/rtl8192su/Kconfig | 2 +- + .../staging/rtl8192su/ieee80211/ieee80211_module.c | 1 - + .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 14 +- + drivers/staging/rtl8192su/r8192U_core.c | 23 +- + drivers/staging/rtl8192su/r8192U_pm.c | 8 +- + drivers/staging/serqt_usb2/serqt_usb2.c | 8 +- + drivers/staging/stlc45xx/stlc45xx.c | 27 +- + drivers/staging/usbip/usbip_common.c | 1 + + drivers/staging/vt6655/device_main.c | 10 +- + drivers/usb/class/cdc-acm.c | 31 +- + drivers/usb/class/usbtmc.c | 10 +- + drivers/usb/core/Kconfig | 2 +- + drivers/usb/core/devices.c | 10 +- + drivers/usb/core/devio.c | 78 +- + drivers/usb/core/hcd.h | 4 + + drivers/usb/core/hub.c | 40 +- + drivers/usb/core/hub.h | 6 +- + drivers/usb/core/message.c | 63 +- + drivers/usb/gadget/Kconfig | 43 +- + drivers/usb/gadget/audio.c | 6 +- + drivers/usb/gadget/ether.c | 11 +- + drivers/usb/gadget/pxa25x_udc.c | 24 +- + drivers/usb/gadget/rndis.c | 2 + + drivers/usb/host/Kconfig | 29 +- + drivers/usb/host/ehci-au1xxx.c | 2 + + drivers/usb/host/ehci-fsl.c | 2 + + drivers/usb/host/ehci-hcd.c | 37 +- + drivers/usb/host/ehci-ixp4xx.c | 2 + + drivers/usb/host/ehci-orion.c | 2 + + drivers/usb/host/ehci-pci.c | 2 + + drivers/usb/host/ehci-ppc-of.c | 2 + + drivers/usb/host/ehci-ps3.c | 2 + + drivers/usb/host/ehci-q.c | 140 ++- + drivers/usb/host/ehci-sched.c | 12 +- + drivers/usb/host/ehci.h | 2 + + drivers/usb/host/fhci-sched.c | 8 +- + drivers/usb/host/isp1760-if.c | 2 +- + drivers/usb/musb/davinci.c | 32 +- + drivers/usb/musb/musb_host.c | 27 +- + drivers/usb/otg/Kconfig | 14 - + drivers/usb/otg/Makefile | 1 - + drivers/usb/otg/langwell_otg.c | 1915 -------------------- + drivers/usb/otg/nop-usb-xceiv.c | 1 + + drivers/usb/serial/console.c | 13 +- + drivers/usb/serial/cp210x.c | 2 + + drivers/usb/serial/cypress_m8.c | 4 +- + drivers/usb/serial/ftdi_sio.c | 67 +- + drivers/usb/serial/ftdi_sio.h | 18 +- + drivers/usb/serial/option.c | 45 +- + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 4 + + drivers/usb/serial/sierra.c | 51 +- + drivers/usb/serial/ti_usb_3410_5052.c | 3 +- + drivers/usb/serial/usb-serial.c | 3 +- + drivers/usb/storage/option_ms.c | 3 + + drivers/video/omap/omapfb_main.c | 14 +- + fs/partitions/check.c | 2 +- + include/linux/device.h | 2 - + include/linux/usb.h | 6 +- + include/linux/usb/langwell_otg.h | 177 -- + sound/soc/codecs/wm8988.c | 4 +- + 75 files changed, 689 insertions(+), 2484 deletions(-) + delete mode 100644 drivers/usb/otg/langwell_otg.c + delete mode 100644 include/linux/usb/langwell_otg.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/mach-ep93xx/dma-m2p.c | 1 + + arch/arm/mach-kirkwood/mpp.h | 2 +- + arch/arm/mach-mx3/Kconfig | 8 + + arch/arm/mach-mx3/Makefile | 1 + + arch/arm/mach-mx3/armadillo5x0.c | 63 ++++++++ + arch/arm/mach-mx3/devices.c | 1 - + arch/arm/mach-mx3/pcm037.c | 183 ++++++++++++++++++++++--- + arch/arm/mach-mx3/pcm037.h | 11 ++ + arch/arm/mach-mx3/pcm037_eet.c | 204 +++++++++++++++++++++++++++ + arch/arm/mach-pxa/include/mach/mfp-pxa300.h | 6 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-u300/core.c | 4 +- + arch/arm/plat-mxc/include/mach/iomux-mx3.h | 2 + + arch/arm/plat-pxa/gpio.c | 9 +- + drivers/mmc/host/pxamci.c | 4 +- + drivers/video/backlight/pwm_bl.c | 2 + + 16 files changed, 468 insertions(+), 35 deletions(-) + create mode 100644 arch/arm/mach-mx3/pcm037.h + create mode 100644 arch/arm/mach-mx3/pcm037_eet.c +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/8139too.c | 1 + + drivers/net/arm/ixp4xx_eth.c | 4 ++- + drivers/net/ehea/ehea_main.c | 2 + + drivers/net/fec.c | 1 + + drivers/net/gianfar.c | 2 + + drivers/net/hamradio/6pack.c | 10 +++++--- + drivers/net/hamradio/mkiss.c | 41 ++++++++++++++++++++-------------- + drivers/net/plip.c | 3 ++ + drivers/net/ppp_async.c | 11 ++++++--- + drivers/net/ppp_synctty.c | 11 ++++++--- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/net/smc91x.c | 1 + + drivers/net/smsc911x.c | 1 + + drivers/net/sunvnet.c | 2 + + drivers/net/usb/kaweth.c | 3 ++ + drivers/net/usb/pegasus.c | 3 ++ + drivers/net/via-rhine.c | 1 + + drivers/net/wireless/orinoco/main.c | 3 +- + drivers/net/wireless/strip.c | 39 ++++++++++++++++++++------------ + net/core/sock.c | 19 ++++++++++++++- + net/ipv4/ip_output.c | 1 - + net/ipv6/ip6_output.c | 1 - + net/ipv6/sit.c | 1 + + 24 files changed, 113 insertions(+), 50 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + arch/x86/include/asm/io_apic.h | 2 ++ + arch/x86/kernel/apic/io_apic.c | 14 +++----------- + arch/x86/pci/i386.c | 7 +++++++ + 3 files changed, 12 insertions(+), 11 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Auto-merging include/linux/device.h +Merge made by recursive. + drivers/base/base.h | 5 +++++ + drivers/base/core.c | 20 ++++++++++++++------ + drivers/base/dd.c | 31 +++++++++++++++++++++++++++++-- + include/linux/device.h | 16 ++++------------ + 4 files changed, 52 insertions(+), 20 deletions(-) +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 +Auto-merging drivers/input/misc/pcspkr.c +Merge made by recursive. + drivers/input/joystick/xpad.c | 26 +++++++++++++------------- + drivers/input/keyboard/atkbd.c | 16 ++++++++++++++++ + drivers/input/misc/pcspkr.c | 8 ++++++-- + drivers/input/misc/wistron_btns.c | 9 +++++++++ + 4 files changed, 44 insertions(+), 15 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 8 +- + arch/arm/Kconfig | 18 + + arch/arm/Makefile | 1 + + arch/arm/common/vic.c | 99 ++- + arch/arm/configs/nhk8815_defconfig | 1316 ++++++++++++++++++++ + arch/arm/include/asm/mach/mmc.h | 2 + + arch/arm/include/asm/pgtable.h | 20 +- + arch/arm/kernel/crunch.c | 13 +- + arch/arm/mach-at91/Kconfig | 49 +- + arch/arm/mach-at91/Makefile | 6 + + arch/arm/mach-at91/Makefile.boot | 4 + + arch/arm/mach-at91/at91sam9261.c | 22 +- + arch/arm/mach-at91/at91sam9g45.c | 360 ++++++ + arch/arm/mach-at91/at91sam9g45_devices.c | 1230 ++++++++++++++++++ + arch/arm/mach-at91/board-sam9261ek.c | 14 + + arch/arm/mach-at91/board-sam9g20ek.c | 1 + + arch/arm/mach-at91/board-sam9m10g45ek.c | 389 ++++++ + arch/arm/mach-at91/board-sam9rlek.c | 79 ++ + arch/arm/mach-at91/clock.c | 66 +- + arch/arm/mach-at91/generic.h | 2 + + arch/arm/mach-at91/gpio.c | 15 - + arch/arm/mach-at91/include/mach/at91sam9261.h | 3 + + arch/arm/mach-at91/include/mach/at91sam9g45.h | 138 ++ + .../mach-at91/include/mach/at91sam9g45_matrix.h | 153 +++ + arch/arm/mach-at91/include/mach/board.h | 8 +- + arch/arm/mach-at91/include/mach/cpu.h | 23 + + arch/arm/mach-at91/include/mach/hardware.h | 4 +- + arch/arm/mach-at91/include/mach/timex.h | 10 + + arch/arm/mach-at91/pm.c | 3 +- + arch/arm/mach-ep93xx/adssphere.c | 11 +- + arch/arm/mach-ep93xx/clock.c | 127 ++- + arch/arm/mach-ep93xx/core.c | 79 +- + arch/arm/mach-ep93xx/edb93xx.c | 10 +- + arch/arm/mach-ep93xx/gesbc9312.c | 11 +- + arch/arm/mach-ep93xx/gpio.c | 64 +- + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 97 +- + arch/arm/mach-ep93xx/include/mach/hardware.h | 17 +- + arch/arm/mach-ep93xx/include/mach/io.h | 17 +- + arch/arm/mach-ep93xx/include/mach/platform.h | 16 + + arch/arm/mach-ep93xx/include/mach/system.h | 12 +- + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 1 - + arch/arm/mach-ep93xx/micro9.c | 11 +- + arch/arm/mach-ep93xx/ts72xx.c | 15 +- + arch/arm/mach-integrator/integrator_cp.c | 2 + + arch/arm/mach-nomadik/Kconfig | 21 + + arch/arm/mach-nomadik/Makefile | 19 + + arch/arm/mach-nomadik/Makefile.boot | 4 + + arch/arm/mach-nomadik/board-nhk8815.c | 111 ++ + arch/arm/mach-nomadik/clock.c | 45 + + arch/arm/mach-nomadik/clock.h | 14 + + arch/arm/mach-nomadik/cpu-8815.c | 139 ++ + arch/arm/mach-nomadik/gpio.c | 396 ++++++ + arch/arm/mach-nomadik/i2c-8815nhk.c | 65 + + arch/arm/mach-nomadik/include/mach/clkdev.h | 7 + + arch/arm/mach-nomadik/include/mach/debug-macro.S | 22 + + arch/arm/mach-nomadik/include/mach/entry-macro.S | 43 + + arch/arm/mach-nomadik/include/mach/gpio.h | 71 ++ + arch/arm/mach-nomadik/include/mach/hardware.h | 90 ++ + arch/arm/mach-nomadik/include/mach/io.h | 22 + + arch/arm/mach-nomadik/include/mach/irqs.h | 82 ++ + arch/arm/mach-nomadik/include/mach/memory.h | 28 + + arch/arm/mach-nomadik/include/mach/mtu.h | 45 + + arch/arm/mach-nomadik/include/mach/setup.h | 22 + + arch/arm/mach-nomadik/include/mach/system.h | 45 + + arch/arm/mach-nomadik/include/mach/timex.h | 6 + + arch/arm/mach-nomadik/include/mach/uncompress.h | 63 + + arch/arm/mach-nomadik/include/mach/vmalloc.h | 2 + + arch/arm/mach-nomadik/timer.c | 164 +++ + arch/arm/mach-omap1/mcbsp.c | 1 - + arch/arm/mach-omap2/mcbsp.c | 1 - + arch/arm/mach-realview/core.c | 7 + + arch/arm/mach-realview/include/mach/gpio.h | 6 + + arch/arm/mach-realview/realview_eb.c | 22 +- + arch/arm/mach-realview/realview_pb1176.c | 22 +- + arch/arm/mach-realview/realview_pb11mp.c | 22 +- + arch/arm/mach-realview/realview_pba8.c | 22 +- + arch/arm/mach-realview/realview_pbx.c | 22 +- + arch/arm/mach-u300/mmc.c | 2 + + arch/arm/mach-versatile/core.c | 17 +- + arch/arm/mach-versatile/include/mach/gpio.h | 6 + + arch/arm/mach-versatile/include/mach/irqs.h | 11 +- + arch/arm/mach-versatile/versatile_pb.c | 17 +- + arch/arm/mm/Kconfig | 2 +- + arch/arm/mm/proc-macros.S | 6 - + arch/arm/plat-stmp3xxx/pinmux.c | 1 - + arch/arm/tools/mach-types | 37 +- + drivers/mmc/host/mmci.c | 71 +- + drivers/mmc/host/mmci.h | 2 + + drivers/mtd/nand/ts7250.c | 5 +- + drivers/net/Kconfig | 2 +- + drivers/spi/amba-pl022.c | 2 - + drivers/video/Kconfig | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 36 - + 93 files changed, 6119 insertions(+), 297 deletions(-) + create mode 100644 arch/arm/configs/nhk8815_defconfig + create mode 100644 arch/arm/mach-at91/at91sam9g45.c + create mode 100644 arch/arm/mach-at91/at91sam9g45_devices.c + create mode 100644 arch/arm/mach-at91/board-sam9m10g45ek.c + create mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45.h + create mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h + create mode 100644 arch/arm/mach-nomadik/Kconfig + create mode 100644 arch/arm/mach-nomadik/Makefile + create mode 100644 arch/arm/mach-nomadik/Makefile.boot + create mode 100644 arch/arm/mach-nomadik/board-nhk8815.c + create mode 100644 arch/arm/mach-nomadik/clock.c + create mode 100644 arch/arm/mach-nomadik/clock.h + create mode 100644 arch/arm/mach-nomadik/cpu-8815.c + create mode 100644 arch/arm/mach-nomadik/gpio.c + create mode 100644 arch/arm/mach-nomadik/i2c-8815nhk.c + create mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h + create mode 100644 arch/arm/mach-nomadik/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-nomadik/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-nomadik/include/mach/gpio.h + create mode 100644 arch/arm/mach-nomadik/include/mach/hardware.h + create mode 100644 arch/arm/mach-nomadik/include/mach/io.h + create mode 100644 arch/arm/mach-nomadik/include/mach/irqs.h + create mode 100644 arch/arm/mach-nomadik/include/mach/memory.h + create mode 100644 arch/arm/mach-nomadik/include/mach/mtu.h + create mode 100644 arch/arm/mach-nomadik/include/mach/setup.h + create mode 100644 arch/arm/mach-nomadik/include/mach/system.h + create mode 100644 arch/arm/mach-nomadik/include/mach/timex.h + create mode 100644 arch/arm/mach-nomadik/include/mach/uncompress.h + create mode 100644 arch/arm/mach-nomadik/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-nomadik/timer.c + create mode 100644 arch/arm/mach-realview/include/mach/gpio.h + create mode 100644 arch/arm/mach-versatile/include/mach/gpio.h +Merging davinci/for-next +$ git merge davinci/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging thumb-2/thumb-2 +$ git merge thumb-2/thumb-2 +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Merge made by recursive. + arch/arm/Kconfig | 15 +++ + arch/arm/Kconfig.debug | 1 + + arch/arm/Makefile | 11 ++- + arch/arm/boot/Makefile | 9 ++- + arch/arm/boot/compressed/head.S | 170 +++++++++++++++++++++-------------- + arch/arm/include/asm/assembler.h | 84 ++++++++++++++++++ + arch/arm/include/asm/elf.h | 3 + + arch/arm/include/asm/futex.h | 1 + + arch/arm/include/asm/memory.h | 6 ++ + arch/arm/include/asm/uaccess.h | 7 +- + arch/arm/include/asm/unified.h | 126 ++++++++++++++++++++++++++ + arch/arm/kernel/entry-armv.S | 169 +++++++++++++++++++++-------------- + arch/arm/kernel/entry-common.S | 28 ++---- + arch/arm/kernel/entry-header.S | 92 ++++++++++++++++++- + arch/arm/kernel/head-common.S | 15 ++- + arch/arm/kernel/head-nommu.S | 11 ++- + arch/arm/kernel/head.S | 28 ++++--- + arch/arm/kernel/module.c | 53 +++++++++++ + arch/arm/kernel/process.c | 2 +- + arch/arm/kernel/setup.c | 28 +++++-- + arch/arm/kernel/unwind.c | 4 + + arch/arm/lib/ashldi3.S | 4 +- + arch/arm/lib/ashrdi3.S | 4 +- + arch/arm/lib/backtrace.S | 8 ++- + arch/arm/lib/clear_user.S | 15 ++-- + arch/arm/lib/copy_from_user.S | 19 ++-- + arch/arm/lib/copy_template.S | 24 +++++- + arch/arm/lib/copy_to_user.S | 19 ++-- + arch/arm/lib/csumpartialcopyuser.S | 48 +++-------- + arch/arm/lib/div64.S | 4 +- + arch/arm/lib/findbit.S | 34 ++++++-- + arch/arm/lib/getuser.S | 5 + + arch/arm/lib/io-writesw-armv4.S | 5 +- + arch/arm/lib/lshrdi3.S | 4 +- + arch/arm/lib/memcpy.S | 7 +- + arch/arm/lib/memmove.S | 28 +++--- + arch/arm/lib/putuser.S | 15 +++ + arch/arm/lib/sha1.S | 2 + + arch/arm/lib/strncpy_from_user.S | 2 +- + arch/arm/lib/strnlen_user.S | 2 +- + arch/arm/mach-realview/platsmp.c | 18 ++--- + arch/arm/mm/alignment.c | 20 +++- + arch/arm/mm/cache-v7.S | 16 +++- + arch/arm/mm/proc-v7.S | 5 +- + arch/arm/vfp/entry.S | 2 + + arch/arm/vfp/vfphw.S | 48 +++++++---- + 46 files changed, 893 insertions(+), 328 deletions(-) + create mode 100644 arch/arm/include/asm/unified.h +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/mmu.h | 9 +++++---- + arch/cris/include/arch-v32/arch/mmu.h | 10 ++++++---- + arch/cris/include/asm/pgtable.h | 2 ++ + 3 files changed, 13 insertions(+), 8 deletions(-) +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + arch/ia64/include/asm/xen/hypervisor.h | 1 + + arch/ia64/kernel/dma-mapping.c | 8 ++++++++ + 2 files changed, 9 insertions(+), 0 deletions(-) +Merging m68k/for-next +$ git merge m68k/for-next +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Merge made by recursive. + drivers/rtc/Kconfig | 19 +++ + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 511 insertions(+), 0 deletions(-) + create mode 100644 drivers/rtc/rtc-msm6242.c + create mode 100644 drivers/rtc/rtc-rp5c01.c +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/include/asm/checksum_mm.h +Removing arch/m68k/include/asm/checksum_no.h +Removing arch/m68k/include/asm/dma_mm.h +Removing arch/m68k/include/asm/dma_no.h +Removing arch/m68k/include/asm/elia.h +Removing arch/m68k/include/asm/hardirq_mm.h +Removing arch/m68k/include/asm/hardirq_no.h +Removing arch/m68k/include/asm/irq_mm.h +Removing arch/m68k/include/asm/irq_no.h +Removing arch/m68k/include/asm/processor_mm.h +Removing arch/m68k/include/asm/processor_no.h +Auto-merging drivers/net/fec.c +Merge made by recursive. + arch/m68k/include/asm/checksum.h | 173 +++++++- + arch/m68k/include/asm/checksum_mm.h | 148 ------- + arch/m68k/include/asm/checksum_no.h | 132 ------ + arch/m68k/include/asm/dma.h | 492 +++++++++++++++++++++- + arch/m68k/include/asm/dma_mm.h | 16 - + arch/m68k/include/asm/dma_no.h | 494 --------------------- + arch/m68k/include/asm/elia.h | 41 -- + arch/m68k/include/asm/gpio.h | 238 ++++++++++ + arch/m68k/include/asm/hardirq.h | 13 +- + arch/m68k/include/asm/hardirq_mm.h | 16 - + arch/m68k/include/asm/hardirq_no.h | 27 -- + arch/m68k/include/asm/irq.h | 135 ++++++- + arch/m68k/include/asm/irq_mm.h | 126 ------ + arch/m68k/include/asm/irq_no.h | 26 -- + arch/m68k/include/asm/m5206sim.h | 33 +- + arch/m68k/include/asm/m520xsim.h | 77 +++- + arch/m68k/include/asm/m523xsim.h | 77 ++++ + arch/m68k/include/asm/m5249sim.h | 54 ++- + arch/m68k/include/asm/m5272sim.h | 62 +++- + arch/m68k/include/asm/m527xsim.h | 169 +++++++ + arch/m68k/include/asm/m528xsim.h | 151 +++++++ + arch/m68k/include/asm/m5307sim.h | 32 +- + arch/m68k/include/asm/m532xsim.h | 198 ++++----- + arch/m68k/include/asm/m5407sim.h | 28 +- + arch/m68k/include/asm/mcfgpio.h | 40 ++ + arch/m68k/include/asm/mcfintc.h | 89 ++++ + arch/m68k/include/asm/mcfsim.h | 93 +---- + arch/m68k/include/asm/mcfsmc.h | 6 +- + arch/m68k/include/asm/nettel.h | 4 +- + arch/m68k/include/asm/pinmux.h | 30 ++ + arch/m68k/include/asm/processor.h | 171 +++++++- + arch/m68k/include/asm/processor_mm.h | 130 ------ + arch/m68k/include/asm/processor_no.h | 143 ------ + arch/m68knommu/Kconfig | 6 + + arch/m68knommu/kernel/irq.c | 26 -- + arch/m68knommu/kernel/time.c | 2 +- + arch/m68knommu/lib/checksum.c | 11 +- + arch/m68knommu/platform/5206/Makefile | 2 +- + arch/m68knommu/platform/5206/config.c | 56 +-- + arch/m68knommu/platform/5206/gpio.c | 49 ++ + arch/m68knommu/platform/5206e/Makefile | 2 +- + arch/m68knommu/platform/5206e/config.c | 58 +-- + arch/m68knommu/platform/5206e/gpio.c | 49 ++ + arch/m68knommu/platform/520x/Makefile | 2 +- + arch/m68knommu/platform/520x/config.c | 30 -- + arch/m68knommu/platform/520x/gpio.c | 211 +++++++++ + arch/m68knommu/platform/523x/Makefile | 2 +- + arch/m68knommu/platform/523x/config.c | 63 --- + arch/m68knommu/platform/523x/gpio.c | 283 ++++++++++++ + arch/m68knommu/platform/5249/Makefile | 2 +- + arch/m68knommu/platform/5249/config.c | 49 +-- + arch/m68knommu/platform/5249/gpio.c | 65 +++ + arch/m68knommu/platform/5249/intc2.c | 59 +++ + arch/m68knommu/platform/5272/Makefile | 2 +- + arch/m68knommu/platform/5272/config.c | 78 +--- + arch/m68knommu/platform/5272/gpio.c | 81 ++++ + arch/m68knommu/platform/5272/intc.c | 138 ++++++ + arch/m68knommu/platform/527x/Makefile | 2 +- + arch/m68knommu/platform/527x/config.c | 49 -- + arch/m68knommu/platform/527x/gpio.c | 607 ++++++++++++++++++++++++++ + arch/m68knommu/platform/528x/Makefile | 2 +- + arch/m68knommu/platform/528x/config.c | 51 +-- + arch/m68knommu/platform/528x/gpio.c | 438 +++++++++++++++++++ + arch/m68knommu/platform/5307/Makefile | 2 +- + arch/m68knommu/platform/5307/config.c | 65 +-- + arch/m68knommu/platform/5307/gpio.c | 49 ++ + arch/m68knommu/platform/532x/Makefile | 2 +- + arch/m68knommu/platform/532x/config.c | 53 +--- + arch/m68knommu/platform/532x/gpio.c | 337 ++++++++++++++ + arch/m68knommu/platform/5407/Makefile | 2 +- + arch/m68knommu/platform/5407/config.c | 68 +-- + arch/m68knommu/platform/5407/gpio.c | 49 ++ + arch/m68knommu/platform/68328/ints.c | 72 ++-- + arch/m68knommu/platform/68360/ints.c | 44 ++- + arch/m68knommu/platform/coldfire/Makefile | 21 +- + arch/m68knommu/platform/coldfire/gpio.c | 127 ++++++ + arch/m68knommu/platform/coldfire/intc-2.c | 93 ++++ + arch/m68knommu/platform/coldfire/intc-simr.c | 78 ++++ + arch/m68knommu/platform/coldfire/intc.c | 153 +++++++ + arch/m68knommu/platform/coldfire/pinmux.c | 28 ++ + arch/m68knommu/platform/coldfire/pit.c | 8 - + arch/m68knommu/platform/coldfire/timers.c | 18 +- + arch/m68knommu/platform/coldfire/vectors.c | 20 +- + drivers/net/fec.c | 18 +- + 84 files changed, 5180 insertions(+), 2266 deletions(-) + delete mode 100644 arch/m68k/include/asm/checksum_mm.h + delete mode 100644 arch/m68k/include/asm/checksum_no.h + delete mode 100644 arch/m68k/include/asm/dma_mm.h + delete mode 100644 arch/m68k/include/asm/dma_no.h + delete mode 100644 arch/m68k/include/asm/elia.h + create mode 100644 arch/m68k/include/asm/gpio.h + delete mode 100644 arch/m68k/include/asm/hardirq_mm.h + delete mode 100644 arch/m68k/include/asm/hardirq_no.h + delete mode 100644 arch/m68k/include/asm/irq_mm.h + delete mode 100644 arch/m68k/include/asm/irq_no.h + create mode 100644 arch/m68k/include/asm/mcfgpio.h + create mode 100644 arch/m68k/include/asm/mcfintc.h + create mode 100644 arch/m68k/include/asm/pinmux.h + delete mode 100644 arch/m68k/include/asm/processor_mm.h + delete mode 100644 arch/m68k/include/asm/processor_no.h + create mode 100644 arch/m68knommu/platform/5206/gpio.c + create mode 100644 arch/m68knommu/platform/5206e/gpio.c + create mode 100644 arch/m68knommu/platform/520x/gpio.c + create mode 100644 arch/m68knommu/platform/523x/gpio.c + create mode 100644 arch/m68knommu/platform/5249/gpio.c + create mode 100644 arch/m68knommu/platform/5249/intc2.c + create mode 100644 arch/m68knommu/platform/5272/gpio.c + create mode 100644 arch/m68knommu/platform/5272/intc.c + create mode 100644 arch/m68knommu/platform/527x/gpio.c + create mode 100644 arch/m68knommu/platform/528x/gpio.c + create mode 100644 arch/m68knommu/platform/5307/gpio.c + create mode 100644 arch/m68knommu/platform/532x/gpio.c + create mode 100644 arch/m68knommu/platform/5407/gpio.c + create mode 100644 arch/m68knommu/platform/coldfire/gpio.c + create mode 100644 arch/m68knommu/platform/coldfire/intc-2.c + create mode 100644 arch/m68knommu/platform/coldfire/intc-simr.c + create mode 100644 arch/m68knommu/platform/coldfire/intc.c + create mode 100644 arch/m68knommu/platform/coldfire/pinmux.c +Merging microblaze/next +$ git merge microblaze/next +Merge made by recursive. + arch/microblaze/include/asm/io.h | 1 - + arch/microblaze/include/asm/tlb.h | 2 +- + 2 files changed, 1 insertions(+), 2 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Resolved 'arch/mips/cavium-octeon/dma-octeon.c' using previous resolution. +Resolved 'arch/mips/cavium-octeon/executive/cvmx-helper-errata.c' using previous resolution. +Resolved 'arch/mips/mm/tlbex.c' using previous resolution. +Resolved 'arch/mips/sibyte/swarm/setup.c' using previous resolution. +Resolved 'drivers/char/hw_random/Kconfig' using previous resolution. +Resolved 'drivers/char/hw_random/Makefile' using previous resolution. +Resolved 'drivers/dma/txx9dmac.c' using previous resolution. +Auto-merging arch/mips/Kconfig +Auto-merging arch/mips/cavium-octeon/dma-octeon.c +CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-errata.c +CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c +Auto-merging arch/mips/cavium-octeon/octeon-irq.c +Auto-merging arch/mips/include/asm/cpu-features.h +Auto-merging arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h +Auto-merging arch/mips/mm/c-r4k.c +Auto-merging arch/mips/mm/tlbex.c +CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c +Auto-merging arch/mips/sibyte/Kconfig +Auto-merging arch/mips/sibyte/swarm/setup.c +CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c +Auto-merging drivers/char/hw_random/Kconfig +CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig +Auto-merging drivers/char/hw_random/Makefile +CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile +Auto-merging drivers/dma/txx9dmac.c +CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5cdf9df] Merge commit 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/mips/cavium-octeon/Makefile | 4 + + arch/mips/cavium-octeon/msi.c | 288 +++++++ + arch/mips/cavium-octeon/pci-common.c | 137 ++++ + arch/mips/cavium-octeon/pci-common.h | 39 + + arch/mips/cavium-octeon/pci.c | 568 ++++++++++++++ + arch/mips/cavium-octeon/pcie.c | 1370 ++++++++++++++++++++++++++++++++++ + 6 files changed, 2406 insertions(+), 0 deletions(-) + create mode 100644 arch/mips/cavium-octeon/msi.c + create mode 100644 arch/mips/cavium-octeon/pci-common.c + create mode 100644 arch/mips/cavium-octeon/pci-common.h + create mode 100644 arch/mips/cavium-octeon/pci.c + create mode 100644 arch/mips/cavium-octeon/pcie.c +Merging parisc/master +$ git merge parisc/master +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/Kconfig | 1 - + arch/s390/include/asm/atomic.h | 205 +++++++++---- + arch/s390/include/asm/checksum.h | 25 +-- + arch/s390/include/asm/chsc.h | 28 ++ + arch/s390/include/asm/cio.h | 223 +------------- + .../cio/scsw.c => arch/s390/include/asm/scsw.h | 345 +++++++++++++------- + arch/s390/include/asm/timex.h | 16 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/early.c | 2 +- + arch/s390/kernel/head.S | 2 +- + arch/s390/kernel/mcount.S | 147 +-------- + arch/s390/kernel/mcount64.S | 78 +++++ + arch/s390/kernel/time.c | 9 +- + drivers/s390/block/dasd.c | 21 +- + drivers/s390/block/dasd_alias.c | 3 +- + drivers/s390/block/dasd_diag.c | 3 +- + drivers/s390/block/dasd_eckd.c | 45 +-- + drivers/s390/block/dasd_eer.c | 2 +- + drivers/s390/block/dasd_fba.c | 7 +- + drivers/s390/block/dasd_int.h | 11 +- + drivers/s390/cio/Makefile | 2 +- + drivers/s390/cio/chsc.h | 24 -- + drivers/s390/cio/qdio_main.c | 4 +- + 23 files changed, 564 insertions(+), 641 deletions(-) + rename drivers/s390/cio/scsw.c => arch/s390/include/asm/scsw.h (70%) + create mode 100644 arch/s390/kernel/mcount64.S +Merging sh/master +$ git merge sh/master +Removing arch/sh/boot/compressed/misc_32.c +Removing arch/sh/boot/compressed/misc_64.c +Removing arch/sh/boot/compressed/piggy.S +Auto-merging drivers/video/Kconfig +Merge made by recursive. + arch/sh/Kconfig | 7 + + arch/sh/Kconfig.debug | 11 ++- + arch/sh/Makefile | 4 + + arch/sh/boot/compressed/.gitignore | 1 + + arch/sh/boot/compressed/Makefile | 25 +++- + arch/sh/boot/compressed/misc.c | 149 +++++++++++++++++++++ + arch/sh/boot/compressed/misc_32.c | 206 ---------------------------- + arch/sh/boot/compressed/misc_64.c | 210 ----------------------------- + arch/sh/boot/compressed/piggy.S | 8 - + arch/sh/boot/compressed/vmlinux.scr | 10 ++ + arch/sh/include/asm/ftrace.h | 7 +- + arch/sh/include/asm/hwblk.h | 61 +++++++++ + arch/sh/include/asm/lmb.h | 6 + + arch/sh/include/asm/suspend.h | 9 ++ + arch/sh/include/asm/syscall_32.h | 1 + + arch/sh/include/asm/thread_info.h | 11 +- + arch/sh/include/cpu-sh4/cpu/sh7722.h | 14 ++ + arch/sh/kernel/Makefile_32 | 2 + + arch/sh/kernel/asm-offsets.c | 1 + + arch/sh/kernel/cpu/Makefile | 2 +- + arch/sh/kernel/cpu/hwblk.c | 130 ++++++++++++++++++ + arch/sh/kernel/cpu/sh4a/Makefile | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 60 +++++---- + arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c | 106 +++++++++++++++ + arch/sh/kernel/cpu/shmobile/Makefile | 1 + + arch/sh/kernel/cpu/shmobile/cpuidle.c | 102 ++++++++++++++ + arch/sh/kernel/cpu/shmobile/pm.c | 26 ++-- + arch/sh/kernel/entry-common.S | 18 ++- + arch/sh/kernel/ftrace.c | 190 ++++++++++++++++++++++++++ + arch/sh/kernel/irq.c | 17 --- + arch/sh/kernel/process_32.c | 5 +- + arch/sh/kernel/ptrace_32.c | 8 + + arch/sh/kernel/setup.c | 71 +++++++--- + arch/sh/kernel/sh_ksyms_32.c | 4 +- + arch/sh/kernel/time.c | 2 + + arch/sh/kernel/vmlinux.lds.S | 87 ++----------- + arch/sh/lib/Makefile | 2 +- + arch/sh/lib/mcount.S | 228 +++++++++++++++++++++++++++++++- + arch/sh/mm/fault_32.c | 164 +++++++++++++++-------- + arch/sh/mm/numa.c | 36 ++++-- + drivers/usb/gadget/m66592-udc.c | 34 ++--- + drivers/usb/gadget/m66592-udc.h | 1 - + drivers/video/Kconfig | 2 +- + drivers/video/sh_mobile_lcdcfb.c | 16 +-- + 44 files changed, 1339 insertions(+), 718 deletions(-) + create mode 100644 arch/sh/boot/compressed/.gitignore + create mode 100644 arch/sh/boot/compressed/misc.c + delete mode 100644 arch/sh/boot/compressed/misc_32.c + delete mode 100644 arch/sh/boot/compressed/misc_64.c + delete mode 100644 arch/sh/boot/compressed/piggy.S + create mode 100644 arch/sh/boot/compressed/vmlinux.scr + create mode 100644 arch/sh/include/asm/hwblk.h + create mode 100644 arch/sh/include/asm/lmb.h + create mode 100644 arch/sh/kernel/cpu/hwblk.c + create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c + create mode 100644 arch/sh/kernel/cpu/shmobile/cpuidle.c + create mode 100644 arch/sh/kernel/vmlinux_64.lds.S +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/cifs_debug.c | 8 +++++++- + fs/cifs/cifsglob.h | 2 ++ + fs/cifs/cifssmb.c | 5 ++++- + 3 files changed, 13 insertions(+), 2 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Resolved 'fs/configfs/dir.c' using previous resolution. +Auto-merging fs/configfs/dir.c +CONFLICT (content): Merge conflict in fs/configfs/dir.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c27a4e2] Merge commit 'configfs/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/ext4/ioctl.c +Merge made by recursive. + fs/ext4/ext4.h | 14 +- + fs/ext4/ext4_jbd2.c | 4 + + fs/ext4/ext4_jbd2.h | 6 +- + fs/ext4/extents.c | 1 + + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 384 ++++++++++++++---------------------------- + fs/ext4/ioctl.c | 20 ++- + fs/ext4/mballoc.c | 60 +++---- + fs/jbd2/journal.c | 31 ++-- + fs/jbd2/transaction.c | 68 ++++---- + include/trace/events/ext4.h | 48 +----- + 11 files changed, 240 insertions(+), 398 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Auto-merging fs/fuse/dev.c +Merge made by recursive. + fs/fuse/dev.c | 10 +++++----- + fs/fuse/fuse_i.h | 12 ++++++------ + fs/fuse/inode.c | 14 ++++++++++++++ + include/linux/fuse.h | 29 +++++++++++++++++++++++++++-- + 4 files changed, 52 insertions(+), 13 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/aops.c | 39 +++++++++++++++++++++ + fs/gfs2/glock.c | 99 ++++++++++++++++++++++++++++++------------------------ + fs/gfs2/rgrp.c | 23 +++++-------- + fs/gfs2/super.c | 39 ++++++++++++++-------- + fs/gfs2/super.h | 4 ++ + 5 files changed, 132 insertions(+), 72 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + include/linux/nfs4.h | 2 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/Kconfig | 27 +-------------------------- + fs/nilfs2/Kconfig | 25 +++++++++++++++++++++++++ + fs/nilfs2/super.c | 27 +++++++++++++++++++++++---- + 3 files changed, 49 insertions(+), 30 deletions(-) + create mode 100644 fs/nilfs2/Kconfig +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/file.c | 4 +++- + fs/ocfs2/journal.c | 8 +++++++- + fs/ocfs2/journal.h | 1 + + fs/ocfs2/super.c | 4 +++- + 5 files changed, 15 insertions(+), 4 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Resolved 'net/9p/protocol.c' using previous resolution. +Auto-merging net/9p/protocol.c +CONFLICT (content): Merge conflict in net/9p/protocol.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9558123] Merge commit 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Auto-merging fs/xfs/linux-2.6/xfs_super.c +Auto-merging fs/xfs/xfs_inode.h +Merge made by recursive. + fs/xfs/linux-2.6/xfs_super.c | 2 +- + fs/xfs/linux-2.6/xfs_sync.c | 15 --------------- + fs/xfs/linux-2.6/xfs_sync.h | 1 - + fs/xfs/xfs_bmap.c | 2 +- + fs/xfs/xfs_bmap.h | 11 ----------- + fs/xfs/xfs_bmap_btree.c | 20 ++++++++++---------- + fs/xfs/xfs_bmap_btree.h | 1 - + fs/xfs/xfs_btree.c | 42 +----------------------------------------- + fs/xfs/xfs_btree.h | 15 --------------- + fs/xfs/xfs_inode.c | 8 ++++---- + fs/xfs/xfs_inode.h | 5 ----- + fs/xfs/xfs_inum.h | 1 - + fs/xfs/xfs_itable.c | 2 +- + fs/xfs/xfs_itable.h | 5 ----- + fs/xfs/xfs_log_priv.h | 2 -- + fs/xfs/xfs_log_recover.c | 2 +- + fs/xfs/xfs_mount.c | 2 +- + fs/xfs/xfs_mount.h | 3 --- + fs/xfs/xfs_mru_cache.c | 29 ----------------------------- + fs/xfs/xfs_mru_cache.h | 1 - + fs/xfs/xfs_rw.h | 6 ------ + fs/xfs/xfs_vnodeops.c | 2 +- + 22 files changed, 21 insertions(+), 156 deletions(-) +Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 +$ git merge reiserfs-bkl/reiserfs/kill-bkl-rc6 +Resolved 'fs/reiserfs/journal.c' using previous resolution. +Resolved 'fs/reiserfs/super.c' using previous resolution. +Auto-merging fs/reiserfs/dir.c +Auto-merging fs/reiserfs/do_balan.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/reiserfs/journal.c +CONFLICT (content): Merge conflict in fs/reiserfs/journal.c +Auto-merging fs/reiserfs/resize.c +Auto-merging fs/reiserfs/super.c +CONFLICT (content): Merge conflict in fs/reiserfs/super.c +Auto-merging fs/reiserfs/xattr.c +Auto-merging include/linux/reiserfs_fs.h +Auto-merging include/linux/reiserfs_fs_sb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1227e36] Merge commit 'reiserfs-bkl/reiserfs/kill-bkl-rc6' +$ git diff -M --stat --summary HEAD^.. + fs/reiserfs/Makefile | 2 +- + fs/reiserfs/bitmap.c | 4 ++ + fs/reiserfs/dir.c | 8 +++ + fs/reiserfs/do_balan.c | 17 ++---- + fs/reiserfs/fix_node.c | 19 ++++++-- + fs/reiserfs/inode.c | 73 ++++++++++++++++++--------- + fs/reiserfs/ioctl.c | 6 ++- + fs/reiserfs/journal.c | 109 ++++++++++++++++++++++++++++------------ + fs/reiserfs/lock.c | 89 ++++++++++++++++++++++++++++++++ + fs/reiserfs/namei.c | 13 ++++- + fs/reiserfs/prints.c | 4 -- + fs/reiserfs/resize.c | 2 + + fs/reiserfs/stree.c | 53 ++++++++++++++++--- + fs/reiserfs/super.c | 55 +++++++++++++++++--- + fs/reiserfs/xattr.c | 4 +- + include/linux/reiserfs_fs.h | 68 +++++++++++++++++++++++-- + include/linux/reiserfs_fs_sb.h | 20 +++++++ + 17 files changed, 441 insertions(+), 105 deletions(-) + create mode 100644 fs/reiserfs/lock.c +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merging arch/x86/include/asm/pci.h +Merge made by recursive. + arch/alpha/include/asm/pci.h | 1 - + arch/arm/include/asm/pci.h | 2 -- + arch/frv/mb93090-mb00/pci-frv.c | 10 ++++------ + arch/h8300/include/asm/pci.h | 1 - + arch/ia64/include/asm/pci.h | 14 ++++++++++++-- + arch/mips/include/asm/pci.h | 2 -- + arch/mn10300/include/asm/pci.h | 13 ++++++++++++- + arch/parisc/include/asm/pci.h | 1 - + arch/powerpc/include/asm/pci.h | 1 - + arch/sh/include/asm/pci.h | 1 - + arch/sparc/include/asm/pci_32.h | 1 - + arch/sparc/include/asm/pci_64.h | 1 - + arch/um/include/asm/pci.h | 1 - + arch/x86/include/asm/pci.h | 1 - + drivers/pci/probe.c | 3 +-- + drivers/pci/setup-res.c | 1 + + drivers/pcmcia/yenta_socket.c | 16 ++++++++-------- + include/asm-generic/pci.h | 13 ++++++++++++- + 18 files changed, 50 insertions(+), 33 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Auto-merging drivers/hid/usbhid/hid-core.c +Auto-merging drivers/hid/usbhid/hiddev.c +Merge made by recursive. + drivers/hid/Kconfig | 22 +-- + drivers/hid/Makefile | 5 +- + drivers/hid/hid-a4tech.c | 4 +- + drivers/hid/hid-apple.c | 4 +- + drivers/hid/hid-belkin.c | 4 +- + drivers/hid/hid-cherry.c | 4 +- + drivers/hid/hid-chicony.c | 4 +- + drivers/hid/hid-core.c | 58 +++++-- + drivers/hid/hid-cypress.c | 4 +- + drivers/hid/hid-debug.c | 438 ++++++++++++++++++++++++++++++++++------- + drivers/hid/hid-ezkey.c | 4 +- + drivers/hid/hid-gyration.c | 4 +- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-input.c | 13 +-- + drivers/hid/hid-kensington.c | 4 +- + drivers/hid/hid-kye.c | 4 +- + drivers/hid/hid-lg.c | 6 +- + drivers/hid/hid-lgff.c | 1 + + drivers/hid/hid-microsoft.c | 4 +- + drivers/hid/hid-monterey.c | 4 +- + drivers/hid/hid-ntrig.c | 37 +++- + drivers/hid/hid-petalynx.c | 4 +- + drivers/hid/hid-pl.c | 4 +- + drivers/hid/hid-samsung.c | 43 ++++- + drivers/hid/hid-sjoy.c | 4 +- + drivers/hid/hid-sony.c | 4 +- + drivers/hid/hid-sunplus.c | 4 +- + drivers/hid/hid-tmff.c | 10 +- + drivers/hid/hid-topseed.c | 4 +- + drivers/hid/hid-wacom.c | 4 +- + drivers/hid/hid-zpff.c | 4 +- + drivers/hid/usbhid/hid-core.c | 9 +- + drivers/hid/usbhid/hiddev.c | 4 +- + include/linux/hid-debug.h | 48 ++++-- + include/linux/hid.h | 22 +-- + 35 files changed, 583 insertions(+), 214 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/chips/tsl2550.c | 17 ++++++++++------- + include/linux/i2c-id.h | 11 ----------- + include/linux/i2c.h | 2 -- + 3 files changed, 10 insertions(+), 20 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/tmp421 | 36 +++++ + drivers/hwmon/Kconfig | 10 ++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/hwmon-vid.c | 10 +- + drivers/hwmon/pc87427.c | 6 +- + drivers/hwmon/tmp421.c | 347 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/vt1211.c | 6 +- + 7 files changed, 409 insertions(+), 7 deletions(-) + create mode 100644 Documentation/hwmon/tmp421 + create mode 100644 drivers/hwmon/tmp421.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merging drivers/media/radio/radio-si470x.c +Auto-merging drivers/media/video/bt8xx/bttv-driver.c +Auto-merging drivers/media/video/pwc/pwc.h +Merge made by recursive. + Documentation/video4linux/CARDLIST.em28xx | 2 +- + drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 2 +- + drivers/media/dvb/frontends/cx24123.c | 2 +- + drivers/media/dvb/frontends/dib0070.c | 2 +- + drivers/media/dvb/frontends/mt312.c | 7 +- + drivers/media/dvb/frontends/stv0900_sw.c | 2 +- + drivers/media/dvb/frontends/zl10036.c | 2 +- + drivers/media/dvb/ttpci/av7110_v4l.c | 2 +- + drivers/media/radio/radio-si470x.c | 381 ++++++++++++++------------- + drivers/media/video/adv7343.c | 1 - + drivers/media/video/bt8xx/bttv-driver.c | 12 +- + drivers/media/video/cx18/cx18-cards.c | 2 +- + drivers/media/video/cx18/cx18-driver.c | 41 +++- + drivers/media/video/cx18/cx18-fileops.c | 2 +- + drivers/media/video/cx18/cx18-ioctl.c | 2 +- + drivers/media/video/cx231xx/cx231xx-video.c | 4 +- + drivers/media/video/cx23885/cx23885.h | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 2 + + drivers/media/video/ivtv/ivtv-driver.c | 2 +- + drivers/media/video/meye.c | 3 +- + drivers/media/video/pwc/pwc.h | 6 - + drivers/media/video/saa7134/saa7134-video.c | 2 +- + drivers/media/video/uvc/uvc_ctrl.c | 205 ++++++++------- + drivers/media/video/uvc/uvc_driver.c | 139 +++++----- + drivers/media/video/uvc/uvc_v4l2.c | 14 +- + drivers/media/video/uvc/uvc_video.c | 30 ++- + drivers/media/video/uvc/uvcvideo.h | 160 +----------- + drivers/media/video/v4l2-ioctl.c | 23 ++- + include/linux/usb/video.h | 164 ++++++++++++ + include/linux/videodev2.h | 39 ++-- + include/media/v4l2-subdev.h | 3 + + 32 files changed, 666 insertions(+), 596 deletions(-) + create mode 100644 include/linux/usb/video.h +Merging quota/for_next +$ git merge quota/for_next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Auto-merging drivers/ata/libata-eh.c +Merge made by recursive. + drivers/ata/libata-eh.c | 6 ++++-- + drivers/ata/sata_sil.c | 13 +++++++++++++ + 2 files changed, 17 insertions(+), 2 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/mad.c | 6 +--- + drivers/infiniband/core/sa_query.c | 7 +--- + drivers/infiniband/core/uverbs_main.c | 4 +-- + drivers/infiniband/hw/ehca/ehca_main.c | 8 +++--- + drivers/infiniband/hw/mthca/mthca_config_reg.h | 2 - + drivers/infiniband/hw/mthca/mthca_reset.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 - + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 - + drivers/net/mlx4/cmd.c | 5 +++- + drivers/net/mlx4/cq.c | 1 - + drivers/net/mlx4/eq.c | 1 - + drivers/net/mlx4/icm.c | 1 - + drivers/net/mlx4/main.c | 32 +++++++++-------------- + drivers/net/mlx4/mcg.c | 1 - + drivers/net/mlx4/mr.c | 1 - + drivers/net/mlx4/pd.c | 1 - + drivers/net/mlx4/profile.c | 2 - + drivers/net/mlx4/qp.c | 2 - + drivers/net/mlx4/reset.c | 1 - + drivers/net/mlx4/srq.c | 2 - + 20 files changed, 25 insertions(+), 55 deletions(-) +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + arch/ia64/hp/common/sba_iommu.c | 7 +- + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/Kconfig | 17 ++- + drivers/acpi/Makefile | 2 + + drivers/acpi/acpi_memhotplug.c | 51 ++--- + drivers/acpi/acpica/Makefile | 2 +- + drivers/acpi/acpica/acconfig.h | 10 +- + drivers/acpi/acpica/acdebug.h | 4 - + drivers/acpi/acpica/acglobal.h | 36 ++-- + drivers/acpi/acpica/achware.h | 8 + + drivers/acpi/acpica/acinterp.h | 4 +- + drivers/acpi/acpica/aclocal.h | 13 ++ + drivers/acpi/acpica/acmacros.h | 2 + + drivers/acpi/acpica/acnamesp.h | 2 + + drivers/acpi/acpica/acutils.h | 30 ++- + drivers/acpi/acpica/amlcode.h | 1 + + drivers/acpi/acpica/evevent.c | 13 +- + drivers/acpi/acpica/evgpe.c | 8 +- + drivers/acpi/acpica/evgpeblk.c | 4 +- + drivers/acpi/acpica/evrgnini.c | 45 +---- + drivers/acpi/acpica/exdump.c | 6 +- + drivers/acpi/acpica/exfield.c | 82 +++++--- + drivers/acpi/acpica/exfldio.c | 7 +- + drivers/acpi/acpica/exutils.c | 53 +++-- + drivers/acpi/acpica/hwgpe.c | 34 ++-- + drivers/acpi/acpica/hwregs.c | 206 +++++++++++++++++- + drivers/acpi/acpica/hwsleep.c | 24 +-- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwxface.c | 180 ++++++++++------- + drivers/acpi/acpica/nsalloc.c | 88 ++++++--- + drivers/acpi/acpica/nsdumpdv.c | 7 +- + drivers/acpi/acpica/nsload.c | 3 +- + drivers/acpi/acpica/nspredef.c | 396 +++++++++++++++++++---------------- + drivers/acpi/acpica/nsutils.c | 5 +- + drivers/acpi/acpica/nsxfeval.c | 23 ++- + drivers/acpi/acpica/nsxfname.c | 237 ++++++++++++++++----- + drivers/acpi/acpica/tbutils.c | 82 +++++++- + drivers/acpi/acpica/uteval.c | 375 ++++----------------------------- + drivers/acpi/acpica/utglobal.c | 11 +- + drivers/acpi/acpica/utids.c | 382 +++++++++++++++++++++++++++++++++ + drivers/acpi/acpica/utmisc.c | 85 +++++++- + drivers/acpi/bus.c | 2 +- + drivers/acpi/container.c | 11 +- + drivers/acpi/dock.c | 8 +- + drivers/acpi/ec.c | 118 ++++------- + drivers/acpi/glue.c | 8 +- + drivers/acpi/processor_aggregator.c | 389 ++++++++++++++++++++++++++++++++++ + drivers/acpi/processor_core.c | 244 ++++++++++----------- + drivers/acpi/processor_idle.c | 10 +- + drivers/acpi/processor_thermal.c | 3 +- + drivers/acpi/processor_throttling.c | 3 +- + drivers/acpi/scan.c | 160 +++++++++------ + drivers/acpi/sleep.c | 14 -- + drivers/char/agp/hp-agp.c | 9 +- + drivers/ide/ide-acpi.c | 5 +- + drivers/pci/hotplug/acpiphp_ibm.c | 12 +- + drivers/platform/x86/sony-laptop.c | 7 +- + drivers/pnp/pnpacpi/core.c | 6 +- + include/acpi/acpi_bus.h | 14 +- + include/acpi/acpixf.h | 10 +- + include/acpi/actbl.h | 19 ++- + include/acpi/actbl1.h | 8 +- + include/acpi/actypes.h | 92 ++++---- + 63 files changed, 2386 insertions(+), 1315 deletions(-) + create mode 100644 drivers/acpi/acpica/utids.c + create mode 100644 drivers/acpi/processor_aggregator.c +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/include/asm/msr-index.h +Removing arch/x86/kvm/kvm_svm.h +Removing virt/kvm/kvm_trace.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 39 ++ + Documentation/kvm/api.txt | 683 ++++++++++++++++++++++++++++++++ + arch/ia64/include/asm/kvm_host.h | 4 +- + arch/ia64/kvm/Kconfig | 11 +- + arch/ia64/kvm/kvm-ia64.c | 85 ++--- + arch/ia64/kvm/mmio.c | 6 +- + arch/ia64/kvm/vcpu.c | 10 +- + arch/ia64/kvm/vcpu.h | 13 +- + arch/powerpc/include/asm/kvm_host.h | 4 +- + arch/powerpc/kvm/44x.c | 4 +- + arch/powerpc/kvm/44x_tlb.c | 11 +- + arch/powerpc/kvm/Kconfig | 14 +- + arch/powerpc/kvm/Makefile | 4 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/e500.c | 7 +- + arch/powerpc/kvm/e500_emulate.c | 3 + + arch/powerpc/kvm/e500_tlb.c | 26 +- + arch/powerpc/kvm/e500_tlb.h | 6 +- + arch/powerpc/kvm/emulate.c | 7 +- + arch/powerpc/kvm/powerpc.c | 32 +- + arch/powerpc/kvm/trace.h | 104 +++++ + arch/s390/include/asm/kvm_host.h | 15 +- + arch/s390/kvm/Kconfig | 9 +- + arch/s390/kvm/gaccess.h | 23 +- + arch/s390/kvm/intercept.c | 18 +- + arch/s390/kvm/interrupt.c | 8 +- + arch/s390/kvm/kvm-s390.c | 78 ++--- + arch/s390/kvm/kvm-s390.h | 32 ++- + arch/s390/kvm/sigp.c | 60 ++-- + arch/x86/include/asm/apicdef.h | 2 + + arch/x86/include/asm/kvm.h | 10 + + arch/x86/include/asm/kvm_host.h | 50 ++-- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/vmx.h | 8 + + arch/x86/kvm/Kconfig | 21 +- + arch/x86/kvm/Makefile | 35 +- + arch/x86/kvm/i8254.c | 159 +++++--- + arch/x86/kvm/i8254.h | 5 +- + arch/x86/kvm/i8259.c | 58 ++- + arch/x86/kvm/kvm_cache_regs.h | 9 + + arch/x86/kvm/kvm_svm.h | 51 --- + arch/x86/kvm/kvm_timer.h | 2 +- + arch/x86/kvm/lapic.c | 322 +++++++++++---- + arch/x86/kvm/lapic.h | 4 + + arch/x86/kvm/mmu.c | 362 ++++++++++++------ + arch/x86/kvm/mmu.h | 4 +- + arch/x86/kvm/mmutrace.h | 220 +++++++++++ + arch/x86/kvm/paging_tmpl.h | 54 ++-- + arch/x86/kvm/svm.c | 259 ++++++++---- + arch/x86/kvm/timer.c | 16 +- + arch/x86/kvm/trace.h | 355 +++++++++++++++++ + arch/x86/kvm/vmx.c | 418 +++++++++++++++----- + arch/x86/kvm/x86.c | 742 +++++++++++++++++++++++++---------- + arch/x86/kvm/x86.h | 4 + + arch/x86/kvm/x86_emulate.c | 257 ++++++++++++- + include/linux/kvm.h | 125 +++++-- + include/linux/kvm_host.h | 119 ++++-- + include/trace/events/kvm.h | 151 +++++++ + mm/hugetlb.c | 1 + + virt/kvm/Kconfig | 14 + + virt/kvm/coalesced_mmio.c | 74 ++-- + virt/kvm/coalesced_mmio.h | 1 + + virt/kvm/eventfd.c | 578 +++++++++++++++++++++++++++ + virt/kvm/ioapic.c | 84 +++-- + virt/kvm/iodev.h | 55 ++-- + virt/kvm/irq_comm.c | 51 ++- + virt/kvm/kvm_main.c | 289 ++++++++++---- + virt/kvm/kvm_trace.c | 285 -------------- + 68 files changed, 4949 insertions(+), 1624 deletions(-) + create mode 100644 Documentation/kvm/api.txt + create mode 100644 arch/powerpc/kvm/trace.h + delete mode 100644 arch/x86/kvm/kvm_svm.h + create mode 100644 arch/x86/kvm/mmutrace.h + create mode 100644 arch/x86/kvm/trace.h + create mode 100644 include/trace/events/kvm.h + create mode 100644 virt/kvm/Kconfig + create mode 100644 virt/kvm/eventfd.c + delete mode 100644 virt/kvm/kvm_trace.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Merge made by recursive. + drivers/scsi/bnx2i/bnx2i_init.c | 93 +++++++++++++------------------- + drivers/scsi/constants.c | 95 ++++++++++++++++++++++++++------- + drivers/scsi/device_handler/scsi_dh.c | 23 ++++++--- + drivers/scsi/scsi_lib.c | 1 + + include/scsi/scsi_device.h | 2 + + 5 files changed, 133 insertions(+), 81 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/Kconfig +Merge made by recursive. + drivers/dma/Kconfig | 4 ++-- + drivers/dma/dmatest.c | 2 +- + drivers/dma/fsldma.c | 17 ++++++++++++----- + drivers/dma/fsldma.h | 1 + + drivers/dma/ioat.c | 28 +++++++++++++++------------- + drivers/dma/mv_xor.c | 2 +- + 6 files changed, 32 insertions(+), 22 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Resolved 'drivers/net/wireless/orinoco/main.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/misc/sgi-xp/xpnet.c +Auto-merging drivers/net/8139too.c +Auto-merging drivers/net/a2065.c +Auto-merging drivers/net/bmac.c +Auto-merging drivers/net/epic100.c +Auto-merging drivers/net/fealnx.c +Auto-merging drivers/net/fec.c +Auto-merging drivers/net/hamachi.c +Auto-merging drivers/net/hamradio/6pack.c +Auto-merging drivers/net/hamradio/baycom_epp.c +Auto-merging drivers/net/hamradio/mkiss.c +Auto-merging drivers/net/natsemi.c +Auto-merging drivers/net/pci-skeleton.c +Auto-merging drivers/net/pcmcia/nmclan_cs.c +Auto-merging drivers/net/pcnet32.c +Auto-merging drivers/net/plip.c +Auto-merging drivers/net/smc91x.c +Auto-merging drivers/net/starfire.c +Auto-merging drivers/net/sundance.c +Auto-merging drivers/net/tulip/de2104x.c +Auto-merging drivers/net/tulip/tulip_core.c +Auto-merging drivers/net/tulip/winbond-840.c +Auto-merging drivers/net/usb/kaweth.c +Auto-merging drivers/net/usb/pegasus.c +Auto-merging drivers/net/via-rhine.c +Auto-merging drivers/net/wan/sbni.c +Auto-merging drivers/net/wireless/orinoco/main.c +CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/main.c +Removing drivers/net/wireless/p54/p54common.c +Removing drivers/net/wireless/p54/p54common.h +Auto-merging drivers/net/wireless/ray_cs.c +Removing drivers/net/wireless/rt2x00/rt2x00rfkill.c +Auto-merging drivers/net/wireless/strip.c +Auto-merging drivers/net/wireless/wavelan_cs.c +Removing drivers/net/wireless/wl12xx/acx.c +Removing drivers/net/wireless/wl12xx/cmd.c +Removing drivers/net/wireless/wl12xx/wl12xx.h +Auto-merging drivers/net/yellowfin.c +Auto-merging drivers/staging/stlc45xx/stlc45xx.c +Auto-merging net/ipv6/ip6_output.c +Auto-merging net/ipv6/sit.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6c486a5] Merge commit 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 5 + + arch/ia64/hp/sim/simeth.c | 2 +- + arch/um/drivers/net_kern.c | 2 +- + arch/xtensa/platforms/iss/network.c | 2 +- + drivers/ieee802154/fakehard.c | 2 +- + drivers/isdn/hysdn/hysdn_net.c | 2 +- + drivers/isdn/i4l/isdn_net.c | 16 +- + drivers/isdn/i4l/isdn_ppp.c | 6 +- + drivers/media/dvb/dvb-core/dvb_net.c | 2 +- + drivers/message/fusion/mptlan.c | 2 +- + drivers/misc/sgi-xp/xpnet.c | 4 +- + drivers/net/3c501.c | 2 +- + drivers/net/3c505.c | 2 +- + drivers/net/3c507.c | 2 +- + drivers/net/3c509.c | 2 +- + drivers/net/3c515.c | 4 +- + drivers/net/3c523.c | 2 +- + drivers/net/3c527.c | 4 +- + drivers/net/3c59x.c | 4 +- + drivers/net/7990.c | 2 +- + drivers/net/8139cp.c | 2 +- + drivers/net/8139too.c | 4 +- + drivers/net/82596.c | 4 +- + drivers/net/a2065.c | 4 +- + drivers/net/amd8111e.c | 2 +- + drivers/net/appletalk/cops.c | 2 +- + drivers/net/appletalk/ipddp.c | 4 +- + drivers/net/appletalk/ltpc.c | 2 +- + drivers/net/ariadne.c | 4 +- + drivers/net/arm/am79c961a.c | 2 +- + drivers/net/arm/at91_ether.c | 2 +- + drivers/net/arm/ether1.c | 2 +- + drivers/net/arm/ether3.c | 4 +- + drivers/net/at1700.c | 2 +- + drivers/net/atarilance.c | 4 +- + drivers/net/atp.c | 2 +- + drivers/net/au1000_eth.c | 2 +- + drivers/net/bfin_mac.c | 2 +- + drivers/net/bmac.c | 2 +- + drivers/net/bonding/bond_3ad.c | 5 +- + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/can/sja1000/sja1000.c | 2 +- + drivers/net/cassini.c | 4 +- + drivers/net/cris/eth_v10.c | 2 +- + drivers/net/cs89x0.c | 4 +- + drivers/net/cxgb3/adapter.h | 10 + + drivers/net/cxgb3/ael1002.c | 1193 +-------- + drivers/net/cxgb3/aq100x.c | 7 +- + drivers/net/cxgb3/common.h | 10 + + drivers/net/cxgb3/cxgb3_main.c | 99 +- + drivers/net/cxgb3/t3_hw.c | 2 + + drivers/net/cxgb3/xgmac.c | 11 +- + drivers/net/de600.c | 2 +- + drivers/net/de620.c | 2 +- + drivers/net/declance.c | 4 +- + drivers/net/defxx.c | 6 +- + drivers/net/depca.c | 2 +- + drivers/net/dm9000.c | 109 +- + drivers/net/dm9000.h | 18 + + drivers/net/dnet.c | 2 +- + drivers/net/dummy.c | 2 +- + drivers/net/e100.c | 2 +- + drivers/net/e1000/e1000.h | 7 +- + drivers/net/e1000/e1000_ethtool.c | 51 +- + drivers/net/e1000/e1000_hw.c | 2 +- + drivers/net/e1000/e1000_hw.h | 3 - + drivers/net/e1000/e1000_main.c | 483 +++- + drivers/net/eepro.c | 4 +- + drivers/net/eexpress.c | 4 +- + drivers/net/enc28j60.c | 2 +- + drivers/net/epic100.c | 4 +- + drivers/net/eql.c | 2 +- + drivers/net/eth16i.c | 4 +- + drivers/net/ewrk3.c | 2 +- + drivers/net/fealnx.c | 2 +- + drivers/net/fec.c | 2 +- + drivers/net/hamachi.c | 2 +- + drivers/net/hamradio/6pack.c | 2 +- + drivers/net/hamradio/baycom_epp.c | 6 +- + drivers/net/hamradio/bpqether.c | 2 +- + drivers/net/hamradio/dmascc.c | 2 +- + drivers/net/hamradio/hdlcdrv.c | 4 +- + drivers/net/hamradio/mkiss.c | 2 +- + drivers/net/hamradio/scc.c | 6 +- + drivers/net/hamradio/yam.c | 2 +- + drivers/net/hp100.c | 6 +- + drivers/net/ibm_newemac/core.c | 2 +- + drivers/net/ibmveth.c | 2 +- + drivers/net/ifb.c | 2 +- + drivers/net/ioc3-eth.c | 2 +- + drivers/net/irda/ali-ircc.c | 12 +- + drivers/net/irda/au1k_ir.c | 4 +- + drivers/net/irda/donauboe.c | 8 +- + drivers/net/irda/irda-usb.c | 2 +- + drivers/net/irda/nsc-ircc.c | 10 +- + drivers/net/irda/pxaficp_ir.c | 4 +- + drivers/net/irda/sa1100_ir.c | 4 +- + drivers/net/irda/sir_dev.c | 6 +- + drivers/net/irda/smsc-ircc2.c | 16 +- + drivers/net/irda/stir4200.c | 2 +- + drivers/net/irda/via-ircc.c | 12 +- + drivers/net/irda/vlsi_ir.c | 6 +- + drivers/net/irda/w83977af_ir.c | 4 +- + drivers/net/isa-skeleton.c | 2 +- + drivers/net/iseries_veth.c | 4 +- + drivers/net/ixgb/ixgb_main.c | 2 +- + drivers/net/ixp2000/ixpdev.c | 4 +- + drivers/net/jme.c | 189 +- + drivers/net/jme.h | 21 +- + drivers/net/lance.c | 2 +- + drivers/net/lib82596.c | 4 +- + drivers/net/lib8390.c | 2 +- + drivers/net/ll_temac_main.c | 2 +- + drivers/net/loopback.c | 2 +- + drivers/net/lp486e.c | 4 +- + drivers/net/mac89x0.c | 2 +- + drivers/net/macb.c | 2 +- + drivers/net/mace.c | 2 +- + drivers/net/meth.c | 2 +- + drivers/net/mipsnet.c | 2 +- + drivers/net/mlx4/en_tx.c | 2 +- + drivers/net/myri10ge/myri10ge.c | 10 +- + drivers/net/myri_sbus.c | 2 +- + drivers/net/natsemi.c | 2 +- + drivers/net/netx-eth.c | 2 +- + drivers/net/ni5010.c | 2 +- + drivers/net/ni52.c | 4 +- + drivers/net/ni65.c | 2 +- + drivers/net/pci-skeleton.c | 2 +- + drivers/net/pcmcia/3c574_cs.c | 2 +- + drivers/net/pcmcia/3c589_cs.c | 2 +- + drivers/net/pcmcia/axnet_cs.c | 2 +- + drivers/net/pcmcia/fmvj18x_cs.c | 4 +- + drivers/net/pcmcia/nmclan_cs.c | 2 +- + drivers/net/pcmcia/smc91c92_cs.c | 6 +- + drivers/net/pcmcia/xirc2ps_cs.c | 4 +- + drivers/net/pcnet32.c | 2 +- + drivers/net/phy/Kconfig | 6 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/bcm63xx.c | 132 + + drivers/net/plip.c | 2 +- + drivers/net/ppp_generic.c | 4 +- + drivers/net/r6040.c | 4 +- + drivers/net/rionet.c | 7 +- + drivers/net/rrunner.c | 2 +- + drivers/net/s2io.c | 10 +- + drivers/net/sb1000.c | 2 +- + drivers/net/sb1250-mac.c | 2 +- + drivers/net/seeq8005.c | 4 +- + drivers/net/sgiseeq.c | 4 +- + drivers/net/sh_eth.c | 2 +- + drivers/net/sis900.c | 2 +- + drivers/net/skfp/skfddi.c | 4 +- + drivers/net/slip.c | 6 +- + drivers/net/smc911x.c | 6 +- + drivers/net/smc9194.c | 8 +- + drivers/net/smc91x.c | 4 +- + drivers/net/sonic.c | 4 +- + drivers/net/starfire.c | 2 +- + drivers/net/sun3_82586.c | 4 +- + drivers/net/sun3lance.c | 4 +- + drivers/net/sunbmac.c | 2 +- + drivers/net/sundance.c | 2 +- + drivers/net/sunhme.c | 2 +- + drivers/net/sunlance.c | 2 +- + drivers/net/sunqe.c | 2 +- + drivers/net/tc35815.c | 2 +- + drivers/net/tlan.c | 6 +- + drivers/net/tokenring/3c359.c | 2 +- + drivers/net/tokenring/ibmtr.c | 2 +- + drivers/net/tokenring/lanstreamer.c | 2 +- + drivers/net/tokenring/olympic.c | 2 +- + drivers/net/tokenring/smctr.c | 2 +- + drivers/net/tokenring/tms380tr.c | 2 +- + drivers/net/tulip/de2104x.c | 2 +- + drivers/net/tulip/dmfe.c | 4 +- + drivers/net/tulip/tulip_core.c | 2 +- + drivers/net/tulip/uli526x.c | 4 +- + drivers/net/tulip/winbond-840.c | 2 +- + drivers/net/tulip/xircom_cb.c | 2 +- + drivers/net/tun.c | 5 +- + drivers/net/typhoon.c | 2 +- + drivers/net/ucc_geth.c | 42 +- + drivers/net/ucc_geth.h | 2 + + drivers/net/usb/catc.c | 2 +- + drivers/net/usb/hso.c | 2 +- + drivers/net/usb/kaweth.c | 4 +- + drivers/net/usb/pegasus.c | 2 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/usb/usbnet.c | 14 + + drivers/net/veth.c | 6 +- + drivers/net/via-rhine.c | 6 +- + drivers/net/via-velocity.c | 2 +- + drivers/net/vxge/vxge-config.c | 10 - + drivers/net/vxge/vxge-config.h | 10 +- + drivers/net/vxge/vxge-main.c | 100 +- + drivers/net/vxge/vxge-main.h | 4 +- + drivers/net/vxge/vxge-reg.h | 9 +- + drivers/net/vxge/vxge-traffic.h | 2 - + drivers/net/vxge/vxge-version.h | 2 +- + drivers/net/wan/cycx_x25.c | 2 +- + drivers/net/wan/dlci.c | 4 +- + drivers/net/wan/dscc4.c | 2 +- + drivers/net/wan/farsync.c | 27 +- + drivers/net/wan/hdlc_fr.c | 6 +- + drivers/net/wan/lmc/lmc_main.c | 2 +- + drivers/net/wan/sbni.c | 4 +- + drivers/net/wan/wanxl.c | 2 +- + drivers/net/wan/x25_asy.c | 10 +- + drivers/net/wireless/adm8211.c | 3 +- + drivers/net/wireless/airo.c | 14 +- + drivers/net/wireless/arlan-main.c | 2 +- + drivers/net/wireless/at76c50x-usb.c | 3 +- + drivers/net/wireless/ath/ar9170/main.c | 6 +- + drivers/net/wireless/ath/ar9170/usb.c | 2 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 21 +- + drivers/net/wireless/ath/ath5k/attach.c | 3 + + drivers/net/wireless/ath/ath5k/base.c | 130 +- + drivers/net/wireless/ath/ath5k/base.h | 10 +- + drivers/net/wireless/ath/ath5k/debug.c | 8 +- + drivers/net/wireless/ath/ath5k/phy.c | 7 +- + drivers/net/wireless/ath/ath5k/qcu.c | 1 - + drivers/net/wireless/ath/ath5k/reset.c | 1 - + drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- + drivers/net/wireless/ath/ath9k/beacon.c | 15 +- + drivers/net/wireless/ath/ath9k/debug.c | 10 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 2 - + drivers/net/wireless/ath/ath9k/hw.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 62 +- + drivers/net/wireless/ath/ath9k/recv.c | 67 +- + drivers/net/wireless/ath/ath9k/xmit.c | 33 +- + drivers/net/wireless/ath/regd.c | 2 - + drivers/net/wireless/atmel.c | 6 +- + drivers/net/wireless/b43/xmit.c | 3 +- + drivers/net/wireless/b43legacy/xmit.c | 3 +- + drivers/net/wireless/hostap/hostap_80211_tx.c | 42 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 10 +- + drivers/net/wireless/ipw2x00/libipw_tx.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 29 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 74 +- + drivers/net/wireless/iwlwifi/iwl-calib.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 63 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 6 + + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 31 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 16 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 88 +- + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 235 ++- + drivers/net/wireless/iwmc3200wifi/commands.c | 116 +- + drivers/net/wireless/iwmc3200wifi/commands.h | 7 +- + drivers/net/wireless/iwmc3200wifi/eeprom.c | 4 - + drivers/net/wireless/iwmc3200wifi/fw.c | 21 +- + drivers/net/wireless/iwmc3200wifi/iwm.h | 32 +- + drivers/net/wireless/iwmc3200wifi/lmac.h | 4 + + drivers/net/wireless/iwmc3200wifi/main.c | 38 +- + drivers/net/wireless/iwmc3200wifi/netdev.c | 27 +- + drivers/net/wireless/iwmc3200wifi/rx.c | 36 +- + drivers/net/wireless/iwmc3200wifi/sdio.c | 6 +- + drivers/net/wireless/iwmc3200wifi/umac.h | 2 + + drivers/net/wireless/iwmc3200wifi/wext.c | 352 +--- + drivers/net/wireless/libertas/assoc.c | 6 + + drivers/net/wireless/libertas/dev.h | 1 - + drivers/net/wireless/libertas/if_cs.c | 3 - + drivers/net/wireless/libertas/if_sdio.c | 5 +- + drivers/net/wireless/libertas/if_spi.c | 8 +- + drivers/net/wireless/libertas/if_usb.c | 3 +- + drivers/net/wireless/libertas/wext.c | 2 +- + drivers/net/wireless/libertas_tf/main.c | 3 +- + drivers/net/wireless/mac80211_hwsim.c | 83 +- + drivers/net/wireless/mwl8k.c | 3 +- + drivers/net/wireless/netwave_cs.c | 2 +- + drivers/net/wireless/orinoco/Kconfig | 1 + + drivers/net/wireless/orinoco/Makefile | 2 +- + drivers/net/wireless/orinoco/airport.c | 98 +- + drivers/net/wireless/orinoco/cfg.c | 162 ++ + drivers/net/wireless/orinoco/cfg.h | 15 + + drivers/net/wireless/orinoco/fw.c | 41 +- + drivers/net/wireless/orinoco/hermes.c | 2 +- + drivers/net/wireless/orinoco/hermes.h | 2 +- + drivers/net/wireless/orinoco/hermes_dld.c | 50 +- + drivers/net/wireless/orinoco/hw.c | 668 +++++- + drivers/net/wireless/orinoco/hw.h | 11 +- + drivers/net/wireless/orinoco/main.c | 1132 +++------ + drivers/net/wireless/orinoco/main.h | 3 +- + drivers/net/wireless/orinoco/orinoco.h | 49 +- + drivers/net/wireless/orinoco/orinoco_cs.c | 96 +- + drivers/net/wireless/orinoco/orinoco_nortel.c | 38 +- + drivers/net/wireless/orinoco/orinoco_pci.c | 38 +- + drivers/net/wireless/orinoco/orinoco_pci.h | 57 +- + drivers/net/wireless/orinoco/orinoco_plx.c | 38 +- + drivers/net/wireless/orinoco/orinoco_tmd.c | 38 +- + drivers/net/wireless/orinoco/scan.c | 291 ++-- + drivers/net/wireless/orinoco/scan.h | 21 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 96 +- + drivers/net/wireless/orinoco/wext.c | 878 +------ + drivers/net/wireless/p54/Makefile | 3 + + drivers/net/wireless/p54/eeprom.c | 564 ++++ + drivers/net/wireless/p54/eeprom.h | 226 ++ + drivers/net/wireless/p54/fwio.c | 698 +++++ + drivers/net/wireless/p54/led.c | 163 ++ + drivers/net/wireless/p54/lmac.h | 551 ++++ + drivers/net/wireless/p54/main.c | 607 +++++ + drivers/net/wireless/p54/p54.h | 148 +- + drivers/net/wireless/p54/p54common.c | 2688 -------------------- + drivers/net/wireless/p54/p54common.h | 644 ----- + drivers/net/wireless/p54/p54pci.c | 9 +- + drivers/net/wireless/p54/p54spi.c | 50 +- + drivers/net/wireless/p54/p54usb.c | 42 +- + drivers/net/wireless/p54/txrx.c | 826 ++++++ + drivers/net/wireless/prism54/islpci_eth.c | 2 +- + drivers/net/wireless/prism54/islpci_hotplug.c | 4 +- + drivers/net/wireless/ray_cs.c | 6 +- + drivers/net/wireless/rndis_wlan.c | 298 ++-- + drivers/net/wireless/rt2x00/Kconfig | 8 - + drivers/net/wireless/rt2x00/Makefile | 1 - + drivers/net/wireless/rt2x00/rt2400pci.c | 7 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 7 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 7 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 7 +- + drivers/net/wireless/rt2x00/rt2x00.h | 13 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 5 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 21 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 12 +- + drivers/net/wireless/rt2x00/rt2x00rfkill.c | 127 - + drivers/net/wireless/rt2x00/rt61pci.c | 7 +- + drivers/net/wireless/rt2x00/rt73usb.c | 7 +- + drivers/net/wireless/rtl818x/rtl8180_dev.c | 5 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 3 +- + drivers/net/wireless/strip.c | 2 +- + drivers/net/wireless/wavelan.c | 2 +- + drivers/net/wireless/wavelan_cs.c | 4 +- + drivers/net/wireless/wl12xx/Kconfig | 17 +- + drivers/net/wireless/wl12xx/Makefile | 9 +- + drivers/net/wireless/wl12xx/acx.c | 689 ----- + drivers/net/wireless/wl12xx/cmd.c | 353 --- + drivers/net/wireless/wl12xx/reg.h | 1 - + drivers/net/wireless/wl12xx/wl1251.h | 479 +++- + drivers/net/wireless/wl12xx/wl1251_acx.c | 840 ++++++ + .../net/wireless/wl12xx/{acx.h => wl1251_acx.h} | 199 +-- + .../net/wireless/wl12xx/{boot.c => wl1251_boot.c} | 114 +- + .../net/wireless/wl12xx/{boot.h => wl1251_boot.h} | 12 +- + drivers/net/wireless/wl12xx/wl1251_cmd.c | 428 ++++ + .../net/wireless/wl12xx/{cmd.h => wl1251_cmd.h} | 194 ++- + .../wl12xx/{debugfs.c => wl1251_debugfs.c} | 60 +- + .../wl12xx/{debugfs.h => wl1251_debugfs.h} | 16 +- + .../wireless/wl12xx/{event.c => wl1251_event.c} | 54 +- + .../wireless/wl12xx/{event.h => wl1251_event.h} | 12 +- + .../net/wireless/wl12xx/{init.c => wl1251_init.c} | 78 +- + .../net/wireless/wl12xx/{init.h => wl1251_init.h} | 27 +- + .../net/wireless/wl12xx/{main.c => wl1251_main.c} | 638 +++-- + drivers/net/wireless/wl12xx/wl1251_netlink.c | 679 +++++ + .../wl12xx/{debugfs.h => wl1251_netlink.h} | 15 +- + .../net/wireless/wl12xx/{wl1251.c => wl1251_ops.c} | 297 ++- + drivers/net/wireless/wl12xx/wl1251_ops.h | 165 ++ + drivers/net/wireless/wl12xx/{ps.c => wl1251_ps.c} | 64 +- + drivers/net/wireless/wl12xx/{ps.h => wl1251_ps.h} | 18 +- + drivers/net/wireless/wl12xx/{rx.c => wl1251_rx.c} | 90 +- + drivers/net/wireless/wl12xx/{rx.h => wl1251_rx.h} | 22 +- + .../net/wireless/wl12xx/{spi.c => wl1251_spi.c} | 179 +- + .../net/wireless/wl12xx/{spi.h => wl1251_spi.h} | 62 +- + drivers/net/wireless/wl12xx/{tx.c => wl1251_tx.c} | 124 +- + drivers/net/wireless/wl12xx/{tx.h => wl1251_tx.h} | 21 +- + drivers/net/wireless/wl12xx/wl12xx.h | 409 --- + drivers/net/wireless/wl3501_cs.c | 3 +- + drivers/net/wireless/zd1201.c | 4 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 3 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 73 +- + drivers/net/xen-netfront.c | 4 +- + drivers/net/yellowfin.c | 4 +- + drivers/net/znet.c | 4 +- + drivers/s390/net/claw.c | 2 + + drivers/s390/net/ctcm_main.c | 10 +- + drivers/s390/net/lcs.c | 8 +- + drivers/s390/net/netiucv.c | 6 +- + drivers/s390/net/qeth_l2_main.c | 1 + + drivers/s390/net/qeth_l3_main.c | 1 + + drivers/staging/agnx/xmit.c | 3 +- + drivers/staging/at76_usb/at76_usb.c | 8 +- + drivers/staging/epl/VirtualEthernetLinux.c | 2 +- + drivers/staging/otus/usbdrv.c | 8 +- + drivers/staging/otus/wrap_pkt.c | 3 - + drivers/staging/rt2860/rt_main_dev.c | 6 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8187se/r8180_core.c | 4 +- + drivers/staging/slicoss/slicoss.c | 2 +- + drivers/staging/stlc45xx/stlc45xx.c | 3 +- + drivers/staging/winbond/wb35rx.c | 3 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/usb/gadget/f_phonet.c | 2 +- + drivers/usb/gadget/u_ether.c | 6 +- + firmware/Makefile | 5 +- + firmware/WHENCE | 17 + + firmware/cxgb3/ael2005_opt_edc.bin.ihex | 69 + + firmware/cxgb3/ael2005_twx_edc.bin.ihex | 93 + + firmware/cxgb3/ael2020_twx_edc.bin.ihex | 100 + + fs/dlm/netlink.c | 2 +- + include/linux/ieee80211.h | 4 + + include/linux/net_dropmon.h | 1 - + include/linux/netdevice.h | 4 - + include/linux/nl80211.h | 96 + + include/linux/rfkill.h | 14 + + include/linux/tipc.h | 2 + + include/linux/usb/usbnet.h | 3 + + include/net/cfg80211.h | 460 +++- + include/net/genetlink.h | 66 +- + include/net/ipv6.h | 12 + + include/net/iw_handler.h | 2 +- + include/net/mac80211.h | 34 +- + include/net/net_namespace.h | 7 + + include/net/netns/x_tables.h | 3 + + include/net/scm.h | 2 - + include/net/udp.h | 3 + + kernel/taskstats.c | 10 +- + net/Makefile | 1 - + net/atm/br2684.c | 4 +- + net/atm/clip.c | 12 +- + net/atm/lec.c | 8 +- + net/atm/mpc.c | 2 +- + net/bluetooth/bnep/netdev.c | 6 +- + net/bridge/br_device.c | 2 +- + net/bridge/br_netfilter.c | 96 +- + net/core/dev.c | 6 +- + net/core/net_namespace.c | 35 +- + net/core/netpoll.c | 6 +- + net/core/rtnetlink.c | 21 +- + net/decnet/dn_route.c | 2 +- + net/econet/af_econet.c | 4 +- + net/ipv4/af_inet.c | 12 +- + net/ipv4/ip_gre.c | 6 +- + net/ipv4/ipip.c | 6 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/udp.c | 61 + + net/ipv6/af_inet6.c | 20 +- + net/ipv6/ip6_input.c | 6 +- + net/ipv6/ip6_output.c | 26 +- + net/ipv6/ip6_tunnel.c | 4 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/sit.c | 6 +- + net/ipv6/udp.c | 141 +- + net/irda/irlan/irlan_eth.c | 4 +- + net/irda/irnetlink.c | 2 +- + net/lapb/lapb_iface.c | 2 +- + net/mac80211/Kconfig | 16 - + net/mac80211/cfg.c | 216 +- + net/mac80211/debugfs_netdev.c | 46 - + net/mac80211/debugfs_sta.c | 98 +- + net/mac80211/event.c | 23 +- + net/mac80211/ibss.c | 6 +- + net/mac80211/ieee80211_i.h | 148 +- + net/mac80211/iface.c | 30 +- + net/mac80211/key.c | 28 +- + net/mac80211/main.c | 5 +- + net/mac80211/mesh.c | 6 +- + net/mac80211/mesh.h | 3 +- + net/mac80211/mlme.c | 1637 +++++------- + net/mac80211/rx.c | 103 +- + net/mac80211/scan.c | 29 +- + net/mac80211/sta_info.h | 17 + + net/mac80211/tx.c | 12 +- + net/mac80211/wep.c | 52 +- + net/mac80211/wep.h | 4 - + net/mac80211/wext.c | 450 +--- + net/mac80211/wpa.c | 3 +- + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + net/netlink/af_netlink.c | 36 +- + net/netlink/genetlink.c | 186 ++- + net/netrom/nr_dev.c | 4 +- + net/phonet/pep-gprs.c | 4 +- + net/rfkill/core.c | 10 +- + net/rose/rose_dev.c | 2 +- + net/sched/sch_teql.c | 6 +- + net/tipc/netlink.c | 2 +- + net/tipc/socket.c | 6 + + net/wireless/Kconfig | 43 +- + net/wireless/Makefile | 4 +- + net/wireless/core.c | 385 ++- + net/wireless/core.h | 184 ++- + net/wireless/debugfs.c | 14 +- + net/wireless/debugfs.h | 8 +- + net/wireless/ibss.c | 158 +- + net/wireless/mlme.c | 581 ++++- + net/wireless/nl80211.c | 1124 ++++++--- + net/wireless/nl80211.h | 71 +- + net/wireless/reg.c | 48 +- + net/wireless/scan.c | 75 +- + net/wireless/sme.c | 792 ++++++ + net/wireless/util.c | 21 + + net/wireless/wext-compat.c | 496 ++++- + net/wireless/wext-sme.c | 380 +++ + net/wireless/wext.c | 11 +- + 498 files changed, 18101 insertions(+), 14159 deletions(-) + create mode 100644 drivers/net/phy/bcm63xx.c + create mode 100644 drivers/net/wireless/orinoco/cfg.c + create mode 100644 drivers/net/wireless/orinoco/cfg.h + create mode 100644 drivers/net/wireless/p54/eeprom.c + create mode 100644 drivers/net/wireless/p54/eeprom.h + create mode 100644 drivers/net/wireless/p54/fwio.c + create mode 100644 drivers/net/wireless/p54/led.c + create mode 100644 drivers/net/wireless/p54/lmac.h + create mode 100644 drivers/net/wireless/p54/main.c + delete mode 100644 drivers/net/wireless/p54/p54common.c + delete mode 100644 drivers/net/wireless/p54/p54common.h + create mode 100644 drivers/net/wireless/p54/txrx.c + delete mode 100644 drivers/net/wireless/rt2x00/rt2x00rfkill.c + delete mode 100644 drivers/net/wireless/wl12xx/acx.c + delete mode 100644 drivers/net/wireless/wl12xx/cmd.c + create mode 100644 drivers/net/wireless/wl12xx/wl1251_acx.c + rename drivers/net/wireless/wl12xx/{acx.h => wl1251_acx.h} (86%) + rename drivers/net/wireless/wl12xx/{boot.c => wl1251_boot.c} (67%) + rename drivers/net/wireless/wl12xx/{boot.h => wl1251_boot.h} (78%) + create mode 100644 drivers/net/wireless/wl12xx/wl1251_cmd.c + rename drivers/net/wireless/wl12xx/{cmd.h => wl1251_cmd.h} (60%) + rename drivers/net/wireless/wl12xx/{debugfs.c => wl1251_debugfs.c} (92%) + copy drivers/net/wireless/wl12xx/{debugfs.h => wl1251_debugfs.h} (74%) + rename drivers/net/wireless/wl12xx/{event.c => wl1251_event.c} (59%) + rename drivers/net/wireless/wl12xx/{event.h => wl1251_event.h} (94%) + rename drivers/net/wireless/wl12xx/{init.c => wl1251_init.c} (55%) + rename drivers/net/wireless/wl12xx/{init.h => wl1251_init.h} (55%) + rename drivers/net/wireless/wl12xx/{main.c => wl1251_main.c} (60%) + create mode 100644 drivers/net/wireless/wl12xx/wl1251_netlink.c + rename drivers/net/wireless/wl12xx/{debugfs.h => wl1251_netlink.h} (73%) + rename drivers/net/wireless/wl12xx/{wl1251.c => wl1251_ops.c} (66%) + create mode 100644 drivers/net/wireless/wl12xx/wl1251_ops.h + rename drivers/net/wireless/wl12xx/{ps.c => wl1251_ps.c} (55%) + rename drivers/net/wireless/wl12xx/{ps.h => wl1251_ps.h} (72%) + rename drivers/net/wireless/wl12xx/{rx.c => wl1251_rx.c} (68%) + rename drivers/net/wireless/wl12xx/{rx.h => wl1251_rx.h} (89%) + rename drivers/net/wireless/wl12xx/{spi.c => wl1251_spi.c} (63%) + rename drivers/net/wireless/wl12xx/{spi.h => wl1251_spi.h} (61%) + rename drivers/net/wireless/wl12xx/{tx.c => wl1251_tx.c} (79%) + rename drivers/net/wireless/wl12xx/{tx.h => wl1251_tx.h} (93%) + delete mode 100644 drivers/net/wireless/wl12xx/wl12xx.h + create mode 100644 firmware/cxgb3/ael2005_opt_edc.bin.ihex + create mode 100644 firmware/cxgb3/ael2005_twx_edc.bin.ihex + create mode 100644 firmware/cxgb3/ael2020_twx_edc.bin.ihex + create mode 100644 net/wireless/sme.c + create mode 100644 net/wireless/wext-sme.c +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/s390/crypto/des_s390.c | 11 ++-- + arch/x86/crypto/aesni-intel_glue.c | 2 +- + crypto/Kconfig | 2 +- + crypto/ablkcipher.c | 23 +++++++- + crypto/algapi.c | 103 +++++++++++++++++++++++++++++++---- + crypto/algboss.c | 5 ++ + crypto/ansi_cprng.c | 34 ++++-------- + crypto/api.c | 31 ++++++++--- + crypto/internal.h | 10 ++-- + crypto/shash.c | 57 ++++++++++++++++++-- + crypto/tcrypt.c | 15 +++++- + crypto/testmgr.c | 21 +++++--- + drivers/char/hw_random/amd-rng.c | 4 +- + drivers/char/hw_random/geode-rng.c | 3 +- + drivers/char/random.c | 14 +++++ + include/crypto/algapi.h | 20 +++++++- + include/crypto/internal/hash.h | 58 ++++++++++++++++++++ + include/linux/fips.h | 10 ++++ + 18 files changed, 347 insertions(+), 76 deletions(-) + create mode 100644 include/linux/fips.h +Merging sound/for-next +$ git merge sound/for-next +Auto-merging sound/soc/codecs/wm8988.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 4 + + Documentation/sound/alsa/HD-Audio-Models.txt | 12 +- + Documentation/sound/alsa/HD-Audio.txt | 60 + + include/sound/memalloc.h | 6 + + include/sound/pcm.h | 23 + + include/sound/soc-dapm.h | 1 + + include/sound/soc.h | 13 +- + include/sound/tlv.h | 14 + + include/sound/uda1380.h | 22 + + include/sound/wm8993.h | 44 + + sound/core/Kconfig | 4 + + sound/core/Makefile | 2 +- + sound/core/info.c | 4 +- + sound/core/memalloc.c | 4 + + sound/core/pcm_memory.c | 2 + + sound/core/vmaster.c | 8 +- + sound/isa/cmi8330.c | 86 +- + sound/pci/Kconfig | 4 +- + sound/pci/azt3328.c | 978 ++++++----- + sound/pci/azt3328.h | 87 +- + sound/pci/hda/Kconfig | 14 + + sound/pci/hda/hda_beep.c | 4 + + sound/pci/hda/hda_codec.c | 26 +- + sound/pci/hda/hda_codec.h | 10 +- + sound/pci/hda/hda_hwdep.c | 236 +++- + sound/pci/hda/hda_intel.c | 42 +- + sound/pci/hda/hda_local.h | 1 - + sound/pci/hda/patch_realtek.c | 1846 ++++++++------------ + sound/pci/ice1712/ice1712.h | 9 + + sound/pci/ice1712/ice1724.c | 112 ++- + sound/pci/ice1712/prodigy_hifi.c | 46 +- + sound/soc/blackfin/bf5xx-ad73311.c | 16 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 16 +- + sound/soc/codecs/Kconfig | 12 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ak4535.c | 16 - + sound/soc/codecs/twl4030.c | 105 +- + sound/soc/codecs/twl4030.h | 2 + + sound/soc/codecs/uda1380.c | 313 ++-- + sound/soc/codecs/uda1380.h | 8 - + sound/soc/codecs/wm8350.c | 40 +- + sound/soc/codecs/wm8400.c | 17 + + sound/soc/codecs/wm8523.c | 755 ++++++++ + sound/soc/codecs/wm8523.h | 160 ++ + sound/soc/codecs/wm8580.c | 55 +- + sound/soc/codecs/wm8731.c | 73 +- + sound/soc/codecs/wm8753.c | 35 + + sound/soc/codecs/wm8900.c | 30 +- + sound/soc/codecs/wm8903.c | 27 +- + sound/soc/codecs/wm8940.c | 17 + + sound/soc/codecs/wm8960.c | 33 +- + sound/soc/codecs/wm8961.c | 1326 ++++++++++++++ + sound/soc/codecs/wm8961.h | 866 +++++++++ + sound/soc/codecs/wm8988.c | 42 +- + sound/soc/codecs/wm8993.c | 2203 +++++++++++++++++++++++ + sound/soc/codecs/wm8993.h | 2132 ++++++++++++++++++++++ + sound/soc/codecs/wm9081.c | 17 + + sound/soc/davinci/Kconfig | 13 + + sound/soc/davinci/Makefile | 3 + + sound/soc/davinci/davinci-evm.c | 102 +- + sound/soc/davinci/davinci-i2s.c | 339 ++-- + sound/soc/davinci/davinci-mcasp.c | 874 +++++++++ + sound/soc/davinci/davinci-mcasp.h | 55 + + sound/soc/davinci/davinci-pcm.c | 1 + + sound/soc/davinci/davinci-pcm.h | 18 +- + sound/soc/omap/Kconfig | 7 + + sound/soc/omap/Makefile | 2 + + sound/soc/omap/sdp3430.c | 2 +- + sound/soc/omap/zoom2.c | 314 ++++ + sound/soc/pxa/magician.c | 54 +- + sound/soc/pxa/pxa-ssp.c | 50 +- + sound/soc/soc-core.c | 122 +- + sound/soc/soc-dapm.c | 348 +++- + sound/soc/txx9/txx9aclc.c | 10 +- + sound/usb/usbmixer.c | 13 +- + 75 files changed, 12011 insertions(+), 2362 deletions(-) + create mode 100644 include/sound/uda1380.h + create mode 100644 include/sound/wm8993.h + create mode 100644 sound/soc/codecs/wm8523.c + create mode 100644 sound/soc/codecs/wm8523.h + create mode 100644 sound/soc/codecs/wm8961.c + create mode 100644 sound/soc/codecs/wm8961.h + create mode 100644 sound/soc/codecs/wm8993.c + create mode 100644 sound/soc/codecs/wm8993.h + create mode 100644 sound/soc/davinci/davinci-mcasp.c + create mode 100644 sound/soc/davinci/davinci-mcasp.h + create mode 100644 sound/soc/omap/zoom2.c +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + Documentation/cpu-freq/user-guide.txt | 9 +- + drivers/cpufreq/cpufreq.c | 265 +++++++++++++++++++-------------- + 2 files changed, 158 insertions(+), 116 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging drivers/acpi/processor_throttling.c +Auto-merging kernel/trace/trace.c +Auto-merging virt/kvm/kvm_main.c +Merge made by recursive. + arch/alpha/include/asm/smp.h | 2 +- + arch/alpha/include/asm/topology.h | 18 - + arch/alpha/kernel/smp.c | 14 +- + arch/arm/include/asm/cacheflush.h | 8 +- + arch/arm/include/asm/mmu_context.h | 7 +- + arch/arm/include/asm/smp.h | 1 - + arch/arm/include/asm/tlbflush.h | 4 +- + arch/arm/kernel/smp.c | 10 +- + arch/arm/mm/context.c | 2 +- + arch/arm/mm/flush.c | 10 +- + arch/frv/include/asm/gdb-stub.h | 1 - + arch/ia64/include/asm/smp.h | 1 - + arch/ia64/include/asm/topology.h | 3 - + arch/ia64/kernel/smp.c | 2 +- + arch/m32r/include/asm/mmu_context.h | 4 +- + arch/m32r/include/asm/smp.h | 2 +- + arch/m32r/kernel/smp.c | 30 +- + arch/m32r/kernel/smpboot.c | 2 +- + arch/mips/alchemy/common/time.c | 2 +- + arch/mips/include/asm/mach-ip27/topology.h | 2 - + arch/mips/include/asm/mmu_context.h | 10 +- + arch/mips/include/asm/smp-ops.h | 2 +- + arch/mips/include/asm/smp.h | 2 +- + arch/mips/kernel/smp-cmp.c | 6 +- + arch/mips/kernel/smp-mt.c | 6 +- + arch/mips/kernel/smp-up.c | 3 +- + arch/mips/kernel/smp.c | 8 +- + arch/mips/kernel/smtc.c | 6 +- + arch/mips/mipssim/sim_smtc.c | 5 +- + arch/mips/mm/c-octeon.c | 2 +- + arch/mips/mti-malta/malta-smtc.c | 4 +- + arch/mips/pmc-sierra/yosemite/smp.c | 4 +- + arch/mips/sgi-ip27/ip27-memory.c | 2 +- + arch/mips/sgi-ip27/ip27-smp.c | 4 +- + arch/mips/sibyte/bcm1480/smp.c | 5 +- + arch/mips/sibyte/sb1250/smp.c | 5 +- + arch/mn10300/include/asm/gdb-stub.h | 1 - + arch/mn10300/include/asm/mmu_context.h | 12 +- + arch/parisc/include/asm/smp.h | 1 - + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/include/asm/topology.h | 12 - + arch/powerpc/kernel/setup-common.c | 6 +- + arch/powerpc/kernel/smp.c | 12 +- + arch/powerpc/platforms/powermac/smp.c | 6 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 +- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/topology.h | 1 - + arch/s390/kernel/smp.c | 4 +- + arch/sh/include/asm/smp.h | 1 - + arch/sh/include/asm/topology.h | 1 - + arch/sparc/include/asm/smp_64.h | 1 - + arch/sparc/include/asm/topology_64.h | 16 - + arch/um/include/asm/mmu_context.h | 4 +- + arch/um/kernel/smp.c | 2 +- + arch/x86/include/asm/lguest_hcall.h | 2 +- + arch/x86/include/asm/mmu_context.h | 6 +- + arch/x86/include/asm/smp.h | 1 - + arch/x86/kernel/acpi/cstate.c | 36 +- + arch/x86/kernel/apic/io_apic.c | 7 +- + arch/x86/kernel/ldt.c | 4 +- + arch/x86/kernel/process.c | 6 +- + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/smpboot.c | 9 +- + arch/x86/lguest/boot.c | 7 +- + arch/x86/mm/tlb.c | 15 +- + arch/x86/xen/mmu.c | 4 +- + drivers/acpi/processor_perflib.c | 3 +- + drivers/acpi/processor_throttling.c | 97 ++-- + drivers/block/virtio_blk.c | 5 +- + drivers/firmware/dcdbas.c | 49 +-- + drivers/lguest/lg.h | 2 - + drivers/net/sfc/efx.c | 3 +- + drivers/oprofile/buffer_sync.c | 3 +- + drivers/virtio/virtio_pci.c | 2 +- + include/asm-generic/topology.h | 17 - + include/linux/cpumask.h | 709 +++++++++----------------- + include/linux/interrupt.h | 2 - + include/linux/lguest.h | 2 +- + include/linux/sched.h | 3 + + include/linux/smp.h | 11 - + include/linux/topology.h | 6 - + include/linux/virtio_net.h | 14 +- + init/main.c | 5 - + kernel/kthread.c | 10 +- + kernel/module.c | 3 +- + kernel/smp.c | 7 - + kernel/trace/trace.c | 7 +- + mm/quicklist.c | 3 +- + virt/kvm/kvm_main.c | 3 +- + 89 files changed, 522 insertions(+), 831 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Auto-merging drivers/input/misc/cobalt_btns.c +Merge made by recursive. + drivers/input/misc/cobalt_btns.c | 2 +- + drivers/input/misc/dm355evm_keys.c | 42 +++++++++++++-------------- + drivers/input/serio/at32psif.c | 2 +- + drivers/input/touchscreen/Kconfig | 7 ++++ + drivers/input/touchscreen/atmel_tsadcc.c | 8 ++-- + drivers/input/touchscreen/ucb1400_ts.c | 5 ++- + drivers/input/touchscreen/usbtouchscreen.c | 32 +++++++++++++++++++++ + drivers/input/touchscreen/w90p910_ts.c | 34 +++++++++++----------- + 8 files changed, 85 insertions(+), 47 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging fs/char_dev.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/ubifs/super.c +Auto-merging include/linux/backing-dev.h +Auto-merging include/linux/blkdev.h +Removing mm/pdflush.c +Merge made by recursive. + block/blk-core.c | 119 ++++++- + block/blk-merge.c | 43 +++ + block/blk.h | 1 + + block/cfq-iosched.c | 38 ++- + drivers/block/aoe/aoeblk.c | 1 + + drivers/char/mem.c | 1 + + drivers/scsi/scsi_lib.c | 6 +- + fs/btrfs/disk-io.c | 1 + + fs/buffer.c | 2 +- + fs/char_dev.c | 1 + + fs/configfs/inode.c | 1 + + fs/fs-writeback.c | 775 ++++++++++++++++++++++++++++++++++--------- + fs/fuse/inode.c | 1 + + fs/hugetlbfs/inode.c | 1 + + fs/nfs/client.c | 1 + + fs/ocfs2/dlm/dlmfs.c | 1 + + fs/ramfs/inode.c | 1 + + fs/super.c | 3 - + fs/sync.c | 2 +- + fs/sysfs/inode.c | 1 + + fs/ubifs/super.c | 1 + + include/linux/backing-dev.h | 71 ++++- + include/linux/bio.h | 43 ++-- + include/linux/blkdev.h | 27 ++- + include/linux/fs.h | 11 +- + include/linux/writeback.h | 15 +- + kernel/cgroup.c | 1 + + mm/Makefile | 2 +- + mm/backing-dev.c | 533 +++++++++++++++++++++++++++++- + mm/page-writeback.c | 157 ++-------- + mm/pdflush.c | 269 --------------- + mm/swap_state.c | 1 + + mm/vmscan.c | 2 +- + 33 files changed, 1484 insertions(+), 649 deletions(-) + delete mode 100644 mm/pdflush.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Merge made by recursive. + Documentation/power/power_supply_class.txt | 7 + + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/ds2782_battery.c | 330 ++++++++++++++++++++++++++++ + drivers/power/olpc_battery.c | 76 ++++++- + drivers/power/power_supply_sysfs.c | 12 + + include/linux/power_supply.h | 18 ++ + 7 files changed, 440 insertions(+), 11 deletions(-) + create mode 100644 drivers/power/ds2782_battery.c +Merging leds/for-mm +$ git merge leds/for-mm +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging arch/x86/kernel/kgdb.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 9 +++++++-- + include/linux/kgdb.h | 48 ++++++++++++++++++++++++++++++++++++++++++------ + kernel/kgdb.c | 6 +++--- + 3 files changed, 52 insertions(+), 11 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging mm/Makefile +Auto-merging mm/slub.c +Merge made by recursive. + Documentation/vm/slqbinfo.c | 1047 ++++++++++++ + Documentation/vm/slub.txt | 10 + + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 301 ++++ + init/Kconfig | 28 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3765 +++++++++++++++++++++++++++++++++++++++++++ + mm/slub.c | 41 +- + 11 files changed, 5233 insertions(+), 19 deletions(-) + create mode 100644 Documentation/vm/slqbinfo.c + create mode 100644 include/linux/rcu_types.h + create mode 100644 include/linux/slqb_def.h + create mode 100644 mm/slqb.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/mfd/ezx-pcap.c +Merge made by recursive. + MAINTAINERS | 18 ++ + drivers/mfd/ab3100-core.c | 8 +- + drivers/mfd/ezx-pcap.c | 103 ++++++++---- + drivers/mfd/twl4030-irq.c | 2 +- + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 1 + + drivers/regulator/pcap-regulator.c | 318 ++++++++++++++++++++++++++++++++++++ + include/linux/mfd/ezx-pcap.h | 3 + + 8 files changed, 425 insertions(+), 35 deletions(-) + create mode 100644 drivers/regulator/pcap-regulator.c +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 62 ++++++++++++++++++++++++------- + drivers/regulator/da903x.c | 61 +++++++++++++++++++++++++++++-- + drivers/regulator/pcf50633-regulator.c | 2 +- + drivers/regulator/virtual.c | 44 ++++++++++++++-------- + drivers/regulator/wm8350-regulator.c | 2 + + include/linux/mfd/da903x.h | 4 ++- + include/linux/regulator/machine.h | 13 ++++++- + 7 files changed, 152 insertions(+), 36 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + fs/proc/base.c | 23 +++---- + include/linux/lsm_audit.h | 10 ++- + include/linux/security.h | 14 ++-- + kernel/ptrace.c | 2 +- + security/capability.c | 2 +- + security/commoncap.c | 4 +- + security/keys/proc.c | 4 + + security/security.c | 4 +- + security/selinux/avc.c | 8 ++- + security/selinux/hooks.c | 24 +++++-- + security/selinux/include/avc.h | 6 +- + security/selinux/ss/services.c | 142 +++++++++++++++++++++++++++++++++------ + security/smack/smack.h | 2 +- + security/smack/smack_access.c | 11 ++-- + security/smack/smack_lsm.c | 8 +- + security/tomoyo/common.c | 30 +++++++++ + security/tomoyo/common.h | 2 - + security/tomoyo/domain.c | 42 ++---------- + security/tomoyo/tomoyo.c | 10 +-- + security/tomoyo/tomoyo.h | 3 +- + 20 files changed, 230 insertions(+), 121 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Recorded preimage for 'drivers/usb/serial/sierra.c' +Resolved 'drivers/usb/serial/generic.c' using previous resolution. +Auto-merging drivers/char/cyclades.c +Auto-merging drivers/char/mxser.c +Auto-merging drivers/char/tty_ldisc.c +Auto-merging drivers/char/vt.c +Auto-merging drivers/char/vt_ioctl.c +Auto-merging drivers/net/hamradio/6pack.c +Auto-merging drivers/net/hamradio/mkiss.c +Auto-merging drivers/net/slip.c +Auto-merging drivers/net/wireless/strip.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/ftdi_sio.h +Auto-merging drivers/usb/serial/generic.c +CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c +Auto-merging drivers/usb/serial/mos7840.c +Auto-merging drivers/usb/serial/pl2303.c +CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.c +Auto-merging drivers/usb/serial/sierra.c +CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/serial/pl2303.c'. +Recorded resolution for 'drivers/usb/serial/sierra.c'. +[master 26d637d] Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap1/board-ams-delta.c | 38 + + arch/mn10300/kernel/asm-offsets.c | 6 +- + arch/x86/include/asm/termios.h | 25 +- + drivers/char/cyclades.c | 2283 ++++++++----------------------- + drivers/char/esp.c | 7 +- + drivers/char/mxser.c | 8 +- + drivers/char/tty_ldisc.c | 25 +- + drivers/char/tty_port.c | 2 + + drivers/char/vt.c | 4 +- + drivers/char/vt_ioctl.c | 279 +++- + drivers/firmware/dmi_scan.c | 34 +- + drivers/net/slip.c | 96 +- + drivers/serial/21285.c | 8 +- + drivers/serial/8250.c | 28 +- + drivers/serial/8250.h | 1 + + drivers/serial/amba-pl010.c | 6 +- + drivers/serial/amba-pl011.c | 6 +- + drivers/serial/atmel_serial.c | 14 +- + drivers/serial/bfin_5xx.c | 20 +- + drivers/serial/bfin_sport_uart.c | 7 +- + drivers/serial/clps711x.c | 4 +- + drivers/serial/cpm_uart/cpm_uart_core.c | 2 +- + drivers/serial/dz.c | 6 +- + drivers/serial/icom.c | 16 +- + drivers/serial/imx.c | 16 +- + drivers/serial/ioc3_serial.c | 54 +- + drivers/serial/ioc4_serial.c | 68 +- + drivers/serial/ip22zilog.c | 14 +- + drivers/serial/jsm/jsm_neo.c | 2 +- + drivers/serial/jsm/jsm_tty.c | 20 +- + drivers/serial/m32r_sio.c | 6 +- + drivers/serial/max3100.c | 16 +- + drivers/serial/mcf.c | 4 +- + drivers/serial/mpc52xx_uart.c | 4 +- + drivers/serial/mpsc.c | 4 +- + drivers/serial/msm_serial.c | 7 +- + drivers/serial/mux.c | 4 +- + drivers/serial/netx-serial.c | 6 +- + drivers/serial/nwpserial.c | 4 +- + drivers/serial/pmac_zilog.c | 12 +- + drivers/serial/pnx8xxx_uart.c | 8 +- + drivers/serial/pxa.c | 6 +- + drivers/serial/sa1100.c | 8 +- + drivers/serial/samsung.c | 8 +- + drivers/serial/sb1250-duart.c | 6 +- + drivers/serial/sc26xx.c | 10 +- + drivers/serial/serial_core.c | 845 ++++++------ + drivers/serial/serial_ks8695.c | 6 +- + drivers/serial/serial_lh7a40x.c | 6 +- + drivers/serial/serial_txx9.c | 4 +- + drivers/serial/sh-sci.c | 10 +- + drivers/serial/sn_console.c | 22 +- + drivers/serial/sunhv.c | 8 +- + drivers/serial/sunsab.c | 10 +- + drivers/serial/sunsu.c | 6 +- + drivers/serial/sunzilog.c | 14 +- + drivers/serial/timbuart.c | 10 +- + drivers/serial/uartlite.c | 6 +- + drivers/serial/ucc_uart.c | 4 +- + drivers/serial/vr41xx_siu.c | 6 +- + drivers/serial/zs.c | 6 +- + drivers/usb/serial/mos7720.c | 120 ++- + drivers/usb/serial/mos7840.c | 115 -- + drivers/usb/serial/sierra.c | 150 ++- + include/linux/cyclades.h | 11 +- + include/linux/hayesesp.h | 1 - + include/linux/ioport.h | 4 +- + include/linux/kfifo.h | 4 +- + include/linux/serial.h | 2 + + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 77 +- + include/linux/tty.h | 10 +- + include/linux/vt.h | 32 +- + include/linux/vt_kern.h | 16 +- + kernel/kfifo.c | 2 +- + kernel/power/console.c | 63 +- + kernel/resource.c | 15 +- + 77 files changed, 1938 insertions(+), 2860 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 8bbfa27 Merge commit 'security-testing/next' +Merging refs/next/20090713/ttydev +$ git merge refs/next/20090713/ttydev +Resolved 'drivers/usb/serial/generic.c' using previous resolution. +Auto-merging drivers/char/cyclades.c +Auto-merging drivers/char/tty_ldisc.c +Auto-merging drivers/char/vt.c +Auto-merging drivers/char/vt_ioctl.c +Auto-merging drivers/net/slip.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/ftdi_sio.h +Auto-merging drivers/usb/serial/generic.c +CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c +Auto-merging drivers/usb/serial/mos7840.c +Auto-merging drivers/usb/serial/pl2303.c +CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/serial/pl2303.c'. +[master 41c36d2] Merge commit 'refs/next/20090713/ttydev' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap1/board-ams-delta.c | 38 + + drivers/char/cyclades.c | 2276 ++++++++------------------------- + drivers/char/tty_ldisc.c | 25 +- + drivers/char/vt.c | 4 +- + drivers/char/vt_ioctl.c | 279 ++++- + drivers/firmware/dmi_scan.c | 34 +- + drivers/net/slip.c | 96 +-- + drivers/serial/8250.c | 18 +- + drivers/serial/8250.h | 1 + + drivers/serial/bfin_sport_uart.c | 1 - + drivers/usb/serial/mos7720.c | 120 ++- + drivers/usb/serial/mos7840.c | 115 -- + include/linux/cyclades.h | 10 + + include/linux/ioport.h | 4 +- + include/linux/kfifo.h | 4 +- + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 1 + + include/linux/vt.h | 32 +- + include/linux/vt_kern.h | 16 +- + kernel/kfifo.c | 2 +- + kernel/power/console.c | 63 +- + kernel/resource.c | 15 +- + 22 files changed, 1059 insertions(+), 2096 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +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-merging drivers/pci/intel-iommu.c +Merge made by recursive. + drivers/pci/intel-iommu.c | 15 +++++++++++++-- + 1 files changed, 13 insertions(+), 2 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Merge made by recursive. + fs/proc/uptime.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Merge made by recursive. + Documentation/filesystems/seq_file.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-at91/board-sam9261ek.c +Auto-merging arch/arm/mach-at91/board-sam9g20ek.c +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Auto-merging drivers/block/DAC960.c +Auto-merging drivers/net/rionet.c +Auto-merging drivers/usb/host/ehci-pci.c +Auto-merging drivers/usb/host/ehci.h +Auto-merging include/linux/usb.h +Merge made by recursive. + Documentation/filesystems/nfsroot.txt | 2 +- + Documentation/hwmon/hpfall.c | 64 +++++++++++----------- + Documentation/powerpc/dts-bindings/marvell.txt | 2 +- + Documentation/sysctl/kernel.txt | 30 ++++++----- + MAINTAINERS | 2 +- + arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- + arch/arm/mach-at91/board-cam60.c | 2 +- + arch/arm/mach-at91/board-neocore926.c | 2 +- + arch/arm/mach-at91/board-qil-a9260.c | 2 +- + arch/arm/mach-at91/board-sam9260ek.c | 2 +- + arch/arm/mach-at91/board-sam9261ek.c | 2 +- + arch/arm/mach-at91/board-sam9263ek.c | 2 +- + arch/arm/mach-at91/board-sam9g20ek.c | 2 +- + arch/arm/mach-at91/board-sam9rlek.c | 2 +- + arch/arm/mach-at91/board-usb-a9260.c | 2 +- + arch/arm/mach-at91/board-usb-a9263.c | 2 +- + arch/blackfin/mach-bf538/include/mach/defBF539.h | 2 +- + arch/h8300/kernel/timer/tpu.c | 1 - + arch/powerpc/kernel/udbg_16550.c | 2 +- + arch/powerpc/platforms/powermac/udbg_scc.c | 2 +- + drivers/block/DAC960.c | 4 +- + drivers/edac/edac_core.h | 2 +- + drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +- + drivers/isdn/i4l/isdn_common.c | 4 +- + drivers/md/md.h | 2 +- + drivers/mtd/devices/m25p80.c | 4 +- + drivers/mtd/devices/slram.c | 2 +- + drivers/mtd/ftl.c | 2 +- + drivers/mtd/nand/cafe_nand.c | 4 +- + drivers/mtd/nand/cmx270_nand.c | 4 +- + drivers/net/bnx2x_reg.h | 2 +- + drivers/net/rionet.c | 2 +- + drivers/usb/host/ehci-pci.c | 2 +- + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/ohci-q.c | 2 +- + fs/xfs/xfs_fs.h | 2 +- + include/linux/capability.h | 2 +- + include/linux/namei.h | 2 +- + include/linux/usb.h | 2 +- + include/linux/workqueue.h | 2 +- + kernel/panic.c | 2 +- + scripts/basic/fixdep.c | 3 +- + scripts/mod/sumversion.c | 2 - + sound/oss/swarm_cs4297a.c | 3 - + 44 files changed, 92 insertions(+), 97 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Merge made by recursive. + arch/arm/include/asm/device.h | 3 + + arch/arm/plat-omap/debug-leds.c | 11 +- + arch/arm/plat-omap/gpio.c | 14 +- + arch/ia64/include/asm/device.h | 3 + + arch/microblaze/include/asm/device.h | 3 + + arch/powerpc/include/asm/device.h | 3 + + arch/sparc/include/asm/device.h | 3 + + arch/x86/include/asm/device.h | 3 + + drivers/base/platform.c | 36 --- + drivers/dma/dw_dmac.c | 15 +- + drivers/dma/txx9dmac.c | 15 +- + drivers/i2c/busses/i2c-pxa.c | 25 ++- + drivers/i2c/busses/i2c-s3c2410.c | 25 ++- + drivers/usb/musb/musb_core.c | 18 +- + include/asm-generic/device.h | 3 + + include/linux/platform_device.h | 5 +- + kernel/power/hibernate.c | 21 ++- + kernel/power/power.h | 2 +- + kernel/power/snapshot.c | 400 ++++++++++++++++++++++++++-------- + 19 files changed, 428 insertions(+), 180 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. + Documentation/00-INDEX | 2 + + Documentation/btmrvl.txt | 119 +++++ + drivers/bluetooth/Kconfig | 25 + + drivers/bluetooth/Makefile | 6 + + drivers/bluetooth/btmrvl_debugfs.c | 432 ++++++++++++++++ + drivers/bluetooth/btmrvl_drv.h | 139 +++++ + drivers/bluetooth/btmrvl_main.c | 624 ++++++++++++++++++++++ + drivers/bluetooth/btmrvl_sdio.c | 1002 ++++++++++++++++++++++++++++++++++++ + drivers/bluetooth/btmrvl_sdio.h | 108 ++++ + drivers/bluetooth/btusb.c | 4 +- + include/net/bluetooth/l2cap.h | 8 +- + net/bluetooth/hidp/core.c | 1 + + net/bluetooth/l2cap.c | 72 +++- + net/bluetooth/sco.c | 49 ++- + 14 files changed, 2561 insertions(+), 30 deletions(-) + create mode 100644 Documentation/btmrvl.txt + create mode 100644 drivers/bluetooth/btmrvl_debugfs.c + create mode 100644 drivers/bluetooth/btmrvl_drv.h + create mode 100644 drivers/bluetooth/btmrvl_main.c + create mode 100644 drivers/bluetooth/btmrvl_sdio.c + create mode 100644 drivers/bluetooth/btmrvl_sdio.h +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Merge made by recursive. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging init/Kconfig +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 7 + + fs/notify/Kconfig | 12 +- + fs/notify/dnotify/Kconfig | 2 +- + fs/notify/dnotify/dnotify.c | 2 +- + fs/notify/inode_mark.c | 18 ++- + fs/notify/inotify/Kconfig | 2 +- + fs/notify/inotify/inotify_user.c | 91 ++++++--- + fs/notify/notification.c | 10 +- + include/linux/fsnotify_backend.h | 10 +- + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 ++- + kernel/audit_tree.c | 223 ++++++++++++---------- + kernel/audit_watch.c | 293 ++++++++++++++++------------ + kernel/auditfilter.c | 39 ++--- + kernel/auditsc.c | 9 +- + 17 files changed, 434 insertions(+), 326 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/hwlat_detector.txt | 64 ++ + MAINTAINERS | 9 + + drivers/misc/Kconfig | 29 + + drivers/misc/Makefile | 1 + + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 1311 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwlat_detector.txt + create mode 100644 drivers/misc/hwlat_detector.c +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'drivers/oprofile/oprofile_stats.c' using previous resolution. +Resolved 'include/linux/rcupdate.h' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/oprofile/nmi_int.c +Auto-merging drivers/oprofile/oprofile_stats.c +CONFLICT (content): Merge conflict in drivers/oprofile/oprofile_stats.c +Removing include/linux/rcuclassic.h +Auto-merging include/linux/rcupdate.h +CONFLICT (content): Merge conflict in include/linux/rcupdate.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Removing kernel/rcuclassic.c +Auto-merging kernel/sched.c +Auto-merging kernel/trace/trace.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c1ae13d9] Merge commit 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/RTFP.txt | 77 +++ + Documentation/RCU/UP.txt | 34 +- + Documentation/RCU/checklist.txt | 20 +- + Documentation/RCU/rcubarrier.txt | 7 + + Documentation/RCU/torture.txt | 23 +- + Documentation/RCU/whatisRCU.txt | 14 +- + Documentation/feature-removal-schedule.txt | 9 - + Documentation/kernel-parameters.txt | 5 + + Documentation/scheduler/sched-rt-group.txt | 13 +- + Documentation/trace/events.txt | 9 + + arch/x86/Kconfig | 5 + + arch/x86/boot/video-vesa.c | 7 +- + arch/x86/boot/video-vga.c | 10 - + arch/x86/boot/video.c | 5 - + arch/x86/boot/video.h | 20 +- + arch/x86/include/asm/i387.h | 1 + + arch/x86/include/asm/ioctls.h | 95 +---- + arch/x86/include/asm/ipcbuf.h | 29 +- + arch/x86/include/asm/mce.h | 2 +- + arch/x86/include/asm/mman.h | 14 +- + arch/x86/include/asm/module.h | 13 +- + arch/x86/include/asm/msgbuf.h | 40 +-- + arch/x86/include/asm/param.h | 23 +- + arch/x86/include/asm/paravirt.h | 711 +------------------------ + arch/x86/include/asm/paravirt_types.h | 720 +++++++++++++++++++++++++ + arch/x86/include/asm/pgtable.h | 16 +- + arch/x86/include/asm/scatterlist.h | 27 +- + arch/x86/include/asm/shmbuf.h | 52 +-- + arch/x86/include/asm/socket.h | 61 +-- + arch/x86/include/asm/sockios.h | 14 +- + arch/x86/include/asm/termbits.h | 199 +------- + arch/x86/include/asm/termios.h | 115 +---- + arch/x86/include/asm/types.h | 12 +- + arch/x86/include/asm/ucontext.h | 8 +- + arch/x86/kernel/cpu/mcheck/mce.c | 4 +- + arch/x86/kernel/cpu/mtrr/amd.c | 97 ++-- + arch/x86/kernel/cpu/mtrr/centaur.c | 168 ++----- + arch/x86/kernel/cpu/mtrr/cleanup.c | 350 ++++++------ + arch/x86/kernel/cpu/mtrr/cyrix.c | 94 ++-- + arch/x86/kernel/cpu/mtrr/generic.c | 304 ++++++----- + arch/x86/kernel/cpu/mtrr/if.c | 135 +++-- + arch/x86/kernel/cpu/mtrr/main.c | 455 +++++++++-------- + arch/x86/kernel/cpu/mtrr/mtrr.h | 19 +- + arch/x86/kernel/cpu/mtrr/state.c | 68 ++- + arch/x86/kernel/cpu/proc.c | 2 - + arch/x86/kernel/ds.c | 6 +- + arch/x86/kernel/process_32.c | 27 +- + arch/x86/kernel/process_64.c | 33 +- + arch/x86/kernel/traps.c | 33 +- + arch/x86/mm/fault.c | 51 +- + arch/x86/mm/highmem_32.c | 2 +- + arch/x86/oprofile/nmi_int.c | 101 ++-- + arch/x86/oprofile/op_model_amd.c | 267 ++++----- + arch/x86/oprofile/op_model_p4.c | 60 +-- + arch/x86/oprofile/op_model_ppro.c | 95 ++-- + arch/x86/oprofile/op_x86_model.h | 47 +- + drivers/oprofile/cpu_buffer.c | 16 +- + include/linux/irq.h | 7 - + include/linux/oprofile.h | 2 +- + include/linux/poison.h | 16 +- + include/linux/rcuclassic.h | 178 ------ + include/linux/rcupdate.h | 29 +- + include/linux/rcupreempt.h | 10 + + include/linux/rcutree.h | 12 +- + include/linux/sched.h | 6 + + init/Kconfig | 12 +- + kernel/Makefile | 1 - + kernel/irq/manage.c | 2 +- + kernel/kprobes.c | 30 +- + kernel/printk.c | 146 ++++-- + kernel/rcuclassic.c | 807 ---------------------------- + kernel/rcupdate.c | 25 + + kernel/rcutorture.c | 202 ++++---- + kernel/sched.c | 188 ++++++- + kernel/trace/kmemtrace.c | 120 +++- + kernel/trace/trace.c | 4 +- + kernel/trace/trace.h | 3 + + kernel/trace/trace_events.c | 37 ++- + 78 files changed, 2750 insertions(+), 3931 deletions(-) + create mode 100644 arch/x86/include/asm/paravirt_types.h + delete mode 100644 include/linux/rcuclassic.h + delete mode 100644 kernel/rcuclassic.c +Merging percpu/for-next +$ git merge percpu/for-next +Resolved 'arch/sh/kernel/vmlinux.lds.S' using previous resolution. +Resolved 'arch/x86/kernel/cpu/perf_counter.c' using previous resolution. +Resolved 'drivers/cpufreq/cpufreq_ondemand.c' using previous resolution. +Auto-merging Makefile +Auto-merging arch/ia64/kernel/smp.c +Auto-merging arch/mn10300/kernel/vmlinux.lds.S +Auto-merging arch/sh/kernel/vmlinux.lds.S +CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/kernel/cpu/perf_counter.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c +Auto-merging block/cfq-iosched.c +Auto-merging drivers/cpufreq/cpufreq_conservative.c +Auto-merging drivers/cpufreq/cpufreq_ondemand.c +CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c +Auto-merging drivers/xen/events.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging init/main.c +Auto-merging kernel/module.c +Auto-merging kernel/perf_counter.c +Auto-merging kernel/sched.c +Auto-merging kernel/trace/trace_events.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +Auto-merging mm/page-writeback.c +Auto-merging mm/quicklist.c +Auto-merging mm/slub.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 03ef7bf] Merge commit 'percpu/for-next' +$ git diff -M --stat --summary HEAD^.. + Makefile | 2 +- + arch/alpha/include/asm/percpu.h | 100 +--- + arch/alpha/include/asm/tlbflush.h | 1 + + arch/alpha/kernel/vmlinux.lds.S | 9 +- + arch/arm/kernel/vmlinux.lds.S | 1 + + arch/avr32/kernel/vmlinux.lds.S | 9 +- + arch/blackfin/kernel/vmlinux.lds.S | 5 +- + arch/blackfin/mm/sram-alloc.c | 6 +- + arch/cris/include/asm/mmu_context.h | 3 +- + arch/cris/kernel/vmlinux.lds.S | 9 +- + arch/cris/mm/fault.c | 2 +- + arch/frv/kernel/vmlinux.lds.S | 2 + + arch/h8300/kernel/vmlinux.lds.S | 5 +- + arch/ia64/Kconfig | 3 + + arch/ia64/kernel/smp.c | 3 +- + arch/ia64/kernel/vmlinux.lds.S | 16 +- + arch/ia64/sn/kernel/setup.c | 2 +- + arch/m32r/kernel/vmlinux.lds.S | 10 +- + arch/m68k/kernel/vmlinux-std.lds | 10 +- + arch/m68k/kernel/vmlinux-sun3.lds | 9 +- + arch/m68knommu/kernel/vmlinux.lds.S | 7 +- + arch/microblaze/kernel/vmlinux.lds.S | 6 +- + arch/mips/kernel/vmlinux.lds.S | 21 +- + arch/mn10300/kernel/vmlinux.lds.S | 8 +- + arch/parisc/kernel/vmlinux.lds.S | 8 +- + arch/powerpc/Kconfig | 3 + + arch/powerpc/kernel/vmlinux.lds.S | 9 +- + arch/powerpc/mm/stab.c | 2 +- + arch/powerpc/platforms/ps3/smp.c | 2 +- + arch/s390/include/asm/percpu.h | 32 +- + arch/s390/kernel/vmlinux.lds.S | 9 +- + arch/sh/kernel/vmlinux.lds.S | 10 +- + arch/sparc/Kconfig | 3 - + arch/sparc/kernel/smp_64.c | 42 +- + arch/sparc/kernel/vmlinux.lds.S | 8 +- + arch/um/include/asm/common.lds.S | 5 - + arch/um/kernel/dyn.lds.S | 2 + + arch/um/kernel/uml.lds.S | 2 + + arch/x86/Kconfig | 3 - + arch/x86/include/asm/percpu.h | 9 - + arch/x86/kernel/cpu/cpu_debug.c | 4 +- + arch/x86/kernel/cpu/mcheck/mce.c | 8 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- + arch/x86/kernel/cpu/perf_counter.c | 14 +- + arch/x86/kernel/setup_percpu.c | 297 ++------ + arch/x86/kernel/vmlinux.lds.S | 11 +- + arch/x86/mm/pageattr.c | 1 + + arch/xtensa/kernel/vmlinux.lds.S | 13 +- + block/as-iosched.c | 10 +- + block/cfq-iosched.c | 10 +- + drivers/cpufreq/cpufreq_conservative.c | 12 +- + drivers/cpufreq/cpufreq_ondemand.c | 15 +- + drivers/xen/events.c | 13 +- + include/asm-generic/vmlinux.lds.h | 24 +- + include/linux/percpu-defs.h | 66 ++- + include/linux/percpu.h | 80 ++- + init/main.c | 24 - + kernel/module.c | 6 +- + kernel/perf_counter.c | 6 +- + kernel/sched.c | 4 +- + kernel/trace/trace_events.c | 6 +- + lib/Kconfig.debug | 15 + + mm/Makefile | 2 +- + mm/allocpercpu.c | 28 + + mm/kmemleak-test.c | 6 +- + mm/page-writeback.c | 5 +- + mm/percpu.c | 1316 +++++++++++++++++++++++++------- + mm/quicklist.c | 2 +- + mm/slub.c | 4 +- + net/ipv4/syncookies.c | 5 +- + net/ipv6/syncookies.c | 5 +- + net/rds/ib_stats.c | 2 +- + net/rds/iw_stats.c | 2 +- + net/rds/page.c | 2 +- + scripts/module-common.lds | 8 + + 75 files changed, 1499 insertions(+), 927 deletions(-) + create mode 100644 scripts/module-common.lds +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/io_apic.h +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging arch/x86/kernel/e820.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging init/main.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 5 + + MAINTAINERS | 12 + + arch/x86/Kconfig | 4 +- + arch/x86/include/asm/io_apic.h | 3 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/acpi/boot.c | 24 +-- + arch/x86/kernel/apic/io_apic.c | 27 ++- + arch/x86/kernel/e820.c | 5 + + arch/x86/kernel/setup.c | 3 + + arch/x86/kernel/sfi.c | 284 +++++++++++++++++++++++++ + arch/x86/pci/mmconfig-shared.c | 5 +- + drivers/Makefile | 1 + + drivers/acpi/tables.c | 3 + + drivers/sfi/Kconfig | 15 ++ + drivers/sfi/Makefile | 3 + + drivers/sfi/sfi_acpi.c | 151 ++++++++++++++ + drivers/sfi/sfi_core.c | 388 +++++++++++++++++++++++++++++++++++ + drivers/sfi/sfi_core.h | 44 ++++ + include/linux/sfi.h | 198 ++++++++++++++++++ + include/linux/sfi_acpi.h | 60 ++++++ + init/main.c | 2 + + 21 files changed, 1205 insertions(+), 33 deletions(-) + create mode 100644 arch/x86/kernel/sfi.c + create mode 100644 drivers/sfi/Kconfig + create mode 100644 drivers/sfi/Makefile + create mode 100644 drivers/sfi/sfi_acpi.c + create mode 100644 drivers/sfi/sfi_core.c + create mode 100644 drivers/sfi/sfi_core.h + create mode 100644 include/linux/sfi.h + create mode 100644 include/linux/sfi_acpi.h +Merging asm-generic/next +$ git merge asm-generic/next +Merge made by recursive. + lib/checksum.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Resolved 'init/main.c' using previous resolution. +Auto-merging drivers/char/mem.c +Auto-merging drivers/infiniband/hw/ehca/ehca_main.c +Auto-merging drivers/s390/net/netiucv.c +Auto-merging fs/partitions/check.c +Auto-merging include/linux/device.h +Auto-merging include/linux/netdevice.h +Auto-merging init/main.c +CONFLICT (content): Merge conflict in init/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4ab3d78] Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + block/genhd.c | 2 +- + drivers/base/Kconfig | 25 ++ + drivers/base/Makefile | 1 + + drivers/base/base.h | 6 + + drivers/base/core.c | 7 +- + drivers/base/devtmpfs.c | 367 ++++++++++++++++++++++++++++ + drivers/base/driver.c | 4 +- + drivers/base/init.c | 1 + + drivers/block/cciss.c | 2 +- + drivers/char/mem.c | 82 +++---- + drivers/firewire/core-device.c | 2 +- + drivers/firmware/dmi-id.c | 2 +- + drivers/infiniband/hw/ehca/ehca_main.c | 2 +- + drivers/infiniband/hw/ipath/ipath_kernel.h | 2 +- + drivers/infiniband/hw/ipath/ipath_sysfs.c | 2 +- + drivers/input/input.c | 2 +- + drivers/misc/enclosure.c | 4 +- + drivers/mmc/core/mmc.c | 2 +- + drivers/mmc/core/sd.c | 2 +- + drivers/mtd/mtdcore.c | 2 +- + drivers/s390/cio/css.c | 2 +- + drivers/s390/cio/device.c | 2 +- + drivers/s390/net/netiucv.c | 2 +- + drivers/scsi/scsi_priv.h | 2 +- + drivers/scsi/scsi_sysfs.c | 4 +- + drivers/uio/Kconfig | 5 - + drivers/usb/core/endpoint.c | 2 +- + drivers/usb/core/sysfs.c | 4 +- + drivers/usb/core/usb.h | 4 +- + drivers/uwb/lc-dev.c | 2 +- + fs/partitions/check.c | 2 +- + include/linux/attribute_container.h | 2 +- + include/linux/device.h | 16 +- + include/linux/netdevice.h | 2 +- + include/linux/shmem_fs.h | 3 + + include/linux/transport_class.h | 2 +- + init/do_mounts.c | 2 +- + init/main.c | 2 + + mm/shmem.c | 9 +- + net/bluetooth/hci_sysfs.c | 4 +- + net/core/net-sysfs.c | 2 +- + 41 files changed, 501 insertions(+), 93 deletions(-) + create mode 100644 drivers/base/devtmpfs.c +$ git am -3 ../patches/0001-driver-core-fix-for-mtd-typo.patch +Applying: driver-core: fix for mtd typo +$ git reset HEAD^ +drivers/mtd/mtdcore.c: locally modified +$ git add . +$ git commit -v -a --amend +[master ef3f4c2] Merge branch 'quilt/driver-core' +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..08a1bca78140 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,126 @@ +Importing driver-core.current based on 2.6.31-rc2-git9 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7638d5322bd89d49e013a03fe2afaeb6d214fabd +HEAD is now at 7638d53 Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +driver-core-move-dev_get-set_drvdata-to-drivers-base-dd.c.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core.current +From ../quilt-tmp + + ddb7998...e9b92dc master -> quilt/driver-core.current (forced update) +Importing usb.current based on quilt/driver-core.current + quilt series is empty +$ git update-ref refs/heads/quilt/usb.current e9b92dc3e909b587eb7b297e31e34801f695d6a5 +Importing i2c based on 2.6.31-rc2-git9 +$ cd ../quilt-tmp +$ git reset --hard 7638d5322bd89d49e013a03fe2afaeb6d214fabd +HEAD is now at 7638d53 Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-tsl2550-fix-lux-value-in-dark-env.patch +i2c-drop-i2c_driver-id.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + cc5e225...aca63f4 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.31-rc2-git9 +$ cd ../quilt-tmp +$ git reset --hard 7638d5322bd89d49e013a03fe2afaeb6d214fabd +HEAD is now at 7638d53 Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-vid-limit-AMD-0Fh-6-bit-VID.patch +hwmon-driver-for-TI-TMP421-TMP422-TMP423-chips.patch +hwmon-tmp421-add-documentation.patch +hwmon-use-resource_size.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 1f04044...969318a master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.31-rc1-git5 + quilt series is empty +$ git update-ref refs/heads/quilt/kernel-doc 52989765629e7d182b4f146050ebba0abf2cb0b7 +Importing rr based on v2.6.31-rc2-432-gf00caa7 +Unchanged quilt series rr +Importing device-mapper based on block/for-next +Unchanged quilt series device-mapper +Importing ttydev based on 34f25476ace556263784ea2f8173e22b25557a13 +$ cd ../quilt-tmp +$ git reset --hard 34f25476ace556263784ea2f8173e22b25557a13 +HEAD is now at 34f2547 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq +$ git quiltimport --author Alan Cox <alan@lxorguk.ukuu.org.uk> --patches ../quilt/ttydev +tty-net-locking +tty-usb-fix-perf-regression +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:21: trailing whitespace. + where the USB serial is not a console anyway */ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:24: trailing whitespace. + else { +warning: 2 lines add whitespace errors. +tty-usb-fix-kref-leak +tty-usb-pl2303-fastpath +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:31: trailing whitespace. + +warning: 1 line adds whitespace errors. +tty-usb-ftdi-ccsnew +kfifo-const +tty-cyclades-refcount +tty-cyclades-use-port-block-helper +tty-cyclades-precompute +tty-cyclades-use-port-hangup +tty-cyclades-use-port-close +tty-cyclades-cleanup +tty-cyclades-sleep-not-busy +tty-cyclades-use-dtr-helpers +tty-cyclades-merge-startup-common +tty-cyclades-ioctl-cleanup +tty-cyclades-modem-cleanup +tty-cyclades-add-io-helpers +tty-cyclades-remove-set-line-dups +tty-cyclades-fix-const-assign +tty-usb-mos7840-modem +tty-usb-cp210x-arkham +vt-events +vt-pm-extract +vt-incfix +vt-lockactive +net-slip-ttyfix +serial-add-irqflags-support +serial-8250-amstrad-e3 +serial-8250-minbaud +tty-bfin-remove-memset +dmi-sanity +kernel-shared-regions +tty-usb-mos7720-modem +tty-usb-mos7720-lsr +tty-ldisc-close-hangup-racefix +tty-x86-termios-clean +tty-usb-ft232-add-turtelizer +tty-usb-sierra-order-devices +tty-usb-sierra-updates-pm +serial-kill-info +serial-msm-platform-probe +serial-fold-closing-port +serial-port-portptr +serial-move-counts +serial-move-flags +serial-move-mutex +serial-move-users +serial-msr-move +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/ttydev +From ../quilt-tmp + + 4a82603...bfaed20 master -> quilt/ttydev (forced update) +Importing aoe based on v2.6.29-rc2 +Unchanged quilt series aoe +Importing driver-core based on quilt/usb.current +$ cd ../quilt-tmp +$ git reset --hard e9b92dc3e909b587eb7b297e31e34801f695d6a5 +HEAD is now at e9b92dc Driver core: move dev_get/set_drvdata to drivers/base/dd.c +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +uio-remove-default-n-from-kconfig.patch +driver-model-constify-attribute-groups.patch +mem_class-use-minor-as-index-instead-of-searching-the-array.patch +driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core +From ../quilt-tmp + + e5115a8...a2e761f master -> quilt/driver-core (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..aafa04ce048f --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090714 |