diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-28 18:52:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-28 18:52:16 +1100 |
| commit | 5f28751cd29cd3275410ee252c3bbba9552da838 (patch) | |
| tree | a6604bb492eef02464d2843b5d745b486420942d | |
| parent | deae0de5d89b5309d12090a2d2149aeaf84bb19b (diff) | |
Add linux-next specific files for 20091028next-20091028
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 147 | ||||
| -rw-r--r-- | Next/Trees | 149 | ||||
| -rw-r--r-- | Next/merge.log | 5189 | ||||
| -rw-r--r-- | Next/quilt-import.log | 439 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5925 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c29abf1d2195 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,147 @@ +Name SHA1 +---- ---- +origin 964fe080d94db82a3268443e9b9ece4c60246414 +fixes df5281a73b4ba568ed0d266efc417856524c1e86 +arm-current 0996391139f43d032335b5360db11da62a2cbb39 +m68k-current 9848484fad9ddeb18f18f02f9ecdcd330ac9a216 +powerpc-merge 40578fca24e7f777f3da7a693b030ae28ef7e486 +sparc-current 03717e3d12b625268848414e39beda25e4515692 +scsi-rc-fixes 9e820afd0c4f3c8e8894aa91f5671fd7d11a787b +net-current f568a926a353d6816b3704d7367f34371df44ce7 +sound-current fb66ebd88471cd2cc1205536dfc781b2f4c1d6b5 +pci-current 55a1098476619d5d8f4cdae7240ea759274dead7 +wireless-current 83fc9c8938cdb55f06aa6e14f4747136b747be74 +kbuild-current 7e50a1b6c27265fa74f355b29b1190f1db25bf84 +driver-core.current 68e4c95628871d6ea7f98e5d880d397f277cbd9c +tty.current 68e4c95628871d6ea7f98e5d880d397f277cbd9c +usb.current 950f2f06f8de19e2bcac8917638fec58917cf527 +staging.current eded2d7522b6eb619b2f09a0710a0b6482269f5d +cpufreq-current f0adb134d8dc9993a9998dc50845ec4f6ff4fadc +input-current e57130698fe3dd2b7d617d90bbf86474473cb40c +md-current da17bf4306fd3a52e938b121df82a7baa10eb282 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 13b79b971564ddd0f14e706592472adc8199e912 +ide-curent 032665a26f5fe230509c4d35bd53f69fb6aa45b0 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 658e3a00804fd6f76597f7aed8abb431c4272977 +davinci be58e3fc842e2ec4d0b880384cee5bac0c74baeb +omap 1f99cf63582ad3d8e4f789c097ba3c0bcb277ca2 +pxa fd524295c5fde415d2db2fa25b29fd2aeb429b13 +avr32 5416bf33f92a4104dbcd6062bf377c8421ca3cfd +blackfin 796dada9f5584a677a0a2a1972090bfc538903ff +cris 24924ece4482d5466ffcd0affedce63816c88e53 +ia64 8add570a70d2ea6e9e15fce001c6503589c833d1 +m68k b25ef35f34a9837e1133b3ef5fab8058155cc69f +m68knommu ddfcb0dff21dc06f00ce01da6f76b038e16f2b2a +microblaze 0eca52a92735f43462165efe00a7e394345fb38e +mips 0a1fb72e196d694c37d35a7479d41906ce6b3f00 +parisc 36a07902c2134649c4af7f07980413ffb1a56085 +powerpc 964fe080d94db82a3268443e9b9ece4c60246414 +4xx 94a8d5caba74211ec76dac80fc6e2d5c391530df +galak 1dcd8ffc81e80a170625883f63f6a5db3cd0428d +s390 2f2114e42e224aaecabb936314e6a4208330afb3 +sh 5b380ec11d198a07aa6bf3a9e851531e91bf4234 +sparc 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +ceph 6ca874e92d5e50beb8e351dfd8121947bafc79ec +cifs 8347a5cdd1422eea0470ed586274c7f29e274b47 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs f19c974b10cb68db1d361e879cc05bd41b19f3f5 +ext3 0429a478d88846266c561185d4ff1eae66652f61 +ext4 fbbf69456619de5d251cb9f1df609069178c62d5 +fatfs 817b33d38f81c8736d39283c35c886ae4668f1af +fuse 79a9d99434b104c562f30f21b75317667f444793 +gfs2 fab89d6f35efc7cba6ea4daeeb2014e3bcb0a9b7 +jfs 4a19fb11a90fdbbcb3bc02effa036230d035ca28 +nfs 9a3936aac133037f65124fcb2d676a6c201a90a4 +nfsd aba24d71580180dfdf6a1a83a5858a1c048fd785 +nilfs2 012abeea669ea49636cf952d13298bb68654146a +ocfs2 b80474b432913f73cce8db001e9fa3104f9b79ee +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +udf cbc8cc33529b0e0e55ae0ff077b8cb0b71d54c7a +v9fs 47d425b937566337d4a7afdf01040a3006781007 +ubifs 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 +xfs 05277c75f6dea8ecf59138cd1b6781fb54ae08bd +reiserfs-bkl 27b3a5c51b50a234fb4a21146841e6723b5934ce +vfs aa7dfb8954ccf49e026ba13d12991a4eb7defb96 +pci db635adc5bda97b33a81c850452192f8a894f47d +hid 73cdcf567aaa4b348a1150c85ac5917c32f3c7f9 +i2c a5f5f1c56699b7bb3d41ad11e5aacb0d2a7df6b2 +jdelvare-hwmon 4653d1f1c0a1e8c757ecaa672b7312ae8fed3cbc +kernel-doc 964fe080d94db82a3268443e9b9ece4c60246414 +v4l-dvb f25140438ef7ccdab2a53598ab8c974a29c35195 +kbuild 197e1cc97d0e57753d990e13283f64664f02eef1 +kconfig 7b76bfc86757ca5e7b0a62f50003752da77c115b +ide 7fa07729e439a6184bd824746d06a49cca553f15 +libata a3ccf63ee643ef243cbf8918da8b3f9238f10029 +infiniband 06c3aa5ef1c9491f4c94483ca52afc420bc58c5a +acpi 03985f034e99ae840863d42bfaa7ea3560c7fbfb +ieee1394 cb7c96da3651111efbe088fa12f9bed61836ea93 +ubi a5eddf8faaadb50906924fd9b54add306a03a4a2 +kvm cf27adc91db1043508688918ff83092c8eaa1fec +dlm 9c1fe834c1bd7725b411055c66886b64c928083d +scsi bfa27150c1ba70e2cb2d3b738025ec4803f4101e +async_tx 1f6672d44c1ae7408b43c06170ec34eb0a0e9b9f +net a361c83cb4d7c8fe013d82a2f124175a7f276f30 +wireless bd6b4442ff3cee73f73987cf0c0e66ea677aa075 +mtd 8ce110ac19bc88b82e3feacfbb3a2ee08a07fe22 +crypto 3e02e5cb47e049727a26c9c110867a26972bd0d6 +sound 07fd2a3c384f0fee8f7062a3c23e3b1bfc18861b +cpufreq f0adb134d8dc9993a9998dc50845ec4f6ff4fadc +rr e526044b0d05ac7c10d5f3a935f8c2d6f25d9ac4 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +tmio-mmc 4b52cd752af330463abf2527a8b0df9a10916613 +input b1680a3bbfb86de49bf2679b100b6f2e1ce03a27 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block e5a76f77b4f765dc49f2bcdc0dc84c17dce7deae +device-mapper ca489abdb19f98e15e94726c8afe15386434a784 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 2007ddf6ec59786fbe7c7dea0f6e57952a2937ec +battery f056878332a91ed984a116bad4e7d49aefff9e6e +leds 39b5adc61e879b0ca7bb1e92cc40c608ff3c9498 +backlight 1aabce812a1bb9efbaddd26ea0d4c7c039bd113c +kgdb 98517d8f092cceea77ab93f15437c182b5615d9e +slab 4bdd652edb4b3cc057e7ad493b43cc0e4e352e27 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md da17bf4306fd3a52e938b121df82a7baa10eb282 +mfd 0a2546041803c5f6fe85845b4eddd768d3ebd7b6 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm c182be37ed7cb04c344501b88b8fdb747016e6cf +voltage 9dca8c172f6f3499d8a05a365ba551a21ed778be +security-testing d6ba452128178091dab7a04d54f7e66fdc32fb39 +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 049211d10e644fb36c8582336c9d5a917123bd98 +uwb 0396c215f301e92677d1e9a064b405e31501dc1d +watchdog 80f506918fdaaca6b574ba931536a58ce015c7be +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu aa697079ee66315c4b9747a5eb3e48487fb1b8be +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 505dce5cb794d38acb67cd7397007512df9f2e67 +jc_docs 1243ba98e3abecd12e9e90dd390801b95ef070f2 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 7d99e55fed2d8fbc4068dedf120e608bafaf811b +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend 0e4b57ee1b9d16fe4026b52d2346eb4a1d833fc8 +bluetooth 7e7430908c3ccaf71f0851050c8ccaf9ecfb3b56 +fsnotify 06f40a9772526e62f019fa5fe8061fad112ad25e +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +drbd f86c2f3e3ca3fdd73c6c4da101d5fda6d3156415 +catalin a44f4b17c937803ef0d5fbb541f7e86d982eda1a +alacrity 05a3c9ee16965444bd7588a9aa71d76fa4b90bfa +i7core_edac 505ca6e3b72d60cd51671b96d9129d30fbb144c0 +devicetree e91edcf5a2940bb7f1f316c871dfe9e2aaf9d6d9 +limits c1b9b7eaf7386a7f142d59a2bb433ac8217b0ad1 +tip a009e6f937bee73aa32012647b9b3878069430b7 +oprofile 374576a8b6f865022c0fd1ca62396889b23d66dd +percpu dec54bf538326a1503dd780c9f2811f495af95c5 +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 428bc597508e482cdea17b11b7b08eabd6b924a6 +hwpoison 465fdd97cbe16ef8727221857e96ef62dd352017 +driver-core 59935c964e65bd71249970e7c73f7aed0fdfcc16 +tty ae1c5dfc014bf08dd597d5185ea0d250de89efd4 +usb 8bc7dd0c63b93d1890afaa4bfe851e10bd15d1c1 +staging 910415f2e777cb7e0645472bb625260c82ba89e6 +scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..cc8c93900b2e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,149 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +tty.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-tty.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb.current/ +staging.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-staging.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +reiserfs-bkl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#reiserfs/kill-bkl +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +tmio-mmc git git://git.mnementh.co.uk/linux-2.6-im#linux-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +hwlat git git://git.kernel.org/pub/scm/linux/kernel/git/jcm/linux-2.6-hwlat.git#for-linus +drbd git git://git.drbd.org/linux-2.6-drbd.git#for-jens +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree +limits git git://decibel.fi.muni.cz/~xslaby/linux#writable_limits +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-driver-core/ +tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-tty/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-usb/ +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-08-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..2b49c7ccdc7d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5189 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 964fe08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus +Merging origin/master +$ git merge origin/master +Already up-to-date. +Merging fixes/fixes +$ git merge fixes/fixes +Merge made by recursive. + arch/powerpc/kvm/timing.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/configs/u300_defconfig | 94 ++++++++++++++++++-------- + arch/arm/include/asm/elf.h | 3 + + arch/arm/include/asm/tlbflush.h | 3 +- + arch/arm/kernel/entry-armv.S | 28 ++++---- + arch/arm/kernel/entry-header.S | 15 ++++ + arch/arm/kernel/process.c | 9 +++ + arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- + arch/arm/mach-ep93xx/core.c | 1 - + arch/arm/mach-ep93xx/edb93xx.c | 2 +- + arch/arm/mach-ep93xx/include/mach/platform.h | 1 - + arch/arm/mach-mx2/clock_imx27.c | 8 +- + arch/arm/mach-mx2/pcm038.c | 96 +++++++++++++++++++++++++- + arch/arm/mach-mx2/pcm970-baseboard.c | 2 +- + arch/arm/mach-mx25/devices.c | 19 +++++ + arch/arm/mach-mx25/mx25pdk.c | 25 +++++-- + arch/arm/mach-mx3/clock-imx35.c | 2 +- + arch/arm/mach-mx3/clock.c | 2 +- + arch/arm/mach-mx3/devices.c | 24 +++--- + arch/arm/mach-mx3/devices.h | 6 +- + arch/arm/mach-mx3/mm.c | 2 + + arch/arm/mach-pxa/cm-x300.c | 38 +++++----- + arch/arm/mach-pxa/spitz.c | 39 +++++++++++ + arch/arm/mm/Kconfig | 5 +- + arch/arm/oprofile/op_model_v6.c | 3 + + drivers/usb/gadget/Kconfig | 1 + + 25 files changed, 329 insertions(+), 101 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Merge made by recursive. + arch/powerpc/boot/dts/cm5200.dts | 1 - + arch/powerpc/boot/dts/digsy_mtc.dts | 1 - + arch/powerpc/boot/dts/lite5200.dts | 2 - + arch/powerpc/boot/dts/lite5200b.dts | 2 - + arch/powerpc/boot/dts/media5200.dts | 2 - + arch/powerpc/boot/dts/motionpro.dts | 1 - + arch/powerpc/boot/dts/mpc5121ads.dts | 3 - + arch/powerpc/boot/dts/mucmc52.dts | 332 ++++ + arch/powerpc/boot/dts/pcm030.dts | 2 - + arch/powerpc/boot/dts/pcm032.dts | 2 - + arch/powerpc/boot/dts/tqm5200.dts | 1 - + arch/powerpc/boot/dts/uc101.dts | 284 ++++ + arch/powerpc/configs/52xx/cm5200_defconfig | 136 +- + arch/powerpc/configs/52xx/lite5200b_defconfig | 153 ++- + arch/powerpc/configs/52xx/motionpro_defconfig | 146 +- + arch/powerpc/configs/52xx/pcm030_defconfig | 142 +- + arch/powerpc/configs/52xx/tqm5200_defconfig | 148 +- + arch/powerpc/configs/mpc5200_defconfig | 192 ++- + arch/powerpc/configs/ppc64e_defconfig | 2199 +++++++++++++++++++++++++ + arch/powerpc/kernel/entry_64.S | 41 +- + arch/powerpc/kernel/pci_64.c | 2 + + arch/powerpc/kernel/perf_event.c | 17 +- + arch/powerpc/kernel/process.c | 2 +- + arch/powerpc/kernel/setup_64.c | 1 - + arch/powerpc/kernel/vdso.c | 11 +- + arch/powerpc/kernel/vdso32/vdso32.lds.S | 4 +- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 2 + + arch/powerpc/platforms/iseries/Makefile | 11 +- + arch/powerpc/platforms/iseries/dt.c | 56 +- + arch/powerpc/xmon/xmon.c | 20 +- + drivers/of/of_mdio.c | 13 +- + drivers/serial/mpc52xx_uart.c | 2 +- + fs/Kconfig | 2 +- + init/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + mm/Kconfig | 2 +- + sound/ppc/Kconfig | 2 +- + 37 files changed, 3490 insertions(+), 451 deletions(-) + create mode 100644 arch/powerpc/boot/dts/mucmc52.dts + create mode 100644 arch/powerpc/boot/dts/uc101.dts + create mode 100644 arch/powerpc/configs/ppc64e_defconfig +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/s390/scsi/zfcp_aux.c | 11 ++++++----- + drivers/s390/scsi/zfcp_erp.c | 22 ++++++++++------------ + drivers/s390/scsi/zfcp_ext.h | 1 + + drivers/s390/scsi/zfcp_fc.c | 11 +++++++++++ + drivers/s390/scsi/zfcp_fsf.c | 13 ++++++++++--- + drivers/s390/scsi/zfcp_sysfs.c | 1 + + drivers/scsi/scsi_scan.c | 2 ++ + drivers/scsi/scsi_sysfs.c | 7 ++----- + 8 files changed, 43 insertions(+), 25 deletions(-) +Merging net-current/master +$ git merge net-current/master +Auto-merging drivers/net/igb/igb_ethtool.c +Merge made by recursive. + drivers/isdn/i4l/isdn_net.h | 6 +- + drivers/net/au1000_eth.c | 1 + + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/dm9000.h | 2 +- + drivers/net/e1000e/e1000.h | 12 + + drivers/net/e1000e/hw.h | 2 + + drivers/net/e1000e/ich8lan.c | 150 +++++++++--- + drivers/net/e1000e/phy.c | 469 ++++++++++++++++++++++++---------- + drivers/net/ifb.c | 3 +- + drivers/net/igb/igb_ethtool.c | 35 ++- + drivers/net/igbvf/ethtool.c | 30 ++- + drivers/net/ixgbe/ixgbe_ethtool.c | 22 +- + drivers/net/myri10ge/myri10ge.c | 17 +- + drivers/net/netxen/netxen_nic_hdr.h | 1 + + drivers/net/netxen/netxen_nic_hw.c | 14 +- + drivers/net/netxen/netxen_nic_init.c | 8 +- + drivers/net/netxen/netxen_nic_main.c | 1 + + drivers/net/pppoe.c | 129 +++++----- + drivers/net/r8169.c | 13 +- + drivers/net/sh_eth.c | 1 + + net/core/pktgen.c | 15 +- + net/ipv4/tcp.c | 6 +- + 22 files changed, 636 insertions(+), 309 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + drivers/pci/setup-bus.c | 13 ++----------- + 1 files changed, 2 insertions(+), 11 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 2 +- + drivers/net/wireless/airo.c | 5 ++--- + drivers/net/wireless/b43/leds.h | 1 + + drivers/net/wireless/b43/main.c | 1 - + drivers/net/wireless/b43/rfkill.c | 3 ++- + drivers/net/wireless/libertas/if_spi.c | 10 +++++----- + drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- + net/mac80211/ibss.c | 6 ++---- + net/mac80211/mesh_hwmp.c | 2 +- + net/mac80211/mlme.c | 3 +-- + net/mac80211/tx.c | 2 +- + net/wireless/core.h | 1 + + net/wireless/mlme.c | 9 +++++++++ + net/wireless/sme.c | 21 +++++++++++++++++++-- + 14 files changed, 46 insertions(+), 22 deletions(-) +Merging kbuild-current/master +$ git merge kbuild-current/master +Merge made by recursive. + scripts/Makefile.lib | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + drivers/base/bus.c | 17 +++++++++++------ + drivers/base/driver.c | 2 +- + drivers/base/platform.c | 6 +++++- + include/linux/device.h | 4 +++- + 4 files changed, 20 insertions(+), 9 deletions(-) +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/net/usb/rndis_host.c | 6 +++--- + drivers/usb/host/r8a66597-hcd.c | 23 +++++++++++++---------- + drivers/usb/serial/option.c | 4 ++++ + drivers/usb/serial/sierra.c | 24 ++++++++++++++---------- + 4 files changed, 34 insertions(+), 23 deletions(-) +Merging quilt/staging.current +$ git merge quilt/staging.current +Merge made by recursive. + drivers/staging/hv/ChannelMgmt.h | 2 +- + drivers/staging/hv/TODO | 6 +++++ + drivers/staging/hv/vmbus_drv.c | 14 +------------ + drivers/staging/panel/panel.c | 13 +++++++++-- + .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 4 +-- + .../staging/rtl8187se/ieee80211/ieee80211_module.c | 4 +-- + .../rtl8187se/ieee80211/ieee80211_softmac.c | 12 +++------- + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 17 ++++----------- + .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 8 +------ + .../staging/rtl8192e/ieee80211/ieee80211_module.c | 8 +------ + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 19 +++++------------ + drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 21 ++++--------------- + .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 4 +-- + .../staging/rtl8192su/ieee80211/ieee80211_module.c | 4 +-- + .../rtl8192su/ieee80211/ieee80211_softmac.c | 15 +++++-------- + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 17 ++++----------- + drivers/staging/vt6656/main_usb.c | 1 - + 17 files changed, 55 insertions(+), 114 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Auto-merging drivers/input/keyboard/atkbd.c +Merge made by recursive. + drivers/input/keyboard/atkbd.c | 36 ++++++++++++++++++++++++++++++++++++ + 1 files changed, 36 insertions(+), 0 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Removing drivers/md/unroll.pl +Merge made by recursive. + crypto/async_tx/async_pq.c | 60 +++++++----- + crypto/async_tx/async_raid6_recov.c | 100 +++++++++++++------- + crypto/async_tx/async_xor.c | 18 ++-- + drivers/md/Makefile | 22 ++-- + drivers/md/bitmap.c | 9 +- + drivers/md/md.c | 2 +- + drivers/md/raid1.c | 6 +- + drivers/md/raid10.c | 5 +- + drivers/md/raid5.c | 182 ++++++++++++++++++----------------- + drivers/md/raid5.h | 14 +++- + drivers/md/raid6altivec.uc | 2 +- + drivers/md/raid6int.uc | 2 +- + drivers/md/raid6test/Makefile | 42 ++++---- + drivers/md/unroll.awk | 20 ++++ + drivers/md/unroll.pl | 24 ----- + 15 files changed, 284 insertions(+), 224 deletions(-) + create mode 100644 drivers/md/unroll.awk + delete mode 100644 drivers/md/unroll.pl +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c +Merge made by recursive. + arch/arm/include/asm/memory.h | 2 + + arch/arm/include/asm/swab.h | 19 +++ + arch/arm/mach-at91/at91sam9g45_devices.c | 56 +++++++ + arch/arm/mach-at91/board-sam9m10g45ek.c | 1 + + arch/arm/mach-at91/include/mach/board.h | 1 + + arch/arm/mach-u300/Makefile | 1 + + arch/arm/mach-u300/i2c.c | 248 ++++++++++++++++++++++++++++++ + arch/arm/mach-u300/mmc.c | 64 +------- + arch/arm/mach-u300/regulator.c | 88 +++++++++++ + drivers/dma/Kconfig | 2 +- + 10 files changed, 421 insertions(+), 61 deletions(-) + create mode 100644 arch/arm/mach-u300/regulator.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Removing arch/arm/configs/da830_omapl137_defconfig +Merge made by recursive. + arch/arm/configs/da830_omapl137_defconfig | 1254 -------------------- + ...50_omapl138_defconfig => da8xx_omapl_defconfig} | 245 +++-- + arch/arm/configs/davinci_all_defconfig | 125 ++- + arch/arm/mach-davinci/Kconfig | 54 + + arch/arm/mach-davinci/Makefile | 3 + + arch/arm/mach-davinci/board-da830-evm.c | 245 ++++- + arch/arm/mach-davinci/board-da850-evm.c | 366 ++++++- + arch/arm/mach-davinci/board-dm355-evm.c | 12 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 9 +- + arch/arm/mach-davinci/board-dm365-evm.c | 56 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 12 - + arch/arm/mach-davinci/board-dm646x-evm.c | 84 ++- + arch/arm/mach-davinci/board-sffsdr.c | 12 - + arch/arm/mach-davinci/clock.c | 231 +++- + arch/arm/mach-davinci/clock.h | 17 +- + arch/arm/mach-davinci/common.c | 4 +- + arch/arm/mach-davinci/cp_intc.c | 3 - + arch/arm/mach-davinci/cpufreq.c | 219 ++++ + arch/arm/mach-davinci/da830.c | 75 +- + arch/arm/mach-davinci/da850.c | 300 +++++- + arch/arm/mach-davinci/devices-da8xx.c | 76 +- + arch/arm/mach-davinci/devices.c | 6 +- + arch/arm/mach-davinci/dm355.c | 2 - + arch/arm/mach-davinci/dm365.c | 81 ++- + arch/arm/mach-davinci/dm644x.c | 2 - + arch/arm/mach-davinci/dm646x.c | 11 +- + arch/arm/mach-davinci/dma.c | 105 +- + arch/arm/mach-davinci/gpio.c | 9 - + arch/arm/mach-davinci/include/mach/asp.h | 3 + + arch/arm/mach-davinci/include/mach/cpufreq.h | 25 + + arch/arm/mach-davinci/include/mach/da8xx.h | 23 +- + arch/arm/mach-davinci/include/mach/dm365.h | 7 + + arch/arm/mach-davinci/include/mach/dm644x.h | 1 - + arch/arm/mach-davinci/include/mach/mux.h | 15 +- + arch/arm/mach-davinci/include/mach/system.h | 3 - + arch/arm/mach-davinci/include/mach/usb.h | 57 + + arch/arm/mach-davinci/mux.c | 1 - + arch/arm/mach-davinci/psc.c | 3 - + arch/arm/mach-davinci/serial.c | 6 - + arch/arm/mach-davinci/sram.c | 3 - + arch/arm/mach-davinci/time.c | 6 - + arch/arm/mach-davinci/usb.c | 41 +- + 42 files changed, 2122 insertions(+), 1690 deletions(-) + delete mode 100644 arch/arm/configs/da830_omapl137_defconfig + rename arch/arm/configs/{da850_omapl138_defconfig => da8xx_omapl_defconfig} (86%) + create mode 100644 arch/arm/mach-davinci/cpufreq.c + create mode 100644 arch/arm/mach-davinci/include/mach/cpufreq.h + create mode 100644 arch/arm/mach-davinci/include/mach/usb.h +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/configs/cm_t35_defconfig | 1733 ++++++++++++++++++++ + arch/arm/mach-omap1/board-ams-delta.c | 12 +- + arch/arm/mach-omap1/board-fsample.c | 32 +- + arch/arm/mach-omap1/board-generic.c | 8 +- + arch/arm/mach-omap1/board-h2-mmc.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 16 +- + arch/arm/mach-omap1/board-h3-mmc.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 14 +- + arch/arm/mach-omap1/board-innovator.c | 14 +- + arch/arm/mach-omap1/board-nokia770.c | 22 +- + arch/arm/mach-omap1/board-osk.c | 10 +- + arch/arm/mach-omap1/board-palmte.c | 16 +- + arch/arm/mach-omap1/board-palmtt.c | 18 +- + arch/arm/mach-omap1/board-palmz71.c | 18 +- + arch/arm/mach-omap1/board-perseus2.c | 32 +- + arch/arm/mach-omap1/board-sx1-mmc.c | 4 +- + arch/arm/mach-omap1/board-sx1.c | 18 +- + arch/arm/mach-omap1/board-voiceblue.c | 8 +- + arch/arm/mach-omap1/clock.c | 32 +- + arch/arm/mach-omap1/devices.c | 8 +- + arch/arm/mach-omap1/fpga.c | 2 +- + arch/arm/mach-omap1/id.c | 2 +- + arch/arm/mach-omap1/include/mach/clkdev.h | 5 + + arch/arm/mach-omap1/include/mach/debug-macro.S | 45 + + arch/arm/mach-omap1/include/mach/entry-macro.S | 58 + + arch/arm/mach-omap1/include/mach/gpio.h | 5 + + arch/arm/mach-omap1/include/mach/hardware.h | 5 + + arch/arm/mach-omap1/include/mach/io.h | 5 + + arch/arm/mach-omap1/include/mach/irqs.h | 5 + + arch/arm/mach-omap1/include/mach/memory.h | 5 + + .../include/mach/mtd-xip.h | 0 + arch/arm/mach-omap1/include/mach/smp.h | 5 + + arch/arm/mach-omap1/include/mach/system.h | 5 + + arch/arm/mach-omap1/include/mach/timex.h | 5 + + arch/arm/mach-omap1/include/mach/uncompress.h | 5 + + .../include/mach/vmalloc.h | 5 +- + arch/arm/mach-omap1/io.c | 49 +- + arch/arm/mach-omap1/irq.c | 34 +- + arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +- + arch/arm/mach-omap1/leds.c | 2 +- + arch/arm/mach-omap1/mailbox.c | 2 +- + arch/arm/mach-omap1/mcbsp.c | 42 +- + arch/arm/mach-omap1/mux.c | 72 +- + arch/arm/mach-omap1/pm.c | 114 +- + arch/arm/mach-omap1/pm.h | 53 +- + arch/arm/mach-omap1/serial.c | 32 +- + arch/arm/mach-omap1/sleep.S | 22 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/Kconfig | 4 + + arch/arm/mach-omap2/Makefile | 2 + + arch/arm/mach-omap2/board-2430sdp.c | 14 +- + arch/arm/mach-omap2/board-3430sdp.c | 24 +- + arch/arm/mach-omap2/board-4430sdp.c | 23 +- + arch/arm/mach-omap2/board-apollon.c | 16 +- + arch/arm/mach-omap2/board-cm-t35.c | 459 ++++++ + arch/arm/mach-omap2/board-generic.c | 10 +- + arch/arm/mach-omap2/board-h4.c | 20 +- + arch/arm/mach-omap2/board-ldp.c | 16 +- + arch/arm/mach-omap2/board-n8x0.c | 16 +- + arch/arm/mach-omap2/board-omap3beagle.c | 16 +- + arch/arm/mach-omap2/board-omap3evm.c | 60 +- + arch/arm/mach-omap2/board-omap3pandora.c | 14 +- + arch/arm/mach-omap2/board-overo.c | 16 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 18 +- + arch/arm/mach-omap2/board-rx51.c | 18 +- + arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +- + arch/arm/mach-omap2/board-zoom2.c | 8 +- + arch/arm/mach-omap2/clock.c | 10 +- + arch/arm/mach-omap2/clock.h | 2 +- + arch/arm/mach-omap2/clock24xx.c | 8 +- + arch/arm/mach-omap2/clock34xx.c | 8 +- + arch/arm/mach-omap2/clock34xx.h | 2 +- + arch/arm/mach-omap2/clockdomain.c | 6 +- + arch/arm/mach-omap2/clockdomains.h | 2 +- + arch/arm/mach-omap2/cm.h | 6 +- + arch/arm/mach-omap2/control.c | 4 +- + arch/arm/mach-omap2/devices.c | 12 +- + arch/arm/mach-omap2/gpmc-onenand.c | 6 +- + arch/arm/mach-omap2/gpmc-smc91x.c | 6 +- + arch/arm/mach-omap2/gpmc.c | 4 +- + arch/arm/mach-omap2/id.c | 141 ++- + arch/arm/mach-omap2/include/mach/clkdev.h | 5 + + .../include/mach/debug-macro.S | 19 +- + .../include/mach/entry-macro.S | 62 +- + arch/arm/mach-omap2/include/mach/gpio.h | 5 + + arch/arm/mach-omap2/include/mach/hardware.h | 5 + + arch/arm/mach-omap2/include/mach/io.h | 5 + + arch/arm/mach-omap2/include/mach/irqs.h | 5 + + arch/arm/mach-omap2/include/mach/memory.h | 5 + + arch/arm/mach-omap2/include/mach/smp.h | 5 + + arch/arm/mach-omap2/include/mach/system.h | 5 + + arch/arm/mach-omap2/include/mach/timex.h | 5 + + arch/arm/mach-omap2/include/mach/uncompress.h | 5 + + .../include/mach/vmalloc.h | 3 +- + arch/arm/mach-omap2/io.c | 38 +- + arch/arm/mach-omap2/iommu2.c | 2 +- + arch/arm/mach-omap2/irq.c | 12 +- + arch/arm/mach-omap2/mailbox.c | 2 +- + arch/arm/mach-omap2/mcbsp.c | 8 +- + arch/arm/mach-omap2/mmc-twl4030.c | 6 +- + arch/arm/mach-omap2/mux.c | 4 +- + arch/arm/mach-omap2/omap-smp.c | 29 +- + arch/arm/mach-omap2/omap3-iommu.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 28 +- + arch/arm/mach-omap2/omap_hwmod_2420.h | 6 +- + arch/arm/mach-omap2/omap_hwmod_2430.h | 6 +- + arch/arm/mach-omap2/omap_hwmod_34xx.h | 6 +- + arch/arm/mach-omap2/pm-debug.c | 11 +- + arch/arm/mach-omap2/pm.h | 2 +- + arch/arm/mach-omap2/pm24xx.c | 16 +- + arch/arm/mach-omap2/pm34xx.c | 10 +- + arch/arm/mach-omap2/powerdomain.c | 6 +- + arch/arm/mach-omap2/powerdomains.h | 2 +- + arch/arm/mach-omap2/powerdomains24xx.h | 2 +- + arch/arm/mach-omap2/powerdomains34xx.h | 2 +- + arch/arm/mach-omap2/prcm.c | 4 +- + arch/arm/mach-omap2/prm.h | 6 +- + arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h | 2 +- + .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h | 2 +- + arch/arm/mach-omap2/sdrc.c | 8 +- + arch/arm/mach-omap2/sdrc.h | 11 +- + arch/arm/mach-omap2/sdrc2xxx.c | 8 +- + arch/arm/mach-omap2/serial.c | 28 +- + arch/arm/mach-omap2/sleep24xx.S | 2 +- + arch/arm/mach-omap2/sleep34xx.S | 2 +- + arch/arm/mach-omap2/sram242x.S | 4 +- + arch/arm/mach-omap2/sram243x.S | 4 +- + arch/arm/mach-omap2/timer-gp.c | 5 +- + arch/arm/mach-omap2/usb-musb.c | 4 +- + arch/arm/mach-omap2/usb-tusb6010.c | 4 +- + arch/arm/plat-omap/clock.c | 2 +- + arch/arm/plat-omap/common.c | 59 +- + arch/arm/plat-omap/cpu-omap.c | 2 +- + arch/arm/plat-omap/debug-devices.c | 2 +- + arch/arm/plat-omap/debug-leds.c | 2 +- + arch/arm/plat-omap/devices.c | 38 +- + arch/arm/plat-omap/dma.c | 38 +- + arch/arm/plat-omap/dmtimer.c | 18 +- + arch/arm/plat-omap/fb.c | 6 +- + arch/arm/plat-omap/gpio.c | 425 ++--- + arch/arm/plat-omap/i2c.c | 2 +- + .../plat-omap/include/{mach => plat}/blizzard.h | 0 + .../include/{mach => plat}/board-ams-delta.h | 0 + .../plat-omap/include/{mach => plat}/board-sx1.h | 0 + .../include/{mach => plat}/board-voiceblue.h | 0 + arch/arm/plat-omap/include/{mach => plat}/board.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/clkdev.h | 0 + arch/arm/plat-omap/include/{mach => plat}/clock.h | 0 + .../plat-omap/include/{mach => plat}/clockdomain.h | 6 +- + arch/arm/plat-omap/include/{mach => plat}/common.h | 3 + + .../arm/plat-omap/include/{mach => plat}/control.h | 49 +- + arch/arm/plat-omap/include/{mach => plat}/cpu.h | 72 + + arch/arm/plat-omap/include/{mach => plat}/dma.h | 0 + .../arm/plat-omap/include/{mach => plat}/dmtimer.h | 0 + .../plat-omap/include/{mach => plat}/dsp_common.h | 0 + arch/arm/plat-omap/include/{mach => plat}/fpga.h | 0 + .../plat-omap/include/{mach => plat}/gpio-switch.h | 0 + arch/arm/plat-omap/include/{mach => plat}/gpio.h | 0 + .../plat-omap/include/{mach => plat}/gpmc-smc91x.h | 0 + arch/arm/plat-omap/include/{mach => plat}/gpmc.h | 0 + .../plat-omap/include/{mach => plat}/hardware.h | 16 +- + arch/arm/plat-omap/include/{mach => plat}/hwa742.h | 0 + arch/arm/plat-omap/include/{mach => plat}/io.h | 124 +- + arch/arm/plat-omap/include/{mach => plat}/iommu.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/iommu2.h | 0 + arch/arm/plat-omap/include/{mach => plat}/iovmm.h | 0 + arch/arm/plat-omap/include/{mach => plat}/irda.h | 0 + arch/arm/plat-omap/include/{mach => plat}/irqs.h | 229 +-- + arch/arm/plat-omap/include/{mach => plat}/keypad.h | 0 + .../plat-omap/include/{mach => plat}/lcd_mipid.h | 0 + arch/arm/plat-omap/include/{mach => plat}/led.h | 0 + .../arm/plat-omap/include/{mach => plat}/mailbox.h | 0 + arch/arm/plat-omap/include/{mach => plat}/mcbsp.h | 8 +- + arch/arm/plat-omap/include/{mach => plat}/mcspi.h | 0 + arch/arm/plat-omap/include/{mach => plat}/memory.h | 0 + .../plat-omap/include/{mach => plat}/menelaus.h | 0 + arch/arm/plat-omap/include/{mach => plat}/mmc.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/mux.h | 100 +- + arch/arm/plat-omap/include/{mach => plat}/nand.h | 0 + .../plat-omap/include/{mach => plat}/omap-alsa.h | 4 +- + .../arm/plat-omap/include/{mach => plat}/omap-pm.h | 0 + .../plat-omap/include/{mach => plat}/omap1510.h | 0 + .../plat-omap/include/{mach => plat}/omap16xx.h | 0 + .../plat-omap/include/{mach => plat}/omap24xx.h | 0 + .../plat-omap/include/{mach => plat}/omap34xx.h | 0 + .../plat-omap/include/{mach => plat}/omap44xx.h | 8 +- + .../arm/plat-omap/include/{mach => plat}/omap730.h | 0 + .../include/{mach/omap730.h => plat/omap7xx.h} | 86 +- + .../arm/plat-omap/include/{mach => plat}/omap850.h | 0 + .../plat-omap/include/{mach => plat}/omap_device.h | 2 +- + .../plat-omap/include/{mach => plat}/omap_hwmod.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/omapfb.h | 2 +- + .../arm/plat-omap/include/{mach => plat}/onenand.h | 0 + arch/arm/plat-omap/include/{mach => plat}/param.h | 0 + .../plat-omap/include/{mach => plat}/powerdomain.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/prcm.h | 0 + arch/arm/plat-omap/include/{mach => plat}/sdrc.h | 6 +- + arch/arm/plat-omap/include/{mach => plat}/serial.h | 4 - + arch/arm/plat-omap/include/{mach => plat}/smp.h | 0 + arch/arm/plat-omap/include/{mach => plat}/sram.h | 0 + arch/arm/plat-omap/include/{mach => plat}/system.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/tc.h | 0 + .../plat-omap/include/{mach => plat}/timer-gp.h | 0 + arch/arm/plat-omap/include/{mach => plat}/timex.h | 0 + .../plat-omap/include/{mach => plat}/uncompress.h | 5 +- + arch/arm/plat-omap/include/{mach => plat}/usb.h | 2 +- + arch/arm/plat-omap/io.c | 44 +- + arch/arm/plat-omap/iommu-debug.c | 4 +- + arch/arm/plat-omap/iommu.c | 2 +- + arch/arm/plat-omap/iovmm.c | 17 +- + arch/arm/plat-omap/mailbox.c | 2 +- + arch/arm/plat-omap/mcbsp.c | 4 +- + arch/arm/plat-omap/mux.c | 2 +- + arch/arm/plat-omap/omap-pm-noop.c | 4 +- + arch/arm/plat-omap/omap_device.c | 54 +- + arch/arm/plat-omap/sram.c | 32 +- + arch/arm/plat-omap/usb.c | 18 +- + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/leds/leds-ams-delta.c | 2 +- + drivers/mfd/menelaus.c | 2 +- + drivers/mfd/twl4030-core.c | 2 +- + drivers/mmc/host/omap.c | 10 +- + drivers/mmc/host/omap_hsmmc.c | 8 +- + drivers/mtd/maps/omap_nor.c | 2 +- + drivers/mtd/nand/ams-delta.c | 2 +- + drivers/mtd/nand/omap2.c | 6 +- + drivers/mtd/onenand/omap2.c | 8 +- + drivers/pcmcia/omap_cf.c | 4 +- + drivers/spi/omap2_mcspi.c | 4 +- + drivers/spi/omap_uwire.c | 10 +- + drivers/usb/gadget/omap_udc.c | 6 +- + drivers/usb/host/ohci-omap.c | 6 +- + drivers/usb/musb/omap2430.c | 2 +- + drivers/usb/musb/omap2430.h | 2 +- + drivers/usb/musb/tusb6010_omap.c | 4 +- + drivers/usb/otg/isp1301_omap.c | 4 +- + drivers/video/backlight/omap1_bl.c | 4 +- + drivers/video/omap/blizzard.c | 6 +- + drivers/video/omap/dispc.c | 26 +- + drivers/video/omap/hwa742.c | 6 +- + drivers/video/omap/lcd_2430sdp.c | 4 +- + drivers/video/omap/lcd_ams_delta.c | 4 +- + drivers/video/omap/lcd_apollon.c | 4 +- + drivers/video/omap/lcd_h3.c | 2 +- + drivers/video/omap/lcd_h4.c | 2 +- + drivers/video/omap/lcd_inn1510.c | 4 +- + drivers/video/omap/lcd_inn1610.c | 2 +- + drivers/video/omap/lcd_ldp.c | 4 +- + drivers/video/omap/lcd_mipid.c | 4 +- + drivers/video/omap/lcd_omap2evm.c | 4 +- + drivers/video/omap/lcd_omap3beagle.c | 4 +- + drivers/video/omap/lcd_omap3evm.c | 4 +- + drivers/video/omap/lcd_osk.c | 4 +- + drivers/video/omap/lcd_overo.c | 4 +- + drivers/video/omap/lcd_palmte.c | 4 +- + drivers/video/omap/lcd_palmtt.c | 2 +- + drivers/video/omap/lcd_palmz71.c | 2 +- + drivers/video/omap/lcdc.c | 4 +- + drivers/video/omap/omapfb_main.c | 4 +- + drivers/video/omap/rfbi.c | 2 +- + drivers/video/omap/sossi.c | 4 +- + drivers/watchdog/omap_wdt.c | 2 +- + sound/soc/omap/ams-delta.c | 4 +- + sound/soc/omap/n810.c | 2 +- + sound/soc/omap/omap-mcbsp.c | 6 +- + sound/soc/omap/omap-pcm.c | 2 +- + sound/soc/omap/omap2evm.c | 2 +- + sound/soc/omap/omap3beagle.c | 2 +- + sound/soc/omap/omap3evm.c | 2 +- + sound/soc/omap/osk5912.c | 2 +- + sound/soc/omap/overo.c | 2 +- + sound/soc/omap/sdp3430.c | 2 +- + sound/soc/omap/zoom2.c | 2 +- + 273 files changed, 4116 insertions(+), 1641 deletions(-) + create mode 100644 arch/arm/configs/cm_t35_defconfig + create mode 100644 arch/arm/mach-omap1/include/mach/clkdev.h + create mode 100644 arch/arm/mach-omap1/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-omap1/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-omap1/include/mach/gpio.h + create mode 100644 arch/arm/mach-omap1/include/mach/hardware.h + create mode 100644 arch/arm/mach-omap1/include/mach/io.h + create mode 100644 arch/arm/mach-omap1/include/mach/irqs.h + create mode 100644 arch/arm/mach-omap1/include/mach/memory.h + rename arch/arm/{plat-omap => mach-omap1}/include/mach/mtd-xip.h (100%) + create mode 100644 arch/arm/mach-omap1/include/mach/smp.h + create mode 100644 arch/arm/mach-omap1/include/mach/system.h + create mode 100644 arch/arm/mach-omap1/include/mach/timex.h + create mode 100644 arch/arm/mach-omap1/include/mach/uncompress.h + copy arch/arm/{plat-omap => mach-omap1}/include/mach/vmalloc.h (88%) + create mode 100644 arch/arm/mach-omap2/board-cm-t35.c + create mode 100644 arch/arm/mach-omap2/include/mach/clkdev.h + rename arch/arm/{plat-omap => mach-omap2}/include/mach/debug-macro.S (72%) + rename arch/arm/{plat-omap => mach-omap2}/include/mach/entry-macro.S (68%) + create mode 100644 arch/arm/mach-omap2/include/mach/gpio.h + create mode 100644 arch/arm/mach-omap2/include/mach/hardware.h + create mode 100644 arch/arm/mach-omap2/include/mach/io.h + create mode 100644 arch/arm/mach-omap2/include/mach/irqs.h + create mode 100644 arch/arm/mach-omap2/include/mach/memory.h + create mode 100644 arch/arm/mach-omap2/include/mach/smp.h + create mode 100644 arch/arm/mach-omap2/include/mach/system.h + create mode 100644 arch/arm/mach-omap2/include/mach/timex.h + create mode 100644 arch/arm/mach-omap2/include/mach/uncompress.h + rename arch/arm/{plat-omap => mach-omap2}/include/mach/vmalloc.h (94%) + rename arch/arm/plat-omap/include/{mach => plat}/blizzard.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/board-ams-delta.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/board-sx1.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/board-voiceblue.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/board.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/clkdev.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/clock.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/clockdomain.h (97%) + rename arch/arm/plat-omap/include/{mach => plat}/common.h (96%) + rename arch/arm/plat-omap/include/{mach => plat}/control.h (89%) + rename arch/arm/plat-omap/include/{mach => plat}/cpu.h (84%) + rename arch/arm/plat-omap/include/{mach => plat}/dma.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/dmtimer.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/dsp_common.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/fpga.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/gpio-switch.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/gpio.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/gpmc-smc91x.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/gpmc.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/hardware.h (98%) + rename arch/arm/plat-omap/include/{mach => plat}/hwa742.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/io.h (60%) + rename arch/arm/plat-omap/include/{mach => plat}/iommu.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/iommu2.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/iovmm.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/irda.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/irqs.h (70%) + rename arch/arm/plat-omap/include/{mach => plat}/keypad.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/lcd_mipid.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/led.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/mailbox.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/mcbsp.h (98%) + rename arch/arm/plat-omap/include/{mach => plat}/mcspi.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/memory.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/menelaus.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/mmc.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/mux.h (90%) + rename arch/arm/plat-omap/include/{mach => plat}/nand.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap-alsa.h (98%) + rename arch/arm/plat-omap/include/{mach => plat}/omap-pm.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap1510.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap16xx.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap24xx.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap34xx.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap44xx.h (79%) + copy arch/arm/plat-omap/include/{mach => plat}/omap730.h (100%) + rename arch/arm/plat-omap/include/{mach/omap730.h => plat/omap7xx.h} (56%) + rename arch/arm/plat-omap/include/{mach => plat}/omap850.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap_device.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/omap_hwmod.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/omapfb.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/onenand.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/param.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/powerdomain.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/prcm.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/sdrc.h (96%) + rename arch/arm/plat-omap/include/{mach => plat}/serial.h (94%) + rename arch/arm/plat-omap/include/{mach => plat}/smp.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/sram.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/system.h (97%) + rename arch/arm/plat-omap/include/{mach => plat}/tc.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/timer-gp.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/timex.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/uncompress.h (94%) + rename arch/arm/plat-omap/include/{mach => plat}/usb.h (99%) +Merging pxa/for-next +$ git merge pxa/for-next +Removing arch/arm/mach-pxa/include/mach/treo680.h +Merge made by recursive. + arch/arm/mach-mmp/aspenite.c | 42 ++ + arch/arm/mach-mmp/clock.c | 15 + + arch/arm/mach-mmp/clock.h | 1 + + arch/arm/mach-mmp/include/mach/irqs.h | 4 +- + arch/arm/mach-mmp/include/mach/pxa168.h | 7 + + arch/arm/mach-mmp/include/mach/pxa910.h | 7 + + arch/arm/mach-mmp/pxa168.c | 1 + + arch/arm/mach-mmp/pxa910.c | 1 + + arch/arm/mach-mmp/ttc_dkb.c | 87 +++ + arch/arm/mach-pxa/Kconfig | 572 ++++++++++---------- + arch/arm/mach-pxa/Makefile | 93 ++-- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 2 +- + arch/arm/mach-pxa/devices.c | 4 +- + arch/arm/mach-pxa/include/mach/palmtreo.h | 67 +++ + arch/arm/mach-pxa/include/mach/treo680.h | 49 -- + arch/arm/mach-pxa/littleton.c | 4 +- + arch/arm/mach-pxa/{treo680.c => palmtreo.c} | 361 ++++++++++--- + arch/arm/mach-pxa/saar.c | 96 ++++- + arch/arm/mach-pxa/zylonite.c | 2 +- + arch/arm/mm/mmu.c | 2 +- + .../mach => plat-pxa/include/plat}/pxa3xx_nand.h | 0 + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 82 +++- + 24 files changed, 1024 insertions(+), 479 deletions(-) + create mode 100644 arch/arm/mach-pxa/include/mach/palmtreo.h + delete mode 100644 arch/arm/mach-pxa/include/mach/treo680.h + rename arch/arm/mach-pxa/{treo680.c => palmtreo.c} (54%) + rename arch/arm/{mach-pxa/include/mach => plat-pxa/include/plat}/pxa3xx_nand.h (100%) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/boards/atngw100/mrmt.c | 1 + + arch/avr32/boards/atngw100/setup.c | 5 -- + arch/avr32/kernel/vmlinux.lds.S | 64 ++++----------------------- + arch/avr32/mach-at32ap/at32ap700x.c | 35 ++++++++------- + arch/avr32/mach-at32ap/include/mach/board.h | 1 + + arch/avr32/mach-at32ap/include/mach/cpu.h | 2 + + 6 files changed, 32 insertions(+), 76 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + arch/ia64/include/asm/sn/arch.h | 2 +- + arch/ia64/include/asm/spinlock.h | 62 +++++++++++++------- + arch/ia64/include/asm/spinlock_types.h | 2 +- + arch/ia64/kernel/mca.c | 104 +++++++++++++++++-------------- + arch/ia64/kernel/unaligned.c | 6 +- + arch/ia64/mm/tlb.c | 24 ++++++-- + arch/ia64/pci/pci.c | 9 ++- + arch/ia64/sn/kernel/io_common.c | 8 +-- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 7 +- + 9 files changed, 133 insertions(+), 91 deletions(-) +Merging m68k/for-next +$ git merge m68k/for-next +Resolved 'drivers/rtc/Kconfig' using previous resolution. +Auto-merging drivers/rtc/Kconfig +CONFLICT (content): Merge conflict in drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 482a098] Merge remote branch 'm68k/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/rtc/Kconfig | 19 +++ + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 511 insertions(+), 0 deletions(-) + create mode 100644 drivers/rtc/rtc-msm6242.c + create mode 100644 drivers/rtc/rtc-rp5c01.c +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68k/include/asm/processor.h | 2 ++ + arch/m68k/include/asm/ptrace.h | 12 ++++++++++++ + arch/m68knommu/kernel/ptrace.c | 18 +++++++++++++++--- + 3 files changed, 29 insertions(+), 3 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Removing arch/mips/alchemy/devboards/db1x00/irqmap.c +Removing arch/mips/alchemy/devboards/pb1200/irqmap.c +Removing arch/mips/alchemy/mtx-1/irqmap.c +Removing arch/mips/alchemy/xxs1500/irqmap.c +Removing arch/mips/include/asm/mach-pb1x00/pb1100.h +Removing arch/mips/include/asm/mach-pb1x00/pb1500.h +Removing drivers/pcmcia/au1000_db1x00.c +Removing drivers/pcmcia/au1000_xxs1500.c +Merge made by recursive. + arch/mips/Kconfig | 14 + + arch/mips/Makefile | 31 +- + arch/mips/alchemy/common/dbdma.c | 13 +- + arch/mips/alchemy/common/irq.c | 81 ++-- + arch/mips/alchemy/common/platform.c | 6 - + arch/mips/alchemy/common/setup.c | 3 +- + arch/mips/alchemy/devboards/Makefile | 2 +- + arch/mips/alchemy/devboards/bcsr.c | 148 +++++ + arch/mips/alchemy/devboards/db1x00/Makefile | 2 +- + arch/mips/alchemy/devboards/db1x00/board_setup.c | 109 +++- + arch/mips/alchemy/devboards/db1x00/irqmap.c | 90 --- + arch/mips/alchemy/devboards/db1x00/platform.c | 84 +++ + arch/mips/alchemy/devboards/pb1000/board_setup.c | 17 +- + arch/mips/alchemy/devboards/pb1100/Makefile | 3 +- + arch/mips/alchemy/devboards/pb1100/board_setup.c | 32 +- + arch/mips/alchemy/devboards/pb1100/platform.c | 43 ++ + arch/mips/alchemy/devboards/pb1200/Makefile | 2 +- + arch/mips/alchemy/devboards/pb1200/board_setup.c | 91 +++- + arch/mips/alchemy/devboards/pb1200/irqmap.c | 134 ----- + arch/mips/alchemy/devboards/pb1200/platform.c | 80 +++- + arch/mips/alchemy/devboards/pb1500/Makefile | 3 +- + arch/mips/alchemy/devboards/pb1500/board_setup.c | 36 +- + arch/mips/alchemy/devboards/pb1500/platform.c | 42 ++ + arch/mips/alchemy/devboards/pb1550/Makefile | 3 +- + arch/mips/alchemy/devboards/pb1550/board_setup.c | 38 +- + arch/mips/alchemy/devboards/pb1550/platform.c | 63 +++ + arch/mips/alchemy/devboards/platform.c | 89 +++ + arch/mips/alchemy/devboards/platform.h | 18 + + arch/mips/alchemy/mtx-1/Makefile | 2 +- + arch/mips/alchemy/mtx-1/board_setup.c | 24 + + arch/mips/alchemy/mtx-1/irqmap.c | 56 -- + arch/mips/alchemy/xxs1500/Makefile | 2 +- + arch/mips/alchemy/xxs1500/board_setup.c | 37 +- + arch/mips/alchemy/xxs1500/irqmap.c | 52 -- + arch/mips/alchemy/xxs1500/platform.c | 63 +++ + arch/mips/bcm47xx/prom.c | 10 +- + arch/mips/boot/compressed/Makefile | 97 ++++ + arch/mips/boot/compressed/dbg.c | 37 ++ + arch/mips/boot/compressed/decompress.c | 126 +++++ + arch/mips/boot/compressed/dummy.c | 4 + + arch/mips/boot/compressed/head.S | 55 ++ + arch/mips/boot/compressed/ld.script | 150 +++++ + arch/mips/boot/compressed/uart-16550.c | 43 ++ + arch/mips/fw/arc/cmdline.c | 5 - + arch/mips/include/asm/bootinfo.h | 4 +- + arch/mips/include/asm/mach-au1x00/au1000.h | 59 ++- + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 23 +- + arch/mips/include/asm/mach-db1x00/bcsr.h | 238 ++++++++ + arch/mips/include/asm/mach-db1x00/db1200.h | 123 +----- + arch/mips/include/asm/mach-db1x00/db1x00.h | 100 ---- + arch/mips/include/asm/mach-pb1x00/pb1100.h | 85 --- + arch/mips/include/asm/mach-pb1x00/pb1200.h | 122 +---- + arch/mips/include/asm/mach-pb1x00/pb1500.h | 49 -- + arch/mips/include/asm/mach-pb1x00/pb1550.h | 96 ---- + arch/mips/include/asm/sgialib.h | 3 +- + arch/mips/include/asm/stackframe.h | 20 +- + arch/mips/kernel/setup.c | 4 +- + arch/mips/lasat/prom.c | 4 +- + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/rb532/prom.c | 4 +- + arch/mips/sibyte/common/cfe.c | 4 +- + arch/mips/txx9/generic/setup.c | 4 +- + drivers/ide/au1xxx-ide.c | 21 +- + drivers/mmc/host/au1xmmc.c | 8 +- + drivers/mtd/nand/au1550nd.c | 4 +- + drivers/net/irda/au1k_ir.c | 14 +- + drivers/pcmcia/Kconfig | 21 + + drivers/pcmcia/Makefile | 12 +- + drivers/pcmcia/au1000_db1x00.c | 305 ----------- + drivers/pcmcia/au1000_generic.h | 12 +- + drivers/pcmcia/au1000_pb1x00.c | 119 +---- + drivers/pcmcia/au1000_xxs1500.c | 188 ------- + drivers/pcmcia/db1xxx_ss.c | 630 ++++++++++++++++++++++ + drivers/pcmcia/xxs1500_ss.c | 357 ++++++++++++ + drivers/spi/au1550_spi.c | 6 +- + sound/oss/au1550_ac97.c | 16 +- + sound/soc/au1x/dbdma2.c | 14 +- + 77 files changed, 2861 insertions(+), 1850 deletions(-) + create mode 100644 arch/mips/alchemy/devboards/bcsr.c + delete mode 100644 arch/mips/alchemy/devboards/db1x00/irqmap.c + create mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c + create mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c + delete mode 100644 arch/mips/alchemy/devboards/pb1200/irqmap.c + create mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c + create mode 100644 arch/mips/alchemy/devboards/pb1550/platform.c + create mode 100644 arch/mips/alchemy/devboards/platform.c + create mode 100644 arch/mips/alchemy/devboards/platform.h + delete mode 100644 arch/mips/alchemy/mtx-1/irqmap.c + delete mode 100644 arch/mips/alchemy/xxs1500/irqmap.c + create mode 100644 arch/mips/alchemy/xxs1500/platform.c + create mode 100644 arch/mips/boot/compressed/Makefile + create mode 100644 arch/mips/boot/compressed/dbg.c + create mode 100644 arch/mips/boot/compressed/decompress.c + create mode 100644 arch/mips/boot/compressed/dummy.c + create mode 100644 arch/mips/boot/compressed/head.S + create mode 100644 arch/mips/boot/compressed/ld.script + create mode 100644 arch/mips/boot/compressed/uart-16550.c + create mode 100644 arch/mips/include/asm/mach-db1x00/bcsr.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1100.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1500.h + delete mode 100644 drivers/pcmcia/au1000_db1x00.c + delete mode 100644 drivers/pcmcia/au1000_xxs1500.c + create mode 100644 drivers/pcmcia/db1xxx_ss.c + create mode 100644 drivers/pcmcia/xxs1500_ss.c +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Removing arch/s390/include/asm/todclk.h +Merge made by recursive. + arch/s390/Kconfig | 15 -- + arch/s390/defconfig | 1 - + arch/s390/hypfs/hypfs.h | 4 + + arch/s390/hypfs/hypfs_diag.c | 123 +++++++++++- + arch/s390/hypfs/hypfs_vm.c | 83 +++++++- + arch/s390/hypfs/inode.c | 18 ++- + arch/s390/include/asm/atomic.h | 8 +- + arch/s390/include/asm/cputime.h | 6 +- + arch/s390/include/asm/mmu_context.h | 4 +- + arch/s390/include/asm/pgalloc.h | 3 +- + arch/s390/include/asm/setup.h | 17 +- + arch/s390/include/asm/smp.h | 54 +---- + arch/s390/include/asm/sockios.h | 21 +-- + arch/s390/include/asm/termbits.h | 206 +------------------- + arch/s390/include/asm/timex.h | 13 +- + arch/s390/include/asm/todclk.h | 23 -- + arch/s390/include/asm/uaccess.h | 2 + + arch/s390/kernel/ipl.c | 7 +- + arch/s390/kernel/setup.c | 36 ++-- + arch/s390/kernel/smp.c | 7 +- + arch/s390/kernel/swsusp_asm64.S | 1 + + arch/s390/kernel/vdso.c | 9 +- + arch/s390/kvm/Kconfig | 1 - + arch/s390/lib/uaccess_mvcos.c | 4 - + arch/s390/lib/uaccess_pt.c | 147 +++++--------- + arch/s390/mm/cmm.c | 61 +++++- + arch/s390/mm/fault.c | 380 ++++++++++++++++++----------------- + arch/s390/mm/pgtable.c | 2 +- + drivers/s390/block/dasd.c | 1 - + drivers/s390/block/dasd_3990_erp.c | 1 - + drivers/s390/block/dasd_diag.c | 20 ++- + drivers/s390/block/dasd_eckd.c | 1 - + drivers/s390/block/dasd_fba.c | 1 - + drivers/s390/char/sclp_async.c | 47 ++--- + drivers/s390/net/smsgiucv.c | 7 +- + 35 files changed, 621 insertions(+), 713 deletions(-) + delete mode 100644 arch/s390/include/asm/todclk.h +Merging sh/master +$ git merge sh/master +Recorded preimage for 'fs/Kconfig' +Removing arch/sh/drivers/pci/Kconfig +Removing arch/sh/include/asm/irqflags_32.h +Removing arch/sh/include/asm/irqflags_64.h +Removing arch/sh/kernel/cpu/ubc.S +Removing arch/sh/mm/pmb-fixed.c +Auto-merging fs/Kconfig +CONFLICT (content): Merge conflict in fs/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/Kconfig'. +[master ca493e0] Merge remote branch 'sh/master' +$ git diff -M --stat --summary HEAD^.. + arch/sh/Kconfig | 34 ++- + arch/sh/Makefile | 3 +- + arch/sh/boards/board-ap325rxa.c | 52 ++-- + arch/sh/boards/mach-ecovec24/setup.c | 115 +++++-- + arch/sh/boards/mach-kfr2r09/setup.c | 172 ++++++++++ + arch/sh/boards/mach-migor/setup.c | 52 ++-- + arch/sh/boards/mach-rsk/devices-rsk7203.c | 4 - + arch/sh/boards/mach-rsk/setup.c | 23 +- + arch/sh/boards/mach-se/7724/setup.c | 82 ++++- + arch/sh/boot/Makefile | 6 +- + arch/sh/boot/compressed/misc.c | 2 +- + arch/sh/drivers/pci/Kconfig | 19 -- + arch/sh/include/asm/addrspace.h | 9 +- + arch/sh/include/asm/atomic.h | 9 +- + arch/sh/include/asm/bitops.h | 4 +- + arch/sh/include/asm/bugs.h | 4 + + arch/sh/include/asm/dma-mapping.h | 233 ++++---------- + arch/sh/include/asm/dwarf.h | 28 ++ + arch/sh/include/asm/fixmap.h | 6 +- + arch/sh/include/asm/ftrace.h | 17 + + arch/sh/include/asm/hardirq.h | 13 +- + arch/sh/include/asm/io.h | 4 +- + arch/sh/include/asm/irqflags.h | 31 +-- + arch/sh/include/asm/irqflags_32.h | 99 ------ + arch/sh/include/asm/irqflags_64.h | 85 ----- + arch/sh/include/asm/mmu.h | 13 +- + arch/sh/include/asm/pci.h | 30 +-- + arch/sh/include/asm/pgtable.h | 26 ++- + arch/sh/include/asm/pgtable_32.h | 2 +- + arch/sh/include/asm/scatterlist.h | 2 +- + arch/sh/include/asm/system_32.h | 29 ++ + arch/sh/include/asm/system_64.h | 26 ++ + arch/sh/include/asm/thread_info.h | 26 ++- + arch/sh/include/asm/topology.h | 8 + + arch/sh/include/asm/ubc.h | 11 - + arch/sh/include/asm/watchdog.h | 59 ++++- + arch/sh/include/cpu-sh4/cpu/watchdog.h | 13 + + arch/sh/kernel/Makefile | 8 +- + arch/sh/kernel/cpu/Makefile | 1 - + arch/sh/kernel/cpu/init.c | 11 - + arch/sh/kernel/cpu/sh3/entry.S | 33 -- + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 45 ++- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 37 ++- + arch/sh/kernel/cpu/sh5/entry.S | 2 +- + arch/sh/kernel/cpu/ubc.S | 59 ---- + arch/sh/kernel/dma-nommu.c | 82 +++++ + arch/sh/kernel/dwarf.c | 244 +++++++++++--- + arch/sh/kernel/entry-common.S | 2 +- + arch/sh/kernel/ftrace.c | 146 +++++++++- + arch/sh/kernel/head_32.S | 2 +- + arch/sh/kernel/idle.c | 78 ++++- + arch/sh/kernel/irq.c | 11 +- + arch/sh/kernel/irq_32.c | 57 ++++ + arch/sh/kernel/irq_64.c | 51 +++ + arch/sh/kernel/machine_kexec.c | 6 - + arch/sh/kernel/module.c | 9 +- + arch/sh/kernel/process_32.c | 2 + + arch/sh/kernel/process_64.c | 2 + + arch/sh/kernel/return_address.c | 54 +++ + arch/sh/kernel/setup.c | 4 + + arch/sh/kernel/sh_ksyms_32.c | 81 ++---- + arch/sh/kernel/sh_ksyms_64.c | 10 - + arch/sh/kernel/signal_32.c | 24 +- + arch/sh/kernel/signal_64.c | 13 +- + arch/sh/kernel/smp.c | 4 +- + arch/sh/kernel/topology.c | 26 ++ + arch/sh/kernel/traps.c | 2 + + arch/sh/kernel/traps_32.c | 5 - + arch/sh/mm/Kconfig | 13 +- + arch/sh/mm/Makefile | 3 +- + arch/sh/mm/cache-sh4.c | 504 +++++------------------------ + arch/sh/mm/cache-sh7705.c | 2 +- + arch/sh/mm/cache.c | 12 + + arch/sh/mm/consistent.c | 28 +- + arch/sh/mm/init.c | 19 ++ + arch/sh/mm/kmap.c | 4 +- + arch/sh/mm/pmb-fixed.c | 45 --- + arch/sh/mm/pmb.c | 268 ++++++++-------- + drivers/cdrom/gdrom.c | 10 +- + drivers/mfd/Kconfig | 8 + + drivers/mfd/Makefile | 1 + + drivers/mfd/sh_mobile_sdhi.c | 145 +++++++++ + drivers/mmc/host/Kconfig | 2 +- + drivers/sh/intc.c | 14 +- + drivers/sh/maple/maple.c | 4 +- + fs/Kconfig | 2 +- + include/linux/sh_intc.h | 4 - + 87 files changed, 1996 insertions(+), 1554 deletions(-) + delete mode 100644 arch/sh/drivers/pci/Kconfig + delete mode 100644 arch/sh/include/asm/irqflags_32.h + delete mode 100644 arch/sh/include/asm/irqflags_64.h + delete mode 100644 arch/sh/kernel/cpu/ubc.S + create mode 100644 arch/sh/kernel/dma-nommu.c + create mode 100644 arch/sh/kernel/irq_32.c + create mode 100644 arch/sh/kernel/irq_64.c + create mode 100644 arch/sh/kernel/return_address.c + delete mode 100644 arch/sh/mm/pmb-fixed.c + create mode 100644 drivers/mfd/sh_mobile_sdhi.c +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +Merging ceph/for-next +$ git merge ceph/for-next +Auto-merging MAINTAINERS +Auto-merging fs/Kconfig +Merge made by recursive. + Documentation/filesystems/ceph.txt | 139 ++ + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 9 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ceph/Kconfig | 26 + + fs/ceph/Makefile | 36 + + fs/ceph/README | 17 + + fs/ceph/addr.c | 1115 +++++++++++++ + fs/ceph/buffer.c | 34 + + fs/ceph/buffer.h | 55 + + fs/ceph/caps.c | 2863 +++++++++++++++++++++++++++++++++ + fs/ceph/ceph_debug.h | 37 + + fs/ceph/ceph_frag.c | 21 + + fs/ceph/ceph_frag.h | 109 ++ + fs/ceph/ceph_fs.c | 104 ++ + fs/ceph/ceph_fs.h | 639 ++++++++ + fs/ceph/ceph_strings.c | 163 ++ + fs/ceph/crush/crush.c | 140 ++ + fs/ceph/crush/crush.h | 188 +++ + fs/ceph/crush/hash.h | 90 ++ + fs/ceph/crush/mapper.c | 594 +++++++ + fs/ceph/crush/mapper.h | 20 + + fs/ceph/debugfs.c | 425 +++++ + fs/ceph/decode.h | 141 ++ + fs/ceph/dir.c | 1212 ++++++++++++++ + fs/ceph/export.c | 223 +++ + fs/ceph/file.c | 904 +++++++++++ + fs/ceph/inode.c | 1622 +++++++++++++++++++ + fs/ceph/ioctl.c | 157 ++ + fs/ceph/ioctl.h | 39 + + fs/ceph/mds_client.c | 2912 ++++++++++++++++++++++++++++++++++ + fs/ceph/mds_client.h | 321 ++++ + fs/ceph/mdsmap.c | 166 ++ + fs/ceph/mdsmap.h | 53 + + fs/ceph/messenger.c | 2019 +++++++++++++++++++++++ + fs/ceph/messenger.h | 243 +++ + fs/ceph/mon_client.c | 699 ++++++++ + fs/ceph/mon_client.h | 109 ++ + fs/ceph/msgpool.c | 181 +++ + fs/ceph/msgpool.h | 27 + + fs/ceph/msgr.h | 158 ++ + fs/ceph/osd_client.c | 1308 +++++++++++++++ + fs/ceph/osd_client.h | 144 ++ + fs/ceph/osdmap.c | 882 ++++++++++ + fs/ceph/osdmap.h | 123 ++ + fs/ceph/rados.h | 372 +++++ + fs/ceph/snap.c | 897 +++++++++++ + fs/ceph/super.c | 947 +++++++++++ + fs/ceph/super.h | 888 +++++++++++ + fs/ceph/types.h | 28 + + fs/ceph/xattr.c | 840 ++++++++++ + 52 files changed, 24442 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/ceph.txt + create mode 100644 fs/ceph/Kconfig + create mode 100644 fs/ceph/Makefile + create mode 100644 fs/ceph/README + create mode 100644 fs/ceph/addr.c + create mode 100644 fs/ceph/buffer.c + create mode 100644 fs/ceph/buffer.h + create mode 100644 fs/ceph/caps.c + create mode 100644 fs/ceph/ceph_debug.h + create mode 100644 fs/ceph/ceph_frag.c + create mode 100644 fs/ceph/ceph_frag.h + create mode 100644 fs/ceph/ceph_fs.c + create mode 100644 fs/ceph/ceph_fs.h + create mode 100644 fs/ceph/ceph_strings.c + create mode 100644 fs/ceph/crush/crush.c + create mode 100644 fs/ceph/crush/crush.h + create mode 100644 fs/ceph/crush/hash.h + create mode 100644 fs/ceph/crush/mapper.c + create mode 100644 fs/ceph/crush/mapper.h + create mode 100644 fs/ceph/debugfs.c + create mode 100644 fs/ceph/decode.h + create mode 100644 fs/ceph/dir.c + create mode 100644 fs/ceph/export.c + create mode 100644 fs/ceph/file.c + create mode 100644 fs/ceph/inode.c + create mode 100644 fs/ceph/ioctl.c + create mode 100644 fs/ceph/ioctl.h + create mode 100644 fs/ceph/mds_client.c + create mode 100644 fs/ceph/mds_client.h + create mode 100644 fs/ceph/mdsmap.c + create mode 100644 fs/ceph/mdsmap.h + create mode 100644 fs/ceph/messenger.c + create mode 100644 fs/ceph/messenger.h + create mode 100644 fs/ceph/mon_client.c + create mode 100644 fs/ceph/mon_client.h + create mode 100644 fs/ceph/msgpool.c + create mode 100644 fs/ceph/msgpool.h + create mode 100644 fs/ceph/msgr.h + create mode 100644 fs/ceph/osd_client.c + create mode 100644 fs/ceph/osd_client.h + create mode 100644 fs/ceph/osdmap.c + create mode 100644 fs/ceph/osdmap.h + create mode 100644 fs/ceph/rados.h + create mode 100644 fs/ceph/snap.c + create mode 100644 fs/ceph/super.c + create mode 100644 fs/ceph/super.h + create mode 100644 fs/ceph/types.h + create mode 100644 fs/ceph/xattr.c +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/connect.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. + fs/ecryptfs/inode.c | 97 ++++++++++++++++++++++++++++++++++----------------- + 1 files changed, 65 insertions(+), 32 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + Documentation/filesystems/vfs.txt | 2 +- + arch/alpha/include/asm/fcntl.h | 19 ++- + arch/blackfin/include/asm/fcntl.h | 2 - + arch/mips/include/asm/fcntl.h | 17 ++- + arch/mips/kernel/kspd.c | 1 + + arch/mips/loongson/common/mem.c | 2 +- + arch/mips/mm/cache.c | 2 +- + arch/parisc/include/asm/fcntl.h | 5 +- + arch/sparc/include/asm/fcntl.h | 19 ++- + arch/x86/mm/pat.c | 3 +- + drivers/char/mem.c | 6 +- + drivers/usb/gadget/file_storage.c | 2 +- + fs/afs/write.c | 8 - + fs/btrfs/file.c | 4 +- + fs/cifs/dir.c | 3 +- + fs/cifs/file.c | 6 +- + fs/ext3/inode.c | 4 + + fs/isofs/compress.c | 533 ++++++++++++++++++++----------------- + fs/isofs/rock.c | 3 +- + fs/jbd2/commit.c | 2 +- + fs/namei.c | 9 + + fs/nfs/file.c | 4 +- + fs/nfs/write.c | 2 +- + fs/ocfs2/file.c | 2 +- + fs/sync.c | 13 +- + fs/ubifs/file.c | 13 +- + fs/xfs/linux-2.6/xfs_lrw.c | 2 +- + include/asm-generic/fcntl.h | 25 ++- + include/linux/fs.h | 2 - + mm/filemap.c | 49 +--- + sound/core/rawmidi.c | 2 +- + 31 files changed, 414 insertions(+), 352 deletions(-) +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/Kconfig | 2 + + fs/gfs2/acl.c | 357 +++++++++++-------- + fs/gfs2/acl.h | 24 +- + fs/gfs2/bmap.c | 2 +- + fs/gfs2/glock.c | 13 +- + fs/gfs2/glock.h | 9 - + fs/gfs2/glops.c | 5 +- + fs/gfs2/incore.h | 4 + + fs/gfs2/inode.c | 2 +- + fs/gfs2/log.c | 2 +- + fs/gfs2/lops.c | 2 +- + fs/gfs2/ops_fstype.c | 154 +++++++- + fs/gfs2/quota.c | 393 +++++++++++++++----- + fs/gfs2/quota.h | 5 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 93 ++++- + fs/gfs2/super.h | 4 +- + fs/gfs2/sys.c | 14 +- + fs/gfs2/xattr.c | 74 +++-- + fs/gfs2/xattr.h | 8 +- + fs/quota/Kconfig | 2 +- + fs/quota/dquot.c | 93 +----- + fs/quota/quota.c | 93 +++++ + fs/xattr_acl.c | 2 +- + include/linux/posix_acl.h | 14 + + include/linux/quota.h | 11 + + .../trace_gfs2.h => include/trace/events/gfs2.h | 7 +- + 27 files changed, 942 insertions(+), 449 deletions(-) + rename fs/gfs2/trace_gfs2.h => include/trace/events/gfs2.h (98%) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/nfs/dir.c | 2 ++ + fs/nfs/direct.c | 1 + + fs/nfs/nfs4proc.c | 15 ++++++++------- + fs/nfs/nfs4xdr.c | 1 - + 4 files changed, 11 insertions(+), 8 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + Documentation/filesystems/00-INDEX | 10 +--- + Documentation/filesystems/nfs/00-INDEX | 12 ++++ + Documentation/filesystems/{ => nfs}/Exporting | 0 + Documentation/filesystems/{ => nfs}/nfs-rdma.txt | 0 + Documentation/filesystems/{ => nfs}/nfs.txt | 0 + .../filesystems/{ => nfs}/nfs41-server.txt | 9 +++- + Documentation/filesystems/{ => nfs}/nfsroot.txt | 0 + Documentation/filesystems/porting | 2 +- + Documentation/kernel-parameters.txt | 6 +- + fs/cifs/export.c | 2 +- + fs/exportfs/expfs.c | 2 +- + fs/isofs/export.c | 2 +- + fs/nfs/Kconfig | 2 +- + fs/nfsd/export.c | 22 ++++++- + fs/nfsd/nfs4acl.c | 2 +- + fs/nfsd/nfs4state.c | 18 +++++- + fs/nfsd/nfsproc.c | 1 + + fs/nfsd/vfs.c | 62 ++++++++++++-------- + include/linux/exportfs.h | 2 +- + net/ipv4/Kconfig | 6 +- + net/ipv4/ipconfig.c | 2 +- + net/sunrpc/svcauth_unix.c | 53 ++++++++++------- + 22 files changed, 137 insertions(+), 78 deletions(-) + create mode 100644 Documentation/filesystems/nfs/00-INDEX + rename Documentation/filesystems/{ => nfs}/Exporting (100%) + rename Documentation/filesystems/{ => nfs}/nfs-rdma.txt (100%) + rename Documentation/filesystems/{ => nfs}/nfs.txt (100%) + rename Documentation/filesystems/{ => nfs}/nfs41-server.txt (96%) + rename Documentation/filesystems/{ => nfs}/nfsroot.txt (100%) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/xfs/quota/xfs_qm_syscalls.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging reiserfs-bkl/reiserfs/kill-bkl +$ git merge reiserfs-bkl/reiserfs/kill-bkl +Auto-merging fs/reiserfs/super.c +Merge made by recursive. + fs/reiserfs/Makefile | 2 +- + fs/reiserfs/bitmap.c | 4 + + fs/reiserfs/dir.c | 10 +++- + fs/reiserfs/do_balan.c | 17 ++---- + fs/reiserfs/file.c | 2 +- + fs/reiserfs/fix_node.c | 19 +++++- + fs/reiserfs/inode.c | 95 ++++++++++++++++------------- + fs/reiserfs/ioctl.c | 77 +++++++++++++---------- + fs/reiserfs/journal.c | 130 ++++++++++++++++++++++++++++++---------- + fs/reiserfs/lock.c | 88 +++++++++++++++++++++++++++ + fs/reiserfs/namei.c | 20 ++++-- + fs/reiserfs/prints.c | 4 - + fs/reiserfs/resize.c | 2 + + fs/reiserfs/stree.c | 53 ++++++++++++++--- + fs/reiserfs/super.c | 52 ++++++++++++---- + fs/reiserfs/xattr.c | 6 +- + include/linux/reiserfs_fs.h | 71 +++++++++++++++++++--- + include/linux/reiserfs_fs_sb.h | 20 ++++++ + 18 files changed, 502 insertions(+), 170 deletions(-) + create mode 100644 fs/reiserfs/lock.c +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merging arch/ia64/pci/pci.c +Auto-merging drivers/pci/setup-bus.c +Merge made by recursive. + arch/ia64/pci/pci.c | 30 ++++++---- + arch/sparc/include/asm/pci_64.h | 2 - + arch/sparc/kernel/pci.c | 7 ++ + arch/x86/include/asm/xen/hypervisor.h | 27 --------- + arch/x86/pci/Makefile | 5 ++ + arch/x86/pci/acpi.c | 14 ++++- + arch/x86/pci/amd_bus.c | 45 ++++++--------- + arch/x86/pci/bus_numa.h | 26 +++++++++ + arch/x86/pci/common.c | 20 ++++--- + arch/x86/pci/i386.c | 21 +++++-- + arch/x86/pci/intel_bus.c | 90 ++++++++++++++++++++++++++++++ + arch/x86/pci/mmconfig-shared.c | 31 +++++++---- + arch/x86/xen/enlighten.c | 1 + + drivers/block/xen-blkfront.c | 1 + + drivers/char/hvc_xen.c | 2 + + drivers/input/xen-kbdfront.c | 3 + + drivers/net/xen-netfront.c | 1 + + drivers/pci/hotplug/Makefile | 12 +++- + drivers/pci/hotplug/pci_hotplug_core.c | 22 ++++---- + drivers/pci/pci.c | 96 +++++++++++++++++++++---------- + drivers/pci/pci.h | 2 + + drivers/pci/probe.c | 32 +++++------ + drivers/pci/quirks.c | 28 +++++++++ + drivers/pci/setup-bus.c | 9 +-- + drivers/pci/setup-res.c | 28 ++++----- + drivers/pcmcia/cardbus.c | 23 +++++--- + drivers/pnp/quirks.c | 12 +--- + drivers/pnp/resource.c | 10 +-- + drivers/pnp/support.c | 43 ++------------- + drivers/pnp/system.c | 14 ++--- + drivers/video/xen-fbfront.c | 3 + + drivers/xen/balloon.c | 2 + + drivers/xen/cpu_hotplug.c | 1 + + drivers/xen/evtchn.c | 2 + + drivers/xen/grant-table.c | 1 + + drivers/xen/sys-hypervisor.c | 1 + + drivers/xen/xenbus/xenbus_probe.c | 2 + + drivers/xen/xenfs/super.c | 2 + + include/linux/pci.h | 3 + + include/linux/pci_regs.h | 13 ++++ + include/xen/xen.h | 32 +++++++++++ + lib/vsprintf.c | 80 +++++++++++++++++++++----- + 42 files changed, 531 insertions(+), 268 deletions(-) + create mode 100644 arch/x86/pci/bus_numa.h + create mode 100644 arch/x86/pci/intel_bus.c + create mode 100644 include/xen/xen.h +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/hid-core.c | 6 ++++-- + drivers/hid/hid-ids.h | 1 + + drivers/hid/usbhid/hid-core.c | 9 ++++----- + drivers/hid/usbhid/hid-quirks.c | 1 + + 4 files changed, 10 insertions(+), 7 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Removing Documentation/i2c/busses/i2c-voodoo3 +Removing drivers/i2c/busses/i2c-voodoo3.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 9 - + Documentation/i2c/busses/i2c-piix4 | 2 +- + Documentation/i2c/busses/i2c-voodoo3 | 62 ------- + Documentation/i2c/old-module-parameters | 44 +++++ + drivers/i2c/Kconfig | 1 + + drivers/i2c/busses/Kconfig | 18 +-- + drivers/i2c/busses/Makefile | 3 - + drivers/i2c/busses/i2c-ali1535.c | 2 +- + drivers/i2c/busses/i2c-ali15x3.c | 2 +- + drivers/i2c/busses/i2c-iop3xx.c | 6 - + drivers/i2c/busses/i2c-mv64xxx.c | 3 - + drivers/i2c/busses/i2c-piix4.c | 8 +- + drivers/i2c/busses/i2c-powermac.c | 115 ++++++++------ + drivers/i2c/busses/i2c-scmi.c | 33 +++- + drivers/i2c/busses/i2c-sis5595.c | 2 +- + drivers/i2c/busses/i2c-sis630.c | 2 +- + drivers/i2c/busses/i2c-voodoo3.c | 248 ---------------------------- + drivers/i2c/chips/Kconfig | 10 - + drivers/i2c/chips/Makefile | 1 - + drivers/i2c/i2c-core.c | 99 ++--------- + drivers/i2c/i2c-dev.c | 22 +-- + drivers/misc/Kconfig | 10 + + drivers/misc/Makefile | 1 + + drivers/{i2c/chips => misc}/ds1682.c | 0 + drivers/misc/ics932s401.c | 37 ++--- + drivers/net/sfc/sfe4001.c | 4 +- + include/linux/i2c.h | 94 +---------- + include/linux/pci_ids.h | 2 +- + 28 files changed, 200 insertions(+), 640 deletions(-) + delete mode 100644 Documentation/i2c/busses/i2c-voodoo3 + create mode 100644 Documentation/i2c/old-module-parameters + delete mode 100644 drivers/i2c/busses/i2c-voodoo3.c + rename drivers/{i2c/chips => misc}/ds1682.c (100%) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/hwmon/it87 | 1 - + Documentation/hwmon/mc13783-adc | 50 +++++++++ + Documentation/hwmon/w83627hf | 29 +++++- + MAINTAINERS | 1 + + drivers/hwmon/Kconfig | 17 +++- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adm1021.c | 76 +++++--------- + drivers/hwmon/adm1025.c | 73 ++++--------- + drivers/hwmon/adm1026.c | 47 ++++----- + drivers/hwmon/adm1029.c | 57 +++------- + drivers/hwmon/adm1031.c | 26 ++---- + drivers/hwmon/adm9240.c | 61 ++++------- + drivers/hwmon/ads7828.c | 22 ++-- + drivers/hwmon/adt7462.c | 25 ++--- + drivers/hwmon/adt7470.c | 25 ++--- + drivers/hwmon/adt7473.c | 25 ++--- + drivers/hwmon/adt7475.c | 14 +-- + drivers/hwmon/asb100.c | 55 +++------- + drivers/hwmon/dme1737.c | 61 ++++++----- + drivers/hwmon/ds1621.c | 22 ++--- + drivers/hwmon/f75375s.c | 31 ++---- + drivers/hwmon/fschmd.c | 55 +++++----- + drivers/hwmon/gl518sm.c | 29 ++---- + drivers/hwmon/gl520sm.c | 12 +-- + drivers/hwmon/it87.c | 48 +++++++-- + drivers/hwmon/lm63.c | 54 ++++----- + drivers/hwmon/lm73.c | 205 +++++++++++++++++++++++++++++++++++ + drivers/hwmon/lm75.c | 56 +++++----- + drivers/hwmon/lm77.c | 80 +++++++------- + drivers/hwmon/lm78.c | 60 ++++------- + drivers/hwmon/lm83.c | 81 +++++---------- + drivers/hwmon/lm85.c | 157 +++++++++++---------------- + drivers/hwmon/lm87.c | 41 +++---- + drivers/hwmon/lm90.c | 228 ++++++++++++++++---------------------- + drivers/hwmon/lm92.c | 31 ++---- + drivers/hwmon/lm93.c | 32 ++---- + drivers/hwmon/lm95241.c | 48 ++------- + drivers/hwmon/max1619.c | 64 ++++-------- + drivers/hwmon/max6650.c | 20 +--- + drivers/hwmon/mc13783-adc.c | 224 ++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/smsc47m192.c | 28 +++--- + drivers/hwmon/thmc50.c | 37 +++---- + drivers/hwmon/tmp401.c | 55 +++++----- + drivers/hwmon/tmp421.c | 45 ++++---- + drivers/hwmon/w83627hf.c | 96 +++++++--------- + drivers/hwmon/w83781d.c | 131 +++++++++------------- + drivers/hwmon/w83791d.c | 60 +++------- + drivers/hwmon/w83792d.c | 61 +++-------- + drivers/hwmon/w83793.c | 53 +++------ + drivers/hwmon/w83l785ts.c | 70 ++++-------- + drivers/hwmon/w83l786ng.c | 58 +++------- + 51 files changed, 1462 insertions(+), 1477 deletions(-) + create mode 100644 Documentation/hwmon/mc13783-adc + create mode 100644 drivers/hwmon/lm73.c + create mode 100644 drivers/hwmon/mc13783-adc.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + drivers/media/common/tuners/tuner-xc2028.c | 20 +- + drivers/media/common/tuners/tuner-xc2028.h | 2 + + drivers/staging/tm6000/Kconfig | 32 + + drivers/staging/tm6000/Makefile | 15 + + drivers/staging/tm6000/README | 11 + + drivers/staging/tm6000/hack.c | 252 +++++ + drivers/staging/tm6000/hack.h | 45 + + drivers/staging/tm6000/tm6000-alsa.c | 413 ++++++++ + drivers/staging/tm6000/tm6000-cards.c | 630 +++++++++++ + drivers/staging/tm6000/tm6000-core.c | 511 +++++++++ + drivers/staging/tm6000/tm6000-dvb.c | 322 ++++++ + drivers/staging/tm6000/tm6000-i2c.c | 245 +++++ + drivers/staging/tm6000/tm6000-regs.h | 86 ++ + drivers/staging/tm6000/tm6000-stds.c | 873 +++++++++++++++ + drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + + drivers/staging/tm6000/tm6000-video.c | 1573 ++++++++++++++++++++++++++++ + drivers/staging/tm6000/tm6000.h | 279 +++++ + include/linux/videodev2.h | 1 + + 18 files changed, 5360 insertions(+), 3 deletions(-) + create mode 100644 drivers/staging/tm6000/Kconfig + create mode 100644 drivers/staging/tm6000/Makefile + create mode 100644 drivers/staging/tm6000/README + create mode 100644 drivers/staging/tm6000/hack.c + create mode 100644 drivers/staging/tm6000/hack.h + create mode 100644 drivers/staging/tm6000/tm6000-alsa.c + create mode 100644 drivers/staging/tm6000/tm6000-cards.c + create mode 100644 drivers/staging/tm6000/tm6000-core.c + create mode 100644 drivers/staging/tm6000/tm6000-dvb.c + create mode 100644 drivers/staging/tm6000/tm6000-i2c.c + create mode 100644 drivers/staging/tm6000/tm6000-regs.h + create mode 100644 drivers/staging/tm6000/tm6000-stds.c + create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h + create mode 100644 drivers/staging/tm6000/tm6000-video.c + create mode 100644 drivers/staging/tm6000/tm6000.h +Merging kbuild/master +$ git merge kbuild/master +Auto-merging arch/sh/Makefile +Removing arch/sh/include/asm/.gitignore +Auto-merging drivers/staging/panel/panel.c +Merge made by recursive. + .gitignore | 6 -- + Documentation/dontdiff | 1 + + Documentation/kbuild/kconfig.txt | 3 +- + Kbuild | 4 +- + Makefile | 80 +++++------------------ + arch/alpha/boot/bootp.c | 2 +- + arch/alpha/boot/bootpz.c | 2 +- + arch/alpha/boot/main.c | 2 +- + arch/alpha/include/asm/asm-offsets.h | 1 + + arch/arm/Makefile | 14 +---- + arch/arm/include/asm/asm-offsets.h | 1 + + arch/arm/include/asm/mach-types.h | 1 + + arch/arm/tools/Makefile | 2 +- + arch/arm/tools/gen-mach-types | 2 +- + arch/avr32/include/asm/asm-offsets.h | 1 + + arch/blackfin/include/asm/asm-offsets.h | 1 + + arch/cris/arch-v32/kernel/head.S | 1 - + arch/cris/include/asm/asm-offsets.h | 1 + + arch/cris/kernel/asm-offsets.c | 1 - + arch/cris/kernel/vmlinux.lds.S | 1 - + arch/frv/include/asm/asm-offsets.h | 1 + + arch/frv/kernel/setup.c | 2 +- + arch/h8300/include/asm/asm-offsets.h | 1 + + arch/ia64/Makefile | 2 +- + arch/ia64/include/asm/asm-offsets.h | 1 + + arch/ia64/include/asm/irq.h | 2 +- + arch/ia64/kernel/Makefile | 7 +-- + arch/ia64/kvm/asm-offsets.c | 1 - + arch/m68k/include/asm/asm-offsets.h | 1 + + arch/m68k/kernel/head.S | 2 +- + arch/microblaze/include/asm/asm-offsets.h | 1 + + arch/mips/include/asm/asm-offsets.h | 1 + + arch/mn10300/include/asm/asm-offsets.h | 1 + + arch/parisc/include/asm/asm-offsets.h | 1 + + arch/powerpc/include/asm/asm-offsets.h | 1 + + arch/powerpc/platforms/52xx/efika.c | 2 +- + arch/powerpc/platforms/amigaone/setup.c | 2 +- + arch/powerpc/platforms/cell/spufs/Makefile | 6 +- + arch/powerpc/platforms/chrp/setup.c | 2 +- + arch/powerpc/platforms/powermac/bootx_init.c | 2 +- + arch/s390/include/asm/asm-offsets.h | 1 + + arch/sh/Makefile | 10 +-- + arch/sh/drivers/pci/fixups-rts7751r2d.c | 2 +- + arch/sh/include/asm/.gitignore | 1 - + arch/sh/include/asm/asm-offsets.h | 1 + + arch/sh/include/asm/machvec.h | 2 +- + arch/sh/tools/Makefile | 4 +- + arch/sh/tools/gen-mach-types | 2 +- + arch/sparc/include/asm/asm-offsets.h | 1 + + arch/um/Makefile | 2 +- + arch/um/include/asm/asm-offsets.h | 1 + + arch/x86/boot/header.S | 2 +- + arch/x86/boot/version.c | 4 +- + arch/x86/include/asm/asm-offsets.h | 1 + + arch/xtensa/include/asm/asm-offsets.h | 1 + + drivers/accessibility/braille/braille_console.c | 1 - + drivers/hid/hid-lg.h | 2 - + drivers/platform/x86/compal-laptop.c | 1 - + drivers/staging/iio/ring_sw.h | 1 - + drivers/staging/panel/panel.c | 2 +- + include/linux/mmdebug.h | 2 - + include/linux/mmzone.h | 2 +- + include/linux/page-flags.h | 2 +- + include/linux/vermagic.h | 2 +- + init/Makefile | 8 +-- + init/version.c | 4 +- + kernel/bounds.c | 2 +- + kernel/kexec.c | 2 +- + kernel/trace/trace.c | 2 +- + scripts/basic/fixdep.c | 10 ++-- + scripts/headers.sh | 2 - + scripts/kconfig/confdata.c | 2 +- + scripts/mkcompile_h | 2 +- + 73 files changed, 91 insertions(+), 159 deletions(-) + create mode 100644 arch/alpha/include/asm/asm-offsets.h + create mode 100644 arch/arm/include/asm/asm-offsets.h + create mode 100644 arch/arm/include/asm/mach-types.h + create mode 100644 arch/avr32/include/asm/asm-offsets.h + create mode 100644 arch/blackfin/include/asm/asm-offsets.h + create mode 100644 arch/cris/include/asm/asm-offsets.h + create mode 100644 arch/frv/include/asm/asm-offsets.h + create mode 100644 arch/h8300/include/asm/asm-offsets.h + create mode 100644 arch/ia64/include/asm/asm-offsets.h + create mode 100644 arch/m68k/include/asm/asm-offsets.h + create mode 100644 arch/microblaze/include/asm/asm-offsets.h + create mode 100644 arch/mips/include/asm/asm-offsets.h + create mode 100644 arch/mn10300/include/asm/asm-offsets.h + create mode 100644 arch/parisc/include/asm/asm-offsets.h + create mode 100644 arch/powerpc/include/asm/asm-offsets.h + create mode 100644 arch/s390/include/asm/asm-offsets.h + delete mode 100644 arch/sh/include/asm/.gitignore + create mode 100644 arch/sh/include/asm/asm-offsets.h + create mode 100644 arch/sparc/include/asm/asm-offsets.h + create mode 100644 arch/um/include/asm/asm-offsets.h + create mode 100644 arch/x86/include/asm/asm-offsets.h + create mode 100644 arch/xtensa/include/asm/asm-offsets.h +Merging kconfig/for-next +$ git merge kconfig/for-next +Auto-merging Documentation/dontdiff +Removing scripts/binoffset.c +Merge made by recursive. + Documentation/dontdiff | 1 - + scripts/.gitignore | 1 - + scripts/binoffset.c | 163 ---------------------------------------------- + scripts/extract-ikconfig | 127 ++++++++++++----------------------- + 4 files changed, 44 insertions(+), 248 deletions(-) + delete mode 100644 scripts/binoffset.c +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/net/mlx4/main.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + arch/x86/kernel/reboot.c | 2 +- + drivers/acpi/acpica/dswload.c | 50 ++++++++++++------ + drivers/acpi/acpica/evregion.c | 64 +++++++++++++++++++++-- + drivers/acpi/acpica/nsrepair.c | 110 ++++++++++++++++++++++++++++++--------- + include/acpi/acpixf.h | 2 +- + 5 files changed, 178 insertions(+), 50 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/core-cdev.c +Merge made by recursive. + drivers/firewire/core-card.c | 75 ++++++++++++--------------- + drivers/firewire/core-cdev.c | 95 ++++++++++++++++++---------------- + drivers/firewire/core-topology.c | 17 ++++--- + drivers/firewire/core-transaction.c | 9 +--- + drivers/firewire/core.h | 9 ++-- + drivers/firewire/ohci.c | 30 +++++++---- + drivers/firewire/sbp2.c | 9 +++- + include/linux/firewire.h | 16 +------ + 8 files changed, 128 insertions(+), 132 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/build.c | 3 ++- + drivers/mtd/ubi/kapi.c | 40 ++++++++++++++++++++++++++++++++++++++++ + drivers/mtd/ubi/scan.c | 7 +++---- + drivers/mtd/ubi/scan.h | 2 -- + include/linux/mtd/ubi.h | 2 ++ + 5 files changed, 47 insertions(+), 7 deletions(-) +Merging kvm/linux-next +$ git merge kvm/linux-next +Resolved 'arch/x86/kvm/mmu.c' using previous resolution. +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kvm/i8254.c +Auto-merging arch/x86/kvm/lapic.c +Auto-merging arch/x86/kvm/mmu.c +CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging virt/kvm/kvm_main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 86a500e] Merge remote branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/include/asm/kvm.h | 1 + + arch/ia64/include/asm/kvm_host.h | 1 - + arch/ia64/kvm/Makefile | 2 +- + arch/ia64/kvm/kvm-ia64.c | 19 +- + arch/powerpc/kvm/powerpc.c | 5 +- + arch/s390/kvm/kvm-s390.c | 5 +- + arch/x86/include/asm/kvm.h | 1 + + arch/x86/include/asm/kvm_host.h | 21 +- + arch/x86/kvm/Makefile | 3 +- + arch/x86/kvm/emulate.c | 154 ++++++- + arch/x86/kvm/i8254.c | 2 - + arch/x86/kvm/i8259.c | 44 +- + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/lapic.c | 8 +- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/svm.c | 166 ++++---- + arch/x86/kvm/vmx.c | 188 ++++----- + arch/x86/kvm/x86.c | 205 +++++---- + include/linux/kvm_host.h | 52 ++- + virt/kvm/assigned-dev.c | 818 ++++++++++++++++++++++++++++++++++ + virt/kvm/eventfd.c | 2 - + virt/kvm/ioapic.c | 80 +++- + virt/kvm/ioapic.h | 5 + + virt/kvm/irq_comm.c | 221 ++++++---- + virt/kvm/kvm_main.c | 894 ++++---------------------------------- + 25 files changed, 1628 insertions(+), 1272 deletions(-) + create mode 100644 virt/kvm/assigned-dev.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/scsi/scsi_scan.c +Merge made by recursive. + Documentation/scsi/ChangeLog.megaraid_sas | 62 ++ + drivers/message/fusion/mptbase.h | 4 +- + drivers/message/fusion/mptctl.c | 5 +- + drivers/message/fusion/mptscsih.c | 86 +++- + drivers/scsi/3w-xxxx.c | 2 +- + drivers/scsi/bfa/bfa_cb_ioim_macros.h | 10 +- + drivers/scsi/bfa/bfa_cee.c | 2 +- + drivers/scsi/bfa/bfa_csdebug.c | 4 +- + drivers/scsi/bfa/bfa_fcpim.c | 4 +- + drivers/scsi/bfa/bfa_fcpim_priv.h | 4 +- + drivers/scsi/bfa/bfa_fcport.c | 59 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 11 +- + drivers/scsi/bfa/bfa_fcxp.c | 8 +- + drivers/scsi/bfa/bfa_intr.c | 2 +- + drivers/scsi/bfa/bfa_intr_priv.h | 18 +- + drivers/scsi/bfa/bfa_ioc.c | 10 +- + drivers/scsi/bfa/bfa_ioc.h | 12 +- + drivers/scsi/bfa/bfa_iocfc.c | 8 +- + drivers/scsi/bfa/bfa_iocfc.h | 8 +- + drivers/scsi/bfa/bfa_ioim.c | 4 +- + drivers/scsi/bfa/bfa_itnim.c | 6 +- + drivers/scsi/bfa/bfa_log.c | 4 +- + drivers/scsi/bfa/bfa_port_priv.h | 4 +- + drivers/scsi/bfa/bfa_rport.c | 6 +- + drivers/scsi/bfa/bfa_tskim.c | 9 +- + drivers/scsi/bfa/bfa_uf.c | 2 +- + drivers/scsi/bfa/bfad.c | 6 +- + drivers/scsi/bfa/bfad_fwimg.c | 8 +- + drivers/scsi/bfa/bfad_im.c | 2 +- + drivers/scsi/bfa/bfad_im_compat.h | 2 +- + drivers/scsi/bfa/bfad_intr.c | 3 +- + drivers/scsi/bfa/fabric.c | 18 +- + drivers/scsi/bfa/fcbuild.c | 190 +++--- + drivers/scsi/bfa/fcbuild.h | 6 +- + drivers/scsi/bfa/fcpim.c | 7 +- + drivers/scsi/bfa/fcs.h | 2 +- + drivers/scsi/bfa/fdmi.c | 8 +- + drivers/scsi/bfa/include/aen/bfa_aen.h | 2 +- + drivers/scsi/bfa/include/bfa.h | 10 +- + drivers/scsi/bfa/include/bfa_svc.h | 8 +- + drivers/scsi/bfa/include/bfi/bfi.h | 12 +- + drivers/scsi/bfa/include/bfi/bfi_ioc.h | 2 +- + drivers/scsi/bfa/include/bfi/bfi_lps.h | 4 +- + drivers/scsi/bfa/include/bfi/bfi_rport.h | 8 +- + drivers/scsi/bfa/include/cs/bfa_checksum.h | 6 +- + drivers/scsi/bfa/include/cs/bfa_sm.h | 6 +- + drivers/scsi/bfa/include/cs/bfa_trc.h | 2 +- + drivers/scsi/bfa/include/fcs/bfa_fcs_fabric.h | 2 +- + drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h | 17 +- + drivers/scsi/bfa/include/protocol/ct.h | 10 +- + drivers/scsi/bfa/include/protocol/fc.h | 22 +- + drivers/scsi/bfa/loop.c | 233 +------- + drivers/scsi/bfa/lport_api.c | 15 +- + drivers/scsi/bfa/ns.c | 5 +- + drivers/scsi/bfa/plog.c | 2 +- + drivers/scsi/bfa/rport_ftrs.c | 28 +- + drivers/scsi/bfa/vfapi.c | 2 +- + drivers/scsi/bfa/vport.c | 20 +- + drivers/scsi/megaraid/megaraid_sas.c | 738 ++++++++++++++++++++-- + drivers/scsi/megaraid/megaraid_sas.h | 149 ++++- + drivers/scsi/mpt2sas/mpi/mpi2.h | 5 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 274 +++++++++- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 18 +- + drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 14 +- + drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 16 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 152 ++++- + drivers/scsi/mpt2sas/mpt2sas_base.h | 37 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 197 +++++-- + drivers/scsi/mpt2sas/mpt2sas_ctl.h | 4 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 809 +++++++++++++++++-------- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 86 ++-- + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/scsi_scan.c | 4 +- + drivers/scsi/scsi_transport_fc.c | 72 ++- + drivers/scsi/stex.c | 282 ++++++--- + 75 files changed, 2712 insertions(+), 1169 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/blackfin/mach-common/entry.S +Auto-merging arch/x86/ia32/ia32entry.S +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +Auto-merging drivers/net/bonding/bond_sysfs.c +Auto-merging drivers/net/e100.c +Auto-merging drivers/net/ethoc.c +Auto-merging drivers/net/hamachi.c +Auto-merging drivers/net/hamradio/baycom_epp.c +Auto-merging drivers/net/igb/igb_ethtool.c +Removing drivers/net/sfc/boards.c +Removing drivers/net/sfc/boards.h +Removing drivers/net/sfc/falcon_hwdefs.h +Removing drivers/net/sfc/falcon_io.h +Removing drivers/net/sfc/gmii.h +CONFLICT (delete/modify): drivers/net/sfc/sfe4001.c deleted in net/master and modified in HEAD. Version HEAD of drivers/net/sfc/sfe4001.c left in tree. +Auto-merging drivers/net/skge.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/wan/cosa.c +Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/iwmc3200wifi/main.c +Auto-merging drivers/net/wireless/libertas/cmd.c +Auto-merging drivers/net/wireless/libertas/if_spi.c +Removing drivers/net/wireless/wl12xx/wl1251_netlink.h +Removing firmware/bnx2x-e1-5.0.21.0.fw.ihex +Removing firmware/bnx2x-e1h-5.0.21.0.fw.ihex +Auto-merging net/sunrpc/svcauth_unix.c +Auto-merging net/wireless/core.c +Auto-merging net/wireless/mlme.c +Auto-merging net/wireless/sme.c +Removing net/wireless/wext.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/net/sfc/sfe4001.c +drivers/net/sfc/sfe4001.c: needs merge +rm 'drivers/net/sfc/sfe4001.c' +$ git commit -v -a +[master 6c7a02f] Merge remote branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/isdn/README.gigaset | 34 +- + Documentation/kernel-parameters.txt | 3 + + Documentation/networking/bonding.txt | 42 +- + Documentation/networking/ip-sysctl.txt | 18 + + arch/alpha/include/asm/socket.h | 2 + + arch/alpha/kernel/systbls.S | 1 + + arch/arm/include/asm/socket.h | 2 + + arch/arm/kernel/calls.S | 1 + + arch/avr32/include/asm/socket.h | 2 + + arch/avr32/kernel/syscall_table.S | 1 + + arch/blackfin/mach-common/entry.S | 1 + + arch/cris/include/asm/socket.h | 2 + + arch/frv/include/asm/socket.h | 2 + + arch/h8300/include/asm/socket.h | 2 + + arch/ia64/include/asm/socket.h | 2 + + arch/ia64/include/asm/unistd.h | 3 +- + arch/ia64/kernel/entry.S | 1 + + arch/m32r/include/asm/socket.h | 2 + + arch/m68k/include/asm/socket.h | 2 + + arch/microblaze/kernel/syscall_table.S | 1 + + arch/mips/include/asm/socket.h | 2 + + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/mn10300/include/asm/socket.h | 2 + + arch/parisc/include/asm/socket.h | 2 + + arch/powerpc/include/asm/socket.h | 2 + + arch/s390/include/asm/socket.h | 2 + + arch/sh/include/asm/sh_eth.h | 1 + + arch/sh/kernel/syscalls_64.S | 1 + + arch/sparc/include/asm/socket.h | 2 + + arch/sparc/include/asm/unistd.h | 3 +- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + arch/x86/ia32/ia32entry.S | 1 + + arch/x86/include/asm/unistd_32.h | 3 +- + arch/x86/include/asm/unistd_64.h | 2 + + arch/x86/kernel/syscall_table_32.S | 1 + + arch/xtensa/include/asm/socket.h | 2 + + arch/xtensa/include/asm/unistd.h | 4 +- + drivers/infiniband/hw/nes/nes_nic.c | 12 +- + drivers/isdn/gigaset/Kconfig | 25 +- + drivers/isdn/gigaset/Makefile | 5 +- + drivers/isdn/gigaset/asyncdata.c | 124 +- + drivers/isdn/gigaset/bas-gigaset.c | 4 +- + drivers/isdn/gigaset/capi.c | 2273 +++++ + drivers/isdn/gigaset/common.c | 76 +- + drivers/isdn/gigaset/dummyll.c | 68 + + drivers/isdn/gigaset/ev-layer.c | 90 +- + drivers/isdn/gigaset/gigaset.h | 97 +- + drivers/isdn/gigaset/i4l.c | 506 +- + drivers/isdn/gigaset/isocdata.c | 79 +- + drivers/isdn/mISDN/socket.c | 3 +- + drivers/misc/Kconfig | 1 + + drivers/misc/Makefile | 1 + + drivers/misc/iwmc3200top/Kconfig | 20 + + drivers/misc/iwmc3200top/Makefile | 29 + + drivers/misc/iwmc3200top/debugfs.c | 133 + + drivers/misc/iwmc3200top/debugfs.h | 58 + + drivers/misc/iwmc3200top/fw-download.c | 359 + + drivers/misc/iwmc3200top/fw-msg.h | 113 + + drivers/misc/iwmc3200top/iwmc3200top.h | 206 + + drivers/misc/iwmc3200top/log.c | 347 + + drivers/misc/iwmc3200top/log.h | 158 + + drivers/misc/iwmc3200top/main.c | 699 ++ + drivers/net/3c59x.c | 3 +- + drivers/net/8139cp.c | 8 +- + drivers/net/8139too.c | 3 +- + drivers/net/Kconfig | 2 +- + drivers/net/atl1e/atl1e_main.c | 4 +- + drivers/net/atlx/atl1.c | 11 +- + drivers/net/atlx/atl2.c | 3 +- + drivers/net/bcm63xx_enet.c | 5 +- + drivers/net/benet/be.h | 16 +- + drivers/net/benet/be_cmds.c | 59 + + drivers/net/benet/be_cmds.h | 37 + + drivers/net/benet/be_ethtool.c | 43 +- + drivers/net/benet/be_main.c | 10 +- + drivers/net/bnx2x.h | 72 +- + drivers/net/bnx2x_hsi.h | 20 +- + drivers/net/bnx2x_main.c | 1012 ++- + drivers/net/bonding/bond_3ad.c | 11 +- + drivers/net/bonding/bond_main.c | 88 +- + drivers/net/bonding/bond_sysfs.c | 53 + + drivers/net/bonding/bonding.h | 14 +- + drivers/net/can/Kconfig | 7 + + drivers/net/can/Makefile | 1 + + drivers/net/can/at91_can.c | 34 +- + drivers/net/can/dev.c | 74 +- + drivers/net/can/sja1000/sja1000.c | 17 +- + drivers/net/can/sja1000/sja1000.h | 2 + + drivers/net/can/ti_hecc.c | 993 ++ + drivers/net/can/usb/ems_usb.c | 20 +- + drivers/net/cnic.c | 1812 ++++- + drivers/net/cnic.h | 64 + + drivers/net/cnic_defs.h | 1917 ++++ + drivers/net/cnic_if.h | 14 +- + drivers/net/cpmac.c | 6 +- + drivers/net/cxgb3/adapter.h | 16 + + drivers/net/cxgb3/cxgb3_main.c | 22 +- + drivers/net/cxgb3/sge.c | 31 +- + drivers/net/davinci_emac.c | 26 +- + drivers/net/dl2k.c | 18 +- + drivers/net/e100.c | 5 +- + drivers/net/e1000/e1000.h | 1 - + drivers/net/e1000/e1000_ethtool.c | 35 +- + drivers/net/e1000/e1000_main.c | 70 +- + drivers/net/e1000e/e1000.h | 1 - + drivers/net/e1000e/ethtool.c | 41 +- + drivers/net/e1000e/netdev.c | 80 +- + drivers/net/ehea/ehea_main.c | 9 +- + drivers/net/enic/enic_main.c | 15 +- + drivers/net/ethoc.c | 4 +- + drivers/net/gianfar.c | 591 +- + drivers/net/gianfar.h | 1 + + drivers/net/hamachi.c | 12 +- + drivers/net/hamradio/baycom_epp.c | 6 +- + drivers/net/ibm_newemac/core.c | 10 +- + drivers/net/igb/e1000_82575.c | 306 +- + drivers/net/igb/e1000_82575.h | 1 + + drivers/net/igb/e1000_hw.h | 8 +- + drivers/net/igb/e1000_mac.c | 100 +- + drivers/net/igb/e1000_mbx.c | 82 +- + drivers/net/igb/e1000_nvm.c | 36 +- + drivers/net/igb/e1000_phy.c | 207 +- + drivers/net/igb/e1000_phy.h | 4 +- + drivers/net/igb/e1000_regs.h | 1 + + drivers/net/igb/igb.h | 1 - + drivers/net/igb/igb_ethtool.c | 43 +- + drivers/net/igb/igb_main.c | 312 +- + drivers/net/igbvf/ethtool.c | 25 +- + drivers/net/igbvf/netdev.c | 8 +- + drivers/net/ipg.c | 7 +- + drivers/net/ixgb/ixgb.h | 1 - + drivers/net/ixgb/ixgb_ethtool.c | 69 +- + drivers/net/ixgb/ixgb_main.c | 56 +- + drivers/net/ixgbe/ixgbe.h | 3 +- + drivers/net/ixgbe/ixgbe_82599.c | 128 +- + drivers/net/ixgbe/ixgbe_dcb_nl.c | 2 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 63 +- + drivers/net/ixgbe/ixgbe_main.c | 40 +- + drivers/net/ixgbe/ixgbe_type.h | 11 + + drivers/net/ixp2000/ixpdev.c | 3 +- + drivers/net/korina.c | 5 +- + drivers/net/ks8842.c | 5 +- + drivers/net/lib82596.c | 11 +- + drivers/net/mdio.c | 12 +- + drivers/net/myri10ge/myri10ge.c | 5 +- + drivers/net/netxen/netxen_nic.h | 36 +- + drivers/net/netxen/netxen_nic_ethtool.c | 2 - + drivers/net/netxen/netxen_nic_hdr.h | 76 +- + drivers/net/netxen/netxen_nic_hw.c | 857 +- + drivers/net/netxen/netxen_nic_init.c | 66 +- + drivers/net/netxen/netxen_nic_main.c | 277 +- + drivers/net/niu.c | 7 +- + drivers/net/pasemi_mac_ethtool.c | 14 + + drivers/net/ppp_async.c | 5 +- + drivers/net/ppp_synctty.c | 5 +- + drivers/net/pppol2tp.c | 22 +- + drivers/net/pppox.c | 2 +- + drivers/net/qlge/qlge.h | 201 +- + drivers/net/qlge/qlge_dbg.c | 180 + + drivers/net/qlge/qlge_ethtool.c | 178 + + drivers/net/qlge/qlge_main.c | 392 +- + drivers/net/qlge/qlge_mpi.c | 154 +- + drivers/net/r8169.c | 3 +- + drivers/net/sb1250-mac.c | 1 - + drivers/net/sc92031.c | 4 +- + drivers/net/sfc/Makefile | 4 +- + drivers/net/sfc/bitfield.h | 13 - + drivers/net/sfc/boards.c | 328 - + drivers/net/sfc/boards.h | 28 - + drivers/net/sfc/efx.c | 89 +- + drivers/net/sfc/efx.h | 11 +- + drivers/net/sfc/ethtool.c | 8 +- + drivers/net/sfc/falcon.c | 1122 +-- + drivers/net/sfc/falcon.h | 4 +- + drivers/net/sfc/falcon_boards.c | 752 ++ + drivers/net/sfc/falcon_gmac.c | 95 +- + drivers/net/sfc/falcon_hwdefs.h | 1333 --- + drivers/net/sfc/falcon_io.h | 258 - + drivers/net/sfc/falcon_xmac.c | 178 +- + drivers/net/sfc/gmii.h | 60 - + drivers/net/sfc/io.h | 256 + + drivers/net/sfc/mdio_10g.c | 121 +- + drivers/net/sfc/mdio_10g.h | 1 - + drivers/net/sfc/net_driver.h | 56 +- + drivers/net/sfc/phy.h | 6 +- + drivers/net/sfc/{xfp_phy.c => qt202x_phy.c} | 80 +- + drivers/net/sfc/regs.h | 3180 ++++++ + drivers/net/sfc/rx.c | 16 +- + drivers/net/sfc/selftest.c | 5 +- + drivers/net/sfc/sfe4001.c | 435 - + drivers/net/sfc/tenxpress.c | 14 +- + drivers/net/sfc/tx.c | 83 +- + drivers/net/sfc/workarounds.h | 2 + + drivers/net/sgiseeq.c | 7 +- + drivers/net/sh_eth.c | 54 +- + drivers/net/sh_eth.h | 1 + + drivers/net/sis190.c | 3 +- + drivers/net/skge.c | 7 +- + drivers/net/sky2.c | 3 +- + drivers/net/smsc911x.c | 3 + + drivers/net/tehuti.c | 27 +- + drivers/net/tlan.c | 7 +- + drivers/net/tsi108_eth.c | 10 +- + drivers/net/tun.c | 5 +- + drivers/net/usb/cdc_ether.c | 20 +- + drivers/net/usb/usbnet.c | 17 + + drivers/net/via-rhine.c | 8 +- + drivers/net/via-velocity.c | 3 +- + drivers/net/virtio_net.c | 7 +- + drivers/net/vxge/vxge-config.c | 300 +- + drivers/net/vxge/vxge-config.h | 2 + + drivers/net/vxge/vxge-main.c | 104 +- + drivers/net/vxge/vxge-main.h | 1 - + drivers/net/vxge/vxge-reg.h | 4 - + drivers/net/vxge/vxge-traffic.c | 4 +- + drivers/net/vxge/vxge-traffic.h | 2 + + drivers/net/vxge/vxge-version.h | 4 +- + drivers/net/wan/cosa.c | 20 +- + drivers/net/wimax/i2400m/Kconfig | 8 + + drivers/net/wireless/Kconfig | 84 +- + drivers/net/wireless/at76c50x-usb.c | 10 + + drivers/net/wireless/ath/Kconfig | 8 + + drivers/net/wireless/ath/Makefile | 9 +- + drivers/net/wireless/ath/ar9170/ar9170.h | 4 +- + drivers/net/wireless/ath/ar9170/cmd.c | 3 +- + drivers/net/wireless/ath/ar9170/cmd.h | 1 + + drivers/net/wireless/ath/ar9170/hw.h | 2 + + drivers/net/wireless/ath/ar9170/mac.c | 15 +- + drivers/net/wireless/ath/ar9170/main.c | 30 +- + drivers/net/wireless/ath/ar9170/phy.c | 99 +- + drivers/net/wireless/ath/ath.h | 41 + + drivers/net/wireless/ath/ath5k/ath5k.h | 40 +- + drivers/net/wireless/ath/ath5k/attach.c | 31 +- + drivers/net/wireless/ath/ath5k/base.c | 116 +- + drivers/net/wireless/ath/ath5k/base.h | 12 - + drivers/net/wireless/ath/ath5k/initvals.c | 4 +- + drivers/net/wireless/ath/ath5k/pcu.c | 193 +- + drivers/net/wireless/ath/ath5k/reg.h | 8 +- + drivers/net/wireless/ath/ath5k/reset.c | 16 +- + drivers/net/wireless/ath/ath9k/Kconfig | 8 + + drivers/net/wireless/ath/ath9k/Makefile | 27 +- + drivers/net/wireless/ath/ath9k/ahb.c | 19 +- + drivers/net/wireless/ath/ath9k/ani.c | 141 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 73 +- + drivers/net/wireless/ath/ath9k/beacon.c | 112 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 383 +- + drivers/net/wireless/ath/ath9k/btcoex.h | 64 +- + drivers/net/wireless/ath/ath9k/calib.c | 391 +- + drivers/net/wireless/ath/ath9k/calib.h | 2 + + drivers/net/wireless/ath/ath9k/debug.c | 55 +- + drivers/net/wireless/ath/ath9k/debug.h | 36 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 8 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 9 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 90 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 97 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 183 +- + drivers/net/wireless/ath/ath9k/hw.c | 595 +- + drivers/net/wireless/ath/ath9k/hw.h | 63 +- + drivers/net/wireless/ath/ath9k/initvals.h | 72 +- + drivers/net/wireless/ath/ath9k/mac.c | 162 +- + drivers/net/wireless/ath/ath9k/mac.h | 11 +- + drivers/net/wireless/ath/ath9k/main.c | 841 ++- + drivers/net/wireless/ath/ath9k/pci.c | 37 +- + drivers/net/wireless/ath/ath9k/phy.c | 50 +- + drivers/net/wireless/ath/ath9k/phy.h | 1 + + drivers/net/wireless/ath/ath9k/rc.c | 33 +- + drivers/net/wireless/ath/ath9k/recv.c | 62 +- + drivers/net/wireless/ath/ath9k/reg.h | 5 +- + drivers/net/wireless/ath/ath9k/virtual.c | 22 +- + drivers/net/wireless/ath/ath9k/xmit.c | 113 +- + drivers/net/wireless/ath/debug.c | 32 + + drivers/net/wireless/ath/debug.h | 77 + + drivers/net/wireless/ath/hw.c | 126 + + drivers/net/wireless/ath/reg.h | 27 + + drivers/net/wireless/b43/phy_lp.c | 6 + + drivers/net/wireless/hostap/Kconfig | 2 + + drivers/net/wireless/ipw2x00/Kconfig | 7 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 1 + + drivers/net/wireless/iwlwifi/Kconfig | 28 +- + drivers/net/wireless/iwlwifi/Makefile | 12 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 35 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 371 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 65 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 71 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 127 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 245 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.c | 85 + + drivers/net/wireless/iwlwifi/iwl-agn-led.h | 32 + + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 466 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 124 +- + drivers/net/wireless/iwlwifi/iwl-calib.c | 66 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 12 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 209 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 31 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 - + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 17 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 31 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 13 + + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 178 + + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 45 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 17 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 16 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 323 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 46 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 149 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 3 + + drivers/net/wireless/iwlwifi/iwl-scan.c | 1 - + drivers/net/wireless/iwlwifi/iwl-tx.c | 26 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 28 +- + drivers/net/wireless/iwmc3200wifi/Kconfig | 1 + + drivers/net/wireless/iwmc3200wifi/main.c | 2 + + drivers/net/wireless/libertas/Kconfig | 39 + + drivers/net/wireless/libertas/Makefile | 15 +- + drivers/net/wireless/libertas/README | 26 +- + drivers/net/wireless/libertas/cfg.c | 198 + + drivers/net/wireless/libertas/cfg.h | 16 + + drivers/net/wireless/libertas/cmd.c | 106 +- + drivers/net/wireless/libertas/cmdresp.c | 12 + + drivers/net/wireless/libertas/decl.h | 3 + + drivers/net/wireless/libertas/defs.h | 2 + + drivers/net/wireless/libertas/dev.h | 19 + + drivers/net/wireless/libertas/host.h | 1 + + drivers/net/wireless/libertas/if_cs.c | 3 + + drivers/net/wireless/libertas/if_sdio.c | 56 + + drivers/net/wireless/libertas/if_sdio.h | 3 +- + drivers/net/wireless/libertas/if_spi.c | 3 + + drivers/net/wireless/libertas/if_usb.c | 3 + + drivers/net/wireless/libertas/main.c | 171 +- + drivers/net/wireless/libertas/wext.c | 54 +- + drivers/net/wireless/orinoco/Kconfig | 4 +- + drivers/net/wireless/orinoco/main.c | 1 + + drivers/net/wireless/wl12xx/wl1251_netlink.h | 30 - + drivers/s390/net/ctcm_main.c | 59 +- + drivers/s390/net/lcs.c | 14 +- + drivers/s390/net/qeth_core.h | 2 +- + drivers/s390/net/qeth_core_main.c | 11 +- + drivers/s390/net/qeth_l2_main.c | 4 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + drivers/staging/rtl8187se/Kconfig | 3 +- + drivers/staging/rtl8192e/Kconfig | 3 +- + drivers/staging/vt6655/Kconfig | 4 +- + drivers/staging/vt6656/Kconfig | 4 +- + firmware/Makefile | 2 +- + firmware/WHENCE | 4 +- + firmware/bnx2x-e1-5.0.21.0.fw.ihex |10184 ------------------- + firmware/bnx2x-e1-5.2.7.0.fw.ihex |10178 +++++++++++++++++++ + firmware/bnx2x-e1h-5.0.21.0.fw.ihex |12855 ------------------------ + firmware/bnx2x-e1h-5.2.7.0.fw.ihex |12847 +++++++++++++++++++++++ + fs/ocfs2/cluster/netdebug.c | 8 +- + include/asm-generic/socket.h | 1 + + include/linux/can/dev.h | 20 +- + include/linux/can/platform/ti_hecc.h | 40 + + include/linux/ethtool.h | 36 +- + include/linux/filter.h | 4 +- + include/linux/if_tunnel.h | 12 + + include/linux/if_vlan.h | 14 +- + include/linux/ipv6.h | 4 +- + include/linux/mroute.h | 13 +- + include/linux/net.h | 1 + + include/linux/netdevice.h | 2 +- + include/linux/nl80211.h | 2 + + include/linux/notifier.h | 1 + + include/linux/skbuff.h | 16 +- + include/linux/smsc911x.h | 1 + + include/linux/socket.h | 10 + + include/linux/syscalls.h | 4 + + include/linux/tc_act/tc_skbedit.h | 2 + + include/linux/udp.h | 6 +- + include/linux/usb/usbnet.h | 1 + + include/net/ah.h | 30 +- + include/net/bluetooth/bluetooth.h | 2 +- + include/net/cfg80211.h | 9 +- + include/net/compat.h | 14 +- + include/net/dst.h | 12 +- + include/net/gen_stats.h | 1 + + include/net/inet6_hashtables.h | 4 +- + include/net/inet_hashtables.h | 16 +- + include/net/inet_sock.h | 36 +- + include/net/inet_timewait_sock.h | 2 +- + include/net/ip.h | 12 +- + include/net/ip_fib.h | 25 +- + include/net/ipip.h | 20 +- + include/net/iw_handler.h | 14 +- + include/net/net_namespace.h | 6 +- + include/net/phonet/phonet.h | 1 + + include/net/phonet/pn_dev.h | 6 + + include/net/sock.h | 32 +- + include/net/tc_act/tc_skbedit.h | 2 + + include/net/udp.h | 13 +- + include/net/wext.h | 49 +- + include/net/xfrm.h | 3 - + kernel/sys_ni.c | 2 + + net/8021q/vlan.h | 2 +- + net/8021q/vlan_dev.c | 2 +- + net/appletalk/ddp.c | 2 +- + net/atm/common.c | 2 +- + net/atm/pvc.c | 2 +- + net/atm/svc.c | 2 +- + net/ax25/af_ax25.c | 2 +- + net/bluetooth/af_bluetooth.c | 6 +- + net/bluetooth/bnep/sock.c | 2 +- + net/bluetooth/cmtp/sock.c | 2 +- + net/bluetooth/hci_sock.c | 2 +- + net/bluetooth/hidp/sock.c | 2 +- + net/bluetooth/l2cap.c | 2 +- + net/bluetooth/rfcomm/sock.c | 4 +- + net/bluetooth/sco.c | 2 +- + net/bridge/br_device.c | 1 + + net/can/af_can.c | 2 +- + net/can/bcm.c | 2 +- + net/can/raw.c | 2 +- + net/compat.c | 33 +- + net/core/datagram.c | 1 + + net/core/dev.c | 54 +- + net/core/ethtool.c | 81 +- + net/core/filter.c | 6 + + net/core/gen_stats.c | 8 +- + net/core/net-sysfs.c | 46 +- + net/core/pktgen.c | 11 +- + net/core/rtnetlink.c | 75 +- + net/core/sock.c | 43 +- + net/dccp/ccids/ccid2.c | 327 +- + net/dccp/ccids/ccid2.h | 46 +- + net/dccp/ccids/ccid3.c | 400 +- + net/dccp/ccids/ccid3.h | 120 +- + net/dccp/ipv4.c | 40 +- + net/dccp/ipv6.c | 31 +- + net/dccp/output.c | 4 +- + net/dccp/probe.c | 31 +- + net/dccp/proto.c | 17 +- + net/dccp/timer.c | 4 +- + net/decnet/af_decnet.c | 4 +- + net/econet/af_econet.c | 10 +- + net/ieee802154/af_ieee802154.c | 2 +- + net/ieee802154/dgram.c | 3 +- + net/ieee802154/raw.c | 3 +- + net/ipv4/af_inet.c | 64 +- + net/ipv4/ah4.c | 295 +- + net/ipv4/cipso_ipv4.c | 2 +- + net/ipv4/datagram.c | 18 +- + net/ipv4/fib_frontend.c | 26 +- + net/ipv4/fib_hash.c | 25 +- + net/ipv4/fib_rules.c | 2 +- + net/ipv4/fib_trie.c | 26 +- + net/ipv4/icmp.c | 4 + + net/ipv4/inet_connection_sock.c | 21 +- + net/ipv4/inet_diag.c | 28 +- + net/ipv4/inet_hashtables.c | 36 +- + net/ipv4/inet_timewait_sock.c | 14 +- + net/ipv4/ip_gre.c | 45 +- + net/ipv4/ip_input.c | 2 +- + net/ipv4/ip_output.c | 15 +- + net/ipv4/ip_sockglue.c | 10 +- + net/ipv4/ipip.c | 54 +- + net/ipv4/ipmr.c | 14 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 8 +- + net/ipv4/raw.c | 33 +- + net/ipv4/route.c | 3 - + net/ipv4/syncookies.c | 3 +- + net/ipv4/tcp.c | 15 +- + net/ipv4/tcp_ipv4.c | 76 +- + net/ipv4/tcp_output.c | 4 +- + net/ipv4/tcp_probe.c | 11 +- + net/ipv4/tcp_timer.c | 12 +- + net/ipv4/udp.c | 165 +- + net/ipv4/udplite.c | 4 +- + net/ipv6/Kconfig | 19 + + net/ipv6/addrconf.c | 9 + + net/ipv6/af_inet6.c | 31 +- + net/ipv6/ah6.c | 352 +- + net/ipv6/datagram.c | 34 +- + net/ipv6/inet6_connection_sock.c | 10 +- + net/ipv6/inet6_hashtables.c | 14 +- + net/ipv6/ip6_tunnel.c | 44 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/ipv6_sockglue.c | 9 +- + net/ipv6/ndisc.c | 1 + + net/ipv6/raw.c | 36 +- + net/ipv6/route.c | 3 +- + net/ipv6/sit.c | 252 +- + net/ipv6/syncookies.c | 3 +- + net/ipv6/tcp_ipv6.c | 40 +- + net/ipv6/udp.c | 48 +- + net/ipv6/xfrm6_tunnel.c | 47 +- + net/ipx/af_ipx.c | 2 +- + net/irda/af_irda.c | 2 +- + net/iucv/af_iucv.c | 7 +- + net/key/af_key.c | 4 +- + net/llc/af_llc.c | 2 +- + net/mac80211/iface.c | 10 +- + net/netfilter/xt_socket.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/netlink/genetlink.c | 32 +- + net/netrom/af_netrom.c | 2 +- + net/packet/af_packet.c | 31 +- + net/phonet/af_phonet.c | 57 +- + net/phonet/datagram.c | 6 +- + net/phonet/pep.c | 2 - + net/phonet/pn_dev.c | 131 +- + net/phonet/pn_netlink.c | 130 + + net/phonet/socket.c | 23 + + net/rds/af_rds.c | 2 +- + net/rds/tcp_listen.c | 8 +- + net/rose/af_rose.c | 2 +- + net/rxrpc/af_rxrpc.c | 2 +- + net/rxrpc/ar-recvmsg.c | 2 +- + net/sched/act_api.c | 3 +- + net/sched/act_skbedit.c | 17 +- + net/sched/sch_api.c | 2 +- + net/sched/sch_cbq.c | 2 +- + net/sched/sch_drr.c | 2 +- + net/sched/sch_hfsc.c | 2 +- + net/sched/sch_htb.c | 2 +- + net/sctp/protocol.c | 8 +- + net/sctp/socket.c | 32 +- + net/socket.c | 247 +- + net/sunrpc/svcauth_unix.c | 3 +- + net/sunrpc/svcsock.c | 8 +- + net/unix/af_unix.c | 2 +- + net/wireless/Kconfig | 50 +- + net/wireless/Makefile | 10 +- + net/wireless/core.c | 24 +- + net/wireless/ethtool.c | 45 + + net/wireless/ethtool.h | 6 + + net/wireless/ibss.c | 10 +- + net/wireless/mlme.c | 2 +- + net/wireless/nl80211.c | 6 +- + net/wireless/scan.c | 6 +- + net/wireless/sme.c | 12 +- + net/wireless/wext-core.c | 1063 ++ + net/wireless/wext-priv.c | 248 + + net/wireless/wext-proc.c | 155 + + net/wireless/wext-spy.c | 231 + + net/wireless/wext.c | 1775 ---- + net/x25/af_x25.c | 4 +- + net/xfrm/xfrm_algo.c | 78 - + security/lsm_audit.c | 12 +- + 544 files changed, 52893 insertions(+), 36479 deletions(-) + create mode 100644 drivers/isdn/gigaset/capi.c + create mode 100644 drivers/isdn/gigaset/dummyll.c + create mode 100644 drivers/misc/iwmc3200top/Kconfig + create mode 100644 drivers/misc/iwmc3200top/Makefile + create mode 100644 drivers/misc/iwmc3200top/debugfs.c + create mode 100644 drivers/misc/iwmc3200top/debugfs.h + create mode 100644 drivers/misc/iwmc3200top/fw-download.c + create mode 100644 drivers/misc/iwmc3200top/fw-msg.h + create mode 100644 drivers/misc/iwmc3200top/iwmc3200top.h + create mode 100644 drivers/misc/iwmc3200top/log.c + create mode 100644 drivers/misc/iwmc3200top/log.h + create mode 100644 drivers/misc/iwmc3200top/main.c + create mode 100644 drivers/net/can/ti_hecc.c + delete mode 100644 drivers/net/sfc/boards.c + delete mode 100644 drivers/net/sfc/boards.h + create mode 100644 drivers/net/sfc/falcon_boards.c + delete mode 100644 drivers/net/sfc/falcon_hwdefs.h + delete mode 100644 drivers/net/sfc/falcon_io.h + delete mode 100644 drivers/net/sfc/gmii.h + create mode 100644 drivers/net/sfc/io.h + rename drivers/net/sfc/{xfp_phy.c => qt202x_phy.c} (73%) + create mode 100644 drivers/net/sfc/regs.h + delete mode 100644 drivers/net/sfc/sfe4001.c + create mode 100644 drivers/net/wireless/ath/debug.c + create mode 100644 drivers/net/wireless/ath/debug.h + create mode 100644 drivers/net/wireless/ath/hw.c + create mode 100644 drivers/net/wireless/ath/reg.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace.h + create mode 100644 drivers/net/wireless/libertas/Kconfig + create mode 100644 drivers/net/wireless/libertas/cfg.c + create mode 100644 drivers/net/wireless/libertas/cfg.h + delete mode 100644 drivers/net/wireless/wl12xx/wl1251_netlink.h + delete mode 100644 firmware/bnx2x-e1-5.0.21.0.fw.ihex + create mode 100644 firmware/bnx2x-e1-5.2.7.0.fw.ihex + delete mode 100644 firmware/bnx2x-e1h-5.0.21.0.fw.ihex + create mode 100644 firmware/bnx2x-e1h-5.2.7.0.fw.ihex + create mode 100644 include/linux/can/platform/ti_hecc.h + create mode 100644 net/wireless/ethtool.c + create mode 100644 net/wireless/ethtool.h + create mode 100644 net/wireless/wext-core.c + create mode 100644 net/wireless/wext-priv.c + create mode 100644 net/wireless/wext-proc.c + create mode 100644 net/wireless/wext-spy.c + delete mode 100644 net/wireless/wext.c +$ git am -3 ../patches/0001-net-merge-fixup-for-drivers-net-sfc-falcon_boards.c.patch +Applying: net: merge fixup for drivers/net/sfc/falcon_boards.c +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/sfc/falcon_boards.c +$ git add . +$ git commit -v -a --amend +[master f745eaa] Merge remote branch 'net/master' +Merging wireless/master +$ git merge wireless/master +Recorded preimage for 'drivers/net/wireless/libertas/cmd.c' +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/airo.c +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/wireless/b43/pio.c +Auto-merging drivers/net/wireless/b43legacy/main.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-hcmd.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/iwmc3200wifi/cfg80211.c +Auto-merging drivers/net/wireless/iwmc3200wifi/commands.c +Auto-merging drivers/net/wireless/iwmc3200wifi/main.c +Auto-merging drivers/net/wireless/iwmc3200wifi/rx.c +Removing drivers/net/wireless/libertas/11d.c +Removing drivers/net/wireless/libertas/11d.h +Auto-merging drivers/net/wireless/libertas/cmd.c +CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cmd.c +Removing drivers/net/wireless/libertas/hostcmd.h +Auto-merging drivers/net/wireless/libertas/tx.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/wireless/mlme.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/wireless/libertas/cmd.c'. +[master 6f30a59] Merge remote branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + drivers/net/wireless/airo.c | 3 +- + drivers/net/wireless/ath/ar9170/ar9170.h | 2 +- + drivers/net/wireless/ath/ar9170/hw.h | 4 +- + drivers/net/wireless/ath/ar9170/main.c | 11 +- + drivers/net/wireless/ath/ar9170/usb.c | 12 +- + drivers/net/wireless/ath/ar9170/usb.h | 2 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 13 + + drivers/net/wireless/ath/ath5k/attach.c | 2 + + drivers/net/wireless/ath/ath5k/phy.c | 185 +- + drivers/net/wireless/ath/ath5k/reg.h | 11 +- + drivers/net/wireless/ath/ath5k/reset.c | 17 +- + drivers/net/wireless/ath/ath9k/ahb.c | 6 +- + drivers/net/wireless/ath/ath9k/calib.c | 28 +- + drivers/net/wireless/ath/ath9k/xmit.c | 2 + + drivers/net/wireless/ath/regd.h | 8 + + drivers/net/wireless/ath/regd_common.h | 32 +- + drivers/net/wireless/b43/b43.h | 16 +- + drivers/net/wireless/b43/main.c | 4 +- + drivers/net/wireless/b43/pio.c | 79 +- + drivers/net/wireless/b43/xmit.c | 7 +- + drivers/net/wireless/b43legacy/main.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 17 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 12 - + drivers/net/wireless/iwlwifi/iwl-3945.c | 237 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 8 - + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 3 - + drivers/net/wireless/iwlwifi/iwl-4965.c | 172 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 219 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 172 ++- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 108 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 101 + + drivers/net/wireless/iwlwifi/iwl-agn.c | 154 +- + drivers/net/wireless/iwlwifi/iwl-calib.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 79 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 260 ++- + drivers/net/wireless/iwlwifi/iwl-core.h | 24 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 11 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 1 + + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 676 ++++-- + drivers/net/wireless/iwlwifi/iwl-dev.h | 82 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 8 + + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 5 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 23 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 83 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 177 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-spectrum.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 62 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 45 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 266 ++- + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 47 +- + drivers/net/wireless/iwmc3200wifi/commands.c | 31 +- + drivers/net/wireless/iwmc3200wifi/commands.h | 70 +- + drivers/net/wireless/iwmc3200wifi/fw.c | 9 + + drivers/net/wireless/iwmc3200wifi/iwm.h | 6 + + drivers/net/wireless/iwmc3200wifi/lmac.h | 8 + + drivers/net/wireless/iwmc3200wifi/main.c | 46 + + drivers/net/wireless/iwmc3200wifi/netdev.c | 1 + + drivers/net/wireless/iwmc3200wifi/rx.c | 84 +- + drivers/net/wireless/iwmc3200wifi/sdio.c | 10 +- + drivers/net/wireless/iwmc3200wifi/umac.h | 5 + + drivers/net/wireless/libertas/11d.c | 696 ------ + drivers/net/wireless/libertas/11d.h | 105 - + drivers/net/wireless/libertas/Makefile | 1 - + drivers/net/wireless/libertas/assoc.c | 445 ++++- + drivers/net/wireless/libertas/assoc.h | 141 ++- + drivers/net/wireless/libertas/cmd.c | 481 +---- + drivers/net/wireless/libertas/cmd.h | 127 +- + drivers/net/wireless/libertas/cmdresp.c | 104 +- + drivers/net/wireless/libertas/debugfs.c | 27 +- + drivers/net/wireless/libertas/decl.h | 62 +- + drivers/net/wireless/libertas/defs.h | 1 - + drivers/net/wireless/libertas/dev.h | 424 +--- + drivers/net/wireless/libertas/host.h | 960 +++++++-- + drivers/net/wireless/libertas/hostcmd.h | 800 ------- + drivers/net/wireless/libertas/main.c | 202 +-- + drivers/net/wireless/libertas/persistcfg.c | 8 +- + drivers/net/wireless/libertas/rx.c | 2 +- + drivers/net/wireless/libertas/scan.c | 250 ++- + drivers/net/wireless/libertas/scan.h | 30 + + drivers/net/wireless/libertas/tx.c | 2 +- + drivers/net/wireless/libertas/types.h | 4 +- + drivers/net/wireless/libertas/wext.c | 144 +- + drivers/net/wireless/libertas/wext.h | 8 + + drivers/net/wireless/orinoco/hw.c | 33 +- + drivers/net/wireless/orinoco/hw.h | 3 +- + drivers/net/wireless/orinoco/main.c | 33 +- + drivers/net/wireless/orinoco/orinoco.h | 1 - + drivers/net/wireless/rt2x00/Kconfig | 30 + + drivers/net/wireless/rt2x00/Makefile | 2 + + drivers/net/wireless/rt2x00/rt2800pci.c | 3323 ++++++++++++++++++++++++++ + drivers/net/wireless/rt2x00/rt2800pci.h | 1960 +++++++++++++++ + drivers/net/wireless/rt2x00/rt2x00.h | 7 + + drivers/net/wireless/rt2x00/rt2x00soc.c | 159 ++ + drivers/net/wireless/rt2x00/rt2x00soc.h | 52 + + drivers/net/wireless/wl12xx/wl1251_main.c | 7 +- + drivers/net/wireless/wl12xx/wl1251_rx.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_spi.c | 2 +- + drivers/net/wireless/wl12xx/wl1271.h | 92 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 369 +++- + drivers/net/wireless/wl12xx/wl1271_acx.h | 586 ++--- + drivers/net/wireless/wl12xx/wl1271_boot.c | 215 +- + drivers/net/wireless/wl12xx/wl1271_boot.h | 22 +- + drivers/net/wireless/wl12xx/wl1271_cmd.c | 329 ++- + drivers/net/wireless/wl12xx/wl1271_cmd.h | 115 +- + drivers/net/wireless/wl12xx/wl1271_conf.h | 911 +++++++ + drivers/net/wireless/wl12xx/wl1271_event.c | 64 +- + drivers/net/wireless/wl12xx/wl1271_event.h | 30 +- + drivers/net/wireless/wl12xx/wl1271_init.c | 155 +- + drivers/net/wireless/wl12xx/wl1271_init.h | 53 +- + drivers/net/wireless/wl12xx/wl1271_main.c | 963 ++++++-- + drivers/net/wireless/wl12xx/wl1271_ps.c | 68 +- + drivers/net/wireless/wl12xx/wl1271_ps.h | 2 +- + drivers/net/wireless/wl12xx/wl1271_reg.h | 47 +- + drivers/net/wireless/wl12xx/wl1271_rx.c | 86 +- + drivers/net/wireless/wl12xx/wl1271_rx.h | 4 +- + drivers/net/wireless/wl12xx/wl1271_spi.c | 311 ++-- + drivers/net/wireless/wl12xx/wl1271_spi.h | 65 +- + drivers/net/wireless/wl12xx/wl1271_tx.c | 76 +- + drivers/net/wireless/wl12xx/wl1271_tx.h | 18 +- + drivers/net/wireless/wl12xx/wl12xx_80211.h | 4 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 4 +- + drivers/net/wireless/zd1211rw/zd_chip.h | 18 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 202 ++- + drivers/net/wireless/zd1211rw/zd_mac.h | 25 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 4 +- + drivers/ssb/driver_pcicore.c | 4 +- + include/linux/ssb/ssb.h | 20 +- + include/net/cfg80211.h | 31 +- + include/net/mac80211.h | 32 +- + net/mac80211/iface.c | 4 +- + net/mac80211/mesh.c | 4 +- + net/mac80211/mlme.c | 22 +- + net/mac80211/rx.c | 21 +- + net/mac80211/scan.c | 10 +- + net/wireless/mlme.c | 45 +- + 137 files changed, 13468 insertions(+), 6003 deletions(-) + delete mode 100644 drivers/net/wireless/libertas/11d.c + delete mode 100644 drivers/net/wireless/libertas/11d.h + delete mode 100644 drivers/net/wireless/libertas/hostcmd.h + create mode 100644 drivers/net/wireless/rt2x00/rt2800pci.c + create mode 100644 drivers/net/wireless/rt2x00/rt2800pci.h + create mode 100644 drivers/net/wireless/rt2x00/rt2x00soc.c + create mode 100644 drivers/net/wireless/rt2x00/rt2x00soc.h + create mode 100644 drivers/net/wireless/wl12xx/wl1271_conf.h +Merging mtd/master +$ git merge mtd/master +Auto-merging drivers/mtd/devices/m25p80.c +Auto-merging drivers/mtd/maps/Kconfig +Removing drivers/mtd/maps/ipaq-flash.c +Auto-merging drivers/mtd/mtd_blkdevs.c +Auto-merging drivers/mtd/nand/Kconfig +Merge made by recursive. + arch/arm/mach-bcmring/arch.c | 10 + + arch/arm/mach-bcmring/include/mach/reg_nand.h | 66 +++ + arch/arm/mach-bcmring/include/mach/reg_umi.h | 237 ++++++++++ + arch/arm/mach-nomadik/board-nhk8815.c | 11 +- + drivers/mtd/devices/m25p80.c | 7 +- + drivers/mtd/devices/mtd_dataflash.c | 19 +- + drivers/mtd/maps/Kconfig | 7 +- + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/gpio-addr-flash.c | 5 +- + drivers/mtd/maps/ipaq-flash.c | 460 ------------------- + drivers/mtd/maps/pcmciamtd.c | 175 ++++---- + drivers/mtd/maps/physmap.c | 19 +- + drivers/mtd/maps/sa1100-flash.c | 6 +- + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/mtd/nand/Kconfig | 16 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/atmel_nand.c | 1 - + drivers/mtd/nand/bcm_umi_bch.c | 213 +++++++++ + drivers/mtd/nand/bcm_umi_nand.c | 581 +++++++++++++++++++++++++ + drivers/mtd/nand/davinci_nand.c | 2 +- + drivers/mtd/nand/mxc_nand.c | 18 +- + drivers/mtd/nand/nand_base.c | 6 + + drivers/mtd/nand/nand_bcm_umi.c | 149 +++++++ + drivers/mtd/nand/nand_bcm_umi.h | 358 +++++++++++++++ + drivers/mtd/nand/plat_nand.c | 50 ++- + drivers/mtd/onenand/onenand_base.c | 176 +++++--- + drivers/mtd/tests/mtd_oobtest.c | 18 +- + include/linux/mtd/bbm.h | 35 +- + include/linux/mtd/flashchip.h | 7 + + include/linux/mtd/nand.h | 93 +---- + include/linux/mtd/onenand.h | 19 +- + 31 files changed, 1949 insertions(+), 819 deletions(-) + create mode 100644 arch/arm/mach-bcmring/include/mach/reg_nand.h + create mode 100644 arch/arm/mach-bcmring/include/mach/reg_umi.h + delete mode 100644 drivers/mtd/maps/ipaq-flash.c + create mode 100644 drivers/mtd/nand/bcm_umi_bch.c + create mode 100644 drivers/mtd/nand/bcm_umi_nand.c + create mode 100644 drivers/mtd/nand/nand_bcm_umi.c + create mode 100644 drivers/mtd/nand/nand_bcm_umi.h +Merging crypto/master +$ git merge crypto/master +Removing crypto/digest.c +Removing crypto/hash.c +Merge made by recursive. + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/ghash-clmulni-intel_asm.S | 157 +++++++++++++ + arch/x86/crypto/ghash-clmulni-intel_glue.c | 333 ++++++++++++++++++++++++++++ + arch/x86/include/asm/cpufeature.h | 1 + + crypto/Kconfig | 9 + + crypto/ansi_cprng.c | 82 ++++++- + crypto/cryptd.c | 7 + + crypto/digest.c | 240 -------------------- + crypto/hash.c | 183 --------------- + crypto/proc.c | 7 - + crypto/testmgr.c | 2 +- + include/crypto/algapi.h | 1 - + include/crypto/cryptd.h | 1 + + include/linux/crypto.h | 27 --- + 14 files changed, 582 insertions(+), 471 deletions(-) + create mode 100644 arch/x86/crypto/ghash-clmulni-intel_asm.S + create mode 100644 arch/x86/crypto/ghash-clmulni-intel_glue.c + delete mode 100644 crypto/digest.c + delete mode 100644 crypto/hash.c +Merging sound/for-next +$ git merge sound/for-next +Removing arch/arm/plat-s3c/include/plat/audio.h +Removing include/sound/sscape_ioctl.h +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 9 +- + arch/arm/plat-s3c/include/plat/audio.h | 45 - + arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h | 2 + + include/sound/Kbuild | 1 - + include/sound/ak4113.h | 321 ++ + include/sound/ak4114.h | 12 +- + include/sound/ak4xxx-adda.h | 5 +- + include/sound/soc-dai.h | 14 +- + include/sound/soc-dapm.h | 17 + + include/sound/soc.h | 6 +- + include/sound/sscape_ioctl.h | 21 - + include/sound/tlv320dac33-plat.h | 20 + + include/sound/tpa6130a2-plat.h | 30 + + sound/core/isadma.c | 10 +- + sound/i2c/other/Makefile | 3 +- + sound/i2c/other/ak4113.c | 639 ++++ + sound/i2c/other/ak4xxx-adda.c | 136 +- + sound/isa/Kconfig | 12 +- + sound/isa/sscape.c | 727 ++--- + sound/isa/wss/wss_lib.c | 98 +- + sound/pci/Kconfig | 1 - + sound/pci/hda/hda_intel.c | 16 +- + sound/pci/hda/patch_realtek.c | 139 +- + sound/pci/hda/patch_via.c | 3501 +++++++++++++++++++-- + sound/pci/ice1712/Makefile | 2 +- + sound/pci/ice1712/ice1712.c | 12 + + sound/pci/ice1712/ice1712.h | 14 +- + sound/pci/ice1712/ice1724.c | 103 +- + sound/pci/ice1712/juli.c | 24 +- + sound/pci/ice1712/quartet.c | 1130 +++++++ + sound/pci/ice1712/quartet.h | 10 + + sound/pci/oxygen/Makefile | 3 +- + sound/pci/oxygen/cs2000.h | 83 + + sound/pci/oxygen/hifier.c | 61 +- + sound/pci/oxygen/oxygen.c | 248 ++- + sound/pci/oxygen/oxygen.h | 5 + + sound/pci/oxygen/oxygen_lib.c | 29 +- + sound/pci/oxygen/oxygen_mixer.c | 52 +- + sound/pci/oxygen/oxygen_pcm.c | 19 +- + sound/pci/oxygen/virtuoso.c | 1105 +------- + sound/pci/oxygen/xonar.h | 50 + + sound/pci/oxygen/xonar_cs43xx.c | 434 +++ + sound/pci/oxygen/xonar_hdmi.c | 128 + + sound/pci/oxygen/xonar_lib.c | 132 + + sound/pci/oxygen/xonar_pcm179x.c | 1115 +++++++ + sound/soc/atmel/playpaq_wm8510.c | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/blackfin/bf5xx-ad1836.c | 7 + + sound/soc/blackfin/bf5xx-ad1938.c | 9 +- + sound/soc/blackfin/bf5xx-i2s.c | 15 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 9 +- + sound/soc/blackfin/bf5xx-tdm.c | 45 +- + sound/soc/blackfin/bf5xx-tdm.h | 11 + + sound/soc/codecs/Kconfig | 16 + + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ak4671.c | 825 +++++ + sound/soc/codecs/ak4671.h | 156 + + sound/soc/codecs/cs4270.c | 20 - + sound/soc/codecs/tlv320dac33.c | 1237 ++++++++ + sound/soc/codecs/tlv320dac33.h | 267 ++ + sound/soc/codecs/tpa6130a2.c | 463 +++ + sound/soc/codecs/tpa6130a2.h | 61 + + sound/soc/codecs/wm8350.c | 19 +- + sound/soc/codecs/wm8400.c | 20 +- + sound/soc/codecs/wm8510.c | 4 +- + sound/soc/codecs/wm8523.c | 17 - + sound/soc/codecs/wm8580.c | 21 +- + sound/soc/codecs/wm8711.c | 642 ++++ + sound/soc/codecs/wm8711.h | 42 + + sound/soc/codecs/wm8731.c | 34 - + sound/soc/codecs/wm8753.c | 39 +- + sound/soc/codecs/wm8776.c | 34 - + sound/soc/codecs/wm8900.c | 21 +- + sound/soc/codecs/wm8903.c | 17 - + sound/soc/codecs/wm8940.c | 21 +- + sound/soc/codecs/wm8960.c | 21 +- + sound/soc/codecs/wm8961.c | 17 - + sound/soc/codecs/wm8974.c | 27 +- + sound/soc/codecs/wm8988.c | 34 - + sound/soc/codecs/wm8990.c | 4 +- + sound/soc/codecs/wm8993.c | 38 +- + sound/soc/codecs/wm9081.c | 17 - + sound/soc/codecs/wm9713.c | 4 +- + sound/soc/codecs/wm_hubs.c | 35 + + sound/soc/codecs/wm_hubs.h | 5 + + sound/soc/davinci/Kconfig | 4 +- + sound/soc/davinci/davinci-evm.c | 7 +- + sound/soc/davinci/davinci-i2s.c | 2 + + sound/soc/davinci/davinci-mcasp.c | 17 +- + sound/soc/davinci/davinci-pcm.c | 21 +- + sound/soc/davinci/davinci-pcm.h | 1 + + sound/soc/imx/mx27vis_wm8974.c | 2 +- + sound/soc/pxa/Kconfig | 3 +- + sound/soc/pxa/magician.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 20 +- + sound/soc/pxa/zylonite.c | 5 +- + sound/soc/s3c24xx/Kconfig | 9 + + sound/soc/s3c24xx/Makefile | 2 + + sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 8 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 9 +- + sound/soc/s3c24xx/s3c-i2s-v2.c | 31 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 1 - + sound/soc/s3c24xx/s3c2443-ac97.c | 1 - + sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- + sound/soc/s3c24xx/s3c24xx-pcm.c | 1 - + sound/soc/s3c24xx/s3c64xx-i2s.c | 20 +- + sound/soc/s3c24xx/s3c64xx-i2s.h | 1 + + sound/soc/s3c24xx/smdk64xx_wm8580.c | 273 ++ + sound/soc/soc-cache.c | 46 +- + sound/soc/soc-core.c | 101 +- + sound/soc/soc-dapm.c | 137 +- + sound/usb/usx2y/us122l.c | 75 +- + 112 files changed, 12862 insertions(+), 2769 deletions(-) + delete mode 100644 arch/arm/plat-s3c/include/plat/audio.h + create mode 100644 include/sound/ak4113.h + delete mode 100644 include/sound/sscape_ioctl.h + create mode 100644 include/sound/tlv320dac33-plat.h + create mode 100644 include/sound/tpa6130a2-plat.h + create mode 100644 sound/i2c/other/ak4113.c + create mode 100644 sound/pci/ice1712/quartet.c + create mode 100644 sound/pci/ice1712/quartet.h + create mode 100644 sound/pci/oxygen/cs2000.h + create mode 100644 sound/pci/oxygen/xonar.h + create mode 100644 sound/pci/oxygen/xonar_cs43xx.c + create mode 100644 sound/pci/oxygen/xonar_hdmi.c + create mode 100644 sound/pci/oxygen/xonar_lib.c + create mode 100644 sound/pci/oxygen/xonar_pcm179x.c + create mode 100644 sound/soc/codecs/ak4671.c + create mode 100644 sound/soc/codecs/ak4671.h + create mode 100644 sound/soc/codecs/tlv320dac33.c + create mode 100644 sound/soc/codecs/tlv320dac33.h + create mode 100644 sound/soc/codecs/tpa6130a2.c + create mode 100644 sound/soc/codecs/tpa6130a2.h + create mode 100644 sound/soc/codecs/wm8711.c + create mode 100644 sound/soc/codecs/wm8711.h + create mode 100644 sound/soc/s3c24xx/smdk64xx_wm8580.c +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merging drivers/net/virtio_net.c +Merge made by recursive. + arch/x86/Kconfig.cpu | 2 +- + drivers/net/virtio_net.c | 14 +++++++++++--- + drivers/virtio/virtio_pci.c | 27 +++++++++++++++------------ + drivers/virtio/virtio_ring.c | 3 +++ + include/linux/moduleparam.h | 1 - + kernel/params.c | 17 ++++++----------- + 6 files changed, 36 insertions(+), 28 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging tmio-mmc/linux-next +$ git merge tmio-mmc/linux-next +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mmc/core/core.c +Auto-merging drivers/mmc/core/core.h +Merge made by recursive. + drivers/mfd/Makefile | 6 +- + drivers/mfd/asic3.c | 43 +++++++++++++++---- + drivers/mfd/t7l66xb.c | 31 +++++++++++-- + drivers/mfd/tc6387xb.c | 97 ++++++++++++++++++++++++++++++++++-------- + drivers/mfd/tc6393xb.c | 56 +++++++++++++++++++++---- + drivers/mfd/tmio_core.c | 62 +++++++++++++++++++++++++++ + drivers/mmc/core/core.c | 4 +- + drivers/mmc/core/core.h | 10 ++++ + drivers/mmc/host/tmio_mmc.c | 78 +++++++++++++++-------------------- + drivers/mmc/host/tmio_mmc.h | 46 +++------------------ + include/linux/mfd/tmio.h | 40 ++++++++++++++++++ + 11 files changed, 342 insertions(+), 131 deletions(-) + create mode 100644 drivers/mfd/tmio_core.c +Merging input/next +$ git merge input/next +Merge made by recursive. + arch/arm/mach-davinci/include/mach/keyscan.h | 41 +++ + drivers/input/input-polldev.c | 7 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/davinci_keyscan.c | 337 +++++++++++++++++ + drivers/input/keyboard/lkkbd.c | 496 ++++++++++++------------- + drivers/input/misc/wistron_btns.c | 2 +- + drivers/input/mouse/vsxxxaa.c | 374 +++++++++----------- + drivers/input/serio/Kconfig | 8 + + drivers/input/serio/Makefile | 1 + + drivers/input/serio/altera_ps2.c | 200 +++++++++++ + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/dynapro.c | 206 +++++++++++ + include/linux/input-polldev.h | 11 +- + include/linux/serio.h | 1 + + 16 files changed, 1244 insertions(+), 464 deletions(-) + create mode 100644 arch/arm/mach-davinci/include/mach/keyscan.h + create mode 100644 drivers/input/keyboard/davinci_keyscan.c + create mode 100644 drivers/input/serio/altera_ps2.c + create mode 100644 drivers/input/touchscreen/dynapro.c +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging MAINTAINERS +Removing block/as-iosched.c +Merge made by recursive. + .../blockdev/drbd/DRBD-8.3-data-packets.svg | 588 +++ + Documentation/blockdev/drbd/DRBD-data-packets.svg | 459 ++ + Documentation/blockdev/drbd/README.txt | 16 + + Documentation/blockdev/drbd/conn-states-8.dot | 18 + + Documentation/blockdev/drbd/disk-states-8.dot | 16 + + .../drbd/drbd-connection-state-overview.dot | 85 + + Documentation/blockdev/drbd/node-states-8.dot | 14 + + MAINTAINERS | 13 + + block/Kconfig.iosched | 26 +- + block/Makefile | 1 - + block/as-iosched.c | 1520 ------- + block/blk-core.c | 2 +- + block/cfq-iosched.c | 242 +- + block/elevator.c | 10 +- + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/drbd/Kconfig | 71 + + drivers/block/drbd/Makefile | 5 + + drivers/block/drbd/drbd_actlog.c | 1424 +++++++ + drivers/block/drbd/drbd_bitmap.c | 1327 ++++++ + drivers/block/drbd/drbd_int.h | 2252 ++++++++++ + drivers/block/drbd/drbd_main.c | 3700 ++++++++++++++++ + drivers/block/drbd/drbd_nl.c | 2360 +++++++++++ + drivers/block/drbd/drbd_proc.c | 265 ++ + drivers/block/drbd/drbd_receiver.c | 4427 ++++++++++++++++++++ + drivers/block/drbd/drbd_req.c | 1120 +++++ + drivers/block/drbd/drbd_req.h | 326 ++ + drivers/block/drbd/drbd_strings.c | 113 + + drivers/block/drbd/drbd_vli.h | 351 ++ + drivers/block/drbd/drbd_worker.c | 1512 +++++++ + drivers/block/drbd/drbd_wrappers.h | 91 + + fs/block_dev.c | 2 +- + include/linux/drbd.h | 350 ++ + include/linux/drbd_limits.h | 137 + + include/linux/drbd_nl.h | 137 + + include/linux/drbd_tag_magic.h | 83 + + include/linux/iocontext.h | 5 - + include/linux/lru_cache.h | 294 ++ + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/lru_cache.c | 560 +++ + 41 files changed, 22328 insertions(+), 1602 deletions(-) + create mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/README.txt + create mode 100644 Documentation/blockdev/drbd/conn-states-8.dot + create mode 100644 Documentation/blockdev/drbd/disk-states-8.dot + create mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot + create mode 100644 Documentation/blockdev/drbd/node-states-8.dot + delete mode 100644 block/as-iosched.c + create mode 100644 drivers/block/drbd/Kconfig + create mode 100644 drivers/block/drbd/Makefile + create mode 100644 drivers/block/drbd/drbd_actlog.c + create mode 100644 drivers/block/drbd/drbd_bitmap.c + create mode 100644 drivers/block/drbd/drbd_int.h + create mode 100644 drivers/block/drbd/drbd_main.c + create mode 100644 drivers/block/drbd/drbd_nl.c + create mode 100644 drivers/block/drbd/drbd_proc.c + create mode 100644 drivers/block/drbd/drbd_receiver.c + create mode 100644 drivers/block/drbd/drbd_req.c + create mode 100644 drivers/block/drbd/drbd_req.h + create mode 100644 drivers/block/drbd/drbd_strings.c + create mode 100644 drivers/block/drbd/drbd_vli.h + create mode 100644 drivers/block/drbd/drbd_worker.c + create mode 100644 drivers/block/drbd/drbd_wrappers.h + create mode 100644 include/linux/drbd.h + create mode 100644 include/linux/drbd_limits.h + create mode 100644 include/linux/drbd_nl.h + create mode 100644 include/linux/drbd_tag_magic.h + create mode 100644 include/linux/lru_cache.h + create mode 100644 lib/lru_cache.c +$ git reset --hard HEAD^ +HEAD is now at 3ebb44b Merge remote branch 'input/next' +Merging refs/next/20091026/block +$ git merge refs/next/20091026/block +Auto-merging MAINTAINERS +Removing block/as-iosched.c +Merge made by recursive. + .../blockdev/drbd/DRBD-8.3-data-packets.svg | 588 +++ + Documentation/blockdev/drbd/DRBD-data-packets.svg | 459 ++ + Documentation/blockdev/drbd/README.txt | 16 + + Documentation/blockdev/drbd/conn-states-8.dot | 18 + + Documentation/blockdev/drbd/disk-states-8.dot | 16 + + .../drbd/drbd-connection-state-overview.dot | 85 + + Documentation/blockdev/drbd/node-states-8.dot | 14 + + MAINTAINERS | 13 + + block/Kconfig.iosched | 26 +- + block/Makefile | 1 - + block/as-iosched.c | 1520 ------- + block/elevator.c | 10 +- + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/drbd/Kconfig | 71 + + drivers/block/drbd/Makefile | 5 + + drivers/block/drbd/drbd_actlog.c | 1424 +++++++ + drivers/block/drbd/drbd_bitmap.c | 1327 ++++++ + drivers/block/drbd/drbd_int.h | 2252 ++++++++++ + drivers/block/drbd/drbd_main.c | 3700 ++++++++++++++++ + drivers/block/drbd/drbd_nl.c | 2360 +++++++++++ + drivers/block/drbd/drbd_proc.c | 265 ++ + drivers/block/drbd/drbd_receiver.c | 4427 ++++++++++++++++++++ + drivers/block/drbd/drbd_req.c | 1120 +++++ + drivers/block/drbd/drbd_req.h | 326 ++ + drivers/block/drbd/drbd_strings.c | 113 + + drivers/block/drbd/drbd_vli.h | 351 ++ + drivers/block/drbd/drbd_worker.c | 1512 +++++++ + drivers/block/drbd/drbd_wrappers.h | 91 + + include/linux/drbd.h | 350 ++ + include/linux/drbd_limits.h | 137 + + include/linux/drbd_nl.h | 137 + + include/linux/drbd_tag_magic.h | 83 + + include/linux/lru_cache.h | 294 ++ + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/lru_cache.c | 560 +++ + 37 files changed, 22131 insertions(+), 1548 deletions(-) + create mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/README.txt + create mode 100644 Documentation/blockdev/drbd/conn-states-8.dot + create mode 100644 Documentation/blockdev/drbd/disk-states-8.dot + create mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot + create mode 100644 Documentation/blockdev/drbd/node-states-8.dot + delete mode 100644 block/as-iosched.c + create mode 100644 drivers/block/drbd/Kconfig + create mode 100644 drivers/block/drbd/Makefile + create mode 100644 drivers/block/drbd/drbd_actlog.c + create mode 100644 drivers/block/drbd/drbd_bitmap.c + create mode 100644 drivers/block/drbd/drbd_int.h + create mode 100644 drivers/block/drbd/drbd_main.c + create mode 100644 drivers/block/drbd/drbd_nl.c + create mode 100644 drivers/block/drbd/drbd_proc.c + create mode 100644 drivers/block/drbd/drbd_receiver.c + create mode 100644 drivers/block/drbd/drbd_req.c + create mode 100644 drivers/block/drbd/drbd_req.h + create mode 100644 drivers/block/drbd/drbd_strings.c + create mode 100644 drivers/block/drbd/drbd_vli.h + create mode 100644 drivers/block/drbd/drbd_worker.c + create mode 100644 drivers/block/drbd/drbd_wrappers.h + create mode 100644 include/linux/drbd.h + create mode 100644 include/linux/drbd_limits.h + create mode 100644 include/linux/drbd_nl.h + create mode 100644 include/linux/drbd_tag_magic.h + create mode 100644 include/linux/lru_cache.h + create mode 100644 lib/lru_cache.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-exception-store.c | 33 ++---- + drivers/md/dm-exception-store.h | 34 ++++--- + drivers/md/dm-ioctl.c | 4 +- + drivers/md/dm-snap-persistent.c | 83 ++++++++------- + drivers/md/dm-snap-transient.c | 24 ++-- + drivers/md/dm-snap.c | 232 ++++++++++++++++++++++----------------- + drivers/md/dm.c | 64 +++++++---- + 7 files changed, 264 insertions(+), 210 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Auto-merging drivers/net/wireless/libertas/if_cs.c +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/pcmcia/driver-changes.txt | 7 + + drivers/char/pcmcia/ipwireless/main.c | 270 +++++++++++-------------------- + drivers/char/pcmcia/synclink_cs.c | 64 +++----- + drivers/net/pcmcia/3c574_cs.c | 18 +-- + drivers/net/pcmcia/3c589_cs.c | 21 +-- + drivers/net/pcmcia/fmvj18x_cs.c | 69 ++++---- + drivers/net/pcmcia/nmclan_cs.c | 19 +-- + drivers/net/pcmcia/smc91c92_cs.c | 241 ++++++++------------------- + drivers/net/pcmcia/xirc2ps_cs.c | 130 +++++++--------- + drivers/net/wireless/b43/pcmcia.c | 20 --- + drivers/net/wireless/hostap/hostap_cs.c | 21 +--- + drivers/net/wireless/libertas/if_cs.c | 67 +++----- + drivers/pcmcia/cirrus.h | 10 -- + drivers/pcmcia/cistpl.c | 81 ++++++++- + drivers/pcmcia/cs_internal.h | 19 ++- + drivers/pcmcia/ds.c | 8 +- + drivers/pcmcia/i82365.c | 4 +- + drivers/pcmcia/m32r_cfc.c | 10 +- + drivers/pcmcia/m32r_pcc.c | 10 +- + drivers/pcmcia/m8xx_pcmcia.c | 15 +- + drivers/pcmcia/o2micro.h | 22 --- + drivers/pcmcia/pcmcia_ioctl.c | 2 +- + drivers/pcmcia/pcmcia_resource.c | 217 +++++++++++++++++++++---- + drivers/pcmcia/pd6729.c | 6 + + drivers/pcmcia/rsrc_mgr.c | 1 + + drivers/pcmcia/rsrc_nonstatic.c | 3 +- + drivers/pcmcia/soc_common.c | 5 +- + drivers/pcmcia/socket_sysfs.c | 2 +- + drivers/pcmcia/tcic.c | 4 +- + drivers/serial/serial_cs.c | 87 +++-------- + drivers/ssb/pcmcia.c | 232 ++++++++++++++------------- + include/linux/pci_ids.h | 2 + + include/pcmcia/ds.h | 42 ++++-- + 33 files changed, 834 insertions(+), 895 deletions(-) +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 9 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-alix2.c | 115 +++++++--- + drivers/leds/leds-ss4200.c | 552 ++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 646 insertions(+), 31 deletions(-) + create mode 100644 drivers/leds/leds-ss4200.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + Documentation/laptops/thinkpad-acpi.txt | 51 +++++++----------------------- + drivers/platform/x86/thinkpad_acpi.c | 24 ++++++++++++++- + drivers/video/backlight/lcd.c | 2 +- + 3 files changed, 36 insertions(+), 41 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging include/linux/sched.h +Auto-merging kernel/softlockup.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 12 ++++++++---- + include/linux/sched.h | 4 ++++ + kernel/kgdb.c | 31 +++++++++++++++++++++++-------- + kernel/softlockup.c | 16 ++++++++++++++++ + 4 files changed, 51 insertions(+), 12 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging include/linux/rcupdate.h +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Merge made by recursive. + Documentation/ABI/testing/sysfs-kernel-slab | 109 +- + Documentation/vm/slqbinfo.c | 1047 ++++++++ + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 301 +++ + init/Kconfig | 7 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3791 +++++++++++++++++++++++++++ + mm/slub.c | 18 +- + 11 files changed, 5268 insertions(+), 65 deletions(-) + create mode 100644 Documentation/vm/slqbinfo.c + create mode 100644 include/linux/rcu_types.h + create mode 100644 include/linux/slqb_def.h + create mode 100644 mm/slqb.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/keyboard/Makefile +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/asic3.c +Auto-merging drivers/mfd/twl4030-core.c +Merge made by recursive. + arch/arm/mach-omap2/board-rx51-peripherals.c | 118 +++-- + drivers/gpio/adp5520-gpio.c | 36 +- + drivers/gpio/wm831x-gpio.c | 4 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/adp5520-keys.c | 220 ++++++++ + drivers/input/misc/pcf50633-input.c | 7 +- + drivers/mfd/88pm8607.c | 302 ++++++++++ + drivers/mfd/Kconfig | 36 ++- + drivers/mfd/Makefile | 4 + + drivers/mfd/ab3100-core.c | 3 - + drivers/mfd/ab4500-core.c | 208 +++++++ + drivers/mfd/adp5520.c | 379 +++++++++++++ + drivers/mfd/asic3.c | 2 +- + drivers/mfd/pcf50633-adc.c | 5 +- + drivers/mfd/pcf50633-core.c | 76 ++-- + drivers/mfd/twl4030-core.c | 13 +- + drivers/mfd/twl4030-power.c | 70 ++- + drivers/mfd/wm831x-core.c | 216 ++++++-- + drivers/mfd/wm831x-irq.c | 3 +- + drivers/mfd/wm8350-core.c | 769 +------------------------- + drivers/mfd/wm8350-irq.c | 525 ++++++++++++++++++ + drivers/power/pcf50633-charger.c | 3 +- + drivers/regulator/pcf50633-regulator.c | 5 +- + drivers/rtc/rtc-pcf50633.c | 5 +- + drivers/video/backlight/adp5520_bl.c | 123 +++-- + include/linux/i2c/twl4030.h | 9 + + include/linux/mfd/88pm8607.h | 217 ++++++++ + include/linux/mfd/ab4500.h | 262 +++++++++ + include/linux/mfd/adp5520.h | 299 ++++++++++ + include/linux/mfd/pcf50633/core.h | 10 +- + include/linux/mfd/wm831x/core.h | 3 + + include/linux/mfd/wm8350/core.h | 6 +- + include/linux/mfd/wm8350/gpio.h | 18 + + 34 files changed, 2976 insertions(+), 991 deletions(-) + create mode 100644 drivers/input/keyboard/adp5520-keys.c + create mode 100644 drivers/mfd/88pm8607.c + create mode 100644 drivers/mfd/ab4500-core.c + create mode 100644 drivers/mfd/adp5520.c + create mode 100644 drivers/mfd/wm8350-irq.c + create mode 100644 include/linux/mfd/88pm8607.h + create mode 100644 include/linux/mfd/ab4500.h + create mode 100644 include/linux/mfd/adp5520.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/drm_irq.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/radeon/r100.c +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/radeon/r600d.h +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging include/drm/drmP.h +Merge made by recursive. + drivers/gpu/drm/drm_edid.c | 15 + + drivers/gpu/drm/drm_fb_helper.c | 42 ++- + drivers/gpu/drm/drm_fops.c | 98 +++++++- + drivers/gpu/drm/drm_irq.c | 95 ++++++ + drivers/gpu/drm/drm_stub.c | 2 + + drivers/gpu/drm/i915/i915_drv.c | 1 + + drivers/gpu/drm/radeon/atombios.h | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 348 +++++++++++------------ + drivers/gpu/drm/radeon/r100.c | 30 ++- + drivers/gpu/drm/radeon/r300.c | 2 +- + drivers/gpu/drm/radeon/r500_reg.h | 9 + + drivers/gpu/drm/radeon/r600.c | 39 ++-- + drivers/gpu/drm/radeon/r600_blit.c | 58 +++-- + drivers/gpu/drm/radeon/r600_blit_kms.c | 3 +- + drivers/gpu/drm/radeon/r600d.h | 4 + + drivers/gpu/drm/radeon/radeon.h | 3 + + drivers/gpu/drm/radeon/radeon_atombios.c | 175 ++++++++---- + drivers/gpu/drm/radeon/radeon_benchmark.c | 4 +- + drivers/gpu/drm/radeon/radeon_combios.c | 123 +++++--- + drivers/gpu/drm/radeon/radeon_connectors.c | 143 +++++++--- + drivers/gpu/drm/radeon/radeon_cp.c | 45 +--- + drivers/gpu/drm/radeon/radeon_cursor.c | 10 +- + drivers/gpu/drm/radeon/radeon_display.c | 28 +-- + drivers/gpu/drm/radeon/radeon_encoders.c | 106 +++---- + drivers/gpu/drm/radeon/radeon_gart.c | 20 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 9 + + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 40 ++-- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 27 ++- + drivers/gpu/drm/radeon/radeon_mode.h | 32 ++- + drivers/gpu/drm/radeon/radeon_reg.h | 6 + + drivers/gpu/drm/radeon/radeon_test.c | 6 +- + drivers/gpu/drm/radeon/rs600.c | 18 ++- + drivers/gpu/drm/radeon/rv770.c | 30 ++- + drivers/gpu/drm/radeon/rv770d.h | 5 + + include/drm/drm.h | 33 ++- + include/drm/drmP.h | 26 ++ + 36 files changed, 1068 insertions(+), 569 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Resolved 'drivers/mfd/Kconfig' using previous resolution. +Resolved 'drivers/mfd/Makefile' using previous resolution. +Auto-merging drivers/mfd/Kconfig +CONFLICT (content): Merge conflict in drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +CONFLICT (content): Merge conflict in drivers/mfd/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 43cbe56] Merge remote branch 'voltage/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/mfd/Makefile | 2 +- + drivers/regulator/88pm8607.c | 685 +++++++++++++++++++++++++++++++++++++ + drivers/regulator/Kconfig | 13 + + drivers/regulator/Makefile | 2 + + drivers/regulator/ab3100.c | 10 +- + drivers/regulator/core.c | 235 ++++++++------ + drivers/regulator/da903x.c | 2 +- + drivers/regulator/max8660.c | 510 +++++++++++++++++++++++++++ + drivers/regulator/wm831x-dcdc.c | 207 ++++++++++- + drivers/regulator/wm831x-ldo.c | 6 +- + include/linux/mfd/wm831x/pdata.h | 17 + + include/linux/regulator/machine.h | 6 +- + include/linux/regulator/max8660.h | 57 +++ + 13 files changed, 1627 insertions(+), 125 deletions(-) + create mode 100644 drivers/regulator/88pm8607.c + create mode 100644 drivers/regulator/max8660.c + create mode 100644 include/linux/regulator/max8660.h +Merging security-testing/next +$ git merge security-testing/next +Resolved 'Documentation/dontdiff' using previous resolution. +Auto-merging Documentation/dontdiff +CONFLICT (content): Merge conflict in Documentation/dontdiff +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/char/tpm/tpm.c +Removing security/root_plug.c +Removing security/selinux/include/av_inherit.h +Removing security/selinux/include/av_perm_to_string.h +Removing security/selinux/include/av_permissions.h +Removing security/selinux/include/class_to_string.h +Removing security/selinux/include/common_perm_to_string.h +Removing security/selinux/include/flask.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master daa604a] Merge remote branch 'security-testing/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/dontdiff | 3 + + Documentation/kernel-parameters.txt | 10 - + drivers/char/tpm/tpm.c | 2 +- + fs/exec.c | 4 - + fs/file_table.c | 2 - + fs/inode.c | 10 - + fs/namespace.c | 20 +- + fs/open.c | 27 +- + include/linux/security.h | 41 + + include/linux/tpm.h | 7 + + kernel/capability.c | 9 +- + mm/mmap.c | 4 - + scripts/selinux/Makefile | 4 +- + scripts/selinux/genheaders/.gitignore | 1 + + scripts/selinux/genheaders/Makefile | 5 + + scripts/selinux/genheaders/genheaders.c | 118 +++ + scripts/selinux/mdp/mdp.c | 151 +--- + security/Kconfig | 13 - + security/Makefile | 1 - + security/capability.c | 19 + + security/commoncap.c | 2 +- + security/integrity/ima/Kconfig | 1 + + security/root_plug.c | 90 --- + security/security.c | 48 ++- + security/selinux/.gitignore | 2 + + security/selinux/Makefile | 10 +- + security/selinux/avc.c | 76 +-- + security/selinux/hooks.c | 12 +- + security/selinux/include/av_inherit.h | 34 - + security/selinux/include/av_perm_to_string.h | 183 ----- + security/selinux/include/av_permissions.h | 870 ---------------------- + security/selinux/include/avc_ss.h | 21 +- + security/selinux/include/class_to_string.h | 80 -- + security/selinux/include/classmap.h | 150 ++++ + security/selinux/include/common_perm_to_string.h | 58 -- + security/selinux/include/flask.h | 91 --- + security/selinux/include/security.h | 13 +- + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/Makefile | 2 +- + security/selinux/ss/mls.c | 2 +- + security/selinux/ss/policydb.c | 47 ++- + security/selinux/ss/policydb.h | 7 +- + security/selinux/ss/services.c | 555 +++++++------- + 43 files changed, 837 insertions(+), 1972 deletions(-) + create mode 100644 scripts/selinux/genheaders/.gitignore + create mode 100644 scripts/selinux/genheaders/Makefile + create mode 100644 scripts/selinux/genheaders/genheaders.c + delete mode 100644 security/root_plug.c + create mode 100644 security/selinux/.gitignore + delete mode 100644 security/selinux/include/av_inherit.h + delete mode 100644 security/selinux/include/av_perm_to_string.h + delete mode 100644 security/selinux/include/av_permissions.h + delete mode 100644 security/selinux/include/class_to_string.h + create mode 100644 security/selinux/include/classmap.h + delete mode 100644 security/selinux/include/common_perm_to_string.h + delete mode 100644 security/selinux/include/flask.h +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Merge made by recursive. + drivers/pci/dmar.c | 43 +++++++++++++++++++++++++++++++++++++++-- + drivers/pci/intel-iommu.c | 27 ++++++++++++++++++------- + drivers/pci/intr_remapping.c | 3 +- + include/linux/intel-iommu.h | 1 + + 4 files changed, 62 insertions(+), 12 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merging Documentation/filesystems/00-INDEX +Merge made by recursive. + Documentation/filesystems/00-INDEX | 2 + + Documentation/filesystems/exofs.txt | 23 ++-- + drivers/scsi/osd/osd_initiator.c | 26 +++- + drivers/scsi/osd/osd_uld.c | 232 +++++++++++++++++++++++++---------- + fs/exofs/inode.c | 13 ++- + fs/exofs/super.c | 11 ++ + include/scsi/osd_initiator.h | 55 +++++++-- + include/scsi/osd_sense.h | 3 + + 8 files changed, 270 insertions(+), 95 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Resolved 'drivers/acpi/video_detect.c' using previous resolution. +Auto-merging arch/powerpc/kernel/vdso.c +Auto-merging drivers/acpi/video_detect.c +CONFLICT (content): Merge conflict in drivers/acpi/video_detect.c +Auto-merging drivers/media/dvb/dvb-core/dvb_net.c +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/net/tokenring/ibmtr.c +Auto-merging drivers/net/wireless/ath/ath5k/base.h +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/wireless/b43legacy/main.c +Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c +Auto-merging drivers/scsi/3w-xxxx.c +Auto-merging drivers/scsi/bnx2i/bnx2i_iscsi.c +Auto-merging drivers/spi/spidev.c +Auto-merging drivers/video/omap/lcd_ams_delta.c +Auto-merging drivers/video/omap/lcd_mipid.c +Auto-merging mm/kmemleak.c +Auto-merging mm/memcontrol.c +Auto-merging net/sched/act_api.c +Auto-merging sound/pci/ice1712/juli.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 40be5a2] Merge remote branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/oops-tracing.txt | 2 + + Documentation/sysctl/kernel.txt | 6 ++-- + Documentation/timers/hpet.txt | 2 +- + arch/arm/mach-s3c2400/Kconfig | 6 ---- + arch/arm/mach-s3c2410/Kconfig | 2 - + arch/arm/mach-s3c2412/Kconfig | 4 --- + arch/arm/mach-s3c2440/Kconfig | 3 -- + arch/arm/mach-s3c2442/Kconfig | 4 --- + arch/arm/mach-s3c2443/Kconfig | 2 - + arch/arm/mach-s3c6400/Kconfig | 2 - + arch/arm/mach-s3c6410/Kconfig | 2 - + arch/arm/mach-s5pc100/Kconfig | 2 - + arch/arm/plat-s3c/Kconfig | 2 - + arch/arm/plat-s3c24xx/Kconfig | 2 - + arch/arm/plat-s3c64xx/Kconfig | 2 - + arch/arm/plat-s5pc1xx/Kconfig | 2 - + arch/cris/arch-v10/mm/fault.c | 3 +- + arch/cris/arch-v10/mm/tlb.c | 22 --------------- + arch/parisc/kernel/perf.c | 2 +- + arch/powerpc/kernel/vdso.c | 2 +- + arch/powerpc/oprofile/op_model_cell.c | 2 +- + drivers/Kconfig | 2 - + drivers/acpi/video_detect.c | 10 +++--- + drivers/ata/pata_cs5535.c | 2 +- + drivers/block/ataflop.c | 3 -- + drivers/char/tty_ioctl.c | 2 +- + drivers/cpuidle/governor.c | 4 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- + drivers/isdn/act2000/Kconfig | 4 --- + drivers/isdn/capi/Kconfig | 4 --- + drivers/isdn/hysdn/Kconfig | 4 --- + drivers/isdn/i4l/isdn_net.c | 2 +- + drivers/isdn/icn/Kconfig | 4 --- + drivers/isdn/pcbit/Kconfig | 4 --- + drivers/isdn/sc/Kconfig | 4 --- + drivers/md/dm-crypt.c | 2 +- + drivers/media/dvb/dvb-core/dvb_net.c | 2 +- + drivers/media/dvb/frontends/drx397xD.c | 2 +- + drivers/media/video/cx18/cx18-driver.c | 4 +- + drivers/media/video/cx23885/cx23885-core.c | 4 +- + drivers/media/video/davinci/dm355_ccdc.c | 4 +- + drivers/media/video/davinci/dm644x_ccdc.c | 4 +- + drivers/media/video/ivtv/ivtv-driver.c | 4 +- + drivers/media/video/ov772x.c | 2 +- + drivers/media/video/saa7134/saa7134-core.c | 4 +- + drivers/media/video/saa7164/saa7164-core.c | 4 +- + drivers/mmc/card/sdio_uart.c | 40 ++++++++++++++------------- + drivers/mtd/chips/Kconfig | 3 -- + drivers/mtd/devices/Kconfig | 3 -- + drivers/mtd/lpddr/Kconfig | 3 -- + drivers/mtd/maps/Kconfig | 2 - + drivers/mtd/nand/Kconfig | 2 - + drivers/mtd/onenand/Kconfig | 4 --- + drivers/mtd/ubi/Kconfig | 2 - + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/irda/smsc-ircc2.c | 2 +- + drivers/net/ps3_gelic_wireless.h | 2 +- + drivers/net/qla3xxx.c | 2 +- + drivers/net/tokenring/ibmtr.c | 2 +- + drivers/net/wireless/ath/ath5k/base.h | 2 +- + drivers/net/wireless/b43/main.c | 2 +- + drivers/net/wireless/b43legacy/main.c | 2 +- + drivers/net/wireless/orinoco/hermes_dld.c | 4 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- + drivers/net/wireless/rt2x00/rt61pci.c | 36 ++++++++++++------------ + drivers/platform/Kconfig | 2 - + drivers/rtc/rtc-ds1511.c | 4 +- + drivers/rtc/rtc-stk17ta8.c | 2 +- + drivers/scsi/3w-9xxx.c | 2 +- + drivers/scsi/3w-xxxx.c | 2 +- + drivers/scsi/aic7xxx/aic79xx.seq | 2 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +- + drivers/scsi/aic7xxx/aic7xxx.seq | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/nsp32.c | 2 +- + drivers/spi/spidev.c | 2 +- + drivers/staging/rtl8187se/r8180.h | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/uwb/neh.c | 2 +- + drivers/video/atmel_lcdfb.c | 2 +- + drivers/video/fb_defio.c | 2 +- + drivers/video/omap/lcd_ams_delta.c | 4 +- + drivers/video/omap/lcd_mipid.c | 4 +- + drivers/watchdog/sb_wdog.c | 4 +- + fs/ext4/balloc.c | 2 +- + fs/qnx4/bitmap.c | 2 +- + fs/qnx4/dir.c | 6 ++-- + fs/qnx4/inode.c | 26 +++++++++--------- + fs/qnx4/namei.c | 6 ++-- + include/linux/dm-log-userspace.h | 2 +- + include/linux/spi/spi_bitbang.h | 2 +- + include/sound/ac97_codec.h | 2 +- + ipc/msg.c | 2 +- + kernel/time/clocksource.c | 2 +- + lib/idr.c | 4 +- + mm/kmemleak.c | 4 +- + mm/memcontrol.c | 2 +- + mm/truncate.c | 2 +- + net/bluetooth/bnep/core.c | 4 +- + net/sched/act_api.c | 2 +- + net/sctp/sm_statefuns.c | 2 +- + samples/Kconfig | 3 -- + sound/Kconfig | 4 --- + sound/oss/Kconfig | 2 - + sound/pci/hda/patch_cirrus.c | 2 +- + sound/pci/ice1712/juli.c | 2 +- + 109 files changed, 152 insertions(+), 265 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Auto-merging drivers/pci/pci.c +Auto-merging include/linux/device.h +Removing kernel/power/swsusp.c +Merge made by recursive. + drivers/acpi/glue.c | 3 + + drivers/acpi/scan.c | 1 + + drivers/base/core.c | 4 + + drivers/base/power/Makefile | 2 +- + drivers/base/power/common.c | 283 ++++++++++++++++ + drivers/base/power/main.c | 677 ++++++++++++++++++++++++++++++++++++--- + drivers/base/power/power.h | 42 ++- + drivers/base/power/runtime.c | 4 - + drivers/base/power/sysfs.c | 47 +++ + drivers/pci/pci.c | 1 + + drivers/pci/pcie/portdrv_core.c | 1 + + include/linux/device.h | 11 + + include/linux/pm.h | 13 +- + include/linux/pm_link.h | 30 ++ + include/linux/resume-trace.h | 7 + + kernel/power/Kconfig | 14 + + kernel/power/Makefile | 2 +- + kernel/power/hibernate.c | 37 ++- + kernel/power/main.c | 31 ++- + kernel/power/process.c | 14 +- + kernel/power/swap.c | 109 ++++++- + kernel/power/swsusp.c | 188 ----------- + 22 files changed, 1250 insertions(+), 271 deletions(-) + create mode 100644 drivers/base/power/common.c + create mode 100644 include/linux/pm_link.h + delete mode 100644 kernel/power/swsusp.c +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/exec.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/open.c +Auto-merging init/Kconfig +Merge made by recursive. + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/nfsd/vfs.c | 4 +- + fs/notify/dnotify/dnotify.c | 12 +- + fs/notify/fsnotify.c | 103 +++++++++--- + fs/notify/fsnotify.h | 16 ++- + fs/notify/group.c | 132 ++++++--------- + fs/notify/inode_mark.c | 60 +++++-- + fs/notify/inotify/inotify_fsnotify.c | 62 +++++++- + fs/notify/inotify/inotify_user.c | 219 +++++++++++++++++-------- + fs/notify/notification.c | 161 ++++++++++-------- + fs/open.c | 2 +- + fs/read_write.c | 8 +- + include/linux/fsnotify.h | 44 +++--- + include/linux/fsnotify_backend.h | 75 ++++++--- + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 ++- + kernel/audit_tree.c | 224 ++++++++++++++----------- + kernel/audit_watch.c | 300 ++++++++++++++++++++-------------- + kernel/auditfilter.c | 39 ++--- + kernel/auditsc.c | 9 +- + 23 files changed, 924 insertions(+), 597 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Auto-merging drivers/net/irda/irda-usb.c +Merge made by recursive. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Resolved 'drivers/misc/Makefile' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +CONFLICT (content): Merge conflict in drivers/misc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6337e2b] Merge remote branch 'hwlat/for-linus' +$ git diff -M --stat --summary HEAD^.. + Documentation/hwlat_detector.txt | 64 ++ + MAINTAINERS | 9 + + drivers/misc/Kconfig | 29 + + drivers/misc/Makefile | 1 + + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 1311 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwlat_detector.txt + create mode 100644 drivers/misc/hwlat_detector.c +Merging drbd/for-jens +$ git merge drbd/for-jens +Resolved 'drivers/block/drbd/Kconfig' using previous resolution. +Resolved 'drivers/block/drbd/Makefile' using previous resolution. +Resolved 'drivers/block/drbd/drbd_actlog.c' using previous resolution. +Resolved 'drivers/block/drbd/drbd_int.h' using previous resolution. +Resolved 'drivers/block/drbd/drbd_main.c' using previous resolution. +Resolved 'drivers/block/drbd/drbd_nl.c' using previous resolution. +Resolved 'drivers/block/drbd/drbd_receiver.c' using previous resolution. +Resolved 'drivers/block/drbd/drbd_req.c' using previous resolution. +Resolved 'drivers/block/drbd/drbd_worker.c' using previous resolution. +Resolved 'include/linux/drbd.h' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/block/drbd/Kconfig +CONFLICT (add/add): Merge conflict in drivers/block/drbd/Kconfig +Auto-merging drivers/block/drbd/Makefile +CONFLICT (add/add): Merge conflict in drivers/block/drbd/Makefile +Auto-merging drivers/block/drbd/drbd_actlog.c +CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_actlog.c +Auto-merging drivers/block/drbd/drbd_int.h +CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_int.h +Auto-merging drivers/block/drbd/drbd_main.c +CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_main.c +Auto-merging drivers/block/drbd/drbd_nl.c +CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_nl.c +Auto-merging drivers/block/drbd/drbd_receiver.c +CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/drbd/drbd_req.c +CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_req.c +Auto-merging drivers/block/drbd/drbd_worker.c +CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_worker.c +Auto-merging include/linux/drbd.h +CONFLICT (add/add): Merge conflict in include/linux/drbd.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 180ee02] Merge remote branch 'drbd/for-jens' +$ git diff -M --stat --summary HEAD^.. + drivers/block/drbd/drbd_tracing.c | 752 +++++++++++++++++++++++++++++++++++++ + drivers/block/drbd/drbd_tracing.h | 87 +++++ + 2 files changed, 839 insertions(+), 0 deletions(-) + create mode 100644 drivers/block/drbd/drbd_tracing.c + create mode 100644 drivers/block/drbd/drbd_tracing.h +Merging catalin/for-next +$ git merge catalin/for-next +Auto-merging mm/kmemleak.c +Merge made by recursive. + arch/arm/mach-realview/Kconfig | 8 ++++- + arch/arm/mach-realview/core.c | 42 +++++++++++++++++++++- + arch/arm/mach-realview/core.h | 5 +++ + arch/arm/mach-realview/include/mach/memory.h | 49 ++++++++++++++++++++++++++ + arch/arm/mach-realview/platsmp.c | 5 +-- + arch/arm/mach-realview/realview_eb.c | 1 + + arch/arm/mach-realview/realview_pb1176.c | 13 +++++++ + arch/arm/mach-realview/realview_pb11mp.c | 1 + + arch/arm/mach-realview/realview_pba8.c | 1 + + arch/arm/mach-realview/realview_pbx.c | 21 +++++++++++ + include/linux/kmemleak.h | 6 +-- + kernel/module.c | 13 ++++--- + mm/kmemleak.c | 49 +++++++++++--------------- + mm/slab.c | 10 +++-- + 14 files changed, 177 insertions(+), 47 deletions(-) +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'drivers/net/Kconfig' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/net/Kconfig +CONFLICT (content): Merge conflict in drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5c6afb6] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1553 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 216 ++++++ + drivers/vbus/pci-bridge.c | 1028 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 415 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 81 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 296 ++++++++ + lib/shm_signal.c | 192 ++++++ + 20 files changed, 4349 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/edac.txt | 153 +++ + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/kernel/cpu/mcheck/mce.c | 10 + + arch/x86/pci/legacy.c | 43 +- + drivers/edac/Kconfig | 13 + + drivers/edac/Makefile | 2 + + drivers/edac/edac_core.h | 23 +- + drivers/edac/edac_mc_sysfs.c | 175 +++- + drivers/edac/edac_mce.c | 61 ++ + drivers/edac/i7core_edac.c | 1974 ++++++++++++++++++++++++++++++++++++++ + include/linux/edac_mce.h | 31 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 19 + + 13 files changed, 2463 insertions(+), 44 deletions(-) + create mode 100644 drivers/edac/edac_mce.c + create mode 100644 drivers/edac/i7core_edac.c + create mode 100644 include/linux/edac_mce.h +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Merge made by recursive. + arch/microblaze/include/asm/prom.h | 135 +-------------------------------- + arch/microblaze/kernel/head.S | 2 +- + arch/microblaze/kernel/prom.c | 23 ------ + arch/powerpc/include/asm/prom.h | 147 +----------------------------------- + arch/powerpc/kernel/prom.c | 23 ------ + arch/sparc/include/asm/prom.h | 55 +------------- + drivers/of/base.c | 26 ++++++- + include/linux/of.h | 103 +++++++++++++++++++++++++ + include/linux/of_fdt.h | 86 +++++++++++++++++++++ + 9 files changed, 221 insertions(+), 379 deletions(-) + create mode 100644 include/linux/of_fdt.h +Merging limits/writable_limits +$ git merge limits/writable_limits +Auto-merging include/linux/security.h +Auto-merging security/capability.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Merge made by recursive. + fs/proc/base.c | 78 ++++++++++++++++++++++++++++++++++++++++- + include/linux/posix-timers.h | 2 +- + include/linux/resource.h | 2 + + include/linux/security.h | 9 +++-- + kernel/posix-cpu-timers.c | 10 +++--- + kernel/sys.c | 68 ++++++++++++++++++++++++------------ + security/capability.c | 3 +- + security/security.c | 5 ++- + security/selinux/hooks.c | 10 +++-- + 9 files changed, 146 insertions(+), 41 deletions(-) +Merging tip/auto-latest +$ git merge tip/auto-latest +Recorded preimage for 'arch/x86/kernel/kgdb.c' +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Kconfig.cpu +Auto-merging arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/kernel/kgdb.c +CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c +Auto-merging drivers/pci/intr_remapping.c +Auto-merging include/linux/net.h +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/syscalls.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/trace/trace.c +Removing tools/perf/util/module.c +Removing tools/perf/util/module.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/kgdb.c'. +[master f2026e1] Merge remote branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/trace.txt | 254 +---- + Documentation/RCU/whatisRCU.txt | 2 +- + Documentation/filesystems/proc.txt | 3 +- + Documentation/kernel-parameters.txt | 16 + + Documentation/trace/ftrace-design.txt | 13 +- + Documentation/trace/ftrace.txt | 2 + + Documentation/trace/kprobetrace.txt | 151 +++ + arch/Kconfig | 10 + + arch/s390/kernel/ftrace.c | 67 +-- + arch/x86/Kconfig | 17 +- + arch/x86/Kconfig.cpu | 2 +- + arch/x86/Kconfig.debug | 23 + + arch/x86/Makefile | 4 +- + arch/x86/Makefile_32.cpu | 2 +- + arch/x86/boot/compressed/head_64.S | 3 +- + arch/x86/boot/setup.ld | 3 + + arch/x86/ia32/ia32entry.S | 5 +- + arch/x86/include/asm/acpi.h | 1 + + arch/x86/include/asm/apic.h | 2 + + arch/x86/include/asm/cmpxchg_32.h | 218 ++--- + arch/x86/include/asm/cmpxchg_64.h | 234 ++--- + arch/x86/include/asm/elf.h | 20 +- + arch/x86/include/asm/entry_arch.h | 2 +- + arch/x86/include/asm/hardirq.h | 2 +- + arch/x86/include/asm/hpet.h | 7 +- + arch/x86/include/asm/hw_irq.h | 35 +- + arch/x86/include/asm/inat.h | 188 ++++ + arch/x86/include/asm/inat_types.h | 29 + + arch/x86/include/asm/insn.h | 143 +++ + arch/x86/include/asm/irq.h | 2 +- + arch/x86/include/asm/irq_vectors.h | 2 +- + arch/x86/include/asm/k8.h | 4 +- + arch/x86/include/asm/mce.h | 7 +- + arch/x86/include/asm/msr.h | 4 +- + arch/x86/include/asm/page_types.h | 3 +- + arch/x86/include/asm/perf_event.h | 13 +- + arch/x86/include/asm/ptrace.h | 62 ++ + arch/x86/include/asm/sections.h | 6 + + arch/x86/include/asm/string_32.h | 9 + + arch/x86/include/asm/syscalls.h | 8 +- + arch/x86/include/asm/thread_info.h | 7 +- + arch/x86/include/asm/topology.h | 1 + + arch/x86/include/asm/uaccess.h | 1 - + arch/x86/include/asm/uaccess_32.h | 27 +- + arch/x86/include/asm/uaccess_64.h | 19 +- + arch/x86/include/asm/uv/uv_hub.h | 23 +- + arch/x86/include/asm/uv/uv_irq.h | 14 +- + arch/x86/kernel/acpi/boot.c | 1 + + arch/x86/kernel/acpi/realmode/wakeup.lds.S | 3 + + arch/x86/kernel/apic/Makefile | 2 +- + arch/x86/kernel/apic/apic.c | 25 +- + arch/x86/kernel/apic/apic_noop.c | 205 ++++ + arch/x86/kernel/apic/io_apic.c | 195 ++--- + arch/x86/kernel/apic/x2apic_uv_x.c | 8 +- + arch/x86/kernel/apm_32.c | 14 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce.c | 96 ++- + arch/x86/kernel/cpu/perf_event.c | 185 +++- + arch/x86/kernel/cpuid.c | 17 +- + arch/x86/kernel/crash_dump_32.c | 19 + + arch/x86/kernel/dumpstack.c | 7 +- + arch/x86/kernel/efi.c | 2 + + arch/x86/kernel/entry_32.S | 31 +- + arch/x86/kernel/entry_64.S | 29 +- + arch/x86/kernel/ftrace.c | 84 +-- + arch/x86/kernel/head_64.S | 3 +- + arch/x86/kernel/hpet.c | 60 +- + arch/x86/kernel/ioport.c | 11 +- + arch/x86/kernel/irq.c | 20 +- + arch/x86/kernel/irqinit.c | 4 +- + arch/x86/kernel/kgdb.c | 4 +- + arch/x86/kernel/kprobes.c | 248 ++--- + arch/x86/kernel/microcode_core.c | 2 - + arch/x86/kernel/msr.c | 16 +- + arch/x86/kernel/process.c | 2 + + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 32 +- + arch/x86/kernel/ptrace.c | 112 ++ + arch/x86/kernel/setup.c | 13 +- + arch/x86/kernel/signal.c | 3 + + arch/x86/kernel/tlb_uv.c | 9 +- + arch/x86/kernel/tsc.c | 8 +- + arch/x86/kernel/uv_irq.c | 239 +++++- + arch/x86/kernel/uv_time.c | 77 +- + arch/x86/kernel/vmlinux.lds.S | 31 + + arch/x86/kernel/x8664_ksyms_64.c | 2 +- + arch/x86/lib/Makefile | 13 + + arch/x86/lib/copy_user_64.S | 4 +- + arch/x86/lib/inat.c | 78 ++ + arch/x86/lib/insn.c | 464 +++++++++ + arch/x86/lib/msr.c | 46 +- + arch/x86/lib/usercopy_32.c | 10 +- + arch/x86/lib/x86-opcode-map.txt | 841 +++++++++++++++ + arch/x86/mm/extable.c | 31 - + arch/x86/mm/fault.c | 11 +- + arch/x86/mm/init_32.c | 8 +- + arch/x86/mm/init_64.c | 21 +- + arch/x86/mm/k8topology_64.c | 89 +- + arch/x86/mm/numa_32.c | 4 +- + arch/x86/mm/numa_64.c | 221 ++++- + arch/x86/mm/pageattr.c | 14 + + arch/x86/mm/srat_64.c | 29 +- + arch/x86/mm/testmmiotrace.c | 29 +- + arch/x86/tools/Makefile | 15 + + arch/x86/tools/distill.awk | 42 + + arch/x86/tools/gen-insn-attr-x86.awk | 334 ++++++ + arch/x86/tools/test_get_len.c | 108 ++ + drivers/acpi/numa.c | 10 +- + drivers/edac/edac_mce_amd.c | 21 +- + drivers/misc/sgi-xp/xpc_uv.c | 5 +- + drivers/pci/intr_remapping.c | 89 ++- + drivers/pci/intr_remapping.h | 7 + + fs/proc/array.c | 11 + + fs/proc/stat.c | 19 +- + include/linux/clocksource.h | 1 - + include/linux/compiler-gcc4.h | 6 + + include/linux/compiler.h | 11 + + include/linux/dmar.h | 10 + + include/linux/ftrace_event.h | 34 +- + include/linux/hardirq.h | 24 + + include/linux/hpet.h | 2 + + include/linux/irqflags.h | 2 +- + include/linux/kernel.h | 5 +- + include/linux/kernel_stat.h | 1 + + include/linux/kprobes.h | 2 + + include/linux/net.h | 1 + + include/linux/perf_counter.h | 1 + + include/linux/perf_event.h | 10 +- + include/linux/poison.h | 16 +- + include/linux/ratelimit.h | 33 +- + include/linux/rcupdate.h | 6 + + include/linux/rcutiny.h | 95 ++ + include/linux/rcutree.h | 6 +- + include/linux/smp_lock.h | 21 +- + include/linux/srcu.h | 1 + + include/linux/syscalls.h | 12 +- + include/linux/timex.h | 9 +- + include/linux/topology.h | 4 +- + include/linux/trace_seq.h | 2 +- + include/linux/user-return-notifier.h | 42 + + include/trace/events/bkl.h | 61 ++ + include/trace/events/irq.h | 8 +- + include/trace/events/mce.h | 69 ++ + include/trace/events/power.h | 2 - + include/trace/events/sched.h | 44 +- + include/trace/events/timer.h | 79 +- + include/trace/ftrace.h | 35 +- + include/trace/syscall.h | 13 +- + init/Kconfig | 9 + + kernel/Makefile | 2 + + kernel/cpuset.c | 8 +- + kernel/futex.c | 24 +- + kernel/irq/manage.c | 2 +- + kernel/kprobes.c | 68 +- + kernel/notifier.c | 2 +- + kernel/perf_event.c | 148 +++- + kernel/printk.c | 7 +- + kernel/rcupdate.c | 4 + + kernel/rcutiny.c | 291 ++++++ + kernel/rcutorture.c | 31 +- + kernel/rcutree.c | 51 +- + kernel/rcutree.h | 10 +- + kernel/rcutree_plugin.h | 46 +- + kernel/rcutree_trace.c | 8 +- + kernel/sched.c | 15 +- + kernel/sched_fair.c | 74 +- + kernel/smp.c | 11 +- + kernel/srcu.c | 74 +- + kernel/sysctl.c | 3 + + kernel/time.c | 1 - + kernel/time/timekeeping.c | 108 ++- + kernel/trace/Kconfig | 12 + + kernel/trace/Makefile | 1 + + kernel/trace/ftrace.c | 372 +++++--- + kernel/trace/ring_buffer.c | 27 +- + kernel/trace/trace.c | 12 +- + kernel/trace/trace.h | 71 +- + kernel/trace/trace_event_profile.c | 4 +- + kernel/trace/trace_events.c | 191 +++-- + kernel/trace/trace_events_filter.c | 423 ++++++--- + kernel/trace/trace_export.c | 39 +- + kernel/trace/trace_kprobe.c | 1479 +++++++++++++++++++++++++++ + kernel/trace/trace_output.c | 5 +- + kernel/trace/trace_syscalls.c | 122 ++- + kernel/user-return-notifier.c | 46 + + lib/kernel_lock.c | 20 +- + lib/ratelimit.c | 45 +- + net/core/sysctl_net_core.c | 2 + + net/core/utils.c | 2 + + scripts/recordmcount.pl | 1 + + tools/perf/Documentation/perf-probe.txt | 48 + + tools/perf/Documentation/perf-timechart.txt | 5 +- + tools/perf/Makefile | 79 ++- + tools/perf/builtin-annotate.c | 645 +++--------- + tools/perf/builtin-probe.c | 372 +++++++ + tools/perf/builtin-record.c | 270 ++---- + tools/perf/builtin-report.c | 961 ++++-------------- + tools/perf/builtin-sched.c | 310 +++--- + tools/perf/builtin-stat.c | 31 +- + tools/perf/builtin-timechart.c | 146 +++- + tools/perf/builtin-top.c | 308 +++--- + tools/perf/builtin-trace.c | 174 +--- + tools/perf/builtin.h | 1 + + tools/perf/command-list.txt | 1 + + tools/perf/perf.c | 17 +- + tools/perf/perf.h | 6 + + tools/perf/util/PERF-VERSION-GEN | 2 +- + tools/perf/util/cache.h | 11 +- + tools/perf/util/callchain.c | 2 +- + tools/perf/util/callchain.h | 2 +- + tools/perf/util/color.h | 6 +- + tools/perf/util/data_map.c | 222 ++++ + tools/perf/util/data_map.h | 31 + + tools/perf/util/debug.c | 4 +- + tools/perf/util/debug.h | 7 +- + tools/perf/util/event.c | 177 ++++ + tools/perf/util/event.h | 33 +- + tools/perf/util/exec_cmd.h | 6 +- + tools/perf/util/header.c | 74 ++- + tools/perf/util/header.h | 29 +- + tools/perf/util/help.h | 6 +- + tools/perf/util/hist.c | 210 ++++ + tools/perf/util/hist.h | 50 + + tools/perf/util/include/asm/asm-offsets.h | 1 + + tools/perf/util/include/asm/bitops.h | 18 + + tools/perf/util/include/asm/byteorder.h | 2 + + tools/perf/util/include/asm/swab.h | 1 + + tools/perf/util/include/asm/uaccess.h | 14 + + tools/perf/util/include/linux/bitmap.h | 2 + + tools/perf/util/include/linux/bitops.h | 27 + + tools/perf/util/include/linux/compiler.h | 10 + + tools/perf/util/include/linux/ctype.h | 1 + + tools/perf/util/include/linux/kernel.h | 76 ++ + tools/perf/util/include/linux/string.h | 1 + + tools/perf/util/include/linux/types.h | 9 + + tools/perf/util/levenshtein.h | 6 +- + tools/perf/util/map.c | 26 +- + tools/perf/util/module.c | 545 ---------- + tools/perf/util/module.h | 53 - + tools/perf/util/parse-events.c | 48 +- + tools/perf/util/parse-events.h | 8 +- + tools/perf/util/parse-options.h | 6 +- + tools/perf/util/probe-finder.c | 677 ++++++++++++ + tools/perf/util/probe-finder.h | 53 + + tools/perf/util/quote.h | 6 +- + tools/perf/util/run-command.h | 6 +- + tools/perf/util/sigchain.h | 6 +- + tools/perf/util/sort.c | 290 ++++++ + tools/perf/util/sort.h | 99 ++ + tools/perf/util/strbuf.h | 6 +- + tools/perf/util/string.c | 11 + + tools/perf/util/string.h | 7 +- + tools/perf/util/strlist.h | 6 +- + tools/perf/util/svghelper.c | 2 +- + tools/perf/util/svghelper.h | 6 +- + tools/perf/util/symbol.c | 791 ++++++++++----- + tools/perf/util/symbol.h | 44 +- + tools/perf/util/thread.c | 167 ++-- + tools/perf/util/thread.h | 31 +- + tools/perf/util/trace-event-info.c | 6 +- + tools/perf/util/trace-event-parse.c | 537 ++++++++--- + tools/perf/util/trace-event-read.c | 7 +- + tools/perf/util/trace-event.h | 41 +- + tools/perf/util/types.h | 6 +- + tools/perf/util/util.h | 9 + + tools/perf/util/values.h | 6 +- + 266 files changed, 13230 insertions(+), 5296 deletions(-) + create mode 100644 Documentation/trace/kprobetrace.txt + create mode 100644 arch/x86/include/asm/inat.h + create mode 100644 arch/x86/include/asm/inat_types.h + create mode 100644 arch/x86/include/asm/insn.h + create mode 100644 arch/x86/kernel/apic/apic_noop.c + create mode 100644 arch/x86/lib/inat.c + create mode 100644 arch/x86/lib/insn.c + create mode 100644 arch/x86/lib/x86-opcode-map.txt + create mode 100644 arch/x86/tools/Makefile + create mode 100644 arch/x86/tools/distill.awk + create mode 100644 arch/x86/tools/gen-insn-attr-x86.awk + create mode 100644 arch/x86/tools/test_get_len.c + create mode 100644 include/linux/rcutiny.h + create mode 100644 include/linux/user-return-notifier.h + create mode 100644 include/trace/events/bkl.h + create mode 100644 include/trace/events/mce.h + create mode 100644 kernel/rcutiny.c + create mode 100644 kernel/trace/trace_kprobe.c + create mode 100644 kernel/user-return-notifier.c + create mode 100644 tools/perf/Documentation/perf-probe.txt + create mode 100644 tools/perf/builtin-probe.c + create mode 100644 tools/perf/util/data_map.c + create mode 100644 tools/perf/util/data_map.h + create mode 100644 tools/perf/util/event.c + create mode 100644 tools/perf/util/hist.c + create mode 100644 tools/perf/util/hist.h + create mode 100644 tools/perf/util/include/asm/asm-offsets.h + create mode 100644 tools/perf/util/include/asm/bitops.h + create mode 100644 tools/perf/util/include/asm/byteorder.h + create mode 100644 tools/perf/util/include/asm/swab.h + create mode 100644 tools/perf/util/include/asm/uaccess.h + create mode 100644 tools/perf/util/include/linux/bitmap.h + create mode 100644 tools/perf/util/include/linux/bitops.h + create mode 100644 tools/perf/util/include/linux/compiler.h + create mode 100644 tools/perf/util/include/linux/ctype.h + create mode 100644 tools/perf/util/include/linux/string.h + create mode 100644 tools/perf/util/include/linux/types.h + delete mode 100644 tools/perf/util/module.c + delete mode 100644 tools/perf/util/module.h + create mode 100644 tools/perf/util/probe-finder.c + create mode 100644 tools/perf/util/probe-finder.h + create mode 100644 tools/perf/util/sort.c + create mode 100644 tools/perf/util/sort.h +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging crypto/cryptd.c +Auto-merging kernel/module.c +Auto-merging kernel/rcutorture.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace.h +Auto-merging mm/Makefile +Removing mm/allocpercpu.c +Merge made by recursive. + arch/ia64/Kconfig | 3 - + arch/ia64/include/asm/meminit.h | 2 +- + arch/ia64/include/asm/pgtable.h | 3 +- + arch/ia64/kernel/acpi.c | 33 ++-- + arch/ia64/kernel/setup.c | 23 +-- + arch/ia64/kernel/vmlinux.lds.S | 11 +- + arch/ia64/mm/contig.c | 99 ++++++-- + arch/ia64/mm/discontig.c | 124 +++++++++- + arch/ia64/mm/init.c | 4 +- + arch/sparc/kernel/nmi.c | 8 +- + arch/x86/include/asm/percpu.h | 78 ++++++ + arch/x86/kernel/apic/nmi.c | 8 +- + crypto/cryptd.c | 2 +- + drivers/dma/dmaengine.c | 36 +-- + drivers/infiniband/hw/ehca/ehca_irq.c | 3 +- + drivers/net/chelsio/sge.c | 5 +- + drivers/net/loopback.c | 2 +- + drivers/net/veth.c | 7 +- + fs/ext4/mballoc.c | 2 +- + fs/nfs/iostat.h | 24 +-- + fs/xfs/xfs_mount.c | 12 +- + include/asm-generic/percpu.h | 5 + + include/linux/percpu.h | 424 +++++++++++++++++++++++++++++++-- + include/linux/vmstat.h | 10 +- + include/net/neighbour.h | 7 +- + include/net/netfilter/nf_conntrack.h | 4 +- + include/net/snmp.h | 50 ++--- + kernel/module.c | 150 ------------ + kernel/rcutorture.c | 8 +- + kernel/trace/trace.c | 8 +- + kernel/trace/trace.h | 2 +- + kernel/trace/trace_functions_graph.c | 4 +- + mm/Makefile | 4 - + mm/allocpercpu.c | 177 -------------- + mm/percpu.c | 2 - + 35 files changed, 779 insertions(+), 565 deletions(-) + delete mode 100644 mm/allocpercpu.c +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Merge made by recursive. + lib/checksum.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Merge made by recursive. + drivers/misc/hpilo.h | 13 ++++++++++++- + fs/sysfs/inode.c | 3 ++- + 2 files changed, 14 insertions(+), 2 deletions(-) +Merging quilt/tty +$ git merge quilt/tty +Removing Documentation/serial/hayes-esp.txt +Removing drivers/char/esp.c +Auto-merging include/linux/Kbuild +Removing include/linux/hayesesp.h +Merge made by recursive. + Documentation/serial/hayes-esp.txt | 154 -- + arch/xtensa/platforms/iss/console.c | 2 +- + drivers/char/Kconfig | 13 - + drivers/char/Makefile | 1 - + drivers/char/bfin_jtag_comm.c | 2 +- + drivers/char/epca.c | 2 +- + drivers/char/esp.c | 2533 ---------------------------------- + drivers/char/istallion.c | 8 +- + drivers/char/pcmcia/ipwireless/tty.c | 2 +- + drivers/char/stallion.c | 13 +- + drivers/char/tty_port.c | 51 +- + drivers/serial/8250.c | 16 +- + drivers/serial/jsm/jsm.h | 8 - + drivers/serial/jsm/jsm_driver.c | 48 +- + drivers/serial/jsm/jsm_neo.c | 8 - + drivers/serial/jsm/jsm_tty.c | 6 +- + drivers/serial/serial_core.c | 33 +- + drivers/usb/serial/opticon.c | 7 +- + drivers/usb/serial/usb-serial.c | 83 +- + include/linux/Kbuild | 1 - + include/linux/hayesesp.h | 114 -- + include/linux/tty.h | 10 +- + include/linux/usb/serial.h | 3 - + 23 files changed, 174 insertions(+), 2944 deletions(-) + delete mode 100644 Documentation/serial/hayes-esp.txt + delete mode 100644 drivers/char/esp.c + delete mode 100644 include/linux/hayesesp.h +Merging quilt/usb +$ git merge quilt/usb +Auto-merging drivers/usb/host/ehci-hcd.c +Merge made by recursive. + .../ABI/testing/sysfs-class-uwb_rc-wusbhc | 13 + + Documentation/powerpc/dts-bindings/xilinx.txt | 11 + + drivers/usb/Makefile | 2 + + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/core/generic.c | 2 +- + drivers/usb/core/hub.c | 9 +- + drivers/usb/core/message.c | 8 +- + drivers/usb/core/urb.c | 22 +- + drivers/usb/gadget/at91_udc.c | 6 +- + drivers/usb/gadget/audio.c | 115 --- + drivers/usb/gadget/composite.c | 54 ++- + drivers/usb/gadget/f_audio.c | 76 ++- + drivers/usb/host/Kconfig | 15 +- + drivers/usb/host/ehci-hcd.c | 10 + + drivers/usb/host/ehci-hub.c | 2 +- + drivers/usb/host/ehci-omap.c | 755 ++++++++++++++++++++ + drivers/usb/host/ehci-xilinx-of.c | 300 ++++++++ + drivers/usb/host/ohci-at91.c | 10 +- + drivers/usb/host/ohci-pnx4008.c | 8 +- + drivers/usb/host/whci/debug.c | 20 +- + drivers/usb/host/whci/hcd.c | 1 + + drivers/usb/host/whci/qset.c | 350 ++++++++- + drivers/usb/host/whci/whcd.h | 9 + + drivers/usb/host/whci/whci-hc.h | 14 +- + drivers/usb/host/xhci-pci.c | 2 + + drivers/usb/otg/Kconfig | 9 + + drivers/usb/otg/Makefile | 1 + + drivers/usb/otg/ulpi.c | 136 ++++ + drivers/usb/serial/ftdi_sio.c | 18 +- + drivers/usb/storage/scsiglue.c | 3 +- + drivers/usb/storage/usb.c | 25 +- + drivers/usb/storage/usb.h | 1 + + drivers/usb/usb-skeleton.c | 4 +- + drivers/usb/wusbcore/wusbhc.c | 32 + + drivers/usb/wusbcore/wusbhc.h | 1 + + include/linux/usb.h | 1 + + include/linux/usb/composite.h | 1 + + include/linux/usb/otg.h | 68 ++- + include/linux/usb/ulpi.h | 7 + + 39 files changed, 1908 insertions(+), 217 deletions(-) + create mode 100644 drivers/usb/host/ehci-omap.c + create mode 100644 drivers/usb/host/ehci-xilinx-of.c + create mode 100644 drivers/usb/otg/ulpi.c + create mode 100644 include/linux/usb/ulpi.h +Merging quilt/staging +$ git merge quilt/staging +Auto-merging drivers/net/wireless/Kconfig +CONFLICT (content): Merge conflict in drivers/net/wireless/Kconfig +Removing drivers/staging/android/Kconfig +Removing drivers/staging/android/Makefile +Removing drivers/staging/android/TODO +Removing drivers/staging/android/binder.c +Removing drivers/staging/android/binder.h +Removing drivers/staging/android/logger.c +Removing drivers/staging/android/logger.h +Removing drivers/staging/android/lowmemorykiller.c +Removing drivers/staging/android/ram_console.c +Removing drivers/staging/android/timed_gpio.c +Removing drivers/staging/android/timed_gpio.h +Removing drivers/staging/android/timed_output.c +Removing drivers/staging/android/timed_output.h +Auto-merging drivers/staging/iio/ring_sw.h +Removing drivers/staging/rt2860/2860_main_dev.c +Removing drivers/staging/rt2860/aironet.h +Removing drivers/staging/rt2860/common/2860_rtmp_init.c +Removing drivers/staging/rt2860/common/md5.c +Removing drivers/staging/rt2860/common/rtmp_tkip.c +Removing drivers/staging/rt2860/common/rtmp_wep.c +Removing drivers/staging/rt2860/config.mk +Removing drivers/staging/rt2860/md5.h +Removing drivers/staging/rt2860/rt2860.h +Removing drivers/staging/rt2860/sta/aironet.c +Removing drivers/staging/rt2870/2870_main_dev.c +Removing drivers/staging/rt2870/common/2870_rtmp_init.c +Removing drivers/staging/rt2870/rt2870.h +Removing drivers/staging/rt3090/Kconfig +Removing drivers/staging/rt3090/Makefile +Removing drivers/staging/rt3090/action.h +Removing drivers/staging/rt3090/ap.h +Removing drivers/staging/rt3090/ap_apcli.h +Removing drivers/staging/rt3090/ap_autoChSel.h +Removing drivers/staging/rt3090/ap_autoChSel_cmm.h +Removing drivers/staging/rt3090/ap_cfg.h +Removing drivers/staging/rt3090/ap_ids.h +Removing drivers/staging/rt3090/ap_mbss.h +Removing drivers/staging/rt3090/ap_uapsd.h +Removing drivers/staging/rt3090/ap_wds.h +Removing drivers/staging/rt3090/chips/rt3370.c +Removing drivers/staging/rt3090/chips/rt3390.c +Removing drivers/staging/rt3090/chips/rt33xx.c +Removing drivers/staging/rt3090/chlist.h +Removing drivers/staging/rt3090/common/action.c +Removing drivers/staging/rt3090/common/ba_action.c +Removing drivers/staging/rt3090/common/cmm_data.c +Removing drivers/staging/rt3090/common/cmm_info.c +Removing drivers/staging/rt3090/common/cmm_sanity.c +Removing drivers/staging/rt3090/common/cmm_sync.c +Removing drivers/staging/rt3090/common/cmm_wpa.c +Removing drivers/staging/rt3090/common/crypt_aes.c +Removing drivers/staging/rt3090/common/crypt_biginteger.c +Removing drivers/staging/rt3090/common/crypt_dh.c +Removing drivers/staging/rt3090/common/dfs.c +Removing drivers/staging/rt3090/common/eeprom.c +Removing drivers/staging/rt3090/common/igmp_snoop.c +Removing drivers/staging/rt3090/common/mlme.c +Removing drivers/staging/rt3090/common/mlme_ex.c +Removing drivers/staging/rt3090/common/netif_block.c +Removing drivers/staging/rt3090/common/rtmp_init.c +Removing drivers/staging/rt3090/common/rtmp_mcu.c +Removing drivers/staging/rt3090/common/spectrum.c +Removing drivers/staging/rt3090/config.mk +Removing drivers/staging/rt3090/dfs.h +Removing drivers/staging/rt3090/igmp_snoop.h +Removing drivers/staging/rt3090/ipv6.h +Removing drivers/staging/rt3090/link_list.h +Removing drivers/staging/rt3090/mlme.h +Removing drivers/staging/rt3090/mlme_ex.h +Removing drivers/staging/rt3090/mlme_ex_def.h +Removing drivers/staging/rt3090/oid.h +Removing drivers/staging/rt3090/rt3390.h +Removing drivers/staging/rt3090/rt_ate.c +Removing drivers/staging/rt3090/rt_ate.h +Removing drivers/staging/rt3090/rt_config.h +Removing drivers/staging/rt3090/rt_linux.c +Removing drivers/staging/rt3090/rt_linux.h +Removing drivers/staging/rt3090/rt_main_dev.c +Removing drivers/staging/rt3090/rt_profile.c +Removing drivers/staging/rt3090/rtmp.h +Removing drivers/staging/rt3090/rtmp_def.h +Removing drivers/staging/rt3090/rtmp_mac.h +Removing drivers/staging/rt3090/rtmp_type.h +Removing drivers/staging/rt3090/spectrum.h +Removing drivers/staging/rt3090/spectrum_def.h +Removing drivers/staging/rt3090/sta/assoc.c +Removing drivers/staging/rt3090/sta/auth.c +Removing drivers/staging/rt3090/sta/auth_rsp.c +Removing driResolved 'drivers/net/wireless/Kconfig' using previous resolution. +vers/staging/rt3090/sta/connect.c +Removing drivers/staging/rt3090/sta/dls.c +Removing drivers/staging/rt3090/sta/rtmp_ckipmic.c +Removing drivers/staging/rt3090/sta/rtmp_data.c +Removing drivers/staging/rt3090/sta/sanity.c +Removing drivers/staging/rt3090/sta/sync.c +Removing drivers/staging/rt3090/sta/wpa.c +Removing drivers/staging/rt3090/sta_ioctl.c +Removing drivers/staging/rt3090/vr_ikans.h +Removing drivers/staging/rt3090/wpa.h +Removing drivers/staging/stlc45xx/Kconfig +Removing drivers/staging/stlc45xx/Makefile +Removing drivers/staging/stlc45xx/stlc45xx.c +Removing drivers/staging/stlc45xx/stlc45xx.h +Removing drivers/staging/stlc45xx/stlc45xx_lmac.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fbae063] Merge branch 'quilt/staging' +$ git diff -M --stat --summary HEAD^.. + drivers/net/wireless/Kconfig | 143 +- + drivers/net/wireless/Makefile | 10 - + drivers/staging/Kconfig | 20 +- + drivers/staging/Makefile | 13 +- + drivers/staging/android/Kconfig | 95 - + drivers/staging/android/Makefile | 6 - + drivers/staging/android/TODO | 10 - + drivers/staging/android/binder.c | 3767 ---------- + drivers/staging/android/binder.h | 330 - + drivers/staging/android/logger.c | 607 -- + drivers/staging/android/logger.h | 48 - + drivers/staging/android/lowmemorykiller.c | 173 - + drivers/staging/android/ram_console.c | 410 -- + drivers/staging/android/timed_gpio.c | 166 - + drivers/staging/android/timed_gpio.h | 33 - + drivers/staging/android/timed_output.c | 121 - + drivers/staging/android/timed_output.h | 37 - + drivers/staging/arlan/Kconfig | 15 + + drivers/staging/arlan/Makefile | 3 + + drivers/staging/arlan/TODO | 7 + + .../{net/wireless => staging/arlan}/arlan-main.c | 82 +- + .../{net/wireless => staging/arlan}/arlan-proc.c | 10 +- + drivers/{net/wireless => staging/arlan}/arlan.h | 36 +- + drivers/staging/b3dfg/b3dfg.c | 12 - + drivers/staging/comedi/comedi.h | 8 - + drivers/staging/comedi/comedi_compat32.c | 149 +- + drivers/staging/comedi/comedi_compat32.h | 16 +- + drivers/staging/comedi/comedi_fops.c | 15 - + drivers/staging/comedi/comedidev.h | 60 +- + drivers/staging/comedi/drivers.c | 2 +- + drivers/staging/comedi/drivers/8253.h | 3 +- + drivers/staging/comedi/drivers/8255.c | 23 +- + drivers/staging/comedi/drivers/acl7225b.c | 9 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 3 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 5 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 53 +- + drivers/staging/comedi/drivers/adl_pci7296.c | 19 +- + drivers/staging/comedi/drivers/adl_pci7432.c | 32 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 37 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 18 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 2 +- + drivers/staging/comedi/drivers/dmm32at.c | 2 +- + drivers/staging/comedi/drivers/dt2814.c | 2 +- + drivers/staging/comedi/drivers/dt282x.c | 4 +- + drivers/staging/comedi/drivers/mite.c | 231 +- + drivers/staging/comedi/drivers/mite.h | 7 - + drivers/staging/comedi/drivers/multiq3.c | 25 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 6 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 90 +- + drivers/staging/comedi/drivers/ni_labpc.h | 52 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 18 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 15 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- + drivers/staging/comedi/drivers/pcl726.c | 41 +- + drivers/staging/comedi/drivers/pcm_common.c | 4 +- + drivers/staging/comedi/drivers/pcmmio.c | 231 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/comedi/drivers/rtd520.c | 2 +- + drivers/staging/comedi/drivers/s626.c | 2 +- + drivers/staging/comedi/drivers/s626.h | 8 - + drivers/staging/comedi/drivers/serial2002.c | 9 +- + drivers/staging/comedi/drivers/skel.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 4 +- + drivers/staging/comedi/drivers/vmk80xx.c | 24 +- + drivers/staging/cx25821/cx25821-core.c | 4 +- + drivers/staging/dream/Kconfig | 4 + + drivers/staging/dream/camera/msm_camera.c | 7 +- + drivers/staging/dream/camera/msm_vfe7x.c | 1 + + drivers/staging/dream/gpio_event.c | 3 +- + drivers/staging/dream/gpio_input.c | 7 - + drivers/staging/dream/gpio_matrix.c | 8 - + drivers/staging/dream/qdsp5/adsp.c | 5 - + drivers/staging/dream/qdsp5/audio_out.c | 4 - + drivers/staging/dream/smd/smd_qmi.c | 5 - + drivers/staging/dream/smd/smd_rpcrouter.c | 12 - + drivers/staging/dream/smd/smd_rpcrouter.h | 2 - + drivers/staging/dream/smd/smd_tty.c | 5 - + drivers/staging/dream/synaptics_i2c_rmi.c | 6 + + drivers/staging/et131x/et1310_address_map.h | 343 +- + drivers/staging/et131x/et1310_eeprom.c | 436 +- + drivers/staging/et131x/et1310_eeprom.h | 42 +- + drivers/staging/et131x/et1310_mac.c | 102 +- + drivers/staging/et131x/et1310_phy.c | 1167 ++-- + drivers/staging/et131x/et1310_phy.h | 35 +- + drivers/staging/et131x/et1310_rx.c | 539 +- + drivers/staging/et131x/et1310_rx.h | 50 +- + drivers/staging/et131x/et1310_tx.c | 620 +- + drivers/staging/et131x/et1310_tx.h | 218 +- + drivers/staging/et131x/et131x_adapter.h | 13 +- + drivers/staging/et131x/et131x_defs.h | 1 - + drivers/staging/et131x/et131x_initpci.c | 596 +- + drivers/staging/et131x/et131x_initpci.h | 2 +- + drivers/staging/et131x/et131x_isr.c | 16 +- + drivers/staging/et131x/et131x_netdev.c | 31 +- + drivers/staging/iio/Kconfig | 10 +- + drivers/staging/iio/chrdev.h | 4 +- + drivers/staging/iio/iio.h | 36 +- + drivers/staging/iio/ring_generic.h | 73 +- + drivers/staging/iio/ring_sw.h | 68 +- + drivers/staging/iio/sysfs.h | 114 +- + drivers/staging/iio/trigger.h | 35 +- + drivers/staging/iio/trigger/Kconfig | 6 +- + drivers/staging/iio/trigger_consumer.h | 8 +- + drivers/staging/line6/driver.c | 103 +- + drivers/staging/netwave/Kconfig | 10 + + drivers/staging/netwave/Makefile | 1 + + drivers/staging/netwave/TODO | 7 + + .../{net/wireless => staging/netwave}/netwave_cs.c | 252 +- + drivers/staging/octeon/ethernet-rgmii.c | 4 +- + drivers/staging/p9auth/p9auth.c | 3 +- + drivers/staging/phison/phison.c | 4 +- + drivers/staging/poch/README | 124 +- + drivers/staging/poch/poch.c | 198 +- + drivers/staging/poch/poch.h | 16 +- + drivers/staging/ramzswap/Kconfig | 21 + + drivers/staging/ramzswap/Makefile | 3 + + drivers/staging/ramzswap/TODO | 6 + + drivers/staging/ramzswap/ramzswap.txt | 51 + + drivers/staging/ramzswap/ramzswap_drv.c | 1435 ++++ + drivers/staging/ramzswap/ramzswap_drv.h | 171 + + drivers/staging/ramzswap/ramzswap_ioctl.h | 49 + + drivers/staging/ramzswap/xvmalloc.c | 507 ++ + drivers/staging/ramzswap/xvmalloc.h | 30 + + drivers/staging/ramzswap/xvmalloc_int.h | 86 + + drivers/staging/rt2860/2860_main_dev.c | 1319 ---- + drivers/staging/rt2860/Kconfig | 5 +- + drivers/staging/rt2860/Makefile | 31 +- + drivers/staging/rt2860/aironet.h | 210 - + drivers/staging/rt2860/ap.h | 12 +- + drivers/staging/{rt3090 => rt2860/chip}/mac_pci.h | 87 +- + drivers/staging/rt2860/chip/mac_usb.h | 365 + + .../{rt3090/netif_block.h => rt2860/chip/rt2860.h} | 44 +- + .../{rt3090/rt33xx.h => rt2860/chip/rt2870.h} | 31 +- + .../{rt3090/rt3370.h => rt2860/chip/rt3070.h} | 20 +- + drivers/staging/{rt3090 => rt2860/chip}/rt3090.h | 5 - + drivers/staging/{rt3090 => rt2860/chip}/rt30xx.h | 0 + .../staging/rt2860/{rt28xx.h => chip/rtmp_mac.h} | 952 +-- + drivers/staging/{rt3090 => rt2860/chip}/rtmp_phy.h | 77 +- + drivers/staging/rt2860/chips/rt3070.c | 185 + + drivers/staging/{rt3090 => rt2860}/chips/rt3090.c | 0 + drivers/staging/{rt3090 => rt2860}/chips/rt30xx.c | 12 + + drivers/staging/rt2860/chlist.h | 1223 +--- + drivers/staging/rt2860/common/2860_rtmp_init.c | 897 --- + drivers/staging/rt2860/common/action.c | 12 +- + drivers/staging/rt2860/common/ba_action.c | 147 +- + .../staging/{rt3090 => rt2860}/common/cmm_aes.c | 158 +- + .../staging/{rt3090 => rt2860}/common/cmm_asic.c | 393 +- + .../staging/{rt3090 => rt2860}/common/cmm_cfg.c | 9 +- + drivers/staging/rt2860/common/cmm_data.c | 906 +-- + .../{rt3090 => rt2860}/common/cmm_data_pci.c | 459 +-- + .../common/cmm_data_usb.c} | 256 +- + drivers/staging/rt2860/common/cmm_info.c | 820 ++- + .../{rt3090 => rt2860}/common/cmm_mac_pci.c | 146 +- + drivers/staging/rt2860/common/cmm_mac_usb.c | 1216 ++++ + .../{rt3090 => rt2860}/common/cmm_profile.c | 558 +-- + drivers/staging/rt2860/common/cmm_sanity.c | 233 +- + drivers/staging/rt2860/common/cmm_sync.c | 57 +- + .../staging/{rt3090 => rt2860}/common/cmm_tkip.c | 86 +- + .../staging/{rt3090 => rt2860}/common/cmm_wep.c | 3 +- + drivers/staging/rt2860/common/cmm_wpa.c | 2428 ++++++- + .../staging/{rt3090 => rt2860}/common/crypt_hmac.c | 16 +- + .../staging/{rt3090 => rt2860}/common/crypt_md5.c | 1 - + .../staging/{rt3090 => rt2860}/common/crypt_sha2.c | 7 +- + drivers/staging/rt2860/common/dfs.c | 360 - + .../staging/{rt3090 => rt2860}/common/ee_efuse.c | 33 +- + .../staging/{rt3090 => rt2860}/common/ee_prom.c | 44 +- + drivers/staging/rt2860/common/eeprom.c | 1460 +---- + drivers/staging/rt2860/common/firmware.h | 2 +- + drivers/staging/rt2860/common/firmware_3070.h | 517 ++ + drivers/staging/rt2860/common/md5.c | 1415 ---- + drivers/staging/rt2860/common/mlme.c | 5182 ++++---------- + .../staging/{rt3090 => rt2860}/common/rt_channel.c | 7 - + drivers/staging/{rt3090 => rt2860}/common/rt_rf.c | 23 +- + drivers/staging/rt2860/common/rtmp_init.c | 2028 +++--- + drivers/staging/rt2860/common/rtmp_mcu.c | 311 + + .../staging/{rt3090 => rt2860}/common/rtmp_timer.c | 18 +- + drivers/staging/rt2860/common/rtmp_tkip.c | 1586 ---- + drivers/staging/rt2860/common/rtmp_wep.c | 497 -- + drivers/staging/rt2860/common/spectrum.c | 460 +- + drivers/staging/rt2860/config.mk | 241 - + drivers/staging/{rt3090 => rt2860}/crypt_hmac.h | 13 +- + drivers/staging/{rt3090 => rt2860}/crypt_md5.h | 12 +- + drivers/staging/{rt3090 => rt2860}/crypt_sha2.h | 14 +- + drivers/staging/rt2860/dfs.h | 47 - + drivers/staging/{rt3090 => rt2860}/eeprom.h | 31 +- + .../staging/{rt3090 => rt2860/iface}/rtmp_pci.h | 51 +- + drivers/staging/rt2860/iface/rtmp_usb.h | 200 + + drivers/staging/rt2860/md5.h | 107 - + drivers/staging/rt2860/mlme.h | 89 +- + drivers/staging/rt2860/oid.h | 135 +- + drivers/staging/{rt3090 => rt2860}/pci_main_dev.c | 161 +- + drivers/staging/rt2860/rt2860.h | 333 - + drivers/staging/rt2860/rt_config.h | 32 +- + drivers/staging/rt2860/rt_linux.c | 618 ++- + drivers/staging/rt2860/rt_linux.h | 973 ++-- + drivers/staging/rt2860/rt_main_dev.c | 747 +-- + drivers/staging/{rt3090 => rt2860}/rt_pci_rbus.c | 124 +- + drivers/staging/rt2860/rt_profile.c | 1839 +----- + drivers/staging/rt2860/rt_usb.c | 828 +++ + drivers/staging/rt2860/rtmp.h | 2905 +++----- + drivers/staging/{rt3090 => rt2860}/rtmp_chip.h | 107 +- + drivers/staging/rt2860/rtmp_def.h | 294 +- + drivers/staging/{rt3090 => rt2860}/rtmp_dot11.h | 44 - + drivers/staging/{rt3090 => rt2860}/rtmp_iface.h | 7 +- + drivers/staging/{rt3090 => rt2860}/rtmp_mcu.h | 0 + drivers/staging/{rt3090 => rt2860}/rtmp_os.h | 5 + + drivers/staging/{rt3090 => rt2860}/rtmp_timer.h | 18 +- + drivers/staging/rt2860/rtmp_type.h | 55 +- + drivers/staging/rt2860/rtusb_io.h | 189 + + drivers/staging/rt2860/spectrum.h | 169 +- + drivers/staging/rt2860/spectrum_def.h | 148 +- + drivers/staging/rt2860/sta/aironet.c | 1312 ---- + drivers/staging/rt2860/sta/assoc.c | 315 +- + drivers/staging/rt2860/sta/auth.c | 138 +- + drivers/staging/rt2860/sta/auth_rsp.c | 12 +- + drivers/staging/rt2860/sta/connect.c | 485 +- + drivers/staging/rt2860/sta/rtmp_data.c | 258 +- + drivers/staging/rt2860/sta/sanity.c | 44 +- + drivers/staging/rt2860/sta/sync.c | 416 +- + drivers/staging/rt2860/sta/wpa.c | 1944 +----- + drivers/staging/rt2860/sta_ioctl.c | 768 ++- + drivers/staging/rt2860/usb_main_dev.c | 897 +++ + drivers/staging/rt2860/wpa.h | 97 +- + drivers/staging/rt2870/2870_main_dev.c | 1530 ---- + drivers/staging/rt2870/Makefile | 32 +- + drivers/staging/rt2870/chips/rt3070.c | 1 + + drivers/staging/rt2870/chips/rt30xx.c | 1 + + drivers/staging/rt2870/common/2870_rtmp_init.c | 1730 ----- + drivers/staging/rt2870/common/acction.c | 1 + + drivers/staging/rt2870/common/cmm_aes.c | 1 + + drivers/staging/rt2870/common/cmm_asic.c | 1 + + drivers/staging/rt2870/common/cmm_cfg.c | 1 + + drivers/staging/rt2870/common/cmm_data_usb.c | 1 + + drivers/staging/rt2870/common/cmm_mac_usb.c | 1 + + drivers/staging/rt2870/common/cmm_profile.c | 1 + + drivers/staging/rt2870/common/cmm_tkip.c | 1 + + drivers/staging/rt2870/common/cmm_wep.c | 1 + + drivers/staging/rt2870/common/crypt_hmac.c | 1 + + drivers/staging/rt2870/common/crypt_md5.c | 1 + + drivers/staging/rt2870/common/crypt_sha2.c | 1 + + drivers/staging/rt2870/common/ee_efuse.c | 1 + + drivers/staging/rt2870/common/rt_channel.c | 1 + + drivers/staging/rt2870/common/rt_rf.c | 1 + + drivers/staging/rt2870/common/rtmp_mcu.c | 1 + + drivers/staging/rt2870/common/rtmp_timer.c | 1 + + drivers/staging/rt2870/common/rtusb_bulk.c | 37 +- + drivers/staging/rt2870/common/rtusb_data.c | 55 + + drivers/staging/rt2870/common/rtusb_io.c | 465 +- + drivers/staging/rt2870/rt2870.h | 583 -- + drivers/staging/rt2870/rt_usb.c | 1 + + drivers/staging/rt2870/usb_main_dev.c | 1 + + drivers/staging/rt3070/firmware.h | 2 +- + drivers/staging/rt3090/Kconfig | 5 - + drivers/staging/rt3090/Makefile | 80 - + drivers/staging/rt3090/action.h | 66 - + drivers/staging/rt3090/ap.h | 512 -- + drivers/staging/rt3090/ap_apcli.h | 276 - + drivers/staging/rt3090/ap_autoChSel.h | 79 - + drivers/staging/rt3090/ap_autoChSel_cmm.h | 66 - + drivers/staging/rt3090/ap_cfg.h | 118 - + drivers/staging/rt3090/ap_ids.h | 82 - + drivers/staging/rt3090/ap_mbss.h | 72 - + drivers/staging/rt3090/ap_uapsd.h | 636 -- + drivers/staging/rt3090/ap_wds.h | 212 - + drivers/staging/rt3090/chips/rt3370.c | 121 - + drivers/staging/rt3090/chips/rt3390.c | 122 - + drivers/staging/rt3090/chips/rt33xx.c | 536 -- + drivers/staging/rt3090/chlist.h | 130 - + drivers/staging/rt3090/common/action.c | 1057 --- + drivers/staging/rt3090/common/ba_action.c | 1779 ----- + drivers/staging/rt3090/common/cmm_data.c | 2763 ------- + drivers/staging/rt3090/common/cmm_info.c | 3718 ---------- + drivers/staging/rt3090/common/cmm_sanity.c | 1718 ----- + drivers/staging/rt3090/common/cmm_sync.c | 734 -- + drivers/staging/rt3090/common/cmm_wpa.c | 3149 -------- + drivers/staging/rt3090/common/crypt_aes.c | 1007 --- + drivers/staging/rt3090/common/crypt_biginteger.c | 1119 --- + drivers/staging/rt3090/common/crypt_dh.c | 234 - + drivers/staging/rt3090/common/dfs.c | 481 -- + drivers/staging/rt3090/common/eeprom.c | 98 - + drivers/staging/rt3090/common/igmp_snoop.c | 1365 ---- + drivers/staging/rt3090/common/mlme.c | 6550 ----------------- + drivers/staging/rt3090/common/mlme_ex.c | 215 - + drivers/staging/rt3090/common/netif_block.c | 147 - + drivers/staging/rt3090/common/rtmp_init.c | 3882 ---------- + drivers/staging/rt3090/common/rtmp_mcu.c | 560 -- + drivers/staging/rt3090/common/spectrum.c | 2221 ------ + drivers/staging/rt3090/config.mk | 187 - + drivers/staging/rt3090/dfs.h | 137 - + drivers/staging/rt3090/firmware.h | 2 +- + drivers/staging/rt3090/igmp_snoop.h | 152 - + drivers/staging/rt3090/ipv6.h | 215 - + drivers/staging/rt3090/link_list.h | 133 - + drivers/staging/rt3090/mlme.h | 1360 ---- + drivers/staging/rt3090/mlme_ex.h | 83 - + drivers/staging/rt3090/mlme_ex_def.h | 53 - + drivers/staging/rt3090/oid.h | 1144 --- + drivers/staging/rt3090/rt3390.h | 77 - + drivers/staging/rt3090/rt_ate.c | 6089 ---------------- + drivers/staging/rt3090/rt_ate.h | 314 - + drivers/staging/rt3090/rt_config.h | 126 - + drivers/staging/rt3090/rt_linux.c | 1624 ----- + drivers/staging/rt3090/rt_linux.h | 1034 --- + drivers/staging/rt3090/rt_main_dev.c | 897 --- + drivers/staging/rt3090/rt_profile.c | 101 - + drivers/staging/rt3090/rtmp.h | 6873 ------------------ + drivers/staging/rt3090/rtmp_def.h | 1650 ----- + drivers/staging/rt3090/rtmp_mac.h | 2304 ------ + drivers/staging/rt3090/rtmp_type.h | 147 - + drivers/staging/rt3090/spectrum.h | 234 - + drivers/staging/rt3090/spectrum_def.h | 257 - + drivers/staging/rt3090/sta/assoc.c | 1673 ----- + drivers/staging/rt3090/sta/auth.c | 491 -- + drivers/staging/rt3090/sta/auth_rsp.c | 151 - + drivers/staging/rt3090/sta/connect.c | 2759 ------- + drivers/staging/rt3090/sta/dls.c | 2207 ------ + drivers/staging/rt3090/sta/rtmp_ckipmic.c | 579 -- + drivers/staging/rt3090/sta/rtmp_data.c | 2661 ------- + drivers/staging/rt3090/sta/sanity.c | 382 - + drivers/staging/rt3090/sta/sync.c | 1840 ----- + drivers/staging/rt3090/sta/wpa.c | 396 - + drivers/staging/rt3090/sta_ioctl.c | 7557 -------------------- + drivers/staging/rt3090/vr_ikans.h | 71 - + drivers/staging/rt3090/wpa.h | 447 -- + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 1 - + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 1 - + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 1 - + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 1 - + drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 1 - + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 1 - + drivers/staging/slicoss/slicoss.c | 1 - + drivers/staging/stlc45xx/Kconfig | 8 - + drivers/staging/stlc45xx/Makefile | 1 - + drivers/staging/stlc45xx/stlc45xx.c | 2594 ------- + drivers/staging/stlc45xx/stlc45xx.h | 283 - + drivers/staging/stlc45xx/stlc45xx_lmac.h | 434 -- + drivers/staging/strip/Kconfig | 22 + + drivers/staging/strip/Makefile | 1 + + drivers/staging/strip/TODO | 7 + + drivers/{net/wireless => staging/strip}/strip.c | 54 +- + drivers/staging/vme/bridges/vme_ca91cx42.c | 1 - + drivers/staging/vme/bridges/vme_tsi148.c | 1 - + drivers/staging/vme/devices/vme_user.c | 1 - + drivers/staging/vme/vme.c | 1 - + drivers/staging/vt6655/wroute.c | 2 +- + drivers/staging/vt6656/device.h | 2 +- + drivers/staging/vt6656/rxtx.c | 2 +- + drivers/staging/wavelan/Kconfig | 34 + + drivers/staging/wavelan/Makefile | 2 + + drivers/staging/wavelan/TODO | 7 + + drivers/{net/wireless => staging/wavelan}/i82593.h | 0 + .../{net/wireless => staging/wavelan}/wavelan.c | 62 +- + .../{net/wireless => staging/wavelan}/wavelan.h | 0 + .../{net/wireless => staging/wavelan}/wavelan.p.h | 2 +- + .../{net/wireless => staging/wavelan}/wavelan_cs.c | 174 +- + .../{net/wireless => staging/wavelan}/wavelan_cs.h | 4 +- + .../wireless => staging/wavelan}/wavelan_cs.p.h | 6 +- + drivers/staging/wlags49_h2/Kconfig | 8 + + drivers/staging/wlags49_h2/Makefile | 81 + + drivers/staging/wlags49_h2/README.ubuntu | 180 + + drivers/staging/wlags49_h2/README.wlags49 | 641 ++ + drivers/staging/wlags49_h2/WARNING.txt | 3 + + drivers/staging/wlags49_h2/ap_h2.c | 3337 +++++++++ + drivers/staging/wlags49_h2/ap_h25.c | 4094 +++++++++++ + drivers/staging/wlags49_h2/debug.h | 229 + + drivers/staging/wlags49_h2/dhf.c | 390 + + drivers/staging/wlags49_h2/dhf.h | 226 + + drivers/staging/wlags49_h2/dhfcfg.h | 175 + + drivers/staging/wlags49_h2/hcf.c | 4881 +++++++++++++ + drivers/staging/wlags49_h2/hcf.h | 405 ++ + drivers/staging/wlags49_h2/hcfcfg.h | 2344 ++++++ + drivers/staging/wlags49_h2/hcfdef.h | 809 +++ + drivers/staging/wlags49_h2/man/wlags49.4 | 734 ++ + drivers/staging/wlags49_h2/mdd.h | 1156 +++ + drivers/staging/wlags49_h2/mmd.c | 251 + + drivers/staging/wlags49_h2/mmd.h | 78 + + drivers/staging/wlags49_h2/sta_h2.c | 4480 ++++++++++++ + drivers/staging/wlags49_h2/sta_h25.c | 5255 ++++++++++++++ + drivers/staging/wlags49_h2/wl_cs.c | 715 ++ + drivers/staging/wlags49_h2/wl_cs.h | 112 + + drivers/staging/wlags49_h2/wl_enc.c | 248 + + drivers/staging/wlags49_h2/wl_enc.h | 135 + + drivers/staging/wlags49_h2/wl_if.h | 232 + + drivers/staging/wlags49_h2/wl_internal.h | 1073 +++ + drivers/staging/wlags49_h2/wl_main.c | 3878 ++++++++++ + drivers/staging/wlags49_h2/wl_main.h | 155 + + drivers/staging/wlags49_h2/wl_netdev.c | 2085 ++++++ + drivers/staging/wlags49_h2/wl_netdev.h | 171 + + drivers/staging/wlags49_h2/wl_pci.c | 1596 +++++ + drivers/staging/wlags49_h2/wl_pci.h | 126 + + drivers/staging/wlags49_h2/wl_priv.c | 2095 ++++++ + drivers/staging/wlags49_h2/wl_priv.h | 138 + + drivers/staging/wlags49_h2/wl_profile.c | 1128 +++ + drivers/staging/wlags49_h2/wl_profile.h | 104 + + drivers/staging/wlags49_h2/wl_sysfs.c | 135 + + drivers/staging/wlags49_h2/wl_sysfs.h | 7 + + drivers/staging/wlags49_h2/wl_util.c | 1604 +++++ + drivers/staging/wlags49_h2/wl_util.h | 119 + + drivers/staging/wlags49_h2/wl_version.h | 193 + + drivers/staging/wlags49_h2/wl_wext.c | 4138 +++++++++++ + drivers/staging/wlags49_h2/wl_wext.h | 113 + + drivers/staging/wlags49_h25/Kconfig | 8 + + drivers/staging/wlags49_h25/Makefile | 81 + + drivers/staging/wlags49_h25/README.txt | 30 + + drivers/staging/wlags49_h25/ap_h25.c | 2 + + drivers/staging/wlags49_h25/debug.h | 2 + + drivers/staging/wlags49_h25/dhf.c | 2 + + drivers/staging/wlags49_h25/dhf.h | 2 + + drivers/staging/wlags49_h25/dhfcfg.h | 2 + + drivers/staging/wlags49_h25/hcf.c | 2 + + drivers/staging/wlags49_h25/hcf.h | 2 + + drivers/staging/wlags49_h25/hcfcfg.h | 2 + + drivers/staging/wlags49_h25/hcfdef.h | 2 + + drivers/staging/wlags49_h25/mdd.h | 2 + + drivers/staging/wlags49_h25/mmd.c | 2 + + drivers/staging/wlags49_h25/mmd.h | 2 + + drivers/staging/wlags49_h25/sta_h25.c | 2 + + drivers/staging/wlags49_h25/wl_cs.c | 2 + + drivers/staging/wlags49_h25/wl_cs.h | 2 + + drivers/staging/wlags49_h25/wl_enc.c | 2 + + drivers/staging/wlags49_h25/wl_enc.h | 2 + + drivers/staging/wlags49_h25/wl_if.h | 2 + + drivers/staging/wlags49_h25/wl_internal.h | 2 + + drivers/staging/wlags49_h25/wl_main.c | 2 + + drivers/staging/wlags49_h25/wl_main.h | 2 + + drivers/staging/wlags49_h25/wl_netdev.c | 2 + + drivers/staging/wlags49_h25/wl_netdev.h | 2 + + drivers/staging/wlags49_h25/wl_priv.c | 2 + + drivers/staging/wlags49_h25/wl_priv.h | 2 + + drivers/staging/wlags49_h25/wl_profile.c | 2 + + drivers/staging/wlags49_h25/wl_profile.h | 2 + + drivers/staging/wlags49_h25/wl_sysfs.c | 2 + + drivers/staging/wlags49_h25/wl_sysfs.h | 2 + + drivers/staging/wlags49_h25/wl_util.c | 2 + + drivers/staging/wlags49_h25/wl_util.h | 2 + + drivers/staging/wlags49_h25/wl_version.h | 2 + + drivers/staging/wlags49_h25/wl_wext.c | 2 + + drivers/staging/wlags49_h25/wl_wext.h | 2 + + 448 files changed, 72097 insertions(+), 128314 deletions(-) + delete mode 100644 drivers/staging/android/Kconfig + delete mode 100644 drivers/staging/android/Makefile + delete mode 100644 drivers/staging/android/TODO + delete mode 100644 drivers/staging/android/binder.c + delete mode 100644 drivers/staging/android/binder.h + delete mode 100644 drivers/staging/android/logger.c + delete mode 100644 drivers/staging/android/logger.h + delete mode 100644 drivers/staging/android/lowmemorykiller.c + delete mode 100644 drivers/staging/android/ram_console.c + delete mode 100644 drivers/staging/android/timed_gpio.c + delete mode 100644 drivers/staging/android/timed_gpio.h + delete mode 100644 drivers/staging/android/timed_output.c + delete mode 100644 drivers/staging/android/timed_output.h + create mode 100644 drivers/staging/arlan/Kconfig + create mode 100644 drivers/staging/arlan/Makefile + create mode 100644 drivers/staging/arlan/TODO + rename drivers/{net/wireless => staging/arlan}/arlan-main.c (98%) + rename drivers/{net/wireless => staging/arlan}/arlan-proc.c (99%) + rename drivers/{net/wireless => staging/arlan}/arlan.h (97%) + create mode 100644 drivers/staging/netwave/Kconfig + create mode 100644 drivers/staging/netwave/Makefile + create mode 100644 drivers/staging/netwave/TODO + rename drivers/{net/wireless => staging/netwave}/netwave_cs.c (93%) + create mode 100644 drivers/staging/ramzswap/Kconfig + create mode 100644 drivers/staging/ramzswap/Makefile + create mode 100644 drivers/staging/ramzswap/TODO + create mode 100644 drivers/staging/ramzswap/ramzswap.txt + create mode 100644 drivers/staging/ramzswap/ramzswap_drv.c + create mode 100644 drivers/staging/ramzswap/ramzswap_drv.h + create mode 100644 drivers/staging/ramzswap/ramzswap_ioctl.h + create mode 100644 drivers/staging/ramzswap/xvmalloc.c + create mode 100644 drivers/staging/ramzswap/xvmalloc.h + create mode 100644 drivers/staging/ramzswap/xvmalloc_int.h + delete mode 100644 drivers/staging/rt2860/2860_main_dev.c + delete mode 100644 drivers/staging/rt2860/aironet.h + rename drivers/staging/{rt3090 => rt2860/chip}/mac_pci.h (85%) + create mode 100644 drivers/staging/rt2860/chip/mac_usb.h + rename drivers/staging/{rt3090/netif_block.h => rt2860/chip/rt2860.h} (68%) + rename drivers/staging/{rt3090/rt33xx.h => rt2860/chip/rt2870.h} (78%) + rename drivers/staging/{rt3090/rt3370.h => rt2860/chip/rt3070.h} (90%) + rename drivers/staging/{rt3090 => rt2860/chip}/rt3090.h (94%) + rename drivers/staging/{rt3090 => rt2860/chip}/rt30xx.h (100%) + rename drivers/staging/rt2860/{rt28xx.h => chip/rtmp_mac.h} (70%) + rename drivers/staging/{rt3090 => rt2860/chip}/rtmp_phy.h (91%) + create mode 100644 drivers/staging/rt2860/chips/rt3070.c + rename drivers/staging/{rt3090 => rt2860}/chips/rt3090.c (100%) + rename drivers/staging/{rt3090 => rt2860}/chips/rt30xx.c (98%) + delete mode 100644 drivers/staging/rt2860/common/2860_rtmp_init.c + rename drivers/staging/{rt3090 => rt2860}/common/cmm_aes.c (93%) + rename drivers/staging/{rt3090 => rt2860}/common/cmm_asic.c (89%) + rename drivers/staging/{rt3090 => rt2860}/common/cmm_cfg.c (97%) + rename drivers/staging/{rt3090 => rt2860}/common/cmm_data_pci.c (67%) + rename drivers/staging/{rt2870/common/cmm_data_2870.c => rt2860/common/cmm_data_usb.c} (85%) + rename drivers/staging/{rt3090 => rt2860}/common/cmm_mac_pci.c (94%) + create mode 100644 drivers/staging/rt2860/common/cmm_mac_usb.c + rename drivers/staging/{rt3090 => rt2860}/common/cmm_profile.c (76%) + rename drivers/staging/{rt3090 => rt2860}/common/cmm_tkip.c (91%) + rename drivers/staging/{rt3090 => rt2860}/common/cmm_wep.c (99%) + rename drivers/staging/{rt3090 => rt2860}/common/crypt_hmac.c (94%) + rename drivers/staging/{rt3090 => rt2860}/common/crypt_md5.c (99%) + rename drivers/staging/{rt3090 => rt2860}/common/crypt_sha2.c (99%) + rename drivers/staging/{rt3090 => rt2860}/common/ee_efuse.c (98%) + rename drivers/staging/{rt3090 => rt2860}/common/ee_prom.c (82%) + create mode 100644 drivers/staging/rt2860/common/firmware_3070.h + delete mode 100644 drivers/staging/rt2860/common/md5.c + rename drivers/staging/{rt3090 => rt2860}/common/rt_channel.c (99%) + rename drivers/staging/{rt3090 => rt2860}/common/rt_rf.c (92%) + create mode 100644 drivers/staging/rt2860/common/rtmp_mcu.c + rename drivers/staging/{rt3090 => rt2860}/common/rtmp_timer.c (97%) + delete mode 100644 drivers/staging/rt2860/common/rtmp_tkip.c + delete mode 100644 drivers/staging/rt2860/common/rtmp_wep.c + delete mode 100644 drivers/staging/rt2860/config.mk + rename drivers/staging/{rt3090 => rt2860}/crypt_hmac.h (87%) + rename drivers/staging/{rt3090 => rt2860}/crypt_md5.h (88%) + rename drivers/staging/{rt3090 => rt2860}/crypt_sha2.h (90%) + rename drivers/staging/{rt3090 => rt2860}/eeprom.h (79%) + rename drivers/staging/{rt3090 => rt2860/iface}/rtmp_pci.h (63%) + create mode 100644 drivers/staging/rt2860/iface/rtmp_usb.h + delete mode 100644 drivers/staging/rt2860/md5.h + rename drivers/staging/{rt3090 => rt2860}/pci_main_dev.c (92%) + delete mode 100644 drivers/staging/rt2860/rt2860.h + rename drivers/staging/{rt3090 => rt2860}/rt_pci_rbus.c (88%) + create mode 100644 drivers/staging/rt2860/rt_usb.c + rename drivers/staging/{rt3090 => rt2860}/rtmp_chip.h (76%) + rename drivers/staging/{rt3090 => rt2860}/rtmp_dot11.h (70%) + rename drivers/staging/{rt3090 => rt2860}/rtmp_iface.h (95%) + rename drivers/staging/{rt3090 => rt2860}/rtmp_mcu.h (100%) + rename drivers/staging/{rt3090 => rt2860}/rtmp_os.h (97%) + rename drivers/staging/{rt3090 => rt2860}/rtmp_timer.h (96%) + create mode 100644 drivers/staging/rt2860/rtusb_io.h + delete mode 100644 drivers/staging/rt2860/sta/aironet.c + create mode 100644 drivers/staging/rt2860/usb_main_dev.c + delete mode 100644 drivers/staging/rt2870/2870_main_dev.c + create mode 100644 drivers/staging/rt2870/chips/rt3070.c + create mode 100644 drivers/staging/rt2870/chips/rt30xx.c + delete mode 100644 drivers/staging/rt2870/common/2870_rtmp_init.c + create mode 100644 drivers/staging/rt2870/common/acction.c + create mode 100644 drivers/staging/rt2870/common/cmm_aes.c + create mode 100644 drivers/staging/rt2870/common/cmm_asic.c + create mode 100644 drivers/staging/rt2870/common/cmm_cfg.c + create mode 100644 drivers/staging/rt2870/common/cmm_data_usb.c + create mode 100644 drivers/staging/rt2870/common/cmm_mac_usb.c + create mode 100644 drivers/staging/rt2870/common/cmm_profile.c + create mode 100644 drivers/staging/rt2870/common/cmm_tkip.c + create mode 100644 drivers/staging/rt2870/common/cmm_wep.c + create mode 100644 drivers/staging/rt2870/common/crypt_hmac.c + create mode 100644 drivers/staging/rt2870/common/crypt_md5.c + create mode 100644 drivers/staging/rt2870/common/crypt_sha2.c + create mode 100644 drivers/staging/rt2870/common/ee_efuse.c + create mode 100644 drivers/staging/rt2870/common/rt_channel.c + create mode 100644 drivers/staging/rt2870/common/rt_rf.c + create mode 100644 drivers/staging/rt2870/common/rtmp_mcu.c + create mode 100644 drivers/staging/rt2870/common/rtmp_timer.c + delete mode 100644 drivers/staging/rt2870/rt2870.h + create mode 100644 drivers/staging/rt2870/rt_usb.c + create mode 100644 drivers/staging/rt2870/usb_main_dev.c + delete mode 100644 drivers/staging/rt3090/Kconfig + delete mode 100644 drivers/staging/rt3090/Makefile + delete mode 100644 drivers/staging/rt3090/action.h + delete mode 100644 drivers/staging/rt3090/ap.h + delete mode 100644 drivers/staging/rt3090/ap_apcli.h + delete mode 100644 drivers/staging/rt3090/ap_autoChSel.h + delete mode 100644 drivers/staging/rt3090/ap_autoChSel_cmm.h + delete mode 100644 drivers/staging/rt3090/ap_cfg.h + delete mode 100644 drivers/staging/rt3090/ap_ids.h + delete mode 100644 drivers/staging/rt3090/ap_mbss.h + delete mode 100644 drivers/staging/rt3090/ap_uapsd.h + delete mode 100644 drivers/staging/rt3090/ap_wds.h + delete mode 100644 drivers/staging/rt3090/chips/rt3370.c + delete mode 100644 drivers/staging/rt3090/chips/rt3390.c + delete mode 100644 drivers/staging/rt3090/chips/rt33xx.c + delete mode 100644 drivers/staging/rt3090/chlist.h + delete mode 100644 drivers/staging/rt3090/common/action.c + delete mode 100644 drivers/staging/rt3090/common/ba_action.c + delete mode 100644 drivers/staging/rt3090/common/cmm_data.c + delete mode 100644 drivers/staging/rt3090/common/cmm_info.c + delete mode 100644 drivers/staging/rt3090/common/cmm_sanity.c + delete mode 100644 drivers/staging/rt3090/common/cmm_sync.c + delete mode 100644 drivers/staging/rt3090/common/cmm_wpa.c + delete mode 100644 drivers/staging/rt3090/common/crypt_aes.c + delete mode 100644 drivers/staging/rt3090/common/crypt_biginteger.c + delete mode 100644 drivers/staging/rt3090/common/crypt_dh.c + delete mode 100644 drivers/staging/rt3090/common/dfs.c + delete mode 100644 drivers/staging/rt3090/common/eeprom.c + delete mode 100644 drivers/staging/rt3090/common/igmp_snoop.c + delete mode 100644 drivers/staging/rt3090/common/mlme.c + delete mode 100644 drivers/staging/rt3090/common/mlme_ex.c + delete mode 100644 drivers/staging/rt3090/common/netif_block.c + delete mode 100644 drivers/staging/rt3090/common/rtmp_init.c + delete mode 100644 drivers/staging/rt3090/common/rtmp_mcu.c + delete mode 100644 drivers/staging/rt3090/common/spectrum.c + delete mode 100644 drivers/staging/rt3090/config.mk + delete mode 100644 drivers/staging/rt3090/dfs.h + delete mode 100644 drivers/staging/rt3090/igmp_snoop.h + delete mode 100644 drivers/staging/rt3090/ipv6.h + delete mode 100644 drivers/staging/rt3090/link_list.h + delete mode 100644 drivers/staging/rt3090/mlme.h + delete mode 100644 drivers/staging/rt3090/mlme_ex.h + delete mode 100644 drivers/staging/rt3090/mlme_ex_def.h + delete mode 100644 drivers/staging/rt3090/oid.h + delete mode 100644 drivers/staging/rt3090/rt3390.h + delete mode 100644 drivers/staging/rt3090/rt_ate.c + delete mode 100644 drivers/staging/rt3090/rt_ate.h + delete mode 100644 drivers/staging/rt3090/rt_config.h + delete mode 100644 drivers/staging/rt3090/rt_linux.c + delete mode 100644 drivers/staging/rt3090/rt_linux.h + delete mode 100644 drivers/staging/rt3090/rt_main_dev.c + delete mode 100644 drivers/staging/rt3090/rt_profile.c + delete mode 100644 drivers/staging/rt3090/rtmp.h + delete mode 100644 drivers/staging/rt3090/rtmp_def.h + delete mode 100644 drivers/staging/rt3090/rtmp_mac.h + delete mode 100644 drivers/staging/rt3090/rtmp_type.h + delete mode 100644 drivers/staging/rt3090/spectrum.h + delete mode 100644 drivers/staging/rt3090/spectrum_def.h + delete mode 100644 drivers/staging/rt3090/sta/assoc.c + delete mode 100644 drivers/staging/rt3090/sta/auth.c + delete mode 100644 drivers/staging/rt3090/sta/auth_rsp.c + delete mode 100644 drivers/staging/rt3090/sta/connect.c + delete mode 100644 drivers/staging/rt3090/sta/dls.c + delete mode 100644 drivers/staging/rt3090/sta/rtmp_ckipmic.c + delete mode 100644 drivers/staging/rt3090/sta/rtmp_data.c + delete mode 100644 drivers/staging/rt3090/sta/sanity.c + delete mode 100644 drivers/staging/rt3090/sta/sync.c + delete mode 100644 drivers/staging/rt3090/sta/wpa.c + delete mode 100644 drivers/staging/rt3090/sta_ioctl.c + delete mode 100644 drivers/staging/rt3090/vr_ikans.h + delete mode 100644 drivers/staging/rt3090/wpa.h + delete mode 100644 drivers/staging/stlc45xx/Kconfig + delete mode 100644 drivers/staging/stlc45xx/Makefile + delete mode 100644 drivers/staging/stlc45xx/stlc45xx.c + delete mode 100644 drivers/staging/stlc45xx/stlc45xx.h + delete mode 100644 drivers/staging/stlc45xx/stlc45xx_lmac.h + create mode 100644 drivers/staging/strip/Kconfig + create mode 100644 drivers/staging/strip/Makefile + create mode 100644 drivers/staging/strip/TODO + rename drivers/{net/wireless => staging/strip}/strip.c (99%) + create mode 100644 drivers/staging/wavelan/Kconfig + create mode 100644 drivers/staging/wavelan/Makefile + create mode 100644 drivers/staging/wavelan/TODO + rename drivers/{net/wireless => staging/wavelan}/i82593.h (100%) + rename drivers/{net/wireless => staging/wavelan}/wavelan.c (99%) + rename drivers/{net/wireless => staging/wavelan}/wavelan.h (100%) + rename drivers/{net/wireless => staging/wavelan}/wavelan.p.h (99%) + rename drivers/{net/wireless => staging/wavelan}/wavelan_cs.c (99%) + rename drivers/{net/wireless => staging/wavelan}/wavelan_cs.h (99%) + rename drivers/{net/wireless => staging/wavelan}/wavelan_cs.p.h (99%) + create mode 100644 drivers/staging/wlags49_h2/Kconfig + create mode 100644 drivers/staging/wlags49_h2/Makefile + create mode 100644 drivers/staging/wlags49_h2/README.ubuntu + create mode 100644 drivers/staging/wlags49_h2/README.wlags49 + create mode 100644 drivers/staging/wlags49_h2/WARNING.txt + create mode 100644 drivers/staging/wlags49_h2/ap_h2.c + create mode 100644 drivers/staging/wlags49_h2/ap_h25.c + create mode 100644 drivers/staging/wlags49_h2/debug.h + create mode 100644 drivers/staging/wlags49_h2/dhf.c + create mode 100644 drivers/staging/wlags49_h2/dhf.h + create mode 100644 drivers/staging/wlags49_h2/dhfcfg.h + create mode 100644 drivers/staging/wlags49_h2/hcf.c + create mode 100644 drivers/staging/wlags49_h2/hcf.h + create mode 100644 drivers/staging/wlags49_h2/hcfcfg.h + create mode 100644 drivers/staging/wlags49_h2/hcfdef.h + create mode 100644 drivers/staging/wlags49_h2/man/wlags49.4 + create mode 100644 drivers/staging/wlags49_h2/mdd.h + create mode 100644 drivers/staging/wlags49_h2/mmd.c + create mode 100644 drivers/staging/wlags49_h2/mmd.h + create mode 100644 drivers/staging/wlags49_h2/sta_h2.c + create mode 100644 drivers/staging/wlags49_h2/sta_h25.c + create mode 100644 drivers/staging/wlags49_h2/wl_cs.c + create mode 100644 drivers/staging/wlags49_h2/wl_cs.h + create mode 100644 drivers/staging/wlags49_h2/wl_enc.c + create mode 100644 drivers/staging/wlags49_h2/wl_enc.h + create mode 100644 drivers/staging/wlags49_h2/wl_if.h + create mode 100644 drivers/staging/wlags49_h2/wl_internal.h + create mode 100644 drivers/staging/wlags49_h2/wl_main.c + create mode 100644 drivers/staging/wlags49_h2/wl_main.h + create mode 100644 drivers/staging/wlags49_h2/wl_netdev.c + create mode 100644 drivers/staging/wlags49_h2/wl_netdev.h + create mode 100644 drivers/staging/wlags49_h2/wl_pci.c + create mode 100644 drivers/staging/wlags49_h2/wl_pci.h + create mode 100644 drivers/staging/wlags49_h2/wl_priv.c + create mode 100644 drivers/staging/wlags49_h2/wl_priv.h + create mode 100644 drivers/staging/wlags49_h2/wl_profile.c + create mode 100644 drivers/staging/wlags49_h2/wl_profile.h + create mode 100644 drivers/staging/wlags49_h2/wl_sysfs.c + create mode 100644 drivers/staging/wlags49_h2/wl_sysfs.h + create mode 100644 drivers/staging/wlags49_h2/wl_util.c + create mode 100644 drivers/staging/wlags49_h2/wl_util.h + create mode 100644 drivers/staging/wlags49_h2/wl_version.h + create mode 100644 drivers/staging/wlags49_h2/wl_wext.c + create mode 100644 drivers/staging/wlags49_h2/wl_wext.h + create mode 100644 drivers/staging/wlags49_h25/Kconfig + create mode 100644 drivers/staging/wlags49_h25/Makefile + create mode 100644 drivers/staging/wlags49_h25/README.txt + create mode 100644 drivers/staging/wlags49_h25/ap_h25.c + create mode 100644 drivers/staging/wlags49_h25/debug.h + create mode 100644 drivers/staging/wlags49_h25/dhf.c + create mode 100644 drivers/staging/wlags49_h25/dhf.h + create mode 100644 drivers/staging/wlags49_h25/dhfcfg.h + create mode 100644 drivers/staging/wlags49_h25/hcf.c + create mode 100644 drivers/staging/wlags49_h25/hcf.h + create mode 100644 drivers/staging/wlags49_h25/hcfcfg.h + create mode 100644 drivers/staging/wlags49_h25/hcfdef.h + create mode 100644 drivers/staging/wlags49_h25/mdd.h + create mode 100644 drivers/staging/wlags49_h25/mmd.c + create mode 100644 drivers/staging/wlags49_h25/mmd.h + create mode 100644 drivers/staging/wlags49_h25/sta_h25.c + create mode 100644 drivers/staging/wlags49_h25/wl_cs.c + create mode 100644 drivers/staging/wlags49_h25/wl_cs.h + create mode 100644 drivers/staging/wlags49_h25/wl_enc.c + create mode 100644 drivers/staging/wlags49_h25/wl_enc.h + create mode 100644 drivers/staging/wlags49_h25/wl_if.h + create mode 100644 drivers/staging/wlags49_h25/wl_internal.h + create mode 100644 drivers/staging/wlags49_h25/wl_main.c + create mode 100644 drivers/staging/wlags49_h25/wl_main.h + create mode 100644 drivers/staging/wlags49_h25/wl_netdev.c + create mode 100644 drivers/staging/wlags49_h25/wl_netdev.h + create mode 100644 drivers/staging/wlags49_h25/wl_priv.c + create mode 100644 drivers/staging/wlags49_h25/wl_priv.h + create mode 100644 drivers/staging/wlags49_h25/wl_profile.c + create mode 100644 drivers/staging/wlags49_h25/wl_profile.h + create mode 100644 drivers/staging/wlags49_h25/wl_sysfs.c + create mode 100644 drivers/staging/wlags49_h25/wl_sysfs.h + create mode 100644 drivers/staging/wlags49_h25/wl_util.c + create mode 100644 drivers/staging/wlags49_h25/wl_util.h + create mode 100644 drivers/staging/wlags49_h25/wl_version.h + create mode 100644 drivers/staging/wlags49_h25/wl_wext.c + create mode 100644 drivers/staging/wlags49_h25/wl_wext.h +$ git am -3 ../patches/0001-staging-merge-fixup-for-wireless-drivers-move.patch +Applying: staging: merge fixup for wireless drivers move +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/wireless/libertas/Kconfig +M drivers/staging/netwave/Kconfig +M drivers/staging/wavelan/Kconfig +$ git add . +$ git commit -v -a --amend +[master deae0de] Merge branch 'quilt/staging' +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..983208425fbf --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,439 @@ +Importing driver-core.current based on 2.6.32-rc5 +Unchanged quilt series driver-core.current +Importing tty.current based on quilt/driver-core.current +Unchanged quilt series tty.current +Importing usb.current based on quilt/tty.current +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 68e4c95628871d6ea7f98e5d880d397f277cbd9c +HEAD is now at 68e4c95 Driver core: allow certain drivers prohibit bind/unbind via sysfs +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-rndis_host-debug-info-clobbered-before-it-is-logged.patch +usb-serial-sierra-driver-send_setup-autopm-fix.patch +usb-r8a66597-hcd-fix-cannot-detect-a-device-when-uses_new_polling-is-set.patch +usb-option-tlaytech-tue800-support.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb.current +From ../quilt-tmp + + bef8621...8ea99c0 master -> quilt/usb.current (forced update) +Importing staging.current based on quilt/usb.current +$ cd ../quilt-tmp +$ git reset --hard 8ea99c0bd53f030f1e04671abad31d656047817a +HEAD is now at 8ea99c0 USB: option: TLAYTECH TUE800 support +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging.current +staging-hv-todo-patches.patch +staging-hv-fix-null-pointer-error-after-vmbus-loading.patch +staging-hv-fix-vmbus-load-hang-caused-by-faulty-data-packing.patch +staging-panel-prevent-driver-from-calling-misc_deregister-twice-on-same-ressource.patch +staging-vt6656-fix-the-memory-free-bug-in-vntwusb_disconnect.patch +staging-rtl8187se-rtl8192e-rtl8192su-allow-module-unload.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging.current +From ../quilt-tmp + + 6eec8b7...fc2318f master -> quilt/staging.current (forced update) +Importing i2c based on 2.6.32-rc5-git3 +$ cd ../quilt-tmp +$ git reset --hard 964fe080d94db82a3268443e9b9ece4c60246414 +HEAD is now at 964fe08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-piix4-modify-code-name-sb900-to-hudson-2.patch +i2c-chips-move-ds1682-to-drivers-misc.patch +i2c-powermac-01-multiple-msg-not-supported.patch +i2c-powermac-02-refactor-xfer.patch +i2c-powermac-03-report-errors.patch +i2c-voodoo3-delete.patch +i2c-prevent-priority-inversion-on-top-of-bus-lock.patch +i2c-no-I2C_M_REV_DIR_ADDR.patch +i2c-add-missing-devinit.patch +i2c-core-01-drop-obsolete-force-module-parameters.patch +i2c-core-02-detect-drop-kind-parameter.patch +misc-ics932s401-cleanup-detect.patch +i2c-remove-big-kernel-lock-from-i2cdev_open.patch +i2c-scmi-support-ibm-smbus-cmi-devices.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 1610bda...75e0c05 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.32-rc5-git3 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on origin/master +Unchanged quilt series kernel-doc +Importing rr based on v2.6.32-rc5-81-g964fe08 +Unchanged quilt series rr +Importing device-mapper based on v2.6.32-rc5-81-g964fe08 +$ cd ../quilt-tmp +$ git reset --hard 964fe080d94db82a3268443e9b9ece4c60246414 +HEAD is now at 964fe08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +trailing garbage found in series file: 38657 + +Importing driver-core.current based on 2.6.32-rc5 +Unchanged quilt series driver-core.current +Importing tty.current based on quilt/driver-core.current +Unchanged quilt series tty.current +Importing usb.current based on quilt/tty.current +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 68e4c95628871d6ea7f98e5d880d397f277cbd9c +HEAD is now at 68e4c95 Driver core: allow certain drivers prohibit bind/unbind via sysfs +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-rndis_host-debug-info-clobbered-before-it-is-logged.patch +usb-serial-sierra-driver-send_setup-autopm-fix.patch +usb-r8a66597-hcd-fix-cannot-detect-a-device-when-uses_new_polling-is-set.patch +usb-option-tlaytech-tue800-support.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb.current +From ../quilt-tmp + + 8ea99c0...950f2f0 master -> quilt/usb.current (forced update) +Importing staging.current based on quilt/usb.current +$ cd ../quilt-tmp +$ git reset --hard 950f2f06f8de19e2bcac8917638fec58917cf527 +HEAD is now at 950f2f0 USB: option: TLAYTECH TUE800 support +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging.current +staging-hv-todo-patches.patch +staging-hv-fix-null-pointer-error-after-vmbus-loading.patch +staging-hv-fix-vmbus-load-hang-caused-by-faulty-data-packing.patch +staging-panel-prevent-driver-from-calling-misc_deregister-twice-on-same-ressource.patch +staging-vt6656-fix-the-memory-free-bug-in-vntwusb_disconnect.patch +staging-rtl8187se-rtl8192e-rtl8192su-allow-module-unload.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging.current +From ../quilt-tmp + + fc2318f...eded2d7 master -> quilt/staging.current (forced update) +Importing i2c based on 2.6.32-rc5-git3 +$ cd ../quilt-tmp +$ git reset --hard 964fe080d94db82a3268443e9b9ece4c60246414 +HEAD is now at 964fe08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-piix4-modify-code-name-sb900-to-hudson-2.patch +i2c-chips-move-ds1682-to-drivers-misc.patch +i2c-powermac-01-multiple-msg-not-supported.patch +i2c-powermac-02-refactor-xfer.patch +i2c-powermac-03-report-errors.patch +i2c-voodoo3-delete.patch +i2c-prevent-priority-inversion-on-top-of-bus-lock.patch +i2c-no-I2C_M_REV_DIR_ADDR.patch +i2c-add-missing-devinit.patch +i2c-core-01-drop-obsolete-force-module-parameters.patch +i2c-core-02-detect-drop-kind-parameter.patch +misc-ics932s401-cleanup-detect.patch +i2c-remove-big-kernel-lock-from-i2cdev_open.patch +i2c-scmi-support-ibm-smbus-cmi-devices.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 75e0c05...a5f5f1c master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.32-rc5-git3 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on origin/master +Unchanged quilt series kernel-doc +Importing rr based on v2.6.32-rc5-81-g964fe08 +Unchanged quilt series rr +Importing device-mapper based on v2.6.32-rc5-81-g964fe08 +$ cd ../quilt-tmp +$ git reset --hard 964fe080d94db82a3268443e9b9ece4c60246414 +HEAD is now at 964fe08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-exception-store-free-tmp_store-on-persistent-flag-error.patch +dm-ioctl-prefer-strlcpy-over-strncpy.patch +dm-snapshot-avoid-else-clause-in-persistent_read_metadata.patch +dm-snapshot-simplify-sector_to_chunk-expression.patch +dm-snapshot-abstract-minimum_chunk_size-fn.patch +dm-snapshot-consolidate-insert-exception-functions.patch +dm-snapshot-rename-dm_snap_exception-to-dm_exception.patch +dm-snapshot-rename-exception_table-to-dm_exception_table.patch +dm-snapshot-rename-exception-functions.patch +dm-snapshot-add-allocated-metadata-to-snapshot-status.patch +dm-snapshot-move-cow-ref-from-exception-store-to-snap-core.patch +dm-abstract-dm_in_flight-function.patch +dm-use-clone-in-map_request-function.patch +dm-pass-gfp_mask-to-alloc_rq_tio.patch +dm-abstract-clone_rq.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/device-mapper +From ../quilt-tmp + + 9ea77c6...ca489ab master -> quilt/device-mapper (forced update) +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current +$ cd ../quilt-tmp +$ git reset --hard eded2d7522b6eb619b2f09a0710a0b6482269f5d +HEAD is now at eded2d7 Staging: rtl8187se/rtl8192e/rtl8192su: allow module unload +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +hpilo-add-locking-comment.patch +sysfs-mark-a-locally-only-used-function-static.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core +From ../quilt-tmp + + d04b2d5...59935c9 master -> quilt/driver-core (forced update) +Importing tty based on quilt/driver-core +$ cd ../quilt-tmp +$ git reset --hard 59935c964e65bd71249970e7c73f7aed0fdfcc16 +HEAD is now at 59935c9 sysfs: mark a locally-only used function static +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty +jsm-irq-handlers-doesn-t-need-to-have-irq_disabled-enabled.patch +jsm-rewriting-a-bad-log-message.patch +jsm-remove-the-ch_custom_speed-field.patch +jsm-removing-ch_old_baud-field.patch +jsm-remove-ch_cpstime-field.patch +jsm-removing-unused-jsm_channel-ch_wopen-field.patch +jsm-removing-the-field-jsm_board-intr_count.patch +jsm-adding-eeh-handlers.patch +tty-const-constify-remaining-tty_operations.patch +tty-esp-remove-broken-driver.patch +tty-istallion-kill-off-the-bkl-ioctl.patch +tty-stallion-kill-bkl-ioctl.patch +tty_port-add-tty_port_open-helper.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:48: space before tab in indent. + mutex_unlock(&port->mutex); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:49: space before tab in indent. + return retval; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:50: space before tab in indent. + } +warning: 3 lines add whitespace errors. +tty_port-coding-style-cleaning-pass.patch +usb_serial-use-the-shutdown-operation.patch +usb_serial-kill-port-mutex.patch +opticon-fix-resume-logic.patch +serial-fix-null-pointer-dereference.patch +serial-cascade-needless-conditionals.patch +serial-8250-calculate-irqflags-bitmask-before-loop.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/tty +From ../quilt-tmp + + 8de3703...ae1c5df master -> quilt/tty (forced update) +Importing usb based on quilt/tty +$ cd ../quilt-tmp +$ git reset --hard ae1c5dfc014bf08dd597d5185ea0d250de89efd4 +HEAD is now at ae1c5df serial, 8250: calculate irqflags bitmask before loop +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-serial-ftdi_sio-add-space-mark-parity.patch +usb-ehci-hub-remove-redundant-ehci-debug-check.patch +usb-convert-a-dev_info-to-a-dev_dbg.patch +usb-usb-storage-associate-the-name-of-the-interface-with-the-scsi-host.patch +usb-storage-make-driver-less-chatty-when-it-finds-a-new-device.patch +usb-add-support-for-xilinx-usb-host-controller.patch +usb-add-missing-static-markers-to-ohci-pnx4008.patch +usb-make-urb-scatter-gather-support-more-generic.patch +usb-whci-hcd-support-urbs-with-scatter-gather-lists.patch +usb-allow-interrupt-transfers-to-wusb-devices.patch +usb-whci-hcd-fix-type-and-format-warnings-in-sg-code.patch +usb-skeleton-correct-use-of-and.patch +usb-gadget-handle-endpoint-requests-at-the-function-level.patch +usb-audio-gadget-handle-endpoint-control-requests-at-the-function-level.patch +usb-modifications-for-at91sam9g10.patch +usb-usbtmc-minor-formatting-cleanups.patch +usb-whci-hcd-decode-more-qhead-fields-in-the-debug-files.patch +usb-wusb-add-wusb_phy_rate-sysfs-file-to-host-controllers.patch +usb-otg-add-support-for-ulpi-connected-external-transceivers.patch +usb-otg-add-generic-driver-for-ulpi-otg-transceiver.patch +usb-host-ehci-introduce-omap-ehci-hcd-driver.patch +usb-improved-error-handling-in-usb_port_suspend.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb +From ../quilt-tmp + + 204e3c0...8bc7dd0 master -> quilt/usb (forced update) +Importing staging based on quilt/usb +$ cd ../quilt-tmp +$ git reset --hard 8bc7dd0c63b93d1890afaa4bfe851e10bd15d1c1 +HEAD is now at 8bc7dd0 USB: improved error handling in usb_port_suspend() +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging +staging-rt3090-disable-has_ate-option.patch +staging-rt3090-disable-has_antenna_diversity_support-option.patch +staging-rt3090-remove-private-debugging-ioctls.patch +staging-rt3090-remove-private-ioctls.patch +staging-rt28x0-updates-from-vendor-s-v2.1.0.0-drivers.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:34819: space before tab in indent. + if (pAd->CommonCfg.bAPSDCapable && pAd->CommonCfg.APEdcaParm.bAPSDCapable) +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:34820: space before tab in indent. + { +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:34821: space before tab in indent. + // When APSD is enabled, the period changes as 20 sec +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:34822: space before tab in indent. + if ((pAd->Mlme.OneSecPeriodicRound % 20) == 8) +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:34823: space before tab in indent. + RTMPSendNullFrame(pAd, pAd->CommonCfg.TxRate, TRUE); +warning: squelched 5 whitespace errors +warning: 10 lines add whitespace errors. +staging-rt28x0-remove-unused-code-from-common-dfs.c.patch +staging-rt2860-add-rt3090-chipset-support.patch +staging-remove-no-longer-needed-rt3090-driver.patch +staging-b3dfg-remove-check-for-pci-bus-master.patch +staging-line6-driver.c-factorize-code-and-cleanups.patch +staging-comedi-8253-fix-coding-style-error.patch +staging-comedi-8255-fix-coding-style-error.patch +staging-comedi-drivers.c-checkpatch-fix.patch +staging-comedi-adl_pci6208-code-styling-fix.patch +staging-comedi-ni_labpc.h-fixed-line-lengths-of-some-trailing-comments.patch +staging-comedi-ni_labbc_cs-cleaned-up-debug-define-a-bit.patch +staging-comedi-ni_labpc_cs-removed-null-initialization-of-static.patch +staging-comedi-ni_labpc_cs-added-mandatory-whitespace-to-comparison.patch +staging-comedi-ni_labpc_cs-removed-null-check-from-kfree.patch +staging-comedi-ni_labpc_cs-wrapped-long-comments.patch +staging-comedi-comedi_compat32-fixed-checkpatch.pl-issues.patch +staging-comedi-comedidev.h-fixed-checkpatch.pl-issues.patch +staging-comedi-ni_at_ao.c-fix-coding-style-error.patch +staging-comedi-mite.c-fix-coding-style.patch +staging-comedi-mite.h-deletion-of-unused-functions.patch +staging-comedi-ni_atmio16d-fix-formating-errors.patch +staging-comedi-ni_atmio16d-brace-fixes.patch +staging-comedi-nt_atmio16d-space-and-tab-fixes.patch +staging-comedi-ni_atmio16d-printk-fixups.patch +staging-comedi-vmk80xx-cleanup-formatting.patch +staging-comedi-comedi_compat32.h-fixed-checkpatch.pl-issues.patch +staging-comedi-acl7225b.c-codingstyle-printk-fixups.patch +staging-comedi-adl_pci7296-codingstyle-cleanup.patch +staging-comedi-adl_pci7432-coding-style-cleanup.patch +staging-comedi-amplc_pc263.c-fix-coding-style-issues.patch +staging-comedi-amplc_pc263.c-more-coding-style-fixes.patch +staging-comedi-trivial-fix-of-a-very-frequent-spelling-mistake.patch +staging-comedi-ni_mio_cs.c-coding-style-cleanup.patch +staging-comedi-pcm_common-fixed-all-checkpatch-issues.patch +staging-comedi-pcmmio-coding-style-cleanup.patch +staging-comedi-pcmmio-more-coding-style-cleanup.patch +staging-comedi-remove-check-for-have_unlocked_ioctl.patch +staging-comedi-remove-check-for-have_compat_ioctl.patch +staging-comedi-don-t-check-for-enoioctlcmd.patch +staging-comedi-remove-__cplusplus-check.patch +staging-comedi-remove-extern-macro-since-it-is-not-used.patch +staging-comedi-adl_pci8164-coding-style-fixes.patch +staging-comedi-multiq3-remove-warning-on-braces.patch +staging-comedi-multiq3-add-kern_.patch +staging-comedi-addi-data-cleanup-redundant-tests-on-unsigned.patch +staging-comedi-pcl726-fix-coding-style-issues.patch +staging-xvmalloc-memory-allocator.patch +staging-virtual-block-device-driver.patch +staging-ramzswap-documentation.patch +staging-ramzswap-add-todo-file.patch +staging-et131x-adding-__init-__exit-macros.patch +staging-cx25821-adding-__init-__exit-macros.patch +staging-p9auth-adding-__init-__exit-macros.patch +staging-phison-adding-__init-__exit-macros.patch +staging-iio-kconfig-and-make-edits.patch +staging-iio-lots-of-doc-fixes.patch +staging-slicoss-remove-duplicate-structure-field-initialization.patch +staging-et131x-kill-success-and-failure-defines.patch +staging-et131x-tidy-eeprom-code-up.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:451: space before tab in indent. + /* +warning: 1 line adds whitespace errors. +staging-et131x-extract-the-eeprom-setup-logic-from-initpci.patch +staging-et131x-kill-the-nophyaccess-variable.patch +staging-et131x-tidy-up-initpci-code.patch +staging-et131x-kill-nmi-hacks.patch +staging-et131x-phy-loopback-cannot-be-set-and-isn-t-useful-for-us-anyway.patch +staging-et131x-rxstat-is-not-used.patch +staging-et131x-clean-up-word-3-definition.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:13: space before tab in indent. + /* Last element & Interrupt flag */ +warning: 1 line adds whitespace errors. +staging-et131x-clean-up-word2-usage.patch +staging-et131x-tidy-up-names-for-the-tx-structures.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:563: space before tab in indent. + etdev->tx_ring.txDmaReadyToSend &= ~ET_DMA10_MASK; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:564: space before tab in indent. + etdev->tx_ring.txDmaReadyToSend ^= ET_DMA10_WRAP; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:664: space before tab in indent. + INDEX10(tcb->WrIndexStart)); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:679: space before tab in indent. + tcb->WrIndexStart &= ~ET_DMA10_MASK; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:680: space before tab in indent. + tcb->WrIndexStart ^= ET_DMA10_WRAP; +warning: 5 lines add whitespace errors. +staging-et131x-the-stuck-descriptor-copy-is-never-used.patch +staging-et131x-pci_alloc_consistent-dma-alignment-is-guaranteed.patch +staging-et131x-first-pass-rx-cleanup.patch +staging-et131x-clean-up-the-receive-arrays.patch +staging-et131x-fold-up-simple-wrapper-functions.patch +staging-et131x-remove-old-sendwaitqueue-code.patch +staging-et131x-tidy-up-a-bit-further.patch +staging-et131x-clean-up-the-tx-ring-init.patch +staging-et131x-clean-up-tx-naming.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:278: space before tab in indent. + etdev->tx_ring.send_idx &= ~ET_DMA10_MASK; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:279: space before tab in indent. + etdev->tx_ring.send_idx ^= ET_DMA10_WRAP; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:356: space before tab in indent. + INDEX10(tcb->index_start)); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:369: space before tab in indent. + tcb->index_start &= ~ET_DMA10_MASK; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:370: space before tab in indent. + tcb->index_start ^= ET_DMA10_WRAP; +warning: 5 lines add whitespace errors. +staging-et131x-kill-unused-tcb-fields.patch +staging-et131x-bring-tx-into-coding-style.patch +staging-et131x-tx-ring-mac-error-is-only-used-as-a-local.patch +staging-et131x-kill-the-rx-pending-list.patch +staging-et131x-kill-the-rx-skb-list-element-it-isn-t-used.patch +staging-et131x-clean-the-ipg-types-up.patch +staging-et131x-clean-up-the-half-duplex-control-reg-types.patch +staging-et131x-clean-up-the-mii_mgmt-type.patch +staging-et131x-clean-up-mac_cfg-types.patch +staging-et131x-clean-up-max_fm-type.patch +staging-et131x-kill-off-mac_test_t.patch +staging-et131x-clean-up-mii-control.patch +staging-et131x-phy-clean-up.patch +staging-et131x-clean-up-the-phy-code-especially-dup-stuff.patch +staging-poch-parameter-to-enable-synthetic-counter.patch +staging-poch-fetch-flush-ioctl-interface.patch +staging-poch-increase-groups-per-interrupt.patch +staging-poch-parameter-to-enable-loopback.patch +staging-poch-remove-circular-buffer-header.patch +staging-poch-include-linux-types.h.patch +staging-poch-add-sample-rx-code.patch +staging-vme-remove-unused-include-linux-version.h.patch +staging-rtl8187se-remove-unused-include-linux-version.h.patch +staging-rtl8187su-remove-unused-include-linux-version.h.patch +staging-wlags49_h2-add-agere-driver-for-hermes-ii-and-hermes-ii.5-chipsets.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:4458: space before tab in indent. + 0x000F2101, // Start execution address +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:7797: space before tab in indent. + 0x000F1297, // Start execution address +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:9650: space before tab in indent. + OPW( HREG_INT_EN, i | HREG_EV_TICK ); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:9655: space before tab in indent. + OPW( HREG_INT_EN, i | HREG_EV_SLEEP_REQ ); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:10209: space before tab in indent. + if ( head->next_desc_addr == NULL ) { +warning: squelched 185 whitespace errors +warning: 190 lines add whitespace errors. +staging-dream-make-it-independant-from-config_android.patch +staging-dream-mark-as-broken.patch +staging-dream-synaptics-touchscreen-for-htc-dream-check-that-smbus-is-available.patch +staging-dream-remove-wakelock-support.patch +staging-dream-remove-wakelock-support-from-smd_rpcrouter.h.patch +staging-android-mark-subsystem-as-broken.patch +staging-android-delete-android-drivers.patch +staging-strip-move-driver-to-staging.patch +staging-strip-add-todo-file.patch +staging-arlan-move-driver-to-staging.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:4199: space before tab in indent. + READSHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage) +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:5271: space before tab in indent. + release_mem_region(paddr, ARLAN_SHMEM_SIZE); +warning: 2 lines add whitespace errors. +staging-arlan-add-todo-file.patch +staging-wavelan-move-driver-to-staging.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:11744: space before tab in indent. + forgnesi : 1, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:11745: space before tab in indent. + fifo_32 : 1, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:11746: space before tab in indent. + d6mod : 1, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:11747: space before tab in indent. + throttle_enb : 1; +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:11752: space before tab in indent. + acloc : 1, +warning: squelched 18 whitespace errors +warning: 23 lines add whitespace errors. +staging-wavelan-add-todo-file.patch +staging-netwave-move-driver-to-staging.patch +staging-netwave-add-todo-file.patch +staging-octeon-don-t-ignore-request_irq-return-code.patch +staging-vt6656-use-lowercase-for-via-usb-vendor-id.patch +staging-vt6655-correct-unsigned-bound-issue.patch +staging-remove-stlc45xx-driver.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging +From ../quilt-tmp + + 1f0f7a7...910415f master -> quilt/staging (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5cdb7d1084d2 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20091028 |