diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-23 16:40:57 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-23 16:40:57 +1000 |
| commit | ba5e3e87c55b91823a9d41d1f7f8925011e9ec25 (patch) | |
| tree | a6c39b7ff1701933dd21a4ad4b31afd31fdbe75b | |
| parent | 5ed01bfb1e061c6f5903e5fae1d2706390f65636 (diff) | |
Add linux-next specific files for 20090423next-20090423
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 136 | ||||
| -rw-r--r-- | Next/Trees | 138 | ||||
| -rw-r--r-- | Next/merge.log | 2625 | ||||
| -rw-r--r-- | Next/quilt-import.log | 261 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3161 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..0589f4bbfe01 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,136 @@ +Name SHA1 +---- ---- +origin 091069740304c979f957ceacec39c461d0192158 +arm-current d45d3238fcf054ca006ad1fcfb9bce6f6ffb47e4 +m68k-current adfe7c69891128f5e238a5e6823709b4bb85b340 +powerpc-merge 15f7176eb1cccec0a332541285ee752b935c1c85 +sparc-current 956d039a2537cf79ca608450d36cc70e0e515482 +scsi-rc-fixes ee568b25ee9e160b32d1aef73d8b2ee9c05d34db +net-current 29fe1b481283a1bada994a69f65736db4ae6f35f +sound-current bc8d489c44e05fae469f63b40c0da0718dba6798 +pci-current 1b6b8ce2ac372ea1f2065b89228ede105eb68dc5 +wireless-current 564572256bd68cea338b0e3ba8ce2118c3fe6cf5 +kbuild-current d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a +driver-core.current 9ba779321097cc7ec1b2c7e144571ad2badf27c7 +usb.current b04c7dcab54c1475aa0015b423af1cc5f0cd38ae +cpufreq-current 1e46cfa480d33da098c2c8fc1501651d620ef5a2 +input-current b2546df69b6bef19513112fd54ffb5d37cb3eb7a +md-current 1f59390339f263c0fe7908fbe54466dbf3a64b58 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current acd246b7494c629aa617da49716409566cf52149 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 9759d22c8348343b0da4e25d6150c41712686c14 +avr32 7ebcfcf19723254ebe90cdf8718436b9955a9a01 +blackfin d6879c585b7f8c2f3eb2f7e7beac806af4e9755c +cris d7bd15f67ebaaebc842a971e600c364a73b81b22 +ia64 091069740304c979f957ceacec39c461d0192158 +m68k 9c6948da2e55f787b942946d830eb3018323b7b7 +m68knommu 64f68416e794d59a42ddffdf1c5b7f026a4f23d5 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc b609308e1415efebdf79ebd553f4dd47b0ff2722 +powerpc 15f7176eb1cccec0a332541285ee752b935c1c85 +4xx 3239572d8f3091fef59eb82f3d6ee2b5ccac150d +galak a6be9ab0030791f7df83b639387f7ac6acd03de1 +pxa 126ee52ad3fd0c20c9418f68f3bc88a0f646aa17 +s390 837e816c087f9001fc09a32e337622ad0235e633 +sh 19bdc9d061bcb71efd2b53083d96b59bbe1a1751 +sparc c20a8d287b28a8f7b69410f3bf8daac145205c00 +x86 62f384520c45bb7e9c98750e40c580bee423b573 +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +configfs 3c48f23adada870db612a0dd3488605c4af5c0a5 +ext4 38d726d153cfe5efe5fe22d28d36ab382dda3a5c +fatfs 5a6bb10393eb9a1985e97af12f0cb2906bcbf1af +fuse 3121bfe7631126d1b13064855ac2cfa164381bb0 +gfs2 73b73fbc0436aa681e469bbb3e0947c872f38cce +jfs 9c83633ad38138855181af6936e8ac570ef7e2cb +nfs 4770822f16154559c8168c1b7171c9941a7c4d89 +nfsd b4ddd412d6ad6552cfc198723fc0b0ff7524ab89 +nilfs2 091069740304c979f957ceacec39c461d0192158 +ocfs2 45650bce934986b6a74215fad136365b9ba063f7 +squashfs 363911d027d1de1c6df79eb3f487f5476b9619f4 +v9fs b9b8e1c85b1d98534a562f601acda8132bfff439 +ubifs 0882e8dd3aad33eca41696d463bb896e6c8817eb +xfs 8de2bf937a6bea8f0f775fd5399ba20c1a0c3d77 +tip-core 18943b513d3aacdf0c2965efd46f8271756e22a2 +cpus4096 d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a +tracing 48468eda90921792663a8b2780c3f5f5d81eb347 +genirq e2d121fe458475c93f12481e4f9918b76906fd78 +safe-poison-pointers 1b05d4f78eef76343087460ab26a30d4f6fb17e6 +sched e7591475e7515d77ad31503990a2777775096280 +stackprotector d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a +timers 3b48c29fff77b1deab3781805e1607eea35f8e10 +pci 8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6 +device-mapper d5e75494339c7a0cfd9413f43f95506df161dfd1 +hid 243b706d8a71364ad6080328d45b73516c8af5f3 +i2c d06708f05230967025f877e9f2525055590ed590 +jdelvare-hwmon c97ef6762868f8e139a93bb178b1fbc3e186e94c +kernel-doc 612392307cb09e49051225092cbbd7049bd8db93 +v4l-dvb c74209f1785241ab5b64809c92ce2050b5a40642 +quota 4c1cf65df6357fa4ee8be486c947b25f46a030a6 +kbuild 32fb6c17566ec66de87324a834c7776f40e35e78 +ide 24fc484ab2291d242d1d6bfb5ca5b781061a8578 +libata f1fee71411a568c9a1fa2ecbc18ec81a3a2998f6 +infiniband 6e3df9b8996d4965919934453e0e7c89f06ed4fb +acpi 426cb48a1f2f7d778fcf8a7ea1f9d14dc6884f9b +ieee1394 32a0f488ce5e8a9a148491f15edc508ab5e8265b +ubi 577c9c456f0e1371cbade38eaf91ae8e8a308555 +kvm b59cd35601114cd4ab42af36d972051e3a0db4b7 +dlm a29936f55560a439638a0ecbb683efed3548b3bc +scsi 015640edb1f346e0b2eda703587c4cd1c310ec1d +async_tx 8c6db1bbf80123839ec87bdd6cb364aea384623d +udf 146bca72c7e6ba52de82a63b1fce7934dc103dbc +net 4cb9be7ab47820a1fa747569f5f035a5f628c91b +wireless 1965c85331ed29dc4fd32479ff31663e3e9a518f +mtd e7693548950ea5801d5d8b00414aed37033cf972 +crypto 7cb0e92844fee9db3682e2dbe5a5883afff16bae +vfs f8d1478e7933642be14a4787b855325513a753ba +sound 3d4727a4fdd757187bebe80cdedaffe5abaa13b5 +cpufreq 1e46cfa480d33da098c2c8fc1501651d620ef5a2 +rr 7a5e82cb780071541134bc14c2040a0929e5d21c +cifs cbb7fe129bb2b836083ebcc256c43faff4b48cc2 +mmc 32ab83a56fdf42f543b86c349143c2a86ead9707 +input e912a30184b2d7fb3ab881120f2dc3e09bb59e1d +bkl-removal 4a6a4499693a419a20559c41e33a7bd70bf20a6f +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 0d555c8262ab689454a6efe6efc3216632616c3d +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 372d121f48d50cf19e0bc438bb88483eff085e45 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery 5bf2b994bfe11bfe86231050897b2d881ca544d9 +leds ac15e95090c2588ada4904c8c4ae8edd347acdf0 +backlight e0724bf6e4a1f2e678d2b2aab01cae22e17862f0 +kgdb 4cc984538631d1f47c61f7e556e2031e0d31a1ae +slab f9c1d5d20451ec582c1ef327275ce337dc86a046 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 1f59390339f263c0fe7908fbe54466dbf3a64b58 +mfd fa15ce8ad59e9653d50b8596596cb02d3566d4aa +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm f23c20c83d523e5f8cda1f8f7ed52fe6afffbe29 +voltage ce02f7cc4d6b4835f6046f97c86646e958a0d241 +security-testing 19e4529ee7345079eeacc8e40cf69a304a64dc23 +lblnet 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b +ttydev e4156ede130c5666ed0440e4ba55701f9718692c +agp b854b2ab959e8175d75e01cf8ed452ed2624d0c8 +generic-ipi d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a +oprofile d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a +fastboot d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a +sparseirq 948f87436522e3078085271e05aa583ee5ef6326 +iommu 31f4168d1862253395cb7ab7911bf4c12683d654 +uwb a3c1239eb59c0a907f8be5587d42e950f44543f8 +watchdog abf95846bd7f0f03f7329df1dbdf35acd11c7fc0 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu e523b38e2f568af58baa13120a994cbf24e6dee0 +cputime c742b31c03f37c5c499178f09f57381aa6c70131 +osd 0d8fe329a80714e0f729ae48cba8d64cbe5701cb +jc_docs 7ead643f665c618d4bbd9efb68595fa41b2eb93b +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 70025bf7e756e4e14d357c385e993ab3e93dcc70 +audit def57543418a5f47debae28a0a9dea2effc11692 +omap 0882e8dd3aad33eca41696d463bb896e6c8817eb +aoe 1de9e8e70f5acc441550ca75433563d91b269bbe +kmemleak b525bd3e1944c91f711f113b1d27fbdd1be97d77 +suspend 6a7c7eaf71b636f197d73b381a2ab729ebdcfb2e +driver-core c17c3144bb97cc86722ff35836b87d1e40554e96 +usb 065a881f59eb9efc665b84e1ccdaaea85b83231b +staging 10b1469789f889f1e1c441814c666ac8f66f20a3 +scsi-post-merge 238c6d54830c624f34ac9cf123ac04aebfca5013 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..fbdf6041a3cb --- /dev/null +++ b/Next/Trees @@ -0,0 +1,138 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +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 +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-x86-next +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +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 +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-cpus4096-next +tracing git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-tracing-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-timers-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://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/bart/ide-2.6.git#for-next +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 +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next +fastboot git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next +sparseirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-iommu-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +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/ +kmemleak git git://linux-arm.org/linux-2.6.git#kmemleak +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/ +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..88d45759bc0c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2625 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ccc5ff9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable +Merging origin/master +$ git merge origin/master +Updating ccc5ff9..0910697 +Fast forward + Makefile | 2 +- + arch/alpha/include/asm/percpu.h | 2 +- + arch/ia64/include/asm/smp.h | 2 +- + arch/x86/include/asm/desc.h | 2 +- + arch/x86/include/asm/hardirq.h | 2 +- + arch/x86/include/asm/processor.h | 6 +- + arch/x86/include/asm/tlbflush.h | 2 +- + drivers/base/dd.c | 1 + + drivers/scsi/scsi_scan.c | 2 - + drivers/scsi/scsi_wait_scan.c | 11 +++++ + include/asm-generic/percpu.h | 35 ++++++++++++---- + include/linux/device.h | 1 + + include/linux/percpu-defs.h | 84 ++++++++++++++++++++++++++++++++++++++ + include/linux/percpu.h | 44 -------------------- + include/linux/slow-work.h | 2 +- + net/rds/rds.h | 2 +- + 16 files changed, 134 insertions(+), 66 deletions(-) + create mode 100644 include/linux/percpu-defs.h +Merging arm-current/master +$ git merge arm-current/master +Auto-merging arch/arm/mach-omap2/timer-gp.c +Removing arch/arm/plat-omap/include/mach/eac.h +Removing arch/arm/plat-omap/include/mach/gpioexpander.h +Merge made by recursive. + arch/arm/include/asm/unistd.h | 2 + + arch/arm/kernel/calls.S | 2 + + arch/arm/mach-imx/include/mach/gpio.h | 1 + + arch/arm/mach-omap1/board-h2-mmc.c | 14 +--- + arch/arm/mach-omap1/board-h3-mmc.c | 6 +- + arch/arm/mach-omap1/board-h3.c | 101 ------------------------ + arch/arm/mach-omap1/board-nokia770.c | 6 +- + arch/arm/mach-omap1/mcbsp.c | 4 +- + arch/arm/mach-omap2/board-h4.c | 95 ---------------------- + arch/arm/mach-omap2/board-omap3beagle.c | 4 + + arch/arm/mach-omap2/board-rx51.c | 1 - + arch/arm/mach-omap2/clock24xx.c | 15 ++-- + arch/arm/mach-omap2/clock24xx.h | 10 ++- + arch/arm/mach-omap2/clock34xx.h | 7 +- + arch/arm/mach-omap2/devices.c | 33 -------- + arch/arm/mach-omap2/irq.c | 4 +- + arch/arm/mach-omap2/timer-gp.c | 48 +++++++++++- + arch/arm/mach-omap2/usb-tusb6010.c | 2 +- + arch/arm/mach-pxa/include/mach/audio.h | 10 +++ + arch/arm/mach-pxa/include/mach/palmasoc.h | 7 +-- + arch/arm/mach-pxa/mioa701.c | 6 +- + arch/arm/mach-pxa/palmld.c | 18 ++++- + arch/arm/mach-pxa/palmt5.c | 18 ++++- + arch/arm/mach-pxa/palmtx.c | 23 +++++- + arch/arm/mach-pxa/pcm990-baseboard.c | 6 +- + arch/arm/plat-omap/dma.c | 13 ++-- + arch/arm/plat-omap/dmtimer.c | 28 ++++--- + arch/arm/plat-omap/gpio.c | 20 ++--- + arch/arm/plat-omap/include/mach/dmtimer.h | 2 +- + arch/arm/plat-omap/include/mach/eac.h | 100 ----------------------- + arch/arm/plat-omap/include/mach/gpioexpander.h | 35 -------- + arch/arm/plat-omap/include/mach/irda.h | 4 - + arch/arm/plat-omap/include/mach/mmc.h | 1 - + arch/arm/plat-omap/include/mach/timer-gp.h | 17 ++++ + drivers/mmc/host/omap.c | 2 - + include/sound/pxa2xx-lib.h | 15 ---- + sound/arm/pxa2xx-ac97-lib.c | 2 +- + sound/soc/pxa/palm27x.c | 27 ++++++- + 38 files changed, 228 insertions(+), 481 deletions(-) + delete mode 100644 arch/arm/plat-omap/include/mach/eac.h + delete mode 100644 arch/arm/plat-omap/include/mach/gpioexpander.h + create mode 100644 arch/arm/plat-omap/include/mach/timer-gp.h +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/configs/amiga_defconfig | 163 +++++++++++++++++++++------------ + arch/m68k/configs/apollo_defconfig | 120 +++++++++++++++++-------- + arch/m68k/configs/atari_defconfig | 155 +++++++++++++++++++++----------- + arch/m68k/configs/bvme6000_defconfig | 119 +++++++++++++++++-------- + arch/m68k/configs/hp300_defconfig | 120 +++++++++++++++++-------- + arch/m68k/configs/mac_defconfig | 125 +++++++++++++++++--------- + arch/m68k/configs/multi_defconfig | 157 ++++++++++++++++++++------------ + arch/m68k/configs/mvme147_defconfig | 119 +++++++++++++++++-------- + arch/m68k/configs/mvme16x_defconfig | 119 +++++++++++++++++-------- + arch/m68k/configs/q40_defconfig | 122 +++++++++++++++++-------- + arch/m68k/configs/sun3_defconfig | 120 +++++++++++++++++-------- + arch/m68k/configs/sun3x_defconfig | 120 +++++++++++++++++-------- + arch/m68k/include/asm/unistd.h | 4 +- + arch/m68k/kernel/entry.S | 2 + + arch/m68knommu/kernel/syscalltable.S | 2 + + drivers/scsi/a4000t.c | 2 +- + 16 files changed, 1042 insertions(+), 527 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Merge made by recursive. + arch/sparc/configs/sparc32_defconfig | 98 +++++++++++++------ + arch/sparc/configs/sparc64_defconfig | 182 ++++++++++++++++++++++------------ + arch/sparc/kernel/of_device_32.c | 21 ++++- + arch/sparc/kernel/of_device_64.c | 21 ++++- + 4 files changed, 225 insertions(+), 97 deletions(-) +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 11 ++- + drivers/net/8139too.c | 10 +- + drivers/net/Kconfig | 4 +- + drivers/net/cxgb3/cxgb3_main.c | 44 ++++---- + drivers/net/cxgb3/t3_hw.c | 11 +-- + drivers/net/e1000/e1000_main.c | 6 +- + drivers/net/e1000e/netdev.c | 8 +- + drivers/net/ixgbe/ixgbe_dcb_82599.c | 28 +++-- + drivers/net/ixgbe/ixgbe_main.c | 54 +++++++++- + drivers/net/macb.c | 28 +---- + drivers/net/macvlan.c | 9 +- + drivers/net/mlx4/en_main.c | 5 +- + drivers/net/mlx4/en_netdev.c | 21 ++-- + drivers/net/mlx4/en_port.c | 45 +++------ + drivers/net/mlx4/en_resources.c | 6 + + drivers/net/mlx4/en_rx.c | 12 +-- + drivers/net/mlx4/en_tx.c | 1 + + drivers/net/mlx4/mlx4_en.h | 1 + + drivers/net/pcmcia/pcnet_cs.c | 2 +- + drivers/net/ps3_gelic_wireless.c | 3 + + drivers/net/tg3.c | 26 +++-- + drivers/net/tun.c | 47 +++++---- + drivers/net/ucc_geth.c | 3 +- + drivers/net/usb/pegasus.c | 1 + + drivers/net/wireless/airo.c | 2 +- + drivers/net/wireless/ar9170/hw.h | 8 +- + drivers/net/wireless/ar9170/usb.c | 114 +++++++++++++++++---- + drivers/net/wireless/at76c50x-usb.c | 2 + + drivers/net/wireless/ath9k/recv.c | 4 +- + drivers/net/wireless/atmel.c | 1 - + drivers/net/wireless/b43/dma.c | 50 +++++++-- + drivers/net/wireless/b43/main.c | 5 + + drivers/net/wireless/b43/phy_common.c | 16 ++- + drivers/net/wireless/b43/phy_common.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 1 + + drivers/net/wireless/iwlwifi/iwl-agn.c | 11 +-- + drivers/net/wireless/iwlwifi/iwl-csr.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 4 + + drivers/net/wireless/iwlwifi/iwl-tx.c | 99 ++++++++++-------- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 152 +++++++++++++++++++-------- + drivers/net/wireless/libertas/rx.c | 2 + + drivers/net/wireless/mwl8k.c | 7 +- + drivers/net/wireless/orinoco/hw.c | 8 +- + drivers/net/wireless/p54/p54.h | 12 +- + drivers/net/wireless/p54/p54common.c | 2 - + drivers/net/wireless/p54/p54spi.c | 25 +++-- + drivers/net/wireless/p54/p54usb.c | 1 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 18 +--- + drivers/net/wireless/rt2x00/rt2x00usb.c | 18 +--- + drivers/net/wireless/rt2x00/rt73usb.c | 2 + + firmware/Makefile | 1 + + firmware/WHENCE | 10 ++ + firmware/cis/LA-PCM.cis.ihex | 20 ++++ + include/net/netfilter/nf_nat.h | 1 + + net/8021q/vlan_dev.c | 3 +- + net/ax25/ax25_uid.c | 12 ++- + net/bluetooth/hci_event.c | 38 +++++-- + net/bluetooth/rfcomm/core.c | 2 + + net/can/af_can.c | 4 +- + net/core/dev.c | 13 ++- + net/ipv4/netfilter/nf_nat_core.c | 3 +- + net/ipv4/tcp.c | 6 +- + net/ipv4/tcp_output.c | 2 +- + net/iucv/af_iucv.c | 24 +++-- + net/mac80211/Kconfig | 7 -- + net/mac80211/main.c | 2 +- + net/mac80211/mlme.c | 38 +++++-- + net/mac80211/pm.c | 15 +++- + net/mac80211/rx.c | 15 ++- + net/mac80211/wext.c | 43 ++++++-- + net/netfilter/nf_conntrack_helper.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 14 ++- + net/netfilter/nf_log.c | 4 + + net/netfilter/nfnetlink.c | 2 +- + net/netlabel/netlabel_addrlist.c | 26 ++--- + net/netrom/af_netrom.c | 6 +- + net/sched/sch_netem.c | 8 ++ + net/wireless/core.h | 2 +- + net/wireless/nl80211.c | 4 +- + net/wireless/reg.c | 5 +- + net/wireless/scan.c | 40 ++++++-- + 83 files changed, 849 insertions(+), 485 deletions(-) + create mode 100644 firmware/cis/LA-PCM.cis.ihex +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + sound/aoa/codecs/onyx.c | 76 ++++++++++++++++++++--------- + sound/aoa/codecs/tas.c | 66 ++++++++++++++++--------- + sound/pci/atiixp.c | 6 ++ + sound/pci/hda/patch_realtek.c | 106 ++++++++++++++++++++++++++++++++++++++--- + sound/ppc/keywest.c | 82 ++++++++++++++++---------------- + sound/soc/codecs/wm9705.c | 2 +- + sound/soc/omap/n810.c | 4 +- + sound/soc/omap/omap-mcbsp.c | 5 +- + sound/soc/omap/omap-mcbsp.h | 3 +- + sound/soc/omap/omap-pcm.c | 5 +- + sound/soc/omap/omap-pcm.h | 3 +- + sound/soc/pxa/pxa-ssp.c | 36 +++++++++++--- + sound/usb/usx2y/us122l.c | 12 ++++- + sound/usb/usx2y/usb_stream.c | 67 ++++++++++++-------------- + 14 files changed, 322 insertions(+), 151 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + Documentation/DocBook/kernel-api.tmpl | 6 ++- + arch/x86/include/asm/topology.h | 2 +- + arch/x86/pci/amd_bus.c | 6 ++- + arch/x86/pci/common.c | 5 ++- + arch/x86/pci/i386.c | 4 ++ + arch/x86/pci/mmconfig-shared.c | 6 +- + drivers/pci/access.c | 4 +- + drivers/pci/htirq.c | 1 + + drivers/pci/pci-sysfs.c | 12 ++++-- + drivers/pci/pci.c | 70 ++++++++++++++++++++++++++------- + drivers/pci/probe.c | 6 --- + drivers/pci/quirks.c | 1 + + drivers/pci/setup-bus.c | 6 ++- + drivers/pci/slot.c | 4 +- + include/linux/pci_regs.h | 1 + + 15 files changed, 97 insertions(+), 37 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 - + drivers/net/wireless/rndis_wlan.c | 14 ++++++++++---- + 2 files changed, 10 insertions(+), 5 deletions(-) +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + Documentation/sysfs-rules.txt | 2 +- + drivers/base/platform.c | 9 +++++---- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/class/cdc-wdm.c | 27 ++- + drivers/usb/core/buffer.c | 2 +- + drivers/usb/gadget/ci13xxx_udc.c | 5 +- + drivers/usb/gadget/file_storage.c | 20 +-- + drivers/usb/gadget/omap_udc.c | 3 +- + drivers/usb/host/ehci-sched.c | 2 +- + drivers/usb/musb/musb_core.c | 2 +- + drivers/usb/musb/omap2430.c | 1 - + drivers/usb/musb/tusb6010.c | 1 - + drivers/usb/musb/tusb6010.h | 1 - + drivers/usb/otg/otg.c | 3 +- + drivers/usb/serial/cyberjack.c | 7 - + drivers/usb/serial/cypress_m8.c | 4 - + drivers/usb/serial/empeg.c | 6 - + drivers/usb/serial/garmin_gps.c | 8 - + drivers/usb/serial/generic.c | 6 - + drivers/usb/serial/io_edgeport.c | 8 - + drivers/usb/serial/io_ti.c | 8 - + drivers/usb/serial/ipaq.c | 6 - + drivers/usb/serial/ipw.c | 3 - + drivers/usb/serial/iuu_phoenix.c | 1 - + drivers/usb/serial/kobil_sct.c | 6 - + drivers/usb/serial/mos7720.c | 7 - + drivers/usb/serial/mos7840.c | 361 +++++++++++++++++---------------- + drivers/usb/serial/opticon.c | 8 - + drivers/usb/serial/option.c | 3 - + drivers/usb/serial/sierra.c | 24 ++- + drivers/usb/serial/ti_usb_3410_5052.c | 14 +-- + drivers/usb/serial/usb-serial.c | 90 +++++--- + drivers/usb/serial/visor.c | 8 - + drivers/usb/storage/unusual_devs.h | 6 + + include/linux/usb/musb.h | 5 + + 32 files changed, 305 insertions(+), 351 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/keyboard/omap-keypad.c | 16 +++++++++- + drivers/input/mouse/elantech.c | 48 +++++++++++++++++++++++++++---- + drivers/input/mouse/elantech.h | 5 ++- + drivers/input/serio/sa1111ps2.c | 2 +- + drivers/input/touchscreen/tsc2007.c | 2 +- + drivers/input/touchscreen/ucb1400_ts.c | 2 +- + 6 files changed, 61 insertions(+), 14 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 +Auto-merging drivers/crypto/ixp4xx_crypto.c +Merge made by recursive. + crypto/api.c | 3 ++- + crypto/eseqiv.c | 3 ++- + drivers/crypto/ixp4xx_crypto.c | 33 ++++++++++++++++++++++++++++++++- + drivers/crypto/padlock-aes.c | 2 +- + 4 files changed, 37 insertions(+), 4 deletions(-) +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/boards/merisc/setup.c | 7 ++++--- + drivers/mmc/host/atmel-mci.c | 12 +++++++++--- + include/linux/atmel-mci.h | 2 ++ + 3 files changed, 15 insertions(+), 6 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Removing arch/cris/arch-v10/boot/compressed/Makefile +Removing arch/cris/arch-v10/boot/compressed/README +Removing arch/cris/arch-v10/boot/compressed/misc.c +Removing arch/cris/arch-v32/boot/Makefile +Removing arch/cris/arch-v32/boot/compressed/Makefile +Removing arch/cris/arch-v32/boot/rescue/Makefile +Merge made by recursive. + arch/cris/Makefile | 14 +- + arch/cris/arch-v10/boot/compressed/Makefile | 27 --- + arch/cris/arch-v10/boot/compressed/README | 25 -- + arch/cris/arch-v10/boot/compressed/misc.c | 246 -------------------- + arch/cris/arch-v32/boot/Makefile | 20 -- + arch/cris/arch-v32/boot/compressed/Makefile | 26 -- + arch/cris/arch-v32/boot/rescue/Makefile | 26 -- + arch/cris/arch-v32/kernel/Makefile | 2 - + arch/cris/{arch-v10 => }/boot/.gitignore | 0 + arch/cris/{arch-v10 => }/boot/Makefile | 8 +- + arch/cris/boot/compressed/Makefile | 38 +++ + arch/cris/{arch-v32 => }/boot/compressed/README | 0 + .../compressed/decompress_v10.lds} | 0 + .../compressed/decompress_v32.lds} | 0 + .../head.S => boot/compressed/head_v10.S} | 4 +- + .../head.S => boot/compressed/head_v32.S} | 10 +- + arch/cris/{arch-v32 => }/boot/compressed/misc.c | 193 +++++++++++----- + arch/cris/{arch-v10 => }/boot/rescue/Makefile | 22 ++- + .../boot/rescue/head.S => boot/rescue/head_v10.S} | 2 +- + .../boot/rescue/head.S => boot/rescue/head_v32.S} | 0 + .../cris/{arch-v10 => }/boot/rescue/kimagerescue.S | 0 + .../rescue.lds => boot/rescue/rescue_v10.lds} | 0 + .../rescue.lds => boot/rescue/rescue_v32.lds} | 0 + arch/cris/{arch-v10 => }/boot/rescue/testrescue.S | 0 + arch/cris/{arch-v10 => }/boot/tools/build.c | 0 + 25 files changed, 209 insertions(+), 454 deletions(-) + delete mode 100644 arch/cris/arch-v10/boot/compressed/Makefile + delete mode 100644 arch/cris/arch-v10/boot/compressed/README + delete mode 100644 arch/cris/arch-v10/boot/compressed/misc.c + delete mode 100644 arch/cris/arch-v32/boot/Makefile + delete mode 100644 arch/cris/arch-v32/boot/compressed/Makefile + delete mode 100644 arch/cris/arch-v32/boot/rescue/Makefile + rename arch/cris/{arch-v10 => }/boot/.gitignore (100%) + rename arch/cris/{arch-v10 => }/boot/Makefile (65%) + create mode 100644 arch/cris/boot/compressed/Makefile + rename arch/cris/{arch-v32 => }/boot/compressed/README (100%) + rename arch/cris/{arch-v10/boot/compressed/decompress.lds => boot/compressed/decompress_v10.lds} (100%) + rename arch/cris/{arch-v32/boot/compressed/decompress.lds => boot/compressed/decompress_v32.lds} (100%) + rename arch/cris/{arch-v10/boot/compressed/head.S => boot/compressed/head_v10.S} (97%) + rename arch/cris/{arch-v32/boot/compressed/head.S => boot/compressed/head_v32.S} (94%) + rename arch/cris/{arch-v32 => }/boot/compressed/misc.c (65%) + rename arch/cris/{arch-v10 => }/boot/rescue/Makefile (63%) + rename arch/cris/{arch-v10/boot/rescue/head.S => boot/rescue/head_v10.S} (99%) + rename arch/cris/{arch-v32/boot/rescue/head.S => boot/rescue/head_v32.S} (100%) + rename arch/cris/{arch-v10 => }/boot/rescue/kimagerescue.S (100%) + rename arch/cris/{arch-v10/boot/rescue/rescue.lds => boot/rescue/rescue_v10.lds} (100%) + rename arch/cris/{arch-v32/boot/rescue/rescue.lds => boot/rescue/rescue_v32.lds} (100%) + rename arch/cris/{arch-v10 => }/boot/rescue/testrescue.S (100%) + rename arch/cris/{arch-v10 => }/boot/tools/build.c (100%) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +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 +Merge made by recursive. + arch/m68knommu/Kconfig | 1 + + arch/m68knommu/configs/m5208evb_defconfig | 163 +++++---- + arch/m68knommu/configs/m5249evb_defconfig | 268 ++++++++++--- + arch/m68knommu/configs/m5272c3_defconfig | 645 +++++++++++++++++++++++++++++ + arch/m68knommu/configs/m5275evb_defconfig | 167 +++++---- + arch/m68knommu/configs/m5307c3_defconfig | 231 ++++++++--- + arch/m68knommu/configs/m5407c3_defconfig | 179 +++++---- + arch/m68knommu/kernel/asm-offsets.c | 6 - + arch/m68knommu/kernel/dma.c | 37 ++- + arch/m68knommu/kernel/vmlinux.lds.S | 2 + + arch/m68knommu/platform/527x/config.c | 5 + + 11 files changed, 1346 insertions(+), 358 deletions(-) + create mode 100644 arch/m68knommu/configs/m5272c3_defconfig +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +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 +Merge made by recursive. + arch/powerpc/configs/40x/acadia_defconfig | 2 +- + arch/powerpc/configs/40x/ep405_defconfig | 2 +- + arch/powerpc/configs/40x/kilauea_defconfig | 2 +- + arch/powerpc/configs/40x/makalu_defconfig | 2 +- + arch/powerpc/configs/40x/virtex_defconfig | 2 +- + arch/powerpc/configs/44x/arches_defconfig | 2 +- + arch/powerpc/configs/44x/bamboo_defconfig | 2 +- + arch/powerpc/configs/44x/canyonlands_defconfig | 6 +++--- + arch/powerpc/configs/44x/ebony_defconfig | 2 +- + arch/powerpc/configs/44x/katmai_defconfig | 2 +- + arch/powerpc/configs/44x/rainier_defconfig | 2 +- + arch/powerpc/configs/44x/redwood_defconfig | 2 +- + arch/powerpc/configs/44x/sam440ep_defconfig | 2 +- + arch/powerpc/configs/44x/sequoia_defconfig | 2 +- + arch/powerpc/configs/44x/taishan_defconfig | 2 +- + arch/powerpc/configs/44x/virtex5_defconfig | 2 +- + 16 files changed, 18 insertions(+), 18 deletions(-) +Merging galak/next +$ git merge galak/next +Auto-merging MAINTAINERS +Removing arch/powerpc/configs/85xx/mpc8536_ds_defconfig +Removing arch/powerpc/configs/85xx/mpc8544_ds_defconfig +Removing arch/powerpc/configs/85xx/mpc8568mds_defconfig +Merge made by recursive. + Documentation/powerpc/booting-without-of.txt | 89 +- + Documentation/powerpc/dts-bindings/mtd-physmap.txt | 80 + + MAINTAINERS | 5 +- + arch/powerpc/boot/dts/lite5200b.dts | 39 + + arch/powerpc/boot/dts/mpc832x_mds.dts | 1 - + arch/powerpc/boot/dts/mpc832x_rdb.dts | 1 - + arch/powerpc/boot/dts/mpc8349emitx.dts | 2 - + arch/powerpc/boot/dts/mpc8349emitxgp.dts | 1 - + arch/powerpc/boot/dts/mpc834x_mds.dts | 2 - + arch/powerpc/boot/dts/mpc836x_mds.dts | 1 - + arch/powerpc/boot/dts/mpc8377_mds.dts | 1 - + arch/powerpc/boot/dts/mpc8378_mds.dts | 1 - + arch/powerpc/boot/dts/mpc8379_mds.dts | 1 - + arch/powerpc/boot/dts/mpc8536ds.dts | 4 - + arch/powerpc/boot/dts/mpc8540ads.dts | 1 - + arch/powerpc/boot/dts/mpc8541cds.dts | 2 - + arch/powerpc/boot/dts/mpc8544ds.dts | 4 - + arch/powerpc/boot/dts/mpc8548cds.dts | 3 - + arch/powerpc/boot/dts/mpc8555cds.dts | 2 - + arch/powerpc/boot/dts/mpc8560ads.dts | 1 - + arch/powerpc/boot/dts/mpc8568mds.dts | 2 - + arch/powerpc/boot/dts/mpc8572ds.dts | 3 - + arch/powerpc/boot/dts/mpc8572ds_36b.dts | 3 - + arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 2 - + arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 1 - + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 2 - + arch/powerpc/boot/dts/mpc8641_hpcn.dts | 2 - + arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts | 597 +++++++ + arch/powerpc/boot/dts/p2020ds.dts | 667 ++++++++ + arch/powerpc/boot/dts/sbc8349.dts | 1 - + arch/powerpc/boot/dts/sbc8548.dts | 2 - + arch/powerpc/boot/dts/sbc8560.dts | 1 - + arch/powerpc/boot/dts/sbc8641d.dts | 2 - + arch/powerpc/boot/dts/socrates.dts | 1 - + arch/powerpc/boot/dts/stx_gp3_8560.dts | 1 - + arch/powerpc/boot/dts/tqm8540.dts | 1 - + arch/powerpc/boot/dts/tqm8541.dts | 1 - + arch/powerpc/boot/dts/tqm8548-bigflash.dts | 2 - + arch/powerpc/boot/dts/tqm8548.dts | 2 - + arch/powerpc/boot/dts/tqm8555.dts | 1 - + arch/powerpc/boot/dts/tqm8560.dts | 1 - + arch/powerpc/configs/52xx/cm5200_defconfig | 69 +- + arch/powerpc/configs/52xx/lite5200b_defconfig | 74 +- + arch/powerpc/configs/52xx/motionpro_defconfig | 77 +- + arch/powerpc/configs/52xx/pcm030_defconfig | 69 +- + arch/powerpc/configs/52xx/tqm5200_defconfig | 76 +- + arch/powerpc/configs/85xx/mpc8536_ds_defconfig | 1802 -------------------- + arch/powerpc/configs/85xx/mpc8544_ds_defconfig | 1802 -------------------- + arch/powerpc/configs/85xx/mpc8568mds_defconfig | 1309 -------------- + arch/powerpc/configs/mpc5200_defconfig | 188 ++- + arch/powerpc/configs/mpc85xx_defconfig | 252 ++-- + .../mpc8572_ds_defconfig => mpc85xx_smp_defconfig} | 343 ++-- + arch/powerpc/include/asm/elf.h | 3 +- + arch/powerpc/kernel/prom_parse.c | 11 +- + arch/powerpc/mm/hash_utils_64.c | 2 +- + arch/powerpc/oprofile/op_model_fsl_emb.c | 14 - + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 43 +- + arch/powerpc/platforms/fsl_uli1575.c | 29 +- + arch/powerpc/platforms/pasemi/setup.c | 4 - + arch/powerpc/platforms/ps3/os-area.c | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 2 + + arch/powerpc/sysdev/fsl_rio.c | 28 +- + drivers/macintosh/Kconfig | 2 +- + drivers/macintosh/mediabay.c | 2 + + include/linux/fsl_devices.h | 4 + + include/linux/pci_ids.h | 2 + + 66 files changed, 2215 insertions(+), 5530 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/mtd-physmap.txt + create mode 100644 arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts + create mode 100644 arch/powerpc/boot/dts/p2020ds.dts + delete mode 100644 arch/powerpc/configs/85xx/mpc8536_ds_defconfig + delete mode 100644 arch/powerpc/configs/85xx/mpc8544_ds_defconfig + delete mode 100644 arch/powerpc/configs/85xx/mpc8568mds_defconfig + rename arch/powerpc/configs/{85xx/mpc8572_ds_defconfig => mpc85xx_smp_defconfig} (91%) +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-pxa/include/mach/colibri.h +Auto-merging arch/arm/mach-pxa/include/mach/palmt5.h +Auto-merging arch/arm/mach-pxa/include/mach/palmtx.h +Auto-merging arch/arm/mach-pxa/palmld.c +Auto-merging arch/arm/mach-pxa/palmt5.c +Auto-merging arch/arm/mach-pxa/palmtx.c +Merge made by recursive. + arch/arm/mach-pxa/corgi.c | 55 ++++++-------------------- + arch/arm/mach-pxa/include/mach/colibri.h | 4 ++ + arch/arm/mach-pxa/poodle.c | 18 ++------- + arch/arm/mach-pxa/spitz.c | 63 ++++++----------------------- + 4 files changed, 34 insertions(+), 106 deletions(-) +Merging s390/features +$ git merge s390/features +Removing arch/s390/include/asm/cpu.h +Merge made by recursive. + arch/s390/appldata/appldata_base.c | 32 ++-- + arch/s390/appldata/appldata_mem.c | 2 +- + arch/s390/include/asm/cpu.h | 32 ---- + arch/s390/include/asm/cputime.h | 23 +++ + arch/s390/include/asm/lowcore.h | 1 + + arch/s390/include/asm/spinlock.h | 19 ++- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/head.S | 65 +++++-- + arch/s390/kernel/ipl.c | 1 + + arch/s390/kernel/nmi.c | 2 +- + arch/s390/kernel/s390_ext.c | 2 +- + arch/s390/kernel/sclp.S | 327 ++++++++++++++++++++++++++++++++++++ + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/vtime.c | 18 ++- + arch/s390/lib/spinlock.c | 40 +++++ + drivers/s390/cio/cio.c | 2 +- + fs/proc/stat.c | 5 + + 17 files changed, 499 insertions(+), 76 deletions(-) + delete mode 100644 arch/s390/include/asm/cpu.h + create mode 100644 arch/s390/kernel/sclp.S +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 11 + + arch/sh/configs/sh7724_generic_defconfig | 707 ++++++++++ + arch/sh/include/asm/device.h | 2 + + arch/sh/include/asm/processor.h | 2 +- + arch/sh/include/cpu-sh4/cpu/freq.h | 18 + + arch/sh/include/cpu-sh4/cpu/sh7724.h | 255 ++++ + arch/sh/kernel/cpu/sh4/probe.c | 6 + + arch/sh/kernel/cpu/sh4a/Makefile | 3 + + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 112 ++- + arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 2230 ++++++++++++++++++++++++++++++ + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 10 + + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 10 + + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 10 + + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 10 + + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 556 ++++++++ + arch/sh/kernel/setup.c | 10 +- + arch/sh/kernel/time_32.c | 9 + + arch/sh/oprofile/common.c | 1 + + drivers/clocksource/sh_cmt.c | 84 ++- + drivers/serial/sh-sci.h | 23 +- + 20 files changed, 4050 insertions(+), 19 deletions(-) + create mode 100644 arch/sh/configs/sh7724_generic_defconfig + create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7724.h + create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c + create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7724.c +Merging sparc/master +$ git merge sparc/master +Auto-merging arch/sparc/kernel/smp_64.c +Merge made by recursive. + arch/sparc/Kconfig | 3 + + arch/sparc/include/asm/cpudata_64.h | 197 +----------------------------- + arch/sparc/include/asm/mdesc.h | 3 +- + arch/sparc/include/asm/percpu_64.h | 8 +- + arch/sparc/include/asm/prom.h | 2 + + arch/sparc/include/asm/trap_block.h | 207 +++++++++++++++++++++++++++++++ + arch/sparc/kernel/ds.c | 3 +- + arch/sparc/kernel/head_64.S | 22 ---- + arch/sparc/kernel/mdesc.c | 149 +++++++++++++--------- + arch/sparc/kernel/prom.h | 1 - + arch/sparc/kernel/prom_64.c | 234 +++++++++++++++++++---------------- + arch/sparc/kernel/prom_common.c | 2 - + arch/sparc/kernel/smp_64.c | 192 ++++++++++++++++++++++++----- + arch/sparc/kernel/traps_64.c | 170 ++++++++++++++------------ + arch/sparc/mm/init_32.c | 1 + + arch/sparc/mm/init_64.c | 16 +-- + 16 files changed, 692 insertions(+), 518 deletions(-) + create mode 100644 arch/sparc/include/asm/trap_block.h +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Removing arch/x86/kernel/irqinit_64.c +Auto-merging arch/x86/kernel/tsc.c +Auto-merging arch/x86/lguest/boot.c +Merge made by recursive. + .../ABI/testing/sysfs-devices-cache_disable | 18 + + Documentation/kernel-parameters.txt | 5 + + arch/x86/Kbuild | 16 + + arch/x86/Makefile | 25 +- + arch/x86/boot/Makefile | 5 +- + arch/x86/boot/a20.c | 9 +- + arch/x86/boot/apm.c | 76 ++-- + arch/x86/boot/bioscall.S | 82 ++++ + arch/x86/boot/boot.h | 48 ++ + arch/x86/boot/edd.c | 71 ++-- + arch/x86/boot/header.S | 2 +- + arch/x86/boot/main.c | 39 +- + arch/x86/boot/mca.c | 27 +- + arch/x86/boot/memory.c | 81 ++-- + arch/x86/boot/regs.c | 29 ++ + arch/x86/boot/setup.ld | 6 + + arch/x86/boot/tty.c | 52 ++- + arch/x86/boot/video-bios.c | 27 +- + arch/x86/boot/video-vesa.c | 137 +++--- + arch/x86/boot/video-vga.c | 95 +++-- + arch/x86/boot/video.c | 42 +- + arch/x86/boot/video.h | 14 - + arch/x86/include/asm/apic.h | 21 +- + arch/x86/include/asm/hw_irq.h | 4 + + arch/x86/include/asm/i387.h | 31 +- + arch/x86/include/asm/i8259.h | 4 - + arch/x86/include/asm/irq_vectors.h | 1 + + arch/x86/include/asm/k8.h | 13 + + arch/x86/include/asm/page_32_types.h | 4 - + arch/x86/include/asm/page_64_types.h | 6 - + arch/x86/include/asm/page_types.h | 6 + + arch/x86/include/asm/paravirt.h | 22 +- + arch/x86/include/asm/pgtable.h | 4 + + arch/x86/include/asm/pgtable_64.h | 6 - + arch/x86/include/asm/required-features.h | 8 +- + arch/x86/include/asm/setup.h | 1 - + arch/x86/include/asm/syscalls.h | 45 +- + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/include/asm/traps.h | 2 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/acpi/realmode/Makefile | 2 +- + arch/x86/kernel/acpi/realmode/bioscall.S | 1 + + arch/x86/kernel/acpi/realmode/regs.c | 1 + + arch/x86/kernel/apic/apic.c | 144 ++++-- + arch/x86/kernel/apic/es7000_32.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 256 +++++------ + arch/x86/kernel/apic/nmi.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 1 - + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 17 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 153 +++---- + arch/x86/kernel/dumpstack.h | 1 - + arch/x86/kernel/early-quirks.c | 2 + + arch/x86/kernel/irq.c | 20 +- + arch/x86/kernel/{irqinit_32.c => irqinit.c} | 149 +++++-- + arch/x86/kernel/irqinit_64.c | 177 ------- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/paravirt.c | 56 +-- + arch/x86/kernel/process.c | 1 + + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 2 +- + arch/x86/kernel/quirks.c | 37 ++ + arch/x86/kernel/setup.c | 18 - + arch/x86/kernel/smp.c | 20 +- + arch/x86/kernel/smpboot.c | 14 +- + arch/x86/kernel/traps.c | 10 +- + arch/x86/kernel/tsc.c | 8 +- + arch/x86/kernel/vmi_32.c | 20 +- + arch/x86/lguest/boot.c | 16 +- + arch/x86/mm/dump_pagetables.c | 7 +- + arch/x86/mm/fault.c | 50 +-- + arch/x86/mm/highmem_32.c | 2 - + arch/x86/mm/init.c | 1 + + arch/x86/mm/iomap_32.c | 1 - + arch/x86/mm/numa_32.c | 2 +- + arch/x86/mm/pageattr.c | 14 - + arch/x86/mm/srat_64.c | 6 +- + arch/x86/vdso/vma.c | 1 + + arch/x86/xen/enlighten.c | 10 +- + arch/x86/xen/mmu.c | 23 +- + arch/x86/xen/xen-ops.h | 1 - + drivers/pci/intel-iommu.c | 9 - + drivers/pci/intr_remapping.c | 39 +- + drivers/xen/Kconfig | 20 + + drivers/xen/Makefile | 4 +- + drivers/xen/events.c | 6 + + drivers/xen/evtchn.c | 507 ++++++++++++++++++++ + drivers/xen/manage.c | 9 +- + drivers/xen/sys-hypervisor.c | 445 +++++++++++++++++ + drivers/xen/xenbus/xenbus_probe.c | 61 +-- + drivers/xen/xenbus/xenbus_xs.c | 2 + + drivers/xen/xenfs/super.c | 19 +- + include/Kbuild | 1 + + include/asm-generic/pgtable.h | 21 +- + include/linux/dmar.h | 1 + + include/xen/Kbuild | 1 + + include/xen/events.h | 3 + + include/xen/evtchn.h | 88 ++++ + include/xen/interface/version.h | 3 + + include/xen/xenbus.h | 3 +- + kernel/sched.c | 2 +- + 101 files changed, 2357 insertions(+), 1231 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-cache_disable + create mode 100644 arch/x86/Kbuild + create mode 100644 arch/x86/boot/bioscall.S + create mode 100644 arch/x86/boot/regs.c + create mode 100644 arch/x86/kernel/acpi/realmode/bioscall.S + create mode 100644 arch/x86/kernel/acpi/realmode/regs.c + rename arch/x86/kernel/{irqinit_32.c => irqinit.c} (68%) + delete mode 100644 arch/x86/kernel/irqinit_64.c + create mode 100644 drivers/xen/evtchn.c + create mode 100644 drivers/xen/sys-hypervisor.c + create mode 100644 include/xen/Kbuild + create mode 100644 include/xen/evtchn.h +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. + arch/xtensa/Kconfig | 6 ++---- + arch/xtensa/include/asm/checksum.h | 6 ++++-- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Merge made by recursive. + fs/configfs/symlink.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/jbd/revoke.c +Merge made by recursive. + fs/ext4/ialloc.c | 3 ++- + fs/jbd/commit.c | 2 +- + fs/jbd/revoke.c | 20 +++++++++++--------- + fs/jbd2/commit.c | 3 ++- + fs/jbd2/revoke.c | 21 ++++++++++++--------- + include/linux/jbd.h | 3 ++- + include/linux/jbd2.h | 3 ++- + 7 files changed, 32 insertions(+), 23 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/log.c | 6 ++-- + fs/gfs2/lops.c | 14 ++++--- + fs/gfs2/meta_io.c | 104 ++++++++++++++++++++++++++++++++++++++++++---------- + 3 files changed, 95 insertions(+), 29 deletions(-) +Merging jfs/next +$ git merge jfs/next +Merge made by recursive. + fs/jfs/super.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merging fs/nfs/super.c +Merge made by recursive. + fs/nfs/Kconfig | 9 + + fs/nfs/client.c | 124 ++++- + fs/nfs/direct.c | 9 + + fs/nfs/internal.h | 62 +++ + fs/nfs/nfs4_fs.h | 37 ++- + fs/nfs/nfs4proc.c | 1229 ++++++++++++++++++++++++++++++++++++++++-- + fs/nfs/nfs4renewd.c | 6 +- + fs/nfs/nfs4state.c | 130 ++++- + fs/nfs/nfs4xdr.c | 1078 ++++++++++++++++++++++++++++++++----- + fs/nfs/read.c | 33 +- + fs/nfs/super.c | 12 + + fs/nfs/unlink.c | 20 +- + fs/nfs/write.c | 31 +- + include/linux/nfs4.h | 18 + + include/linux/nfs_fs_sb.h | 67 +++- + include/linux/nfs_xdr.h | 174 ++++++ + include/linux/nfsd/state.h | 1 - + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/sched.h | 1 + + net/sunrpc/clnt.c | 13 + + net/sunrpc/sched.c | 2 +- + 21 files changed, 2838 insertions(+), 219 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 2 +- + fs/ocfs2/dir.c | 4 ++-- + fs/ocfs2/export.c | 9 +++++---- + fs/ocfs2/suballoc.c | 21 +++++++++++++-------- + 4 files changed, 21 insertions(+), 15 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 37d227b] 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 +Already up-to-date. +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Merge made by recursive. + Documentation/RCU/trace.txt | 102 ++- + arch/sparc/include/asm/thread_info_64.h | 4 +- + arch/x86/kernel/entry_64.S | 3 + + include/linux/futex.h | 8 + + include/linux/rculist.h | 30 +- + include/linux/rcutree.h | 9 +- + include/linux/sched.h | 8 +- + include/linux/thread_info.h | 3 +- + init/Kconfig | 2 +- + ipc/sem.c | 4 +- + kernel/futex.c | 1202 +++++++++++++++++++++++------- + kernel/lockdep.c | 22 +- + kernel/rcutree.c | 25 +- + kernel/rcutree_trace.c | 64 ++- + kernel/rtmutex.c | 240 +++++-- + kernel/rtmutex_common.h | 8 + + lib/vsprintf.c | 37 +- + mm/percpu.c | 141 ++--- + security/integrity/ima/ima_fs.c | 4 +- + security/smack/smackfs.c | 8 +- + 20 files changed, 1433 insertions(+), 491 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Already up-to-date. +Merging tracing/auto-tracing-next +$ git merge tracing/auto-tracing-next +Auto-merging arch/x86/kernel/entry_64.S +Auto-merging include/linux/sched.h +Removing include/trace/irq.h +Removing include/trace/kmemtrace.h +Removing include/trace/lockdep.h +Removing include/trace/lockdep_event_types.h +Removing include/trace/sched.h +Removing include/trace/skb.h +Removing include/trace/trace_event_types.h +Removing include/trace/trace_events.h +Auto-merging kernel/lockdep.c +Auto-merging kernel/sched.c +Removing kernel/trace/events.c +Removing kernel/trace/trace_events_stage_1.h +Removing kernel/trace/trace_events_stage_2.h +Removing kernel/trace/trace_events_stage_3.h +Merge made by recursive. + Documentation/trace/events.txt | 135 ++++ + Documentation/trace/power.txt | 17 + + arch/x86/kernel/entry_64.S | 19 +- + block/blk-sysfs.c | 7 +- + block/compat_ioctl.c | 2 +- + drivers/scsi/sg.c | 1 + + include/asm-generic/vmlinux.lds.h | 2 +- + include/linux/blktrace_api.h | 28 +- + include/linux/ftrace.h | 17 +- + include/linux/ftrace_event.h | 150 ++++ + include/linux/init_task.h | 1 + + include/linux/kmemtrace.h | 25 + + include/linux/module.h | 8 + + include/linux/ring_buffer.h | 34 + + include/linux/sched.h | 4 +- + include/linux/slab_def.h | 2 +- + include/linux/slub_def.h | 2 +- + include/linux/trace_seq.h | 90 +++ + include/linux/tracepoint.h | 9 +- + include/trace/define_trace.h | 79 +++ + include/trace/{irq_event_types.h => events/irq.h} | 14 +- + include/trace/events/kmem.h | 194 ++++++ + include/trace/events/lockdep.h | 60 ++ + .../trace/{sched_event_types.h => events/sched.h} | 14 +- + include/trace/events/skb.h | 40 ++ + include/trace/ftrace.h | 493 +++++++++++++ + include/trace/irq.h | 9 - + include/trace/kmemtrace.h | 63 -- + include/trace/lockdep.h | 9 - + include/trace/lockdep_event_types.h | 44 -- + include/trace/sched.h | 9 - + include/trace/skb.h | 11 - + include/trace/trace_event_types.h | 5 - + include/trace/trace_events.h | 5 - + init/main.c | 2 +- + kernel/exit.c | 6 +- + kernel/fork.c | 5 +- + kernel/irq/handle.c | 7 +- + kernel/kthread.c | 5 +- + kernel/lockdep.c | 16 +- + kernel/module.c | 26 +- + kernel/sched.c | 10 +- + kernel/signal.c | 4 +- + kernel/softirq.c | 5 +- + kernel/trace/Kconfig | 73 ++- + kernel/trace/Makefile | 7 +- + kernel/trace/blktrace.c | 165 ++++- + kernel/trace/events.c | 14 - + kernel/trace/ftrace.c | 726 ++++++++++++++++++-- + kernel/trace/kmemtrace.c | 10 +- + kernel/trace/ring_buffer.c | 234 ++++++- + kernel/trace/trace.c | 295 +++++---- + kernel/trace/trace.h | 171 +---- + kernel/trace/trace_boot.c | 5 +- + kernel/trace/trace_branch.c | 8 +- + kernel/trace/trace_event_profile.c | 5 +- + kernel/trace/trace_event_types.h | 8 +- + kernel/trace/trace_events.c | 476 ++++++++++++-- + kernel/trace/trace_events_filter.c | 320 ++++++---- + kernel/trace/trace_events_stage_1.h | 39 - + kernel/trace/trace_events_stage_2.h | 176 ----- + kernel/trace/trace_events_stage_3.h | 281 -------- + kernel/trace/trace_export.c | 91 +++- + kernel/trace/trace_functions_graph.c | 25 +- + kernel/trace/trace_hw_branches.c | 4 +- + kernel/trace/trace_mmiotrace.c | 6 +- + kernel/trace/trace_output.c | 13 + + kernel/trace/trace_output.h | 28 +- + kernel/trace/trace_power.c | 8 +- + kernel/trace/trace_printk.c | 6 +- + kernel/trace/trace_sched_switch.c | 12 +- + kernel/trace/trace_sched_wakeup.c | 2 +- + kernel/trace/trace_stack.c | 13 +- + kernel/trace/trace_stat.c | 2 +- + kernel/trace/trace_stat.h | 2 +- + kernel/trace/trace_sysprof.c | 6 +- + kernel/trace/trace_workqueue.c | 2 +- + mm/slab.c | 2 +- + mm/slob.c | 2 +- + mm/slub.c | 2 +- + mm/util.c | 11 +- + net/core/drop_monitor.c | 2 +- + net/core/net-traces.c | 4 +- + net/core/skbuff.c | 2 +- + samples/Kconfig | 7 + + samples/Makefile | 2 +- + samples/trace_events/Makefile | 8 + + samples/trace_events/trace-events-sample.c | 56 ++ + samples/trace_events/trace-events-sample.h | 124 ++++ + 89 files changed, 3702 insertions(+), 1441 deletions(-) + create mode 100644 Documentation/trace/events.txt + create mode 100644 Documentation/trace/power.txt + create mode 100644 include/linux/ftrace_event.h + create mode 100644 include/linux/kmemtrace.h + create mode 100644 include/linux/trace_seq.h + create mode 100644 include/trace/define_trace.h + rename include/trace/{irq_event_types.h => events/irq.h} (80%) + create mode 100644 include/trace/events/kmem.h + create mode 100644 include/trace/events/lockdep.h + rename include/trace/{sched_event_types.h => events/sched.h} (96%) + create mode 100644 include/trace/events/skb.h + create mode 100644 include/trace/ftrace.h + delete mode 100644 include/trace/irq.h + delete mode 100644 include/trace/kmemtrace.h + delete mode 100644 include/trace/lockdep.h + delete mode 100644 include/trace/lockdep_event_types.h + delete mode 100644 include/trace/sched.h + delete mode 100644 include/trace/skb.h + delete mode 100644 include/trace/trace_event_types.h + delete mode 100644 include/trace/trace_events.h + delete mode 100644 kernel/trace/events.c + delete mode 100644 kernel/trace/trace_events_stage_1.h + delete mode 100644 kernel/trace/trace_events_stage_2.h + delete mode 100644 kernel/trace/trace_events_stage_3.h + create mode 100644 samples/trace_events/Makefile + create mode 100644 samples/trace_events/trace-events-sample.c + create mode 100644 samples/trace_events/trace-events-sample.h +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merging arch/x86/kernel/apic/io_apic.c +Merge made by recursive. + arch/x86/Kconfig | 1 + + arch/x86/kernel/apic/io_apic.c | 2 ++ + kernel/irq/manage.c | 7 +++---- + 3 files changed, 6 insertions(+), 4 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merging arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merging kernel/sched.c +Merge made by recursive. + include/linux/wait.h | 2 - + kernel/mutex.c | 4 +- + kernel/sched.c | 163 +++++++++++++++++++++++++++++++++++++++++++------- + kernel/sched_fair.c | 13 +--- + kernel/wait.c | 2 +- + 5 files changed, 149 insertions(+), 35 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Already up-to-date. +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merging arch/x86/kernel/hpet.c +Merge made by recursive. + arch/x86/kernel/hpet.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-mpath.c | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-lg.c | 2 ++ + drivers/hid/hidraw.c | 12 ++++++++---- + 4 files changed, 12 insertions(+), 4 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/i2c-core.c | 2 +- + drivers/macintosh/therm_pm72.c | 95 ++++++++++---------- + drivers/macintosh/windfarm_lm75_sensor.c | 129 +++++++++++++++------------ + drivers/macintosh/windfarm_max6690_sensor.c | 103 +++++++++++++--------- + drivers/macintosh/windfarm_smu_sat.c | 109 +++++++++++++---------- + 5 files changed, 245 insertions(+), 193 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/ibmaem | 2 +- + drivers/hwmon/Kconfig | 2 +- + drivers/hwmon/ibmaem.c | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + Documentation/dvb/get_dvb_firmware | 6 +- + Documentation/video4linux/CARDLIST.em28xx | 1 + + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/gspca.txt | 1 + + drivers/media/dvb/dvb-usb/af9015.c | 80 +++- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 + + drivers/media/dvb/siano/smscoreapi.c | 36 - + drivers/media/dvb/siano/smscoreapi.h | 119 +++- + drivers/media/dvb/siano/smsendian.c | 100 +++ + drivers/media/dvb/siano/smsendian.h | 32 + + drivers/media/dvb/siano/smsir.c | 301 +++++++++ + drivers/media/dvb/siano/smsir.h | 93 +++ + drivers/media/dvb/siano/smssdio.c | 354 ++++++++++ + drivers/media/video/cx18/cx18-audio.c | 2 +- + drivers/media/video/cx231xx/Kconfig | 44 +- + drivers/media/video/cx88/Makefile | 2 +- + drivers/media/video/cx88/cx88-core.c | 26 +- + drivers/media/video/cx88/cx88-dsp.c | 312 +++++++++ + drivers/media/video/cx88/cx88-tvaudio.c | 115 +++- + drivers/media/video/cx88/cx88.h | 10 + + drivers/media/video/em28xx/em28xx-cards.c | 27 + + drivers/media/video/em28xx/em28xx-core.c | 2 +- + drivers/media/video/em28xx/em28xx-dvb.c | 1 + + drivers/media/video/em28xx/em28xx.h | 1 + + drivers/media/video/gspca/gspca.c | 2 +- + drivers/media/video/gspca/m5602/m5602_bridge.h | 22 +- + drivers/media/video/gspca/m5602/m5602_core.c | 18 +- + drivers/media/video/gspca/m5602/m5602_mt9m111.c | 402 ++++++++++-- + drivers/media/video/gspca/m5602/m5602_mt9m111.h | 801 ++--------------------- + drivers/media/video/gspca/m5602/m5602_ov9650.c | 176 +++-- + drivers/media/video/gspca/m5602/m5602_ov9650.h | 55 +-- + drivers/media/video/gspca/m5602/m5602_po1030.c | 501 ++++++++++++--- + drivers/media/video/gspca/m5602/m5602_po1030.h | 439 +++++-------- + drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 270 ++++++--- + drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 37 +- + drivers/media/video/gspca/m5602/m5602_s5k83a.c | 429 ++++++++----- + drivers/media/video/gspca/m5602/m5602_s5k83a.h | 171 +---- + drivers/media/video/gspca/m5602/m5602_sensor.h | 6 +- + drivers/media/video/gspca/mr97310a.c | 8 +- + drivers/media/video/gspca/t613.c | 2 +- + drivers/media/video/gspca/zc3xx.c | 20 +- + drivers/media/video/saa5246a.c | 3 +- + drivers/media/video/saa5249.c | 4 +- + drivers/media/video/saa7134/saa7134-cards.c | 44 ++ + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/saa7134/saa7134.h | 1 + + include/linux/mmc/sdio_ids.h | 8 + + include/media/v4l2-device.h | 2 +- + 48 files changed, 3274 insertions(+), 1816 deletions(-) + create mode 100644 drivers/media/dvb/siano/smsendian.c + create mode 100644 drivers/media/dvb/siano/smsendian.h + create mode 100644 drivers/media/dvb/siano/smsir.c + create mode 100644 drivers/media/dvb/siano/smsir.h + create mode 100644 drivers/media/dvb/siano/smssdio.c + create mode 100644 drivers/media/video/cx88/cx88-dsp.c +Merging quota/for_next +$ git merge quota/for_next +Merge made by recursive. + fs/ext2/super.c | 4 +++- + fs/quota/Makefile | 9 --------- + 2 files changed, 3 insertions(+), 10 deletions(-) +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging ide/for-next +$ git merge ide/for-next +Auto-merging drivers/macintosh/mediabay.c +Merge made by recursive. + block/blk-core.c | 10 +- + drivers/ide/ide-atapi.c | 168 ++++++---- + drivers/ide/ide-cd.c | 90 ++---- + drivers/ide/ide-cd.h | 4 - + drivers/ide/ide-disk.c | 1 - + drivers/ide/ide-dma.c | 20 +- + drivers/ide/ide-floppy.c | 24 +- + drivers/ide/ide-gd.c | 17 +- + drivers/ide/ide-io.c | 14 +- + drivers/ide/ide-ioctls.c | 1 - + drivers/ide/ide-park.c | 7 +- + drivers/ide/ide-pm.c | 38 +-- + drivers/ide/ide-tape.c | 740 ++++++++++-------------------------------- + drivers/ide/ide-taskfile.c | 18 +- + drivers/ide/palm_bk3710.c | 26 +- + drivers/macintosh/mediabay.c | 1 - + include/linux/ide.h | 27 +- + 17 files changed, 395 insertions(+), 811 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/ahci.c | 17 ++++++++--------- + drivers/ata/libata-eh.c | 6 ++++-- + drivers/ata/libata-sff.c | 20 +++++++++++++------- + drivers/ata/sata_sil.c | 15 ++++++++++++++- + drivers/ata/sata_sx4.c | 11 +++++++---- + 5 files changed, 46 insertions(+), 23 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/cxgb3/iwch_cm.c | 8 ++++ + drivers/infiniband/hw/cxgb3/iwch_qp.c | 1 - + drivers/infiniband/hw/mthca/mthca_cmd.c | 16 ++++--- + drivers/infiniband/hw/nes/nes_verbs.c | 60 +++++++++++++++++++--------- + drivers/infiniband/hw/nes/nes_verbs.h | 1 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 6 ++- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 5 +-- + drivers/net/mlx4/main.c | 2 +- + 8 files changed, 65 insertions(+), 34 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/ABI/testing/sysfs-firmware-acpi | 8 +- + Documentation/laptops/thinkpad-acpi.txt | 4 +- + MAINTAINERS | 5 + + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 30 +- + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 43 +- + drivers/acpi/acpica/rscreate.c | 27 +- + drivers/acpi/button.c | 140 ++--- + drivers/acpi/ec.c | 1 + + drivers/acpi/osl.c | 4 +- + drivers/acpi/processor_idle.c | 15 +- + drivers/acpi/sleep.c | 27 + + drivers/acpi/system.c | 11 +- + drivers/acpi/thermal.c | 2 +- + drivers/acpi/video.c | 51 +- + drivers/platform/x86/Kconfig | 13 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/oqo-wmi.c | 941 +++++++++++++++++++++++++ + drivers/platform/x86/sony-laptop.c | 27 +- + drivers/platform/x86/thinkpad_acpi.c | 81 ++- + drivers/platform/x86/toshiba_acpi.c | 207 ++++++- + include/linux/acpi.h | 1 + + 22 files changed, 1395 insertions(+), 246 deletions(-) + create mode 100644 drivers/platform/x86/oqo-wmi.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 arch/x86/kernel/kvm.c +Merge made by recursive. + arch/ia64/include/asm/kvm_host.h | 5 +- + arch/ia64/include/asm/pgtable.h | 2 + + arch/ia64/kvm/Kconfig | 2 +- + arch/ia64/kvm/kvm-ia64.c | 245 ++++++++++----- + arch/ia64/kvm/kvm_fw.c | 28 ++- + arch/ia64/kvm/lapic.h | 6 +- + arch/ia64/kvm/optvfault.S | 30 ++ + arch/ia64/kvm/process.c | 5 + + arch/ia64/kvm/vcpu.c | 20 +- + arch/ia64/kvm/vmm.c | 12 +- + arch/ia64/kvm/vmm_ivt.S | 18 +- + arch/ia64/kvm/vtlb.c | 3 +- + arch/powerpc/kvm/powerpc.c | 6 + + arch/s390/kvm/interrupt.c | 6 + + arch/x86/include/asm/kvm.h | 1 + + arch/x86/include/asm/kvm_host.h | 12 +- + arch/x86/include/asm/svm.h | 1 + + arch/x86/kernel/kvm.c | 4 + + arch/x86/kvm/Makefile | 2 +- + arch/x86/kvm/i8254.c | 109 ++++--- + arch/x86/kvm/i8254.h | 12 +- + arch/x86/kvm/kvm_timer.h | 18 + + arch/x86/kvm/lapic.c | 251 +++++---------- + arch/x86/kvm/lapic.h | 12 +- + arch/x86/kvm/mmu.c | 136 +++++---- + arch/x86/kvm/mmu.h | 5 + + arch/x86/kvm/paging_tmpl.h | 16 +- + arch/x86/kvm/svm.c | 75 +++--- + arch/x86/kvm/timer.c | 46 +++ + arch/x86/kvm/vmx.c | 349 ++++++++++++--------- + arch/x86/kvm/x86.c | 160 +++++++--- + arch/x86/kvm/x86.h | 18 + + arch/x86/kvm/x86_emulate.c | 121 +++----- + include/linux/kvm.h | 48 +++- + include/linux/kvm_host.h | 20 +- + include/linux/kvm_types.h | 27 ++ + virt/kvm/ioapic.c | 153 ++-------- + virt/kvm/ioapic.h | 27 +-- + virt/kvm/irq_comm.c | 109 ++++--- + virt/kvm/kvm_main.c | 645 +++++++++++++++++++++++++++----------- + 40 files changed, 1666 insertions(+), 1099 deletions(-) + create mode 100644 arch/x86/kvm/kvm_timer.h + create mode 100644 arch/x86/kvm/timer.c +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/lockspace.c | 17 ++++++++--------- + include/linux/dlm.h | 4 ++-- + 2 files changed, 10 insertions(+), 11 deletions(-) +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Auto-merging MAINTAINERS +Auto-merging drivers/net/8139too.c +Auto-merging drivers/net/benet/be_main.c +Auto-merging drivers/net/ucc_geth.c +Auto-merging net/rds/rds.h +Merge made by recursive. + Documentation/isdn/00-INDEX | 45 +- + MAINTAINERS | 2 +- + drivers/net/8139too.c | 92 ++-- + drivers/net/8390.c | 10 +- + drivers/net/8390p.c | 10 +- + drivers/net/atl1e/atl1e_main.c | 3 +- + drivers/net/atlx/atl1.c | 7 +- + drivers/net/benet/be_main.c | 28 +- + drivers/net/bmac.c | 16 +- + drivers/net/chelsio/sge.c | 4 +- + drivers/net/cpmac.c | 23 +- + drivers/net/cxgb3/adapter.h | 2 +- + drivers/net/cxgb3/sge.c | 53 +- + drivers/net/dm9000.c | 30 +- + drivers/net/e1000/e1000_main.c | 13 +- + drivers/net/e1000e/netdev.c | 17 +- + drivers/net/fec.c | 897 +++++++++++--------------- + drivers/net/fec.h | 127 ++--- + drivers/net/fs_enet/mii-fec.c | 6 +- + drivers/net/hplance.c | 21 +- + drivers/net/ibmveth.c | 26 +- + drivers/net/igb/igb_main.c | 13 +- + drivers/net/irda/au1k_ir.c | 18 +- + drivers/net/irda/pxaficp_ir.c | 16 +- + drivers/net/irda/sa1100_ir.c | 18 +- + drivers/net/iseries_veth.c | 17 +- + drivers/net/ixgb/ixgb_main.c | 13 +- + drivers/net/ixgb/ixgb_osdep.h | 2 +- + drivers/net/ixgbe/ixgbe_82598.c | 186 ++++-- + drivers/net/ixgbe/ixgbe_82599.c | 249 +++++-- + drivers/net/ixgbe/ixgbe_common.c | 9 +- + drivers/net/ixgbe/ixgbe_main.c | 18 +- + drivers/net/ixgbe/ixgbe_phy.c | 19 +- + drivers/net/ixgbe/ixgbe_phy.h | 1 + + drivers/net/ixgbe/ixgbe_type.h | 18 +- + drivers/net/ixp2000/ixpdev.c | 19 +- + drivers/net/jazzsonic.c | 19 +- + drivers/net/korina.c | 25 +- + drivers/net/lib82596.c | 23 +- + drivers/net/loopback.c | 21 +- + drivers/net/mace.c | 16 +- + drivers/net/macmace.c | 18 +- + drivers/net/macvlan.c | 22 +- + drivers/net/meth.c | 28 +- + drivers/net/mipsnet.c | 15 +- + drivers/net/mvme147.c | 17 +- + drivers/net/myri10ge/myri10ge.c | 38 +- + drivers/net/netx-eth.c | 17 +- + drivers/net/netxen/netxen_nic.h | 594 ++++++++---------- + drivers/net/netxen/netxen_nic_ctx.c | 204 ++++--- + drivers/net/netxen/netxen_nic_ethtool.c | 105 ++-- + drivers/net/netxen/netxen_nic_hdr.h | 8 - + drivers/net/netxen/netxen_nic_hw.c | 393 +++++------- + drivers/net/netxen/netxen_nic_hw.h | 66 +-- + drivers/net/netxen/netxen_nic_init.c | 291 +++++---- + drivers/net/netxen/netxen_nic_main.c | 268 ++++---- + drivers/net/netxen/netxen_nic_niu.c | 203 ++---- + drivers/net/netxen/netxen_nic_phan_reg.h | 27 +- + drivers/net/pasemi_mac.c | 23 +- + drivers/net/pci-skeleton.c | 19 +- + drivers/net/pppol2tp.c | 3 +- + drivers/net/r8169.c | 61 ++- + drivers/net/rionet.c | 14 +- + drivers/net/sb1250-mac.c | 29 +- + drivers/net/sfc/boards.c | 2 - + drivers/net/sfc/rx.c | 26 +- + drivers/net/sfc/sfe4001.c | 3 - + drivers/net/sgiseeq.c | 18 +- + drivers/net/smc911x.c | 23 +- + drivers/net/sun3lance.c | 17 +- + drivers/net/tg3.c | 89 ++- + drivers/net/tg3.h | 6 + + drivers/net/tulip/winbond-840.c | 3 +- + drivers/net/tun.c | 24 +- + drivers/net/ucc_geth.c | 31 +- + drivers/net/ucc_geth.h | 1 - + drivers/net/usb/Kconfig | 8 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/cdc_ether.c | 33 +- + drivers/net/usb/int51x1.c | 253 ++++++++ + drivers/net/usb/kaweth.c | 33 +- + drivers/net/usb/usbnet.c | 37 +- + drivers/net/virtio_net.c | 12 +- + drivers/net/wan/pc300_drv.c | 20 +- + drivers/net/wireless/at76c50x-usb.c | 3 +- + drivers/net/wireless/ath5k/reset.c | 5 +- + drivers/net/wireless/ath9k/ath9k.h | 6 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 7 +- + drivers/net/wireless/ipw2x00/libipw_module.c | 4 - + drivers/net/wireless/libertas/if_usb.c | 3 +- + drivers/net/wireless/libertas_tf/if_usb.c | 3 +- + include/linux/if_vlan.h | 6 +- + include/linux/netdevice.h | 46 +- + include/linux/skbuff.h | 8 +- + include/linux/socket.h | 6 +- + include/linux/tcp.h | 4 +- + include/linux/usb/usbnet.h | 1 + + include/net/tcp.h | 13 + + net/8021q/vlan_core.c | 4 +- + net/8021q/vlan_dev.c | 23 +- + net/core/datagram.c | 112 +++- + net/core/dev.c | 81 +-- + net/core/iovec.c | 33 +- + net/ipv4/af_inet.c | 2 - + net/ipv4/syncookies.c | 5 +- + net/ipv6/syncookies.c | 4 +- + net/rds/af_rds.c | 1 - + net/rds/connection.c | 4 +- + net/rds/ib.c | 4 +- + net/rds/ib.h | 2 +- + net/rds/ib_recv.c | 2 +- + net/rds/ib_ring.c | 2 +- + net/rds/ib_send.c | 10 +- + net/rds/info.c | 5 +- + net/rds/iw.c | 4 +- + net/rds/iw.h | 2 +- + net/rds/iw_recv.c | 2 +- + net/rds/iw_ring.c | 2 +- + net/rds/iw_send.c | 10 +- + net/rds/rdma.c | 7 +- + net/rds/rdma_transport.c | 12 +- + net/rds/rds.h | 2 +- + net/rds/send.c | 10 +- + 123 files changed, 3149 insertions(+), 2566 deletions(-) + create mode 100644 drivers/net/usb/int51x1.c +Merging wireless/master +$ git merge wireless/master +Recorded preimage for 'drivers/net/wireless/rndis_wlan.c' +Resolved 'include/linux/mmc/sdio_ids.h' using previous resolution. +Resolved 'net/mac80211/pm.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-dev.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/rndis_wlan.c +CONFLICT (content): Merge conflict in drivers/net/wireless/rndis_wlan.c +Auto-merging drivers/platform/x86/sony-laptop.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging include/linux/mmc/sdio_ids.h +CONFLICT (content): Merge conflict in include/linux/mmc/sdio_ids.h +Auto-merging include/linux/pci_ids.h +Removing include/net/wireless.h +Auto-merging net/mac80211/pm.c +CONFLICT (content): Merge conflict in net/mac80211/pm.c +Auto-merging net/mac80211/rx.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/wireless/rndis_wlan.c'. +[master d758f8d] Merge commit 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/networking/mac80211-injection.txt | 28 +- + Documentation/rfkill.txt | 16 +- + MAINTAINERS | 10 +- + arch/arm/mach-pxa/tosa-bt.c | 4 +- + drivers/net/usb/hso.c | 4 +- + drivers/net/wireless/Kconfig | 16 +- + drivers/net/wireless/Makefile | 4 +- + drivers/net/wireless/at76c50x-usb.c | 1 + + drivers/net/wireless/ath/Kconfig | 8 + + drivers/net/wireless/ath/Makefile | 6 + + drivers/net/wireless/{ => ath}/ar9170/Kconfig | 1 + + drivers/net/wireless/{ => ath}/ar9170/Makefile | 0 + drivers/net/wireless/{ => ath}/ar9170/ar9170.h | 32 +- + drivers/net/wireless/{ => ath}/ar9170/cmd.c | 0 + drivers/net/wireless/{ => ath}/ar9170/cmd.h | 0 + drivers/net/wireless/{ => ath}/ar9170/eeprom.h | 0 + drivers/net/wireless/{ => ath}/ar9170/hw.h | 15 +- + drivers/net/wireless/{ => ath}/ar9170/led.c | 0 + drivers/net/wireless/{ => ath}/ar9170/mac.c | 0 + drivers/net/wireless/{ => ath}/ar9170/main.c | 613 ++++++++++--- + drivers/net/wireless/{ => ath}/ar9170/phy.c | 0 + drivers/net/wireless/{ => ath}/ar9170/usb.c | 0 + drivers/net/wireless/{ => ath}/ar9170/usb.h | 2 +- + drivers/net/wireless/{ => ath}/ath5k/Kconfig | 1 + + drivers/net/wireless/{ => ath}/ath5k/Makefile | 0 + drivers/net/wireless/{ => ath}/ath5k/ath5k.h | 5 +- + drivers/net/wireless/{ => ath}/ath5k/attach.c | 0 + drivers/net/wireless/{ => ath}/ath5k/base.c | 74 +- + drivers/net/wireless/{ => ath}/ath5k/base.h | 1 - + drivers/net/wireless/{ => ath}/ath5k/caps.c | 0 + drivers/net/wireless/{ => ath}/ath5k/debug.c | 0 + drivers/net/wireless/{ => ath}/ath5k/debug.h | 0 + drivers/net/wireless/{ => ath}/ath5k/desc.c | 0 + drivers/net/wireless/{ => ath}/ath5k/desc.h | 0 + drivers/net/wireless/{ => ath}/ath5k/dma.c | 2 - + drivers/net/wireless/{ => ath}/ath5k/eeprom.c | 0 + drivers/net/wireless/{ => ath}/ath5k/eeprom.h | 0 + drivers/net/wireless/{ => ath}/ath5k/gpio.c | 0 + drivers/net/wireless/{ => ath}/ath5k/initvals.c | 8 +- + drivers/net/wireless/{ => ath}/ath5k/led.c | 4 +- + drivers/net/wireless/{ => ath}/ath5k/pcu.c | 0 + drivers/net/wireless/{ => ath}/ath5k/phy.c | 49 +- + drivers/net/wireless/{ => ath}/ath5k/qcu.c | 0 + drivers/net/wireless/{ => ath}/ath5k/reg.h | 0 + drivers/net/wireless/{ => ath}/ath5k/reset.c | 2 +- + drivers/net/wireless/{ => ath}/ath5k/rfbuffer.h | 0 + drivers/net/wireless/{ => ath}/ath5k/rfgain.h | 0 + drivers/net/wireless/{ => ath}/ath9k/Kconfig | 1 + + drivers/net/wireless/{ => ath}/ath9k/Makefile | 1 - + drivers/net/wireless/{ => ath}/ath9k/ahb.c | 0 + drivers/net/wireless/{ => ath}/ath9k/ani.c | 8 +- + drivers/net/wireless/{ => ath}/ath9k/ani.h | 0 + drivers/net/wireless/{ => ath}/ath9k/ath9k.h | 65 +- + drivers/net/wireless/{ => ath}/ath9k/beacon.c | 17 +- + drivers/net/wireless/{ => ath}/ath9k/calib.c | 123 +-- + drivers/net/wireless/{ => ath}/ath9k/calib.h | 33 +- + drivers/net/wireless/{ => ath}/ath9k/debug.c | 3 + + drivers/net/wireless/{ => ath}/ath9k/debug.h | 24 +- + drivers/net/wireless/{ => ath}/ath9k/eeprom.c | 24 +- + drivers/net/wireless/{ => ath}/ath9k/eeprom.h | 2 + + drivers/net/wireless/{ => ath}/ath9k/hw.c | 179 ++--- + drivers/net/wireless/{ => ath}/ath9k/hw.h | 90 +-- + drivers/net/wireless/{ => ath}/ath9k/initvals.h | 0 + drivers/net/wireless/{ => ath}/ath9k/mac.c | 63 +- + drivers/net/wireless/{ => ath}/ath9k/mac.h | 0 + drivers/net/wireless/{ => ath}/ath9k/main.c | 374 ++++---- + drivers/net/wireless/{ => ath}/ath9k/pci.c | 0 + drivers/net/wireless/{ => ath}/ath9k/phy.c | 4 +- + drivers/net/wireless/{ => ath}/ath9k/phy.h | 3 - + drivers/net/wireless/{ => ath}/ath9k/rc.c | 24 +- + drivers/net/wireless/{ => ath}/ath9k/rc.h | 4 - + drivers/net/wireless/{ => ath}/ath9k/recv.c | 85 +- + drivers/net/wireless/{ => ath}/ath9k/reg.h | 0 + drivers/net/wireless/{ => ath}/ath9k/virtual.c | 0 + drivers/net/wireless/{ => ath}/ath9k/xmit.c | 64 +- + drivers/net/wireless/ath/main.c | 22 + + drivers/net/wireless/{ath9k => ath}/regd.c | 241 +++--- + drivers/net/wireless/{ath9k => ath}/regd.h | 40 +- + drivers/net/wireless/{ath9k => ath}/regd_common.h | 0 + drivers/net/wireless/b43/Kconfig | 8 +- + drivers/net/wireless/b43/b43.h | 8 +- + drivers/net/wireless/b43/main.c | 69 +- + drivers/net/wireless/b43/rfkill.c | 1 - + drivers/net/wireless/b43legacy/Kconfig | 8 +- + drivers/net/wireless/b43legacy/b43legacy.h | 8 +- + drivers/net/wireless/b43legacy/main.c | 193 +++- + drivers/net/wireless/b43legacy/rfkill.c | 1 - + drivers/net/wireless/b43legacy/xmit.c | 2 +- + drivers/net/wireless/b43legacy/xmit.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 206 +++++ + drivers/net/wireless/iwlwifi/iwl-3945.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 17 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 1 + + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 410 ++++++++- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 25 + + drivers/net/wireless/iwlwifi/iwl-agn.c | 791 ++--------------- + drivers/net/wireless/iwlwifi/iwl-commands.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 751 +++++++++++++++- + drivers/net/wireless/iwlwifi/iwl-core.h | 59 ++- + drivers/net/wireless/iwlwifi/iwl-debug.h | 1 + + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 96 ++- + drivers/net/wireless/iwlwifi/iwl-dev.h | 23 +- + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 1 - + drivers/net/wireless/iwlwifi/iwl-rx.c | 7 - + drivers/net/wireless/iwlwifi/iwl-scan.c | 196 +--- + drivers/net/wireless/iwlwifi/iwl-sta.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 12 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 1017 +++------------------ + drivers/net/wireless/libertas/cmd.c | 26 +- + drivers/net/wireless/libertas/defs.h | 21 + + drivers/net/wireless/libertas/dev.h | 1 + + drivers/net/wireless/libertas/host.h | 3 +- + drivers/net/wireless/libertas/hostcmd.h | 28 +- + drivers/net/wireless/libertas/if_cs.c | 34 +- + drivers/net/wireless/libertas/if_sdio.c | 17 +- + drivers/net/wireless/libertas/if_sdio.h | 2 + + drivers/net/wireless/libertas/if_spi.c | 4 + + drivers/net/wireless/libertas/main.c | 44 +- + drivers/net/wireless/libertas/rx.c | 48 +- + drivers/net/wireless/libertas/tx.c | 8 +- + drivers/net/wireless/libertas/types.h | 2 + + drivers/net/wireless/p54/p54.h | 78 +- + drivers/net/wireless/p54/p54common.c | 216 +++-- + drivers/net/wireless/p54/p54spi.c | 127 ++-- + drivers/net/wireless/rndis_wlan.c | 652 +++++-------- + drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00.h | 18 + + drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 16 +- + drivers/net/wireless/rt2x00/rt61pci.c | 7 +- + drivers/net/wireless/rt2x00/rt61pci.h | 6 - + drivers/net/wireless/rtl818x/Makefile | 2 +- + drivers/net/wireless/rtl818x/rtl8187.h | 7 + + drivers/net/wireless/rtl818x/rtl8187_dev.c | 21 +- + drivers/net/wireless/rtl818x/rtl8187_leds.c | 218 +++++ + drivers/net/wireless/rtl818x/rtl8187_leds.h | 57 ++ + drivers/platform/x86/acer-wmi.c | 1 - + drivers/platform/x86/hp-wmi.c | 3 - + drivers/platform/x86/sony-laptop.c | 4 - + drivers/platform/x86/toshiba_acpi.c | 1 - + include/linux/ieee80211.h | 41 +- + include/linux/mmc/sdio_ids.h | 2 + + include/linux/nl80211.h | 127 +++- + include/linux/pci_ids.h | 2 + + include/linux/rfkill.h | 14 - + include/net/cfg80211.h | 897 +++++++++++++++--- + include/net/mac80211.h | 117 ++- + include/net/regulatory.h | 101 ++ + include/net/wireless.h | 472 ---------- + net/mac80211/Kconfig | 16 + + net/mac80211/cfg.c | 59 +- + net/mac80211/debugfs.c | 8 +- + net/mac80211/event.c | 17 +- + net/mac80211/ht.c | 84 -- + net/mac80211/ibss.c | 347 ++++---- + net/mac80211/ieee80211_i.h | 85 +- + net/mac80211/iface.c | 16 +- + net/mac80211/main.c | 122 +++- + net/mac80211/mlme.c | 445 +++++++--- + net/mac80211/pm.c | 121 +--- + net/mac80211/rx.c | 2 +- + net/mac80211/scan.c | 28 +- + net/mac80211/spectmgmt.c | 2 +- + net/mac80211/sta_info.c | 71 +-- + net/mac80211/sta_info.h | 3 +- + net/mac80211/tx.c | 33 +- + net/mac80211/util.c | 240 +++++- + net/mac80211/wext.c | 270 +----- + net/mac80211/wpa.c | 2 +- + net/rfkill/rfkill-input.c | 69 -- + net/rfkill/rfkill.c | 54 +- + net/wimax/op-rfkill.c | 9 +- + net/wireless/Makefile | 2 +- + net/wireless/core.c | 27 +- + net/wireless/core.h | 15 +- + net/wireless/ibss.c | 369 ++++++++ + net/wireless/mlme.c | 50 +- + net/wireless/nl80211.c | 639 ++++++++++++-- + net/wireless/nl80211.h | 32 +- + net/wireless/reg.c | 35 +- + net/wireless/scan.c | 53 +- + net/wireless/util.c | 6 +- + net/wireless/wext-compat.c | 236 +++++- + 186 files changed, 7845 insertions(+), 5541 deletions(-) + create mode 100644 drivers/net/wireless/ath/Kconfig + create mode 100644 drivers/net/wireless/ath/Makefile + rename drivers/net/wireless/{ => ath}/ar9170/Kconfig (96%) + rename drivers/net/wireless/{ => ath}/ar9170/Makefile (100%) + rename drivers/net/wireless/{ => ath}/ar9170/ar9170.h (90%) + rename drivers/net/wireless/{ => ath}/ar9170/cmd.c (100%) + rename drivers/net/wireless/{ => ath}/ar9170/cmd.h (100%) + rename drivers/net/wireless/{ => ath}/ar9170/eeprom.h (100%) + rename drivers/net/wireless/{ => ath}/ar9170/hw.h (97%) + rename drivers/net/wireless/{ => ath}/ar9170/led.c (100%) + rename drivers/net/wireless/{ => ath}/ar9170/mac.c (100%) + rename drivers/net/wireless/{ => ath}/ar9170/main.c (77%) + rename drivers/net/wireless/{ => ath}/ar9170/phy.c (100%) + rename drivers/net/wireless/{ => ath}/ar9170/usb.c (100%) + rename drivers/net/wireless/{ => ath}/ar9170/usb.h (98%) + rename drivers/net/wireless/{ => ath}/ath5k/Kconfig (98%) + rename drivers/net/wireless/{ => ath}/ath5k/Makefile (100%) + rename drivers/net/wireless/{ => ath}/ath5k/ath5k.h (99%) + rename drivers/net/wireless/{ => ath}/ath5k/attach.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/base.c (98%) + rename drivers/net/wireless/{ => ath}/ath5k/base.h (99%) + rename drivers/net/wireless/{ => ath}/ath5k/caps.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/debug.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/debug.h (100%) + rename drivers/net/wireless/{ => ath}/ath5k/desc.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/desc.h (100%) + rename drivers/net/wireless/{ => ath}/ath5k/dma.c (99%) + rename drivers/net/wireless/{ => ath}/ath5k/eeprom.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/eeprom.h (100%) + rename drivers/net/wireless/{ => ath}/ath5k/gpio.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/initvals.c (99%) + rename drivers/net/wireless/{ => ath}/ath5k/led.c (97%) + rename drivers/net/wireless/{ => ath}/ath5k/pcu.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/phy.c (99%) + rename drivers/net/wireless/{ => ath}/ath5k/qcu.c (100%) + rename drivers/net/wireless/{ => ath}/ath5k/reg.h (100%) + rename drivers/net/wireless/{ => ath}/ath5k/reset.c (99%) + rename drivers/net/wireless/{ => ath}/ath5k/rfbuffer.h (100%) + rename drivers/net/wireless/{ => ath}/ath5k/rfgain.h (100%) + rename drivers/net/wireless/{ => ath}/ath9k/Kconfig (97%) + rename drivers/net/wireless/{ => ath}/ath9k/Makefile (96%) + rename drivers/net/wireless/{ => ath}/ath9k/ahb.c (100%) + rename drivers/net/wireless/{ => ath}/ath9k/ani.c (99%) + rename drivers/net/wireless/{ => ath}/ath9k/ani.h (100%) + rename drivers/net/wireless/{ => ath}/ath9k/ath9k.h (94%) + rename drivers/net/wireless/{ => ath}/ath9k/beacon.c (98%) + rename drivers/net/wireless/{ => ath}/ath9k/calib.c (90%) + rename drivers/net/wireless/{ => ath}/ath9k/calib.h (81%) + rename drivers/net/wireless/{ => ath}/ath9k/debug.c (99%) + rename drivers/net/wireless/{ => ath}/ath9k/debug.h (89%) + rename drivers/net/wireless/{ => ath}/ath9k/eeprom.c (99%) + rename drivers/net/wireless/{ => ath}/ath9k/eeprom.h (99%) + rename drivers/net/wireless/{ => ath}/ath9k/hw.c (96%) + rename drivers/net/wireless/{ => ath}/ath9k/hw.h (87%) + rename drivers/net/wireless/{ => ath}/ath9k/initvals.h (100%) + rename drivers/net/wireless/{ => ath}/ath9k/mac.c (93%) + rename drivers/net/wireless/{ => ath}/ath9k/mac.h (100%) + rename drivers/net/wireless/{ => ath}/ath9k/main.c (91%) + rename drivers/net/wireless/{ => ath}/ath9k/pci.c (100%) + rename drivers/net/wireless/{ => ath}/ath9k/phy.c (99%) + rename drivers/net/wireless/{ => ath}/ath9k/phy.h (99%) + rename drivers/net/wireless/{ => ath}/ath9k/rc.c (98%) + rename drivers/net/wireless/{ => ath}/ath9k/rc.h (98%) + rename drivers/net/wireless/{ => ath}/ath9k/recv.c (93%) + rename drivers/net/wireless/{ => ath}/ath9k/reg.h (100%) + rename drivers/net/wireless/{ => ath}/ath9k/virtual.c (100%) + rename drivers/net/wireless/{ => ath}/ath9k/xmit.c (98%) + create mode 100644 drivers/net/wireless/ath/main.c + rename drivers/net/wireless/{ath9k => ath}/regd.c (65%) + rename drivers/net/wireless/{ath9k => ath}/regd.h (85%) + rename drivers/net/wireless/{ath9k => ath}/regd_common.h (100%) + create mode 100644 drivers/net/wireless/rtl818x/rtl8187_leds.c + create mode 100644 drivers/net/wireless/rtl818x/rtl8187_leds.h + create mode 100644 include/net/regulatory.h + delete mode 100644 include/net/wireless.h + create mode 100644 net/wireless/ibss.c +$ git revert bc3e4095713c0bf57c8c9c1e91d93d6654075079 +Finished one revert. +[master 4deb89c] Revert "rfkill: remove user_claim stuff" + 12 files changed, 72 insertions(+), 9 deletions(-) +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/mtdcore.c | 18 +++++++++++++++--- + 1 files changed, 15 insertions(+), 3 deletions(-) +Merging crypto/master +$ git merge crypto/master +Auto-merging crypto/api.c +Auto-merging drivers/char/hw_random/omap-rng.c +Auto-merging drivers/crypto/padlock-aes.c +Merge made by recursive. + arch/x86/crypto/Makefile | 2 + + arch/x86/crypto/aesni-intel_glue.c | 267 ++++++++++++++- + arch/x86/crypto/fpu.c | 166 +++++++++ + crypto/Kconfig | 10 + + crypto/api.c | 5 +- + crypto/cryptd.c | 14 +- + crypto/pcompress.c | 1 + + crypto/tcrypt.c | 16 +- + crypto/testmgr.c | 6 +- + drivers/char/hw_random/omap-rng.c | 2 +- + drivers/crypto/Kconfig | 2 +- + drivers/crypto/padlock-aes.c | 13 + + drivers/crypto/talitos.c | 713 ++++++++++++++++++++++++++---------- + 13 files changed, 1001 insertions(+), 216 deletions(-) + create mode 100644 arch/x86/crypto/fpu.c +Merging vfs/for-next +$ git merge vfs/for-next +Merge made by recursive. + drivers/scsi/osd/osd_uld.c | 18 ++-- + fs/afs/mntpt.c | 2 +- + fs/autofs/dirhash.c | 5 +- + fs/autofs4/autofs_i.h | 6 +- + fs/autofs4/dev-ioctl.c | 195 +++++++++++++------------------------------ + fs/autofs4/expire.c | 15 ++-- + fs/autofs4/root.c | 7 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/exec.c | 79 ++++++------------ + fs/gfs2/ops_fstype.c | 8 +- + fs/namei.c | 142 ++++++++++++++++++------------- + fs/namespace.c | 14 ++-- + fs/nfs/namespace.c | 2 +- + fs/nfsd/export.c | 78 +++++++---------- + fs/nfsd/vfs.c | 54 ++++++------ + fs/ocfs2/symlink.c | 77 ++++++++--------- + fs/open.c | 2 +- + fs/proc/internal.h | 25 ++++++ + fs/proc/proc_devtree.c | 1 + + include/linux/dcache.h | 2 +- + include/linux/fs.h | 4 +- + include/linux/namei.h | 6 +- + include/linux/nfsd/export.h | 6 +- + include/linux/proc_fs.h | 24 ----- + kernel/audit_tree.c | 6 +- + security/tomoyo/common.c | 6 +- + security/tomoyo/realpath.c | 16 ++-- + 27 files changed, 352 insertions(+), 450 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Auto-merging include/linux/pci_ids.h +Removing include/sound/driver.h +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 7 + + include/linux/pci_ids.h | 5 + + include/sound/core.h | 10 - + include/sound/driver.h | 1 - + include/sound/soc-dai.h | 1 + + include/sound/soc-dapm.h | 10 + + include/sound/soc.h | 6 + + sound/isa/Kconfig | 7 +- + sound/isa/sc6000.c | 127 ++- + sound/pci/Kconfig | 10 + + sound/pci/Makefile | 1 + + sound/pci/hda/Kconfig | 13 + + sound/pci/hda/Makefile | 4 + + sound/pci/hda/hda_codec.c | 122 ++- + sound/pci/hda/hda_codec.h | 1 + + sound/pci/hda/hda_intel.c | 34 +- + sound/pci/hda/patch_ca0110.c | 573 +++++++++ + sound/pci/hda/patch_realtek.c | 5 + + sound/pci/lx6464es/Makefile | 2 + + sound/pci/lx6464es/lx6464es.c | 1152 ++++++++++++++++++ + sound/pci/lx6464es/lx6464es.h | 114 ++ + sound/pci/lx6464es/lx_core.c | 1444 +++++++++++++++++++++++ + sound/pci/lx6464es/lx_core.h | 242 ++++ + sound/pci/lx6464es/lx_defs.h | 376 ++++++ + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/codecs/Kconfig | 8 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/tlv320aic23.c | 2 + + sound/soc/codecs/twl4030.c | 258 ++++- + sound/soc/codecs/twl4030.h | 18 +- + sound/soc/codecs/wm8903.c | 1 + + sound/soc/codecs/wm8960.c | 969 +++++++++++++++ + sound/soc/codecs/wm8960.h | 127 ++ + sound/soc/codecs/wm8988.c | 1097 +++++++++++++++++ + sound/soc/codecs/wm8988.h | 60 + + sound/soc/codecs/wm9713.c | 40 +- + sound/soc/omap/n810.c | 7 +- + sound/soc/omap/omap-mcbsp.c | 38 +- + sound/soc/omap/omap2evm.c | 2 +- + sound/soc/omap/omap3beagle.c | 2 +- + sound/soc/omap/omap3pandora.c | 4 +- + sound/soc/omap/overo.c | 2 +- + sound/soc/omap/sdp3430.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 11 +- + sound/soc/s6000/Kconfig | 19 + + sound/soc/s6000/Makefile | 11 + + sound/soc/s6000/s6000-i2s.c | 629 ++++++++++ + sound/soc/s6000/s6000-i2s.h | 25 + + sound/soc/s6000/s6000-pcm.c | 497 ++++++++ + sound/soc/s6000/s6000-pcm.h | 35 + + sound/soc/s6000/s6105-ipcam.c | 244 ++++ + sound/soc/soc-core.c | 58 +- + sound/soc/soc-dapm.c | 131 ++- + 54 files changed, 8341 insertions(+), 229 deletions(-) + delete mode 100644 include/sound/driver.h + create mode 100644 sound/pci/hda/patch_ca0110.c + create mode 100644 sound/pci/lx6464es/Makefile + create mode 100644 sound/pci/lx6464es/lx6464es.c + create mode 100644 sound/pci/lx6464es/lx6464es.h + create mode 100644 sound/pci/lx6464es/lx_core.c + create mode 100644 sound/pci/lx6464es/lx_core.h + create mode 100644 sound/pci/lx6464es/lx_defs.h + create mode 100644 sound/soc/codecs/wm8960.c + create mode 100644 sound/soc/codecs/wm8960.h + create mode 100644 sound/soc/codecs/wm8988.c + create mode 100644 sound/soc/codecs/wm8988.h + create mode 100644 sound/soc/s6000/Kconfig + create mode 100644 sound/soc/s6000/Makefile + create mode 100644 sound/soc/s6000/s6000-i2s.c + create mode 100644 sound/soc/s6000/s6000-i2s.h + create mode 100644 sound/soc/s6000/s6000-pcm.c + create mode 100644 sound/soc/s6000/s6000-pcm.h + create mode 100644 sound/soc/s6000/s6105-ipcam.c +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Resolved 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c' using previous resolution. +Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Auto-merging arch/x86/lguest/boot.c +Auto-merging drivers/video/uvesafb.c +Auto-merging init/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 43077d6] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + arch/frv/include/asm/gdb-stub.h | 1 - + arch/mn10300/include/asm/gdb-stub.h | 1 - + arch/x86/kernel/acpi/cstate.c | 36 ++++-- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 134 +++++++++++----------- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 60 +++------- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 81 +++++++------ + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 1 + + drivers/acpi/processor_throttling.c | 72 +++++------- + drivers/firmware/dcdbas.c | 49 +++----- + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/cyber2000fb.c | 9 +- + drivers/video/uvesafb.c | 10 +- + include/linux/compiler.h | 5 + + include/linux/cpu.h | 5 - + include/linux/moduleparam.h | 40 +++++-- + init/main.c | 1 - + kernel/cpu.c | 11 +-- + kernel/params.c | 46 +++++--- + 18 files changed, 280 insertions(+), 284 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/CHANGES | 6 ++++++ + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifssmb.c | 20 ++++++++++---------- + fs/cifs/inode.c | 21 +++++++++++++++------ + fs/cifs/readdir.c | 2 +- + 5 files changed, 33 insertions(+), 18 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Auto-merging drivers/input/keyboard/Kconfig +Merge made by recursive. + Documentation/input/input.txt | 2 +- + Documentation/input/rotary-encoder.txt | 9 +- + arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 42 ++ + drivers/char/keyboard.c | 2 - + drivers/input/gameport/fm801-gp.c | 1 + + drivers/input/gameport/gameport.c | 19 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/ep93xx_keypad.c | 470 +++++++++++++++++++++ + drivers/input/keyboard/gpio_keys.c | 3 +- + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/rotary_encoder.c | 61 ++- + drivers/input/misc/twl4030-pwrbutton.c | 145 +++++++ + drivers/input/serio/serio.c | 21 +- + drivers/input/tablet/gtco.c | 1 + + drivers/input/touchscreen/Kconfig | 15 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/atmel-wm97xx.c | 446 +++++++++++++++++++ + include/linux/rotary_encoder.h | 2 + + 20 files changed, 1215 insertions(+), 47 deletions(-) + create mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h + create mode 100644 drivers/input/keyboard/ep93xx_keypad.c + create mode 100644 drivers/input/misc/twl4030-pwrbutton.c + create mode 100644 drivers/input/touchscreen/atmel-wm97xx.c +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging block/blk-core.c +Auto-merging block/blk-sysfs.c +Merge made by recursive. + block/Kconfig | 11 +++-- + block/blk-core.c | 6 ++- + block/blk-merge.c | 5 ++- + block/blk-settings.c | 20 ++++--- + block/blk-sysfs.c | 4 -- + block/blk-timeout.c | 6 ++ + block/blk.h | 7 +-- + block/cfq-iosched.c | 15 +++-- + block/genhd.c | 12 +++-- + block/scsi_ioctl.c | 13 +++++- + fs/bio.c | 124 +++++++++++++++++++++------------------------- + include/linux/bio.h | 1 + + include/linux/blkdev.h | 3 + + include/linux/genhd.h | 1 + + include/linux/pktcdvd.h | 1 + + lib/scatterlist.c | 9 ++- + 16 files changed, 131 insertions(+), 107 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Merge made by recursive. + drivers/base/firmware_class.c | 129 ++++++++++++++++++++++++++++++++-------- + 1 files changed, 103 insertions(+), 26 deletions(-) +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +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. + Documentation/DocBook/kgdb.tmpl | 2 +- + arch/x86/kernel/kgdb.c | 3 +- + include/linux/kgdb.h | 50 +++++++++++++++++++++++++++++++++----- + kernel/kgdb.c | 6 ++-- + 4 files changed, 49 insertions(+), 12 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging init/Kconfig +Merge made by recursive. + Documentation/vm/slqbinfo.c | 1054 ++++++++++++ + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 299 ++++ + init/Kconfig | 28 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3735 +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 5160 insertions(+), 16 deletions(-) + create mode 100644 Documentation/vm/slqbinfo.c + create mode 100644 include/linux/rcu_types.h + create mode 100644 include/linux/slqb_def.h + create mode 100644 mm/slqb.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 8 ++++---- + include/linux/regulator/driver.h | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Auto-merging Documentation/sysctl/kernel.txt +Auto-merging kernel/module.c +Auto-merging kernel/sysctl.c +Auto-merging security/commoncap.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/smack/smackfs.c +Auto-merging security/tomoyo/common.c +Auto-merging security/tomoyo/common.h +Auto-merging security/tomoyo/domain.c +Merge made by recursive. + Documentation/Smack.txt | 20 ++- + Documentation/sysctl/kernel.txt | 11 + + include/linux/lsm_audit.h | 111 ++++++++++ + kernel/module.c | 7 +- + kernel/sysctl.c | 12 + + security/Makefile | 3 + + security/commoncap.c | 32 +++ + security/lsm_audit.c | 386 ++++++++++++++++++++++++++++++++++ + security/selinux/avc.c | 2 +- + security/selinux/include/security.h | 4 +- + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/services.c | 30 +--- + security/smack/smack.h | 108 ++++++++++- + security/smack/smack_access.c | 141 +++++++++++-- + security/smack/smack_lsm.c | 390 ++++++++++++++++++++++++++-------- + security/smack/smackfs.c | 66 ++++++ + 16 files changed, 1185 insertions(+), 142 deletions(-) + create mode 100644 include/linux/lsm_audit.h + create mode 100644 security/lsm_audit.c +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Recorded preimage for 'drivers/usb/serial/cypress_m8.c' +Recorded preimage for 'drivers/usb/serial/option.c' +Recorded preimage for 'drivers/usb/serial/sierra.c' +Resolved 'drivers/usb/serial/usb-serial.c' using previous resolution. +Auto-merging drivers/usb/serial/cyberjack.c +Auto-merging drivers/usb/serial/cypress_m8.c +CONFLICT (content): Merge conflict in drivers/usb/serial/cypress_m8.c +Auto-merging drivers/usb/serial/empeg.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/garmin_gps.c +Auto-merging drivers/usb/serial/generic.c +Auto-merging drivers/usb/serial/io_edgeport.c +Auto-merging drivers/usb/serial/io_ti.c +Auto-merging drivers/usb/serial/ipaq.c +Auto-merging drivers/usb/serial/ipw.c +Auto-merging drivers/usb/serial/iuu_phoenix.c +Auto-merging drivers/usb/serial/kobil_sct.c +Auto-merging drivers/usb/serial/mos7720.c +Auto-merging drivers/usb/serial/mos7840.c +Auto-merging drivers/usb/serial/opticon.c +Auto-merging drivers/usb/serial/option.c +CONFLICT (content): Merge conflict in drivers/usb/serial/option.c +Auto-merging drivers/usb/serial/sierra.c +CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c +Auto-merging drivers/usb/serial/ti_usb_3410_5052.c +Auto-merging drivers/usb/serial/usb-serial.c +CONFLICT (content): Merge conflict in drivers/usb/serial/usb-serial.c +Auto-merging drivers/usb/serial/visor.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/serial/cypress_m8.c'. +Recorded resolution for 'drivers/usb/serial/option.c'. +Recorded resolution for 'drivers/usb/serial/sierra.c'. +[master 43ce15d] Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. + drivers/char/cyclades.c | 23 +---- + drivers/char/epca.c | 4 +- + drivers/char/isicom.c | 19 +++- + drivers/char/istallion.c | 8 +- + drivers/char/mxser.c | 12 ++- + drivers/char/pcmcia/synclink_cs.c | 11 ++- + drivers/char/rocket.c | 13 ++- + drivers/char/stallion.c | 6 +- + drivers/char/synclink.c | 9 +- + drivers/char/synclink_gt.c | 86 ++++++++++++++--- + drivers/char/synclinkmp.c | 9 +- + drivers/char/tty_port.c | 38 +++++++- + drivers/serial/8250_pci.c | 2 - + drivers/usb/class/cdc-acm.c | 6 + + drivers/usb/class/cdc-acm.h | 3 +- + drivers/usb/serial/belkin_sa.c | 6 +- + drivers/usb/serial/ch341.c | 46 +++++---- + drivers/usb/serial/console.c | 6 +- + drivers/usb/serial/cp210x.c | 6 +- + drivers/usb/serial/cyberjack.c | 6 +- + drivers/usb/serial/cypress_m8.c | 81 +++++----------- + drivers/usb/serial/digi_acceleport.c | 75 ++++---------- + drivers/usb/serial/empeg.c | 6 +- + drivers/usb/serial/ftdi_sio.c | 50 ++++++---- + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/generic.c | 3 +- + drivers/usb/serial/io_edgeport.c | 10 +- + drivers/usb/serial/io_ti.c | 3 +- + drivers/usb/serial/ipaq.c | 6 +- + drivers/usb/serial/ipw.c | 18 ++-- + drivers/usb/serial/ir-usb.c | 6 +- + drivers/usb/serial/iuu_phoenix.c | 25 +----- + drivers/usb/serial/keyspan.c | 13 ++- + drivers/usb/serial/keyspan.h | 8 +- + drivers/usb/serial/keyspan_pda.c | 17 ++- + drivers/usb/serial/kl5kusb105.c | 6 +- + drivers/usb/serial/kobil_sct.c | 9 +- + drivers/usb/serial/mct_u232.c | 37 ++++---- + drivers/usb/serial/mos7720.c | 3 +- + drivers/usb/serial/mos7840.c | 48 +--------- + drivers/usb/serial/navman.c | 3 +- + drivers/usb/serial/omninet.c | 6 +- + drivers/usb/serial/opticon.c | 3 +- + drivers/usb/serial/option.c | 68 +++++++------- + drivers/usb/serial/oti6858.c | 57 +---------- + drivers/usb/serial/pl2303.c | 79 ++++++--------- + drivers/usb/serial/sierra.c | 96 ++++++++++--------- + drivers/usb/serial/spcp8x5.c | 85 ++++++---------- + drivers/usb/serial/symbolserial.c | 3 +- + drivers/usb/serial/ti_usb_3410_5052.c | 6 +- + drivers/usb/serial/usb-serial.c | 171 +++++++++++++++++---------------- + drivers/usb/serial/visor.c | 6 +- + drivers/usb/serial/whiteheat.c | 33 +------ + include/linux/tty.h | 6 +- + include/linux/usb/serial.h | 10 +- + 55 files changed, 623 insertions(+), 755 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already up-to-date. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Already up-to-date. +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Already uptodate! +Merge made by recursive. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Merge made by recursive. + arch/x86/Kconfig.debug | 3 +- + arch/x86/kernel/pci-calgary_64.c | 54 +---------------- + arch/x86/kernel/pci-gart_64.c | 45 +++------------ + arch/x86/kernel/pci-swiotlb.c | 2 +- + include/linux/dma-debug.h | 7 ++ + include/linux/swiotlb.h | 3 +- + lib/dma-debug.c | 72 +++++++++++++++++++++-- + lib/swiotlb.c | 119 ++++++++++++++++++++------------------ + 8 files changed, 149 insertions(+), 156 deletions(-) +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/alim7101_wdt.c | 15 +++++++++++---- + drivers/watchdog/at91rm9200_wdt.c | 3 ++- + drivers/watchdog/bfin_wdt.c | 14 ++++++++++---- + drivers/watchdog/cpwd.c | 6 +++--- + drivers/watchdog/davinci_wdt.c | 6 +++--- + drivers/watchdog/iTCO_vendor_support.c | 6 +++--- + drivers/watchdog/iTCO_wdt.c | 22 +++++++++++----------- + drivers/watchdog/ks8695_wdt.c | 4 ++-- + drivers/watchdog/machzwd.c | 9 ++++++--- + drivers/watchdog/mpcore_wdt.c | 7 +++++-- + drivers/watchdog/mtx-1_wdt.c | 6 +++--- + drivers/watchdog/pnx4008_wdt.c | 6 +++--- + drivers/watchdog/rdc321x_wdt.c | 4 ++-- + drivers/watchdog/rm9k_wdt.c | 6 +++--- + drivers/watchdog/s3c2410_wdt.c | 32 ++++++++++++++------------------ + drivers/watchdog/sb_wdog.c | 7 ++++--- + drivers/watchdog/sbc60xxwdt.c | 5 +++-- + drivers/watchdog/sbc8360.c | 4 ++-- + drivers/watchdog/sbc_epx_c3.c | 9 ++++++--- + drivers/watchdog/scx200_wdt.c | 4 +++- + drivers/watchdog/shwdt.c | 4 +++- + drivers/watchdog/softdog.c | 7 +++++-- + drivers/watchdog/w83697hf_wdt.c | 3 ++- + drivers/watchdog/wdrtas.c | 7 +------ + 24 files changed, 110 insertions(+), 86 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Merge made by recursive. + Documentation/SubmittingPatches | 9 ++++++++- + 1 files changed, 8 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 drivers/net/wireless/rndis_wlan.c +Auto-merging fs/compat.c +Auto-merging fs/compat_ioctl.c +Auto-merging net/core/dev.c +Merge made by recursive. + drivers/char/amiserial.c | 2 +- + drivers/media/video/hdpvr/hdpvr-video.c | 2 +- + drivers/mtd/Kconfig | 3 ++- + drivers/net/b44.h | 2 +- + drivers/net/e100.c | 2 +- + drivers/net/niu.h | 4 ++-- + drivers/net/wireless/rndis_wlan.c | 2 +- + drivers/scsi/megaraid.h | 2 +- + drivers/scsi/megaraid/mbox_defs.h | 2 +- + drivers/staging/rt2860/common/mlme.c | 2 +- + drivers/staging/rt2870/common/mlme.c | 2 +- + drivers/staging/rt3070/common/mlme.c | 2 +- + drivers/watchdog/iop_wdt.c | 2 +- + fs/compat.c | 2 +- + fs/compat_ioctl.c | 2 +- + fs/ext2/ext2.h | 2 +- + fs/inode.c | 2 +- + include/linux/ultrasound.h | 2 +- + kernel/power/poweroff.c | 2 +- + net/netfilter/nf_conntrack_acct.c | 2 +- + sound/pci/aw2/aw2-saa7146.c | 2 +- + sound/usb/usbmixer.c | 2 +- + 22 files changed, 24 insertions(+), 23 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 kmemleak/kmemleak +$ git merge kmemleak/kmemleak +Resolved 'lib/Kconfig.debug' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging include/linux/percpu.h +Auto-merging include/linux/slab.h +Auto-merging init/main.c +Auto-merging kernel/module.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging mm/Makefile +Auto-merging mm/slab.c +Auto-merging mm/slob.c +Auto-merging mm/slub.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master edd6104] Merge commit 'kmemleak/kmemleak' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 4 + + Documentation/kmemleak.txt | 142 ++++ + MAINTAINERS | 6 + + arch/arm/kernel/vmlinux.lds.S | 2 + + arch/x86/kernel/vmlinux_32.lds.S | 1 + + arch/x86/kernel/vmlinux_64.lds.S | 1 + + drivers/char/vt.c | 7 + + fs/block_dev.c | 6 + + include/linux/kmemleak.h | 96 +++ + include/linux/percpu.h | 5 + + include/linux/slab.h | 2 + + init/main.c | 4 +- + kernel/module.c | 56 ++ + lib/Kconfig.debug | 33 + + mm/Makefile | 2 + + mm/kmemleak-test.c | 111 +++ + mm/kmemleak.c | 1498 +++++++++++++++++++++++++++++++++++ + mm/page_alloc.c | 11 + + mm/slab.c | 32 +- + mm/slob.c | 7 + + mm/slub.c | 5 +- + mm/vmalloc.c | 30 +- + 22 files changed, 2054 insertions(+), 7 deletions(-) + create mode 100644 Documentation/kmemleak.txt + create mode 100644 include/linux/kmemleak.h + create mode 100644 mm/kmemleak-test.c + create mode 100644 mm/kmemleak.c +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Merge made by recursive. + Documentation/driver-model/device.txt | 32 ++++++++++++++++ + include/linux/sched.h | 2 +- + init/Kconfig | 6 +- + kernel/user.c | 67 +++++++++++++++++++-------------- + 4 files changed, 75 insertions(+), 32 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/option.c +Merge made by recursive. + drivers/usb/core/Kconfig | 16 ++- + drivers/usb/core/driver.c | 21 +-- + drivers/usb/core/sysfs.c | 12 +- + drivers/usb/gadget/Kconfig | 2 +- + drivers/usb/gadget/at91_udc.c | 4 +- + drivers/usb/gadget/atmel_usba_udc.c | 4 +- + drivers/usb/gadget/ci13xxx_udc.c | 6 +- + drivers/usb/gadget/goku_udc.c | 6 +- + drivers/usb/gadget/inode.c | 14 +- + drivers/usb/gadget/pxa27x_udc.c | 71 +++++++--- + drivers/usb/gadget/pxa27x_udc.h | 2 + + drivers/usb/host/ehci-orion.c | 2 +- + drivers/usb/host/r8a66597-hcd.c | 2 +- + drivers/usb/host/uhci-q.c | 2 +- + drivers/usb/musb/Kconfig | 2 + + drivers/usb/musb/blackfin.c | 11 +- + drivers/usb/musb/cppi_dma.c | 34 ++++- + drivers/usb/musb/cppi_dma.h | 6 +- + drivers/usb/musb/davinci.c | 54 ++++---- + drivers/usb/musb/musb_core.c | 228 ++++++++++++++++------------- + drivers/usb/musb/musb_core.h | 22 +++- + drivers/usb/musb/musb_gadget.c | 45 +++--- + drivers/usb/musb/musb_gadget_ep0.c | 45 +++++- + drivers/usb/musb/musb_host.c | 273 ++++++++++++++--------------------- + drivers/usb/musb/musb_host.h | 1 + + drivers/usb/musb/musb_virthub.c | 35 +++-- + drivers/usb/musb/omap2430.c | 64 +++------ + drivers/usb/musb/tusb6010.c | 70 ++++++---- + drivers/usb/otg/nop-usb-xceiv.c | 25 ++-- + drivers/usb/otg/twl4030-usb.c | 28 +++- + drivers/usb/serial/ftdi_sio.c | 90 ++++++++++-- + drivers/usb/serial/ftdi_sio.h | 10 ++- + drivers/usb/serial/option.c | 15 ++ + drivers/usb/storage/option_ms.c | 3 +- + drivers/usb/storage/unusual_devs.h | 2 +- + include/linux/usb/otg.h | 4 +- + 36 files changed, 716 insertions(+), 515 deletions(-) +Merging quilt/staging +$ git merge quilt/staging +Removing drivers/staging/comedi/interrupt.h +Removing drivers/staging/winbond/wbhal.c +Merge made by recursive. + drivers/staging/agnx/debug.h | 9 +- + drivers/staging/agnx/pci.c | 47 +- + drivers/staging/agnx/phy.c | 4 +- + drivers/staging/agnx/phy.h | 2 +- + drivers/staging/agnx/sta.c | 2 +- + drivers/staging/agnx/sta.h | 2 +- + drivers/staging/b3dfg/b3dfg.c | 1 - + drivers/staging/comedi/Kconfig | 2 +- + drivers/staging/comedi/comedi_fops.c | 418 +++++- + drivers/staging/comedi/comedi_rt.h | 5 +- + drivers/staging/comedi/comedidev.h | 14 +- + drivers/staging/comedi/drivers.c | 8 +- + drivers/staging/comedi/drivers/8253.h | 50 +- + drivers/staging/comedi/drivers/8255.c | 6 +- + drivers/staging/comedi/drivers/8255.h | 14 +- + drivers/staging/comedi/drivers/Makefile | 4 +- + drivers/staging/comedi/drivers/acl7225b.c | 8 +- + .../comedi/drivers/addi-data/APCI1710_82x54.c | 360 +++--- + .../comedi/drivers/addi-data/APCI1710_82x54.h | 32 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 388 +++--- + .../comedi/drivers/addi-data/APCI1710_Chrono.h | 36 +- + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 303 ++-- + .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 932 ++++++------ + .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 188 ++-- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 198 ++-- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 1298 ++++++++-------- + .../comedi/drivers/addi-data/APCI1710_Pwm.h | 70 +- + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 216 ++-- + .../comedi/drivers/addi-data/APCI1710_Ssi.h | 6 +- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 424 +++--- + .../comedi/drivers/addi-data/APCI1710_Tor.h | 8 +- + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 190 ++-- + .../comedi/drivers/addi-data/APCI1710_Ttl.h | 8 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 94 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.h | 6 +- + .../comedi/drivers/addi-data/addi_amcc_s5933.h | 2 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 122 +- + .../staging/comedi/drivers/addi-data/addi_common.h | 356 ++--- + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 417 +++--- + .../comedi/drivers/addi-data/amcc_s5933_58.h | 28 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 146 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci035.c | 214 ++-- + .../comedi/drivers/addi-data/hwdrv_apci035.h | 34 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 106 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.h | 29 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 530 ++++---- + .../comedi/drivers/addi-data/hwdrv_apci1500.h | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 174 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.h | 29 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 376 +++--- + .../comedi/drivers/addi-data/hwdrv_apci1564.h | 52 +- + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 126 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 136 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.h | 26 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 174 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.h | 32 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 172 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.h | 26 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 1048 ++++++------- + .../comedi/drivers/addi-data/hwdrv_apci3120.h | 142 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 1668 ++++++++++---------- + .../comedi/drivers/addi-data/hwdrv_apci3200.h | 176 ++- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 225 ++-- + .../comedi/drivers/addi-data/hwdrv_apci3501.h | 44 +- + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 228 ++-- + drivers/staging/comedi/drivers/addi_apci_035.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 150 +- + drivers/staging/comedi/drivers/adl_pci7296.c | 14 +- + drivers/staging/comedi/drivers/adl_pci7432.c | 24 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 80 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 87 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 553 ++++---- + drivers/staging/comedi/drivers/adq12b.c | 42 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 294 ++-- + drivers/staging/comedi/drivers/adv_pci1723.c | 78 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 62 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 28 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 24 +- + drivers/staging/comedi/drivers/am9513.h | 16 +- + drivers/staging/comedi/drivers/amcc_s5933.h | 10 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 64 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 46 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 26 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 40 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 96 +- + drivers/staging/comedi/drivers/c6xdigio.c | 130 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 54 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 445 +++--- + drivers/staging/comedi/drivers/cb_pcidas64.c | 821 +++++----- + drivers/staging/comedi/drivers/cb_pcidda.c | 243 ++-- + drivers/staging/comedi/drivers/cb_pcidio.c | 41 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 154 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 36 +- + drivers/staging/comedi/drivers/comedi_parport.c | 3 +- + drivers/staging/comedi/drivers/comedi_rt_timer.c | 153 ++- + drivers/staging/comedi/drivers/contec_pci_dio.c | 32 +- + drivers/staging/comedi/drivers/daqboard2000.c | 184 ++-- + drivers/staging/comedi/drivers/das08.c | 174 +- + drivers/staging/comedi/drivers/das08.h | 24 +- + drivers/staging/comedi/drivers/das08_cs.c | 10 +- + drivers/staging/comedi/drivers/das16.c | 224 ++-- + drivers/staging/comedi/drivers/das16m1.c | 90 +- + drivers/staging/comedi/drivers/das1800.c | 274 ++-- + drivers/staging/comedi/drivers/das6402.c | 28 +- + drivers/staging/comedi/drivers/das800.c | 66 +- + drivers/staging/comedi/drivers/dmm32at.c | 60 +- + drivers/staging/comedi/drivers/dt2801.c | 81 +- + drivers/staging/comedi/drivers/dt2811.c | 61 +- + drivers/staging/comedi/drivers/dt2814.c | 22 +- + drivers/staging/comedi/drivers/dt2815.c | 22 +- + drivers/staging/comedi/drivers/dt2817.c | 16 +- + drivers/staging/comedi/drivers/dt282x.c | 100 +- + drivers/staging/comedi/drivers/dt3000.c | 68 +- + drivers/staging/comedi/drivers/fl512.c | 32 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 166 +- + drivers/staging/comedi/drivers/icp_multi.c | 2 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 68 +- + drivers/staging/comedi/drivers/jr3_pci.c | 180 +-- + drivers/staging/comedi/drivers/jr3_pci.h | 8 +- + drivers/staging/comedi/drivers/ke_counter.c | 20 +- + drivers/staging/comedi/drivers/me4000.c | 4 +- + drivers/staging/comedi/drivers/mpc624.c | 146 +- + drivers/staging/comedi/drivers/mpc8260cpm.c | 24 +- + drivers/staging/comedi/drivers/multiq3.c | 34 +- + drivers/staging/comedi/drivers/ni_6527.c | 44 +- + drivers/staging/comedi/drivers/ni_65xx.c | 52 +- + drivers/staging/comedi/drivers/ni_660x.c | 163 ++- + drivers/staging/comedi/drivers/ni_670x.c | 46 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 216 ++-- + drivers/staging/comedi/drivers/ni_at_ao.c | 68 +- + drivers/staging/comedi/drivers/ni_atmio.c | 41 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 54 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 56 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 56 +- + drivers/staging/comedi/drivers/ni_labpc.c | 478 +++--- + drivers/staging/comedi/drivers/ni_labpc.h | 50 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 36 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 732 +++++----- + drivers/staging/comedi/drivers/ni_mio_cs.c | 34 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 26 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 101 +- + drivers/staging/comedi/drivers/ni_stc.h | 138 +- + drivers/staging/comedi/drivers/ni_tio.c | 12 +- + drivers/staging/comedi/drivers/ni_tio.h | 18 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 6 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 4 +- + drivers/staging/comedi/drivers/pcl711.c | 38 +- + drivers/staging/comedi/drivers/pcl724.c | 26 +- + drivers/staging/comedi/drivers/pcl725.c | 16 +- + drivers/staging/comedi/drivers/pcl726.c | 42 +- + drivers/staging/comedi/drivers/pcl730.c | 20 +- + drivers/staging/comedi/drivers/pcl812.c | 220 ++-- + drivers/staging/comedi/drivers/pcl816.c | 312 ++-- + drivers/staging/comedi/drivers/pcl818.c | 468 +++--- + drivers/staging/comedi/drivers/pcm3724.c | 46 +- + drivers/staging/comedi/drivers/pcm3730.c | 20 +- + drivers/staging/comedi/drivers/pcmad.c | 12 +- + drivers/staging/comedi/drivers/pcmda12.c | 30 +- + drivers/staging/comedi/drivers/pcmmio.c | 54 +- + drivers/staging/comedi/drivers/pcmuio.c | 42 +- + drivers/staging/comedi/drivers/poc.c | 46 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 36 +- + drivers/staging/comedi/drivers/rtd520.c | 19 +- + drivers/staging/comedi/drivers/rti800.c | 38 +- + drivers/staging/comedi/drivers/rti802.c | 16 +- + drivers/staging/comedi/drivers/s526.c | 352 ++-- + drivers/staging/comedi/drivers/s626.c | 4 +- + drivers/staging/comedi/drivers/serial2002.c | 82 +- + drivers/staging/comedi/drivers/skel.c | 56 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 27 +- + drivers/staging/comedi/drivers/unioxx5.c | 62 +- + drivers/staging/comedi/drivers/usbduxfast.c | 2 +- + drivers/staging/comedi/drivers/vmk80xx.c | 1116 +++++++++++++ + drivers/staging/comedi/interrupt.h | 51 - + drivers/staging/comedi/kcomedilib/ksyms.c | 49 +- + drivers/staging/comedi/range.c | 2 +- + drivers/staging/comedi/rt.c | 16 +- + drivers/staging/comedi/rt_pend_tq.c | 6 +- + drivers/staging/frontier/alphatrack.c | 1 - + drivers/staging/frontier/tranzport.c | 1 - + drivers/staging/heci/heci.h | 1 - + drivers/staging/heci/heci_data_structures.h | 1 - + drivers/staging/heci/heci_interface.h | 1 - + drivers/staging/meilhaus/me0600_ext_irq.c | 1 - + drivers/staging/meilhaus/me0900_di.c | 1 - + drivers/staging/meilhaus/me1400_device.c | 1 - + drivers/staging/meilhaus/me1400_ext_irq.c | 1 - + drivers/staging/meilhaus/me4600_ai.h | 1 - + drivers/staging/meilhaus/me4600_ext_irq.c | 1 - + drivers/staging/meilhaus/me6000_ao.h | 1 - + drivers/staging/meilhaus/me8100_di.c | 1 - + drivers/staging/meilhaus/me8200_di.c | 1 - + drivers/staging/meilhaus/me8200_do.c | 1 - + drivers/staging/meilhaus/memain.c | 182 ++- + drivers/staging/meilhaus/memain.h | 194 --- + drivers/staging/pohmelfs/crypto.c | 3 +- + drivers/staging/pohmelfs/dir.c | 9 +- + drivers/staging/pohmelfs/inode.c | 13 +- + drivers/staging/pohmelfs/net.c | 7 +- + drivers/staging/pohmelfs/netfs.h | 65 +- + drivers/staging/pohmelfs/trans.c | 7 +- + drivers/staging/rspiusb/rspiusb.c | 14 +- + drivers/staging/rt2860/common/cmm_info.c | 2 +- + drivers/staging/rt2860/rt_linux.h | 1 - + drivers/staging/rt2860/sta/assoc.c | 2 +- + drivers/staging/rt2860/sta_ioctl.c | 11 +- + drivers/staging/rt2870/common/cmm_info.c | 2 +- + drivers/staging/rt2870/rt2870.h | 1 + + drivers/staging/rt2870/sta/assoc.c | 2 +- + drivers/staging/rt2870/sta_ioctl.c | 39 +- + drivers/staging/rt2870/tmp60 | 2 +- + drivers/staging/rt2870/tmp61 | 2 +- + drivers/staging/rt3070/2870_main_dev.c | 6 +- + drivers/staging/rt3070/common/2870_rtmp_init.c | 4 +- + drivers/staging/rt3070/common/ba_action.c | 18 +- + drivers/staging/rt3070/common/cmm_data.c | 2 +- + drivers/staging/rt3070/common/cmm_info.c | 2 +- + drivers/staging/rt3070/common/dfs.c | 4 +- + drivers/staging/rt3070/common/rtmp_init.c | 18 +- + drivers/staging/rt3070/common/rtusb_bulk.c | 2 +- + drivers/staging/rt3070/common/spectrum.c | 44 +- + drivers/staging/rt3070/rt_ate.c | 32 +- + drivers/staging/rt3070/rt_linux.c | 18 +- + drivers/staging/rt3070/rt_linux.h | 3 +- + drivers/staging/rt3070/rt_profile.c | 12 +- + drivers/staging/rt3070/rtmp_def.h | 2 +- + drivers/staging/rt3070/sta_ioctl.c | 46 +- + drivers/staging/rtl8187se/r8180.h | 2 +- + drivers/staging/rtl8187se/r8180_core.c | 46 +- + drivers/staging/rtl8187se/r8180_dm.c | 6 +- + drivers/staging/serqt_usb/serqt_usb.c | 1 - + drivers/staging/stlc45xx/stlc45xx.c | 11 +- + drivers/staging/sxg/sxg.c | 38 +- + drivers/staging/sxg/sxg_ethtool.c | 2 +- + drivers/staging/winbond/Makefile | 1 - + drivers/staging/winbond/mds.c | 2 +- + drivers/staging/winbond/mto.c | 2 +- + drivers/staging/winbond/phy_calibration.c | 19 + + drivers/staging/winbond/wbhal.c | 568 ------- + drivers/staging/winbond/wbhal_f.h | 21 - + drivers/staging/winbond/wbhal_s.h | 1 - + drivers/staging/winbond/wbusb.c | 789 ++++++++-- + drivers/staging/wlan-ng/hfa384x.h | 244 +++ + drivers/staging/wlan-ng/hfa384x_usb.c | 1 - + drivers/staging/wlan-ng/p80211metadef.h | 48 + + drivers/staging/wlan-ng/p80211netdev.c | 15 - + drivers/staging/wlan-ng/p80211netdev.h | 3 - + drivers/staging/wlan-ng/p80211wep.c | 1 - + drivers/staging/wlan-ng/prism2fw.c | 1410 +++++++++++++++++ + drivers/staging/wlan-ng/prism2mib.c | 1 - + drivers/staging/wlan-ng/prism2usb.c | 9 +- + 254 files changed, 15461 insertions(+), 12572 deletions(-) + create mode 100644 drivers/staging/comedi/drivers/vmk80xx.c + delete mode 100644 drivers/staging/comedi/interrupt.h + delete mode 100644 drivers/staging/winbond/wbhal.c + create mode 100644 drivers/staging/wlan-ng/prism2fw.c +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +$ git am -3 ../patches/0001-powerpc-fix-for-long-standing-bug-noticed-by-gcc-4.patch +Applying: powerpc: fix for long standing bug noticed by gcc 4.4.0 diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..52779af751e9 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,261 @@ +Importing driver-core.current based on 2.6.30-rc3 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 091069740304c979f957ceacec39c461d0192158 +HEAD is now at 0910697 Linux 2.6.30-rc3 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +driver-core-platform-do-not-complain-for-platform_data-added-by-platform_device_add_data.patch +driver-core-platform-fix-kernel-doc-warnings.patch +doc-sysfs-rules-swap-the-order-of-the-words-so-the-sentence-makes-more-sense.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core.current +From ../quilt-tmp + + 9f3f498...9ba7793 master -> quilt/driver-core.current (forced update) +Importing usb.current based on quilt/driver-core.current +$ cd ../quilt-tmp +$ git reset --hard 9ba779321097cc7ec1b2c7e144571ad2badf27c7 +HEAD is now at 9ba7793 Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-serial-fix-lifetime-and-locking-problems.patch +usb-unusual-device-support-for-gold-mp3-player-energy.patch +usb-gadget-mips-ci13xxx-udc-bugfixes.patch +usb-musb-remove-my-email-address-from-few-musb-related-drivers.patch +usb-musb-fix-build-when-config_pm.patch +usb-mos7840-add-new-device-id.patch +usb-fix-mos7840-problem-with-minor-numbers.patch +usb-mos7840-fix-debug-log-messages.patch +usb-ehci-sched.c-ehci-sitd-scheduling-bugfix.patch +usb-g_file_storage-fix-use-after-free-bug-when-closing-files.patch +usb-pass-mem_flags-to-dma_alloc_coherent.patch +usb-musb-prevent-multiple-includes-of-musb.h.patch +usb-ci13xxx_udc-fix-build-error.patch +usb-gadget-omap_udc-uses-platform_driver_probe.patch +usb-serial-sierra-driver-bug-fix-for-composite-interface.patch +usb-removal-of-tty-low_latency-hack-dating-back-to-the-old-serial-code.patch +usb-correct-error-handling-in-cdc-wdm.patch +usb-otg-fix-bug-on-remove-path-without-transceiver.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb.current +From ../quilt-tmp + + 1ed08b4...b04c7dc master -> quilt/usb.current (forced update) +Importing device-mapper based on v2.6.30-rc2-195-g9f76208 +$ cd ../quilt-tmp +$ git reset --hard 9f76208c33984ab777eace5d07a4e36e88703e02 +HEAD is now at 9f76208 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-mpath-validate-table-argument-count.patch +dm-mpath-validate-hw_handler-argument-count.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/device-mapper +From ../quilt-tmp + + d50f729...d5e7549 master -> quilt/device-mapper (forced update) +Importing i2c based on 2.6.30-rc3 +$ cd ../quilt-tmp +$ git reset --hard 091069740304c979f957ceacec39c461d0192158 +HEAD is now at 0910697 Linux 2.6.30-rc3 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-remove-void-casts.patch +macintosh-therm_pm72-convert-to-new-style-i2c.patch +macintosh-windfarm-convert-to-new-style-i2c.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + afc7055...d06708f master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.30-rc3 +$ cd ../quilt-tmp +$ git reset --hard 091069740304c979f957ceacec39c461d0192158 +HEAD is now at 0910697 Linux 2.6.30-rc3 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-ibmaem-automatically-load-on-hc10-blade.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + f929ab9...c97ef67 master -> quilt/jdelvare-hwmon (forced update) +Unchanged quilt series kernel-doc +Unchanged quilt series rr +Unchanged quilt series ttydev +Unchanged quilt series aoe +Importing driver-core based on quilt/usb.current +$ cd ../quilt-tmp +$ git reset --hard b04c7dcab54c1475aa0015b423af1cc5f0cd38ae +HEAD is now at b04c7dc USB: otg: Fix bug on remove path without transceiver +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +driver-core-set-default-sysfs_deprecated-n.patch +sched-delayed-cleanup-of-user_struct.patch +driver-core-warn-driver-authors-about-adding-device-attributes.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core +From ../quilt-tmp + + 533de5d...c17c314 master -> quilt/driver-core (forced update) +Importing usb based on quilt/driver-core +$ cd ../quilt-tmp +$ git reset --hard c17c3144bb97cc86722ff35836b87d1e40554e96 +HEAD is now at c17c314 Driver Core: Warn driver authors about adding device attributes +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +musb_gadget-fix-unhandled-endpoint-0-irqs.patch +musb_gadget-suppress-parasitic-tx-interrupts-with-cppi.patch +musb_host-refactor-musb_save_toggle.patch +musb_host-factor-out-musb_ep_-get-set-_qh.patch +musb_host-simplify-check-for-active-urb.patch +musb_host-streamline-musb_cleanup_urb-calls.patch +musb_host-refactor-urb-giveback.patch +musb-split-out-cppi-interrupt-handler.patch +usb-move-twl4030_usb-s-probe-function-to-.devinit.text.patch +usb-move-r8a66597_hcd-s-probe-function-to-.devinit.text.patch +usb-move-orion-ehci-s-probe-function-to-.devinit.text.patch +usb-twl4030-usb-fix-minor-reporting-goofage.patch +usb-nop-usb-xceiv-behave-when-linked-as-a-module.patch +musb-proper-hookup-to-transceiver-drivers.patch +musb-otg-timer-cleanup.patch +musb-make-initial-hnp-roleswitch-work.patch +musb-support-disconnect-after-hnp-roleswitch.patch +musb-use-dma-mode-1-for-tx-if-transfer-size-equals-maxpacket.patch +musb-add-high-bandwidth-iso-support.patch +usb-serial-ftdi-add-high-speed-device-support.patch +usb-consolidate-usb_unbind_interface-and-usb_driver_release_interface.patch +usb-usbfs-deprecate-and-hide-option-for-embedded.patch +usb-ignore-storage-device-in-modem-mode-on-dwn-652.patch +usb-core-sysfs-fix-sparse-warnings.patch +usb-ci13xxx_udc-use-helper-functions-to-determine-endpoint-type-and-direction.patch +usb-atmel_usba_udc-use-helper-functions-to-determine-endpoint-type-and-direction.patch +usb-at91_udc-use-helper-functions-to-determine-endpoint-type-and-direction.patch +usb-goku-s-use-helper-functions-to-determine-endpoint-type-and-direction.patch +usb-gadgetfs-use-helper-functions-to-determine-endpoint-type-and-direction.patch +usb-uhci-queue-use-usb_endpoint_type.patch +usb-pxa27x_udc-introduce-pxa27x_clear_otgph.patch +usb-pxa27x_udc-compatibility-with-pxa320-soc.patch +usb-pxa27x_udc-single-thread-setup-requests.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb +From ../quilt-tmp + + 8c423a8d...065a881 master -> quilt/usb (forced update) +Importing staging based on quilt/usb +$ cd ../quilt-tmp +$ git reset --hard 065a881f59eb9efc665b84e1ccdaaea85b83231b +HEAD is now at 065a881 USB: pxa27x_udc: single-thread setup requests +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging +staging-w35und-unregister-device-from-the-ieee80211-stack-upon-disconnect.patch +staging-rt2870-new-device-id.patch +staging-rtl8187se-fix-compilation-warnings-and-procfs-directory-leak.patch +staging-comedi-remove-ni_board-typedef.patch +staging-comedi-remove-ni_private-typedef.patch +staging-comedi-remove-local_info_t-typedef-in-ni_labpc_cs.patch +staging-comedi-remove-dio24_board_struct-typedef.patch +staging-comedi-remove-local_info_t-typedef-in-ni_daq_dio24.patch +staging-comedi-remove-byte-and-pbyte-typedefs-in-addi-data.patch +staging-comedi-remove-short-and-pshort-typedefs-in-addi-data.patch +staging-comedi-remove-ushort-and-pushort-typedefs-in-addi-data.patch +staging-comedi-remove-word-and-pword-typedefs-in-addi-data.patch +staging-comedi-remove-int-and-pint-typedefs-in-addi-data.patch +staging-comedi-remove-uint-and-puint-typedefs-in-addi-data.patch +staging-comedi-remove-long-and-plong-typedefs-in-addi-data.patch +staging-comedi-remove-ulong-and-pulong-typedefs-in-addi-data.patch +staging-comedi-remove-dword-and-pdword-typedefs-in-addi-data.patch +staging-comedi-remove-ulong_ptr-typedef-in-addi-data.patch +staging-comedi-remove-pcrange-typedef-in-addi-data.patch +staging-comedi-remove-boardtype-typedef-in-addi-data.patch +staging-comedi-remove-str_moduleinfo-typedef-in-addi-data.patch +staging-comedi-remove-addi_private-typedef-in-addi-data.patch +staging-comedi-remove-str_mainheader-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-str_digitalinputheader-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-str_digitaloutputheader-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-str_timerdetails-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-str_timermainheader-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-str_analogreadinformation-typedef-in-addi-data-hwdrv_apci3120.h.patch +staging-comedi-remove-str_module-typedef-in-addi-data-hwdrv_apci3200.h.patch +staging-comedi-remove-str_boardinfos-typedef-in-addi-data-hwdrv_apci3200.patch +staging-comedi-remove-str_addidata_rtdstruct-typedef-in-addi-data-hwdrv_apci3200.patch +staging-comedi-remove-labpc_board_struct-typedef.patch +staging-comedi-remove-labpc_private-typedef.patch +staging-comedi-remove-str_analoginputheader-typedef-in-addi-data-addi_eeprom.c.patch +staging-comedi-remove-c99-comments-in-8253.h.patch +staging-comedi-remove-c99-comments-in-acl7225b.c.patch +staging-comedi-remove-c99-comments-in-apci1710_82x54.c.patch +staging-comedi-remove-c99-comments-in-das1800.c.patch +staging-comedi-remove-c99-comments-in-pcl818.c.patch +staging-comedi-remove-c99-comments-in-hwdrv_apci1500.c.patch +staging-comedi-remove-c99-comments-in-apci1710_pwm.c.patch +staging-comedi-remove-c99-comments-in-hwdrv_apci1564.c.patch +staging-comedi-remove-c99-comments-in-hwdrv_apci3200.c.patch +staging-comedi-remove-c99-comments-in-hwdrv_apci3120.c.patch +staging-comedi-remove-c99-comments-in-adl_pci6208.c.patch +staging-comedi-remove-c99-comments-in-adl_pci9118.c.patch +staging-comedi-remove-c99-comments-in-adv_pci1723.c.patch +staging-comedi-remove-c99-comments-in-c6xdigio.c.patch +staging-comedi-remove-c99-comments-in-cb_pcidas64.c.patch +staging-comedi-remove-c99-comments-in-cb_pcidas.c.patch +staging-comedi-remove-c99-comments-in-cb_pcimdas.c.patch +staging-comedi-remove-c99-comments-in-gsc_hpdi.c.patch +staging-comedi-remove-c99-comments-in-mpc624.c.patch +staging-comedi-remove-c99-comments-in-ni_at_a2150.c.patch +staging-comedi-remove-c99-comments-in-ni_labpc.c.patch +staging-comedi-remove-c99-comments-in-pcl724.c.patch +staging-comedi-remove-c99-comments-in-pcl816.c.patch +staging-comedi-remove-c99-comments-in-s526.c.patch +staging-comedi-remove-interrupt.h.patch +staging-comedi-remove-c99-comments.patch +staging-comedi-finish-removing-ni_private-typedef.patch +staging-comedi-pcmcia_parse_tuple-now-has-two-arguments-not-three.patch +staging-comedi-fix-build-errors-in-pcmcia-comedi-drivers.patch +staging-comedi-set-pci-and-pcmcia-defines.patch +staging-comedi-fixed-kconfig-option-for-comedi_pcmcia_drivers.patch +staging-comedi-pcl818-fix-option-handling-for-fifo-mode.patch +staging-comedi-pcl818-tidy-up-ai-command-after-channel-dropout-or-similar-error.patch +staging-comedi-ni_600x-added-support-for-comedi_poll.patch +staging-comedi-work-around-malformed-rtai_version_code.patch +staging-comedi-undo-stupid-commit-made-3-months-ago.patch +staging-comedi-amplc_pc236-corrected-documentation.patch +staging-comedi-added-sysfs-attribute-files-for-setting-and-querying-subdevice-buffer-sizes.patch +staging-comedi-jr3_pci-use-struct-device-from-pci_dev-for-firmware-loading.patch +staging-comedi-replace-__function__-usages.patch +staging-comedi-remove-dupilcated-include.patch +staging-comedi-fix-foo-bar-should-be-foo-bar.patch +staging-comedi-add-spaces-after-commas.patch +staging-comedi-fix-spacing-around-parens.patch +staging-comedi-change-space-indentation-to-tabs.patch +staging-comedi-add-vmk80xx-usb-driver.patch +staging-comedi-vmk80xx.c-get-the-driver-to-build-properly.patch +staging-comedi-makefile-changes.patch +staging-agnx-probe-cleanup.patch +staging-agnx-remove-memlens-from-probe.patch +staging-agnx-fix-fail-paths-in-probe.patch +staging-agnx-fix-bssid-compiler-warnings.patch +staging-meilhaus-switch-to-misc-device.patch +staging-meilhaus-annotate-cpi-functions.patch +staging-meilhaus-move-tables-to-.c.patch +staging-sxg-replace-__function__-usages.patch +staging-rt3070-replace-__function__-usages.patch +staging-rt2860-don-t-call-sprintf-with-overlapping-input-and-output.patch +staging-rt2870-don-t-call-sprintf-with-overlapping-input-and-output.patch +staging-rspiusb-make-driver-compile.patch +staging-rtl8187se-use-to_delayed_work.patch +staging-rt3070-remove-dupilcated-include.patch +staging-remove-unused-include-linux-version.h-s.patch +staging-agnx-replace-print_mac-with-pm.patch +staging-stlc45xx-replace-print_mac-with-pm.patch +staging-winbond-boolean-negation-and-bitwise-operation-in-wrong-order.patch +staging-fix-operator-precedence-errors.patch +staging-w35und-remove-unused-code-from-wbsoft_configure_filter.patch +staging-w35und-replace-switch-error-handling-with-gotos-in-wb35_hw_init.patch +staging-w35und-move-hal_init_hardware-and-hal_halt-int-wbusb.c.patch +staging-w35und-simplify-error-handling-in-wb35_hw_init.patch +staging-w35und-simplify-hal_init_hardware-error-handling.patch +staging-w35und-more-simplify-hal_init_hardware-error-handling.patch +staging-w35und-simplify-hal_init_hardware-and-hal_halt.patch +staging-w35und-clean-up-comments-in-wbusb.c.patch +staging-w35und-inline-hal_set_phy_type-to-wb35_hw_init.patch +staging-w35und-reformat-wbusb.c.patch +staging-w35und-remove-module_author.patch +staging-w35und-make-led-lookup-tables-static.patch +staging-w35und-reformat-wbhal.c.patch +staging-w35und-merge-wbhal.c-to-wbusb.c.patch +staging-w35und-inline-hal_set_rf_power-to-mto.c.patch +staging-w35und-merge-rest-of-wbhal.c-to-phy_calibration.c.patch +staging-wlan-ng-move-firmware-loading-into-driver.patch +staging-pohmelfs-move-open-brace-to-same-line-on-structs.patch +staging-pohmelfs-remove-c99-comments.patch +staging-pohmelfs-remove-braces-around-single-statements.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging +From ../quilt-tmp + + b783194...10b1469 master -> quilt/staging (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..f6cbf2eff96d --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090423 |