diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-04-09 13:08:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-04-09 13:08:42 +1000 |
| commit | fc52daf83c74afdb141b4a0e040d68c6d4de6770 (patch) | |
| tree | 7f04c6b4d83a5793fd20eb6ae93bbd2b527c8e19 | |
| parent | 0d16cef44a765a333fd4078cb86a2a01c8d224e7 (diff) | |
Add linux-next specific files for 20100409next-20100409
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 160 | ||||
| -rw-r--r-- | Next/Trees | 162 | ||||
| -rw-r--r-- | Next/merge.log | 4755 | ||||
| -rw-r--r-- | Next/quilt-import.log | 51 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5129 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..3618d988cdfb --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,160 @@ +Name SHA1 +---- ---- +origin d620a7cf05d4f12f5bbb1060d766e8139ab31458 +fixes 797c319fab5f11b4f7797b9738876c38e515b202 +arm-current bb3c9d4f851d51bb6302ef0df830dcec88d7c529 +m68k-current 3b853fdf745b23adb204f8ab526c7ca1d9accca3 +powerpc-merge 0fdf86754f70e813845af4abaa805165ce57a0bb +sparc-current bdd32ce95f79fb5cc964cd789d7ae4500bba7c6f +scsi-rc-fixes bc0beb44f27dc068c1daefc79826c07e0b22ef6c +net-current 1223c67c0938d2df309fde618bd82c87c8c1af04 +sound-current 55b371d4ac5ed6f3338a398fbf9f2eb9ace78799 +pci-current 4352aa5bbf1d0080c2dcf904ce1e4be0a1cb5937 +wireless-current ece6444c2fe80dab679beb5f0d58b091f1933b00 +kbuild-current 07105202bdebf6e9a4c72c634cf90398abfad870 +driver-core.current 220bf991b0366cc50a94feede3d7341fa5710ee4 +tty.current 220bf991b0366cc50a94feede3d7341fa5710ee4 +usb.current 220bf991b0366cc50a94feede3d7341fa5710ee4 +staging.current 220bf991b0366cc50a94feede3d7341fa5710ee4 +cpufreq-current fd187aaf980c45f1d16a94a846faa68e24de03c8 +input-current 9d32c30542f9ecdb4b96a1a960924c9f403e3562 +md-current 627a2d3c29427637f4c5d31ccc7fcbd8d312cd71 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 74781387822cd7a549123ae2b35862bf802689be +ide-curent 720fc22a7af79d91ec460c80efa92c65c12d105e +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +gcl-current ed01f64b831481762437c8eedddcca8481dc7f67 +arm 0cd9f6f697786b0ae3e72830f7a29fca608b3165 +davinci bce6faa6f60c27063f9012411635735bc50232e8 +i.MX 69583b3eb7db0eacfc16a4ddab7d98ba237d6251 +msm 38e7ca452fa7b9dd20fdd49b0599404262118890 +omap cef9f7db2d0000f03ab35094f14816b4bdbf29f1 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 3b05007e43ea629394e89ea0b023d7b15375a2bb +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin 39710479303fd3affb3e204e9a7a75cc676977b5 +cris d8fe989e7368a26e4baf9acb55524c71e5c3a117 +ia64 da0528828dcdb32328aeeaa411aa5be38db2f8ff +m68k 3b853fdf745b23adb204f8ab526c7ca1d9accca3 +m68knommu 59c7835794c222023567fec13bb2a427190e34e6 +microblaze af2b021fd6dc3e145d20f5eb927af9590c80bc44 +mips 522b119682125a99796e0a1a672b4eb92b69366f +parisc 25cf84cf377c0aae5dbcf937ea89bc7893db5176 +powerpc 359e4284a3f37aba7fd06d993863de2509d86f54 +4xx 3d98ffbffb16f2a1569b83cb78db0b5100e6c937 +52xx-and-virtex ed01f64b831481762437c8eedddcca8481dc7f67 +galak a11106544f33c104706ae42d27219a409b67478e +s390 0df06e4a2c7cb719b9e649f404dd435cb3dbc0d8 +sh 99dc5c0ca953fb154a3c75ebc6801e0a3c2fe3fe +genesis bbff48f5e9e14bea5183dd2c2408e3364f4c19e3 +sparc 3a5b27bf6f29574d667230c7e76e4b83fe3014e0 +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +ceph b8e4adf9f57a24ae43bdfcdf374e0022df53e43a +cifs f05337c6ac48d19d354e0640a8eb8fc884f82bcc +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs d23d960f5c8560ce182c69a31a6e8707c05c947d +ext3 4a316392e4a668aed57ae758729a3d23eeaa07da +ext4 496dc4b0bea0a5dcfdcc96a0ec465efc826d83d5 +fatfs 1bdb6f9199def1c3538c18089e499f5df5ff1747 +fuse b2d82ee3c8b2193ee5bc7eca4687ee9be30abd34 +gfs2 602c89d2e3e8652f94a697c9a919be739b9bcdd5 +jfs d7eecb483cc29e929bbc5515b8def830d7fc6ad2 +logfs 6be7fa06eb4d721df734bd0946b5e63b27c0589b +nfs 4988a7ad6b3851bc1c8e53453fbb94036c1feec4 +nfsd a5990ea1254cd186b38744507aeec3136a0c1c95 +nilfs2 294a6679cc2400cb5329efc5ec906aed76ca5f5b +ocfs2 586141cf95c7e9a1dec118df8d0562e0d16e4832 +squashfs 06862f884d9c2453daaf0c1d070c69cf444f10b1 +udf c15d0fc0fc399d2639240b35ad7ed93ed5a59412 +v9fs fa4588924fa55ee472cd0177b6a548db6046ce5f +ubifs 57d54889cd00db2752994b389ba714138652e60c +xfs 68a2ac777cca40ccc993512bcf457999be71cc36 +reiserfs-bkl b7b7fa43103a9fb30dbcc60cbd5161fdfc25f904 +vfs 9f009a78fb3b54976cfe8173d05ef483dbda4571 +pci 618de67e7fc406182ce34e917e06274306ceb6e5 +hid 992117fda6c66432bb00d29aaab9b7747861d323 +i2c 61b22466a1d84d7f58ca859c1648ef0ee55b61bd +bjdooks-i2c 3f4ae8605261e6f71e721e026bc18cb1851a7276 +jdelvare-hwmon 586f751db157b5b6feef7f9712efbd602e04e0fe +kernel-doc 05240ad14424a627f0cb6b6d13347619f1758b05 +v4l-dvb 49cee5275dae900f62c93460f33bad0d63ed94f9 +kbuild 7926c09dea682be6f3b2e42f16c50d8554c6bbdc +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide c48b24ba6db637e92f477ac2646be21e12b29f86 +libata 4ad2ef007e1679fa503f0f63bfabd0079c232ec4 +infiniband 38681ccbc503055179988c01c455f8b93abf3daa +acpi 3d2fbe2276290230776435ccd90fe40fe25c0d25 +ieee1394 fe43d6d9cf59d8f8cbfdcde2018de13ffd1285c7 +ubi 57d54889cd00db2752994b389ba714138652e60c +kvm 904f210034633abff672600cfcb3ac6885af2ea6 +dlm b6fa8796b2da0390e9f4115e8789a01004fc1c9b +ibft a14a4f87b50fda897d0027066916be6d01f1c5ad +scsi a899afeb5997c7f18a4eb778c7d81f8f9e14b08f +async_tx 6a3cd3ea48584d14f60dce0b3c4e9e4428beb0fe +net e4077e018b5ead3de9951fc01d8bf12eeeeeefed +wireless ace5d5de6bbaff00d3b5dd7ea8f160b570fdb726 +mtd fed457a83611182f5a2e049cce02f8f4e1b65644 +crypto 975d260355fca4734b545a0e3366672af0356905 +sound d175fedc064ef2650ac9761875859d69b612c970 +cpufreq 81f07b43424f6c328b1c9f54277b24b9f627c9b7 +rr 3ec4a3d94564eceb772f5b1a59a1f585fe89dfb4 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input 9d43c11839f253d8f791fb13602cc651594d9891 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 02246c41171097ceab3246f6dc251ac89de6004b +device-mapper 1ef37bd7422348e6171d6be208e04a79db0ccf2f +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 8e14392ecdfdaaacb742b8cb51907d5833326e73 +battery b5874f33bbaf00586d05de37706491ee37057e11 +leds 14b5d6dd40b3091cb5f566568baa4a74dc619286 +backlight ec57af9c2ece22ae6234189972105d777ff5f939 +kgdb 61e2aba62ec09b9100d23b7efc64ec02c00fca24 +slab e7965e1eab4243f2c7459e57248d47f031696038 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 113b4e570a4e2953a227330f33deddc0f21300d6 +mfd c43e1fa5e48a71901298ad1464ae80325fabc13c +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 318f2b24c9a949068cf19d8a62d8e4992badcff5 +voltage 1b060f0a7ebac0b76bf652b242b3a47b397de09a +security-testing e2902eb79fdea3c3bf679a8f15f3432b393cb2c0 +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +uwb 32d12e8cd19f86d424cab68a29c9f09a3fe97259 +watchdog 522dba7134d6b2e5821d3457f7941ec34f668e6d +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 0b8973a81876d90f916507ac40d1381068dc986a +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 220bf991b0366cc50a94feede3d7341fa5710ee4 +jc_docs 724e6d3fe8003c3f60bf404bf22e4e331327c596 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 231c91f53e448ebe5c2d3c8ea88115bb49529674 +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend 2cbeb09026d9e3a77873b672369f1695786258cb +bluetooth 3e81c6da39a265e11ef48f52bd15bf7ca0068c75 +fsnotify 48db02f1d87c626f274766edd6aef311aff1f93b +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +drbd 34871030cfa377ba0f90b8ab91a1deca762138f6 +catalin 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +alacrity e1077ef3b2751766c4437e2f974e3d7372742d0d +i7core_edac d0ae29a6eed06533e30dc7cd00d6f7983e3a7287 +devicetree 9cbbd9e33e2441bb109224c6f5f53ee5ae52a391 +spi 4f4517c45f325ba511458465430a52864a5d0d30 +limits 57158a0fd4c9e29b403d422ac820cf238066cedf +omap_dss2 8871d54b5e1558bd59baad02eb7a80f86d49f4a1 +tip 79583a5148bdbc991eb17798cdf0c027aaaf2496 +edac-amd 5b89d2f9ace1970324facc68ca9b8fae19ce8096 +oprofile bb1165d6882f423f90fc7007a88c6c993b7c2ac4 +percpu d5e50daf92df8afcb701fd717b301985691e802f +workqueues 5ab0fec5e715dd22e9d30d9f2eb1f0bbb05fb001 +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +hwpoison 27df5068e24f2f88de98e95eb6e8dbc9800bf80e +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 832d72674364863496fee86a1dfd7c38b0a5c333 +tty 832d72674364863496fee86a1dfd7c38b0a5c333 +usb 50be717773eb1d77d0a02f1b307cfe7b36121d03 +staging 50be717773eb1d77d0a02f1b307cfe7b36121d03 +slabh 18e5b539b451158be7aae6c390a20f0d3e5b9213 +scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..724b813dd2e8 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,162 @@ +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://repo.or.cz/linux-kbuild.git#for-linus +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 +gcl-current git git://git.secretlab.ca/git/linux-2.6#merge +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 +i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next +msm git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git#for-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 +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +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 +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#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 +genesis git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-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 +logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master +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/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-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://repo.or.cz/linux-kbuild.git#for-next +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 +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git#master +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +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 +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 +spi git git://git.secretlab.ca/git/linux-2.6#next-spi +limits git git://decibel.fi.muni.cz/~xslaby/linux#writable_limits +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +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 +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.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 +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +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/ +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +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..cac90ba8b45d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4755 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 48de8cb Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +Merging origin/master +$ git merge origin/master +Updating 48de8cb..d620a7c +Fast-forward + MAINTAINERS | 13 ++++--- + drivers/acpi/acpica/evgpe.c | 19 ++++------- + drivers/acpi/acpica/exprep.c | 12 +++++++ + drivers/acpi/battery.c | 6 ++-- + drivers/acpi/dock.c | 7 +--- + drivers/acpi/ec.c | 35 +++++--------------- + drivers/acpi/numa.c | 6 ++- + drivers/acpi/osl.c | 23 +++++++------ + drivers/acpi/scan.c | 12 +++--- + drivers/acpi/video.c | 67 +++++++++++++++++++++++++++------------ + drivers/char/hvc_console.c | 4 -- + drivers/char/virtio_console.c | 65 ++++++++++++++++++++++++++++----------- + drivers/ide/ide-atapi.c | 2 +- + drivers/ide/ide-dma.c | 1 + + drivers/ide/ide-io.c | 2 +- + drivers/ide/ide-taskfile.c | 6 +-- + drivers/pnp/pnpacpi/rsparser.c | 42 ++++++++++++++++++------- + fs/nfs/nfs4proc.c | 3 +- + include/linux/ata.h | 4 +- + include/linux/ide.h | 1 + + include/linux/virtio_console.h | 23 -------------- + kernel/sched.c | 2 +- + lib/rwsem-spinlock.c | 14 +++++--- + 23 files changed, 203 insertions(+), 166 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Updating d620a7c..797c319 +Fast-forward + drivers/block/pktcdvd.c | 17 ++++++++++++++--- + fs/compat_ioctl.c | 3 --- + 2 files changed, 14 insertions(+), 6 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 10 ++ + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/mach-bcmring/dma.c | 13 ++- + arch/arm/mach-ep93xx/gpio.c | 6 +- + arch/arm/mach-mx3/Kconfig | 10 ++ + arch/arm/mach-mx3/clock-imx31.c | 5 +- + arch/arm/mach-mx3/devices.c | 19 ++- + arch/arm/mach-mx3/devices.h | 3 +- + arch/arm/mach-mx3/mach-armadillo5x0.c | 166 ++++++++++++++++++++ + arch/arm/mach-mx3/mach-mx31_3ds.c | 116 ++++++++++++--- + arch/arm/mach-mx3/mach-pcm037.c | 1 - + arch/arm/mach-mx3/mx31lite-db.c | 2 +- + arch/arm/mach-mx5/clock-mx51.c | 2 +- + arch/arm/mach-mx5/cpu.c | 53 ++++++ + arch/arm/mach-mx5/mm.c | 32 ++--- + .../mach/{board-mx31pdk.h => board-mx31_3ds.h} | 6 +- + arch/arm/plat-mxc/include/mach/mx51.h | 33 ++--- + arch/arm/plat-mxc/include/mach/uncompress.h | 4 + + 18 files changed, 406 insertions(+), 77 deletions(-) + rename arch/arm/plat-mxc/include/mach/{board-mx31pdk.h => board-mx31_3ds.h} (93%) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/include/asm/atomic_mm.h | 8 ++++++-- + arch/m68k/include/asm/sigcontext.h | 4 +--- + 2 files changed, 7 insertions(+), 5 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/scsi/be2iscsi/be_mgmt.c | 1 + + drivers/scsi/dpt_i2o.c | 15 +++++++++------ + drivers/scsi/lpfc/lpfc_bsg.c | 4 ++-- + drivers/scsi/qla2xxx/qla_attr.c | 1 + + 4 files changed, 13 insertions(+), 8 deletions(-) +Merging net-current/master +$ git merge net-current/master +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/qlcnic/qlcnic_hw.c +Auto-merging drivers/net/r6040.c +Auto-merging drivers/net/stmmac/stmmac_main.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rs.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/vhost/vhost.c +Auto-merging include/net/x25.h +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv6/udp.c +Auto-merging net/mac80211/mesh.c +Auto-merging net/mac80211/rx.c +Auto-merging net/x25/af_x25.c +Auto-merging net/x25/x25_in.c +Merge made by recursive. + Documentation/networking/timestamping.txt | 76 ++++++++++++-------- + drivers/net/cnic.c | 10 ++-- + drivers/net/myri10ge/myri10ge.c | 2 +- + drivers/net/qlcnic/qlcnic_hw.c | 3 + + drivers/net/r6040.c | 11 +-- + drivers/net/stmmac/stmmac_main.c | 10 ++-- + drivers/net/wireless/ath/ath9k/main.c | 3 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 55 +++++++-------- + drivers/net/wireless/iwlwifi/iwl-core.c | 11 ++- + drivers/net/wireless/iwlwifi/iwl-core.h | 5 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 107 +++++++++++++++++++++++++---- + drivers/vhost/vhost.c | 4 + + include/net/x25.h | 4 + + net/bridge/br_multicast.c | 2 +- + net/ipv4/udp.c | 4 +- + net/ipv6/udp.c | 4 +- + net/mac80211/main.c | 4 +- + net/mac80211/mesh.c | 3 - + net/mac80211/rx.c | 5 ++ + net/mac80211/sta_info.c | 20 ++++- + net/x25/af_x25.c | 67 +++++++++++++++++-- + net/x25/x25_facilities.c | 27 ++++++- + net/x25/x25_in.c | 15 +++- + 23 files changed, 326 insertions(+), 126 deletions(-) +$ git am -3 ../patches/0001-ar9170-fix-for-driver-core-ABI-change.patch +Applying: ar9170: fix for driver-core ABI change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/wireless/ath/ar9170/usb.c +$ git add . +$ git commit -v -a --amend +[master 97d0efa] Merge remote branch 'net-current/master' +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + arch/x86/pci/acpi.c | 3 +-- + drivers/pci/pcie/aer/aerdrv.c | 10 ++++++++-- + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/iwlwifi/iwl-4965.c | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) +Merging kbuild-current/for-linus +$ git merge kbuild-current/for-linus +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging quilt/staging.current +$ git merge quilt/staging.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Merge made by recursive. + drivers/cpufreq/cpufreq.c | 19 ++++++++++++++----- + drivers/cpufreq/cpufreq_conservative.c | 8 ++++++-- + 2 files changed, 20 insertions(+), 7 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Auto-merging drivers/input/input.c +Auto-merging drivers/input/keyboard/matrix_keypad.c +Auto-merging drivers/input/mouse/alps.c +Auto-merging drivers/input/serio/i8042.c +Auto-merging drivers/input/sparse-keymap.c +Merge made by recursive. + Documentation/input/multi-touch-protocol.txt | 23 ++++++++--- + drivers/input/input.c | 9 ++++- + drivers/input/keyboard/matrix_keypad.c | 4 +- + drivers/input/mouse/alps.c | 1 + + drivers/input/mouse/bcm5974.c | 1 - + drivers/input/serio/i8042.c | 2 +- + drivers/input/sparse-keymap.c | 52 ++++++++++++++++--------- + include/linux/input/matrix_keypad.h | 2 + + 8 files changed, 65 insertions(+), 29 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Renaming arch/arm/mach-nomadik/gpio.c => arch/arm/plat-nomadik/gpio.c +Auto-merging arch/arm/plat-nomadik/gpio.c +Auto-merging arch/arm/common/clkdev.c +Removing arch/arm/common/icst307.c +Removing arch/arm/common/icst525.c +Removing arch/arm/include/asm/hardware/icst307.h +Removing arch/arm/include/asm/hardware/icst525.h +Removing arch/arm/mach-integrator/common.h +Auto-merging arch/arm/mach-integrator/cpu.c +Auto-merging arch/arm/mach-integrator/impd1.c +Auto-merging arch/arm/mach-integrator/integrator_cp.c +Auto-merging arch/arm/mach-integrator/pci_v3.c +Removing arch/arm/mach-realview/clock.c +Removing arch/arm/mach-realview/clock.h +Auto-merging arch/arm/mach-realview/core.c +Removing arch/arm/mach-versatile/clock.c +Removing arch/arm/mach-versatile/clock.h +Auto-merging arch/arm/mach-versatile/core.c +Auto-merging arch/arm/mm/Kconfig +Merge made by recursive. + arch/arm/Kconfig | 78 +++- + arch/arm/Makefile | 2 + + arch/arm/common/Kconfig | 6 +- + arch/arm/common/Makefile | 3 +- + arch/arm/common/clkdev.c | 7 +- + arch/arm/common/icst.c | 100 ++++ + arch/arm/common/icst307.c | 161 ------- + arch/arm/common/icst525.c | 160 ------- + arch/arm/include/asm/hardware/arm_timer.h | 39 +- + arch/arm/include/asm/hardware/icst.h | 59 +++ + arch/arm/include/asm/hardware/icst307.h | 38 -- + arch/arm/include/asm/hardware/icst525.h | 36 -- + arch/arm/include/asm/mach/time.h | 2 +- + arch/arm/kernel/time.c | 70 +--- + arch/arm/mach-at91/Kconfig | 1 + + arch/arm/mach-integrator/Kconfig | 1 + + arch/arm/mach-integrator/Makefile | 2 +- + arch/arm/mach-integrator/common.h | 2 - + arch/arm/mach-integrator/core.c | 127 +----- + arch/arm/mach-integrator/cpu.c | 53 ++- + arch/arm/mach-integrator/impd1.c | 43 +- + arch/arm/mach-integrator/include/mach/clkdev.h | 7 +- + .../arm/mach-integrator/include/mach/entry-macro.S | 1 + + arch/arm/mach-integrator/include/mach/hardware.h | 17 +- + arch/arm/mach-integrator/include/mach/platform.h | 54 +-- + arch/arm/mach-integrator/integrator_ap.c | 166 +++++++- + arch/arm/mach-integrator/integrator_cp.c | 88 ++-- + arch/arm/mach-integrator/leds.c | 1 + + arch/arm/mach-integrator/pci_v3.c | 7 +- + arch/arm/mach-nomadik/Kconfig | 1 + + arch/arm/mach-nomadik/Makefile | 2 +- + arch/arm/mach-nomadik/cpu-8815.c | 83 ++-- + arch/arm/mach-nomadik/include/mach/gpio.h | 67 +--- + arch/arm/mach-realview/Makefile | 2 +- + arch/arm/mach-realview/clock.c | 64 --- + arch/arm/mach-realview/clock.h | 19 - + arch/arm/mach-realview/core.c | 194 ++------- + arch/arm/mach-realview/include/mach/clkdev.h | 9 + + arch/arm/mach-realview/include/mach/irqs-pb1176.h | 1 + + arch/arm/mach-realview/include/mach/irqs-pba8.h | 8 +- + arch/arm/mach-realview/include/mach/irqs-pbx.h | 14 +- + arch/arm/mach-realview/include/mach/platform.h | 20 - + arch/arm/mach-realview/realview_eb.c | 2 - + arch/arm/mach-realview/realview_pb1176.c | 2 - + arch/arm/mach-realview/realview_pb11mp.c | 2 - + arch/arm/mach-realview/realview_pba8.c | 2 - + arch/arm/mach-ux500/Kconfig | 1 + + arch/arm/mach-ux500/board-mop500.c | 20 +- + arch/arm/mach-ux500/clock.c | 491 ++++++++++++++++++-- + arch/arm/mach-ux500/clock.h | 125 +++++ + arch/arm/mach-ux500/cpu-u8500.c | 126 +++++- + arch/arm/mach-ux500/include/mach/gpio.h | 12 + + arch/arm/mach-ux500/include/mach/hardware.h | 41 ++- + arch/arm/mach-ux500/include/mach/irqs.h | 8 +- + arch/arm/mach-ux500/include/mach/setup.h | 3 + + arch/arm/mach-versatile/Makefile | 2 +- + arch/arm/mach-versatile/clock.c | 65 --- + arch/arm/mach-versatile/clock.h | 20 - + arch/arm/mach-versatile/core.c | 194 +------- + arch/arm/mach-versatile/include/mach/clkdev.h | 9 + + arch/arm/mach-versatile/include/mach/entry-macro.S | 1 + + arch/arm/mach-versatile/include/mach/hardware.h | 3 +- + arch/arm/mach-versatile/include/mach/platform.h | 26 +- + arch/arm/mach-vexpress/Kconfig | 9 + + arch/arm/mach-vexpress/Makefile | 8 + + arch/arm/mach-vexpress/Makefile.boot | 3 + + arch/arm/mach-vexpress/core.h | 26 + + arch/arm/mach-vexpress/ct-ca9x4.c | 215 +++++++++ + arch/arm/mach-vexpress/headsmp.S | 39 ++ + arch/arm/mach-vexpress/include/mach/clkdev.h | 15 + + arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 43 ++ + arch/arm/mach-vexpress/include/mach/debug-macro.S | 23 + + arch/arm/mach-vexpress/include/mach/entry-macro.S | 67 +++ + arch/arm/mach-vexpress/include/mach/hardware.h | 1 + + arch/arm/mach-vexpress/include/mach/io.h | 28 ++ + arch/arm/mach-vexpress/include/mach/irqs.h | 4 + + arch/arm/mach-vexpress/include/mach/memory.h | 25 + + arch/arm/mach-vexpress/include/mach/motherboard.h | 121 +++++ + arch/arm/mach-vexpress/include/mach/smp.h | 21 + + arch/arm/mach-vexpress/include/mach/system.h | 37 ++ + arch/arm/mach-vexpress/include/mach/timex.h | 23 + + arch/arm/mach-vexpress/include/mach/uncompress.h | 52 ++ + arch/arm/mach-vexpress/include/mach/vmalloc.h | 21 + + arch/arm/mach-vexpress/localtimer.c | 26 + + arch/arm/mach-vexpress/platsmp.c | 190 ++++++++ + arch/arm/mach-vexpress/v2m.c | 361 ++++++++++++++ + arch/arm/mm/Kconfig | 3 +- + arch/arm/plat-nomadik/Kconfig | 5 + + arch/arm/plat-nomadik/Makefile | 1 + + arch/arm/{mach-nomadik => plat-nomadik}/gpio.c | 93 +++-- + arch/arm/plat-nomadik/include/plat/gpio.h | 70 +++ + arch/arm/plat-nomadik/timer.c | 125 +++--- + arch/arm/plat-versatile/Makefile | 4 + + .../{mach-integrator => plat-versatile}/clock.c | 43 ++- + arch/arm/plat-versatile/include/plat/clock.h | 15 + + arch/arm/plat-versatile/include/plat/timer-sp.h | 2 + + arch/arm/plat-versatile/sched-clock.c | 53 +++ + arch/arm/plat-versatile/timer-sp.c | 156 +++++++ + drivers/i2c/busses/Kconfig | 2 +- + 99 files changed, 3271 insertions(+), 1629 deletions(-) + create mode 100644 arch/arm/common/icst.c + delete mode 100644 arch/arm/common/icst307.c + delete mode 100644 arch/arm/common/icst525.c + create mode 100644 arch/arm/include/asm/hardware/icst.h + delete mode 100644 arch/arm/include/asm/hardware/icst307.h + delete mode 100644 arch/arm/include/asm/hardware/icst525.h + delete mode 100644 arch/arm/mach-integrator/common.h + delete mode 100644 arch/arm/mach-realview/clock.c + delete mode 100644 arch/arm/mach-realview/clock.h + create mode 100644 arch/arm/mach-ux500/clock.h + create mode 100644 arch/arm/mach-ux500/include/mach/gpio.h + delete mode 100644 arch/arm/mach-versatile/clock.c + delete mode 100644 arch/arm/mach-versatile/clock.h + create mode 100644 arch/arm/mach-vexpress/Kconfig + create mode 100644 arch/arm/mach-vexpress/Makefile + create mode 100644 arch/arm/mach-vexpress/Makefile.boot + create mode 100644 arch/arm/mach-vexpress/core.h + create mode 100644 arch/arm/mach-vexpress/ct-ca9x4.c + create mode 100644 arch/arm/mach-vexpress/headsmp.S + create mode 100644 arch/arm/mach-vexpress/include/mach/clkdev.h + create mode 100644 arch/arm/mach-vexpress/include/mach/ct-ca9x4.h + create mode 100644 arch/arm/mach-vexpress/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-vexpress/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-vexpress/include/mach/hardware.h + create mode 100644 arch/arm/mach-vexpress/include/mach/io.h + create mode 100644 arch/arm/mach-vexpress/include/mach/irqs.h + create mode 100644 arch/arm/mach-vexpress/include/mach/memory.h + create mode 100644 arch/arm/mach-vexpress/include/mach/motherboard.h + create mode 100644 arch/arm/mach-vexpress/include/mach/smp.h + create mode 100644 arch/arm/mach-vexpress/include/mach/system.h + create mode 100644 arch/arm/mach-vexpress/include/mach/timex.h + create mode 100644 arch/arm/mach-vexpress/include/mach/uncompress.h + create mode 100644 arch/arm/mach-vexpress/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-vexpress/localtimer.c + create mode 100644 arch/arm/mach-vexpress/platsmp.c + create mode 100644 arch/arm/mach-vexpress/v2m.c + rename arch/arm/{mach-nomadik => plat-nomadik}/gpio.c (86%) + create mode 100644 arch/arm/plat-nomadik/include/plat/gpio.h + create mode 100644 arch/arm/plat-versatile/Makefile + rename arch/arm/{mach-integrator => plat-versatile}/clock.c (59%) + create mode 100644 arch/arm/plat-versatile/include/plat/clock.h + create mode 100644 arch/arm/plat-versatile/include/plat/timer-sp.h + create mode 100644 arch/arm/plat-versatile/sched-clock.c + create mode 100644 arch/arm/plat-versatile/timer-sp.c +$ git am -3 ../patches/arm__update_gfp_slab.h_includes +Applying: arm: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/mach-vexpress/ct-ca9x4.c +$ git add . +$ git commit -v -a --amend +[master ae0b544] Merge remote branch 'arm/devel' +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/mach-davinci/dma.c +Merge made by recursive. + arch/arm/Kconfig | 1 - + arch/arm/mach-davinci/Kconfig | 2 + + arch/arm/mach-davinci/board-da830-evm.c | 33 +- + arch/arm/mach-davinci/board-da850-evm.c | 20 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- + arch/arm/mach-davinci/board-sffsdr.c | 2 +- + arch/arm/mach-davinci/cdce949.c | 1 + + arch/arm/mach-davinci/clock.c | 13 +- + arch/arm/mach-davinci/clock.h | 7 +- + arch/arm/mach-davinci/cp_intc.c | 6 +- + arch/arm/mach-davinci/devices.c | 2 + + arch/arm/mach-davinci/dm355.c | 2 +- + arch/arm/mach-davinci/dm365.c | 2 +- + arch/arm/mach-davinci/dm644x.c | 4 +- + arch/arm/mach-davinci/dm646x.c | 6 +- + arch/arm/mach-davinci/dma.c | 11 +- + arch/arm/mach-davinci/gpio.c | 41 +- + arch/arm/mach-davinci/include/mach/cp_intc.h | 2 +- + arch/arm/mach-davinci/include/mach/cputype.h | 8 + + arch/arm/mach-davinci/include/mach/da8xx.h | 6 - + arch/arm/mach-davinci/include/mach/gpio.h | 8 +- + arch/arm/mach-davinci/include/mach/irqs.h | 97 ++++ + arch/arm/mach-davinci/include/mach/mux.h | 274 +++++++++++ + arch/arm/mach-davinci/include/mach/psc.h | 55 ++- + arch/arm/mach-davinci/mux.c | 2 +- + arch/arm/mach-davinci/psc.c | 3 +- + arch/arm/mach-davinci/time.c | 6 +- + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-davinci.c | 673 ++++++++++++++++++++++++++ + drivers/rtc/rtc-omap.c | 12 +- + 32 files changed, 1234 insertions(+), 80 deletions(-) + create mode 100644 drivers/rtc/rtc-davinci.c +$ git am -3 ../patches/davinci__update_gfp_slab.h_includes +Applying: davinci: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/rtc/rtc-davinci.c +$ git add . +$ git commit -v -a --amend +[master fccf497] Merge remote branch 'davinci/davinci-next' +Merging i.MX/for-next +$ git merge i.MX/for-next +Recorded preimage for 'arch/arm/mach-mx3/devices.c' +Recorded preimage for 'arch/arm/mach-mx3/devices.h' +Recorded preimage for 'arch/arm/mach-mx3/mx31lite-db.c' +Renaming arch/arm/plat-mxc/include/mach/board-mx31pdk.h->arch/arm/plat-mxc/include/mach/board-mx31_3ds.h +Auto-merging arch/arm/plat-mxc/include/mach/board-mx31_3ds.h +Auto-merging arch/arm/mach-mx3/Kconfig +Auto-merging arch/arm/mach-mx3/devices.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx3/devices.c +Auto-merging arch/arm/mach-mx3/devices.h +CONFLICT (content): Merge conflict in arch/arm/mach-mx3/devices.h +Auto-merging arch/arm/mach-mx3/mx31lite-db.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mx31lite-db.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-mx3/devices.c'. +Recorded resolution for 'arch/arm/mach-mx3/devices.h'. +Recorded resolution for 'arch/arm/mach-mx3/mx31lite-db.c'. +[master 54f134e] Merge remote branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-mx3/devices.c | 19 +++++++++++++++++++ + arch/arm/mach-mx3/devices.h | 1 + + arch/arm/mach-mx3/mx31lite-db.c | 1 + + 3 files changed, 21 insertions(+), 0 deletions(-) +Merging msm/for-next +$ git merge msm/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/mmc/host/msm_sdcc.c +Merge made by recursive. + MAINTAINERS | 1 + + arch/arm/mach-msm/Makefile | 3 +- + arch/arm/mach-msm/acpuclock-arm11.c | 526 ++++++++++++++++++++ + arch/arm/mach-msm/acpuclock.h | 32 ++ + arch/arm/mach-msm/board-halibut.c | 15 + + arch/arm/mach-msm/board-mahimahi.c | 87 ++++ + arch/arm/mach-msm/board-msm7x27.c | 179 +++++++ + arch/arm/mach-msm/board-msm7x30.c | 196 ++++++++ + arch/arm/mach-msm/board-qsd8x50.c | 176 +++++++ + arch/arm/mach-msm/board-sapphire.c | 118 +++++ + arch/arm/mach-msm/{board-dream.c => board-trout.c} | 4 +- + arch/arm/mach-msm/{board-dream.h => board-trout.h} | 0 + arch/arm/mach-msm/devices.c | 78 +++ + arch/arm/mach-msm/dma.c | 28 +- + arch/arm/mach-msm/include/mach/board.h | 11 + + arch/arm/mach-msm/include/mach/dma.h | 2 + + arch/arm/mach-msm/include/mach/vreg.h | 2 +- + arch/arm/mach-msm/irq.c | 4 +- + arch/arm/mach-msm/proc_comm.h | 102 ++++- + arch/arm/mach-msm/vreg.c | 154 +++++-- + drivers/mmc/host/msm_sdcc.c | 472 +++++++++++------- + drivers/mmc/host/msm_sdcc.h | 15 +- + 22 files changed, 1966 insertions(+), 239 deletions(-) + create mode 100644 arch/arm/mach-msm/acpuclock-arm11.c + create mode 100644 arch/arm/mach-msm/acpuclock.h + create mode 100644 arch/arm/mach-msm/board-mahimahi.c + create mode 100644 arch/arm/mach-msm/board-msm7x27.c + create mode 100644 arch/arm/mach-msm/board-msm7x30.c + create mode 100644 arch/arm/mach-msm/board-qsd8x50.c + create mode 100644 arch/arm/mach-msm/board-sapphire.c + rename arch/arm/mach-msm/{board-dream.c => board-trout.c} (97%) + rename arch/arm/mach-msm/{board-dream.h => board-trout.h} (100%) +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/configs/omap_zoom2_defconfig | 2 +- + arch/arm/configs/omap_zoom3_defconfig | 2 +- + arch/arm/mach-omap2/board-3630sdp.c | 1 + + arch/arm/mach-omap2/board-n8x0.c | 18 ++++++------ + arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 1 - + arch/arm/mach-omap2/include/mach/entry-macro.S | 2 +- + arch/arm/mach-omap2/serial.c | 35 ++++++++++++----------- + 8 files changed, 32 insertions(+), 31 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already uptodate! +Merge made by recursive. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Auto-merging arch/m68knommu/kernel/process.c +Auto-merging arch/m68knommu/kernel/ptrace.c +Auto-merging arch/m68knommu/kernel/sys_m68k.c +Auto-merging arch/m68knommu/kernel/syscalltable.S +Auto-merging fs/binfmt_flat.c +Merge made by recursive. + arch/m68k/include/asm/m520xsim.h | 4 + + arch/m68k/include/asm/m523xsim.h | 8 + + arch/m68k/include/asm/m5249sim.h | 6 +- + arch/m68k/include/asm/m527xsim.h | 10 ++ + arch/m68k/include/asm/m528xsim.h | 67 +--------- + arch/m68k/include/asm/m532xsim.h | 1 + + arch/m68k/include/asm/mcfqspi.h | 64 +++++++++ + arch/m68knommu/Kconfig | 4 + + arch/m68knommu/Makefile | 2 +- + arch/m68knommu/kernel/entry.S | 2 +- + arch/m68knommu/platform/520x/config.c | 149 +++++++++++++++++++++ + arch/m68knommu/platform/523x/config.c | 170 ++++++++++++++++++++++++ + arch/m68knommu/platform/5249/config.c | 167 +++++++++++++++++++++++ + arch/m68knommu/platform/5272/intc.c | 39 +++++- + arch/m68knommu/platform/527x/config.c | 182 ++++++++++++++++++++++++++ + arch/m68knommu/platform/528x/config.c | 137 +++++++++++++++++++ + arch/m68knommu/platform/532x/config.c | 124 +++++++++++++++++ + arch/m68knommu/platform/68328/ints.c | 8 +- + arch/m68knommu/platform/68360/ints.c | 8 +- + arch/m68knommu/platform/coldfire/intc-2.c | 76 ++++++++++- + arch/m68knommu/platform/coldfire/intc-simr.c | 68 +++++++++- + arch/m68knommu/platform/coldfire/intc.c | 59 ++++++++- + fs/binfmt_flat.c | 2 +- + 23 files changed, 1252 insertions(+), 105 deletions(-) + create mode 100644 arch/m68k/include/asm/mcfqspi.h +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Merge made by recursive. + drivers/video/tdfxfb.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Removing drivers/misc/hdpuftrs/Makefile +Removing drivers/misc/hdpuftrs/hdpu_cpustate.c +Removing drivers/misc/hdpuftrs/hdpu_nexus.c +Removing include/linux/hdpu_features.h +Merge made by recursive. + arch/powerpc/Kconfig | 1 + + arch/powerpc/boot/Makefile | 4 +- + arch/powerpc/boot/wrapper | 6 +- + arch/powerpc/include/asm/hvcall.h | 1 + + arch/powerpc/include/asm/pgtable-ppc32.h | 2 +- + arch/powerpc/include/asm/ptrace.h | 64 +++++++ + arch/powerpc/include/asm/sparsemem.h | 2 +- + arch/powerpc/include/asm/topology.h | 10 + + arch/powerpc/kernel/exceptions-64s.S | 13 ++- + arch/powerpc/kernel/head_8xx.S | 70 ++++++--- + arch/powerpc/kernel/lparcfg.c | 12 ++- + arch/powerpc/kernel/ptrace.c | 103 ++++++++++++ + arch/powerpc/kernel/rtas.c | 15 +- + arch/powerpc/kernel/smp.c | 4 +- + arch/powerpc/kernel/vio.c | 49 ++++++- + arch/powerpc/lib/string.S | 4 +- + arch/powerpc/mm/fault.c | 5 +- + arch/powerpc/mm/pgtable_32.c | 8 + + arch/powerpc/mm/pgtable_64.c | 8 + + arch/powerpc/platforms/iseries/pci.c | 10 +- + arch/powerpc/platforms/powermac/low_i2c.c | 7 +- + arch/powerpc/platforms/pseries/dlpar.c | 8 +- + drivers/macintosh/macio-adb.c | 1 + + drivers/macintosh/smu.c | 4 +- + drivers/macintosh/therm_adt746x.c | 2 + + drivers/macintosh/windfarm_pm81.c | 6 +- + drivers/macintosh/windfarm_pm91.c | 9 +- + drivers/misc/Makefile | 1 - + drivers/misc/hdpuftrs/Makefile | 1 - + drivers/misc/hdpuftrs/hdpu_cpustate.c | 256 ----------------------------- + drivers/misc/hdpuftrs/hdpu_nexus.c | 149 ----------------- + drivers/serial/mpsc.c | 1 + + include/linux/hdpu_features.h | 26 --- + sound/aoa/core/gpio-pmf.c | 9 +- + 34 files changed, 364 insertions(+), 507 deletions(-) + delete mode 100644 drivers/misc/hdpuftrs/Makefile + delete mode 100644 drivers/misc/hdpuftrs/hdpu_cpustate.c + delete mode 100644 drivers/misc/hdpuftrs/hdpu_nexus.c + delete mode 100644 include/linux/hdpu_features.h +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/defconfig | 40 ++++-- + arch/s390/include/asm/lowcore.h | 48 +++---- + arch/s390/include/asm/pgtable.h | 6 +- + arch/s390/include/asm/system.h | 5 - + arch/s390/include/asm/topology.h | 4 + + arch/s390/kernel/asm-offsets.c | 1 - + arch/s390/kernel/entry.S | 274 +++++++++++++++++------------------- + arch/s390/kernel/entry64.S | 291 ++++++++++++++++++-------------------- + arch/s390/kernel/head.S | 4 +- + arch/s390/kernel/processor.c | 37 +++-- + arch/s390/kernel/setup.c | 24 +--- + arch/s390/kernel/topology.c | 10 +- + arch/s390/mm/vmem.c | 11 +- + drivers/s390/char/Kconfig | 3 +- + drivers/s390/char/sclp_async.c | 2 +- + drivers/s390/char/vmcp.c | 38 +---- + drivers/s390/cio/css.c | 7 +- + 17 files changed, 382 insertions(+), 423 deletions(-) +Merging sh/master +$ git merge sh/master +Auto-merging drivers/clocksource/sh_cmt.c +Auto-merging drivers/clocksource/sh_mtu2.c +Auto-merging drivers/clocksource/sh_tmu.c +Auto-merging drivers/dma/shdma.c +Auto-merging drivers/serial/sh-sci.c +Auto-merging drivers/sh/intc.c +Merge made by recursive. + arch/sh/include/asm/clkdev.h | 35 ++++++ + arch/sh/include/asm/clock.h | 7 - + arch/sh/include/asm/dmaengine.h | 63 +--------- + arch/sh/include/asm/siu.h | 8 +- + arch/sh/include/cpu-sh4/cpu/mmu_context.h | 18 +++- + arch/sh/kernel/Makefile | 2 +- + arch/sh/kernel/clkdev.c | 169 ++++++++++++++++++++++++++ + arch/sh/kernel/cpu/clock-cpg.c | 5 + + arch/sh/kernel/cpu/clock.c | 55 +-------- + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 6 - + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 9 -- + arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 9 -- + arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 12 -- + arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 15 --- + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 9 -- + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 9 -- + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 9 -- + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 24 ---- + arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 9 -- + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 15 --- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 9 -- + arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 12 +- + arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 10 +- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 10 +- + arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 58 ++++++++-- + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 56 +++++++-- + arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 51 +++++++- + arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 80 +++++++++++- + arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 16 --- + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 13 -- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 15 --- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 27 ---- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 27 ---- + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 6 - + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 18 --- + arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 27 ---- + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 18 --- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 24 ---- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 36 ------ + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 18 --- + arch/sh/kernel/cpu/sh5/setup-sh5.c | 9 -- + arch/sh/mm/Makefile | 8 +- + arch/sh/mm/tlb-debugfs.c | 179 +++++++++++++++++++++++++++ + drivers/base/platform.c | 20 +++ + drivers/clocksource/sh_cmt.c | 42 +++--- + drivers/clocksource/sh_mtu2.c | 34 +++--- + drivers/clocksource/sh_tmu.c | 38 +++--- + drivers/dma/shdma.c | 13 +- + drivers/dma/shdma.h | 4 +- + drivers/serial/sh-sci.c | 189 +++++++++++++++++++---------- + drivers/sh/intc.c | 95 ++++++++++++++- + include/linux/device.h | 4 + + include/linux/serial_sci.h | 4 +- + include/linux/sh_dma.h | 101 +++++++++++++++ + include/linux/sh_intc.h | 6 +- + 55 files changed, 1063 insertions(+), 702 deletions(-) + create mode 100644 arch/sh/include/asm/clkdev.h + create mode 100644 arch/sh/kernel/clkdev.c + create mode 100644 arch/sh/mm/tlb-debugfs.c + create mode 100644 include/linux/sh_dma.h +Merging genesis/master +$ git merge genesis/master +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/busses/Kconfig +Merge made by recursive. + MAINTAINERS | 3 +- + arch/arm/mach-shmobile/board-ap4evb.c | 43 ++++- + arch/arm/mach-shmobile/board-g4evm.c | 127 ++++++++++++ + arch/arm/mach-shmobile/include/mach/irqs.h | 6 + + arch/arm/mach-shmobile/intc-sh7367.c | 178 ++++++++++++++++- + arch/arm/mach-shmobile/intc-sh7377.c | 300 +++++++++++++++++++++++++++- + arch/arm/mach-shmobile/setup-sh7372.c | 47 +++++ + drivers/dma/Kconfig | 2 +- + drivers/dma/shdma.c | 8 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 121 ++++++++---- + include/linux/serial_sci.h | 2 +- + 12 files changed, 782 insertions(+), 57 deletions(-) +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 fs/ceph/addr.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/messenger.c +Auto-merging fs/ceph/pagelist.c +Auto-merging fs/ceph/xattr.c +Merge made by recursive. + fs/ceph/addr.c | 9 +------ + fs/ceph/file.c | 2 +- + fs/ceph/mds_client.c | 10 +++----- + fs/ceph/messenger.c | 2 +- + fs/ceph/msgpool.c | 2 +- + fs/ceph/osd_client.c | 56 ++++++++++--------------------------------------- + fs/ceph/pagelist.c | 2 +- + fs/ceph/xattr.c | 8 +------ + 8 files changed, 23 insertions(+), 68 deletions(-) +Merging cifs/master +$ git merge cifs/master +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/cifs/file.c +Merge made by recursive. + fs/cifs/cifsfs.c | 1 + + fs/cifs/cifssmb.c | 34 ++++++++++++++++++++++++++++++++-- + fs/cifs/file.c | 28 ++++++++++++++++++++++++++-- + 3 files changed, 59 insertions(+), 4 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/mmap.c +Auto-merging fs/ecryptfs/super.c +Merge made by recursive. + fs/ecryptfs/crypto.c | 37 ++++++------ + fs/ecryptfs/ecryptfs_kernel.h | 13 ++++- + fs/ecryptfs/inode.c | 129 +++++++++++++++++++++-------------------- + fs/ecryptfs/mmap.c | 38 +++++++------ + fs/ecryptfs/super.c | 1 - + 5 files changed, 118 insertions(+), 100 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + fs/ext2/balloc.c | 6 ++++++ + fs/ext2/ialloc.c | 9 ++++----- + fs/ext2/symlink.c | 2 ++ + fs/ext3/balloc.c | 6 ++++++ + fs/ext3/symlink.c | 2 ++ + fs/quota/dquot.c | 19 +++++++++++++++++-- + 6 files changed, 37 insertions(+), 7 deletions(-) +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/ext4/move_extent.c +Merge made by recursive. + fs/ext4/extents.c | 15 ++++++++------- + fs/ext4/fsync.c | 2 +- + fs/ext4/move_extent.c | 1 + + 3 files changed, 10 insertions(+), 8 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Merge made by recursive. + fs/fat/dir.c | 17 ++++++----------- + fs/fat/inode.c | 6 ++---- + 2 files changed, 8 insertions(+), 15 deletions(-) +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Auto-merging fs/gfs2/bmap.c +Merge made by recursive. + Documentation/filesystems/gfs2.txt | 12 ++++++------ + fs/gfs2/aops.c | 8 +++++--- + fs/gfs2/bmap.c | 17 ++++++++++------- + fs/gfs2/main.c | 2 +- + 4 files changed, 22 insertions(+), 17 deletions(-) +Merging jfs/next +$ git merge jfs/next +Auto-merging fs/jfs/jfs_dmap.c +Merge made by recursive. + fs/jfs/jfs_dmap.c | 16 ++++++++-------- + fs/jfs/jfs_dmap.h | 6 +++--- + 2 files changed, 11 insertions(+), 11 deletions(-) +Merging logfs/master +$ git merge logfs/master +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/nfs/dir.c | 2 +- + fs/nfs/inode.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/export.c +Auto-merging fs/nfsd/nfs4callback.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/vfs.c +Merge made by recursive. + fs/nfsd/export.c | 40 +++++++++++++++++------------ + fs/nfsd/nfs4callback.c | 2 +- + fs/nfsd/nfs4state.c | 58 +++++++++++-------------------------------- + fs/nfsd/nfs4xdr.c | 2 +- + fs/nfsd/nfsctl.c | 64 +++++++++++++++++++++++++++++++++++------------ + fs/nfsd/nfsd.h | 6 ++-- + fs/nfsd/vfs.c | 8 +++-- + fs/nfsd/vfs.h | 1 + + net/sunrpc/cache.c | 45 +++++++++++++++++++++------------ + 9 files changed, 125 insertions(+), 101 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Auto-merging fs/nilfs2/ioctl.c +Auto-merging fs/nilfs2/segbuf.c +Auto-merging fs/nilfs2/segment.c +Merge made by recursive. + Documentation/filesystems/nilfs2.txt | 4 +- + fs/nilfs2/btree.c | 93 +++++------------------- + fs/nilfs2/btree.h | 23 +++++- + fs/nilfs2/ioctl.c | 2 +- + fs/nilfs2/segbuf.c | 66 +++++++++------- + fs/nilfs2/segbuf.h | 6 +- + fs/nilfs2/segment.c | 108 +++++---------------------- + fs/nilfs2/segment.h | 4 +- + fs/nilfs2/super.c | 134 ++++++++++++++++++---------------- + 9 files changed, 175 insertions(+), 265 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/buffer_head_io.c +Auto-merging fs/ocfs2/dlm/dlmast.c +Auto-merging fs/ocfs2/inode.c +Auto-merging fs/ocfs2/quota_global.c +Auto-merging fs/ocfs2/quota_local.c +Auto-merging fs/ocfs2/refcounttree.c +Merge made by recursive. + Documentation/filesystems/ocfs2.txt | 7 + + fs/ocfs2/Makefile | 1 + + fs/ocfs2/alloc.c | 166 ++------ + fs/ocfs2/aops.c | 3 + + fs/ocfs2/buffer_head_io.c | 2 + + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/dir.c | 53 +-- + fs/ocfs2/dlm/dlmast.c | 5 +- + fs/ocfs2/dlmfs/dlmfs.c | 12 +- + fs/ocfs2/file.c | 28 +- + fs/ocfs2/inode.c | 22 +- + fs/ocfs2/inode.h | 2 + + fs/ocfs2/journal.c | 11 +- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/localalloc.c | 276 ++++++++---- + fs/ocfs2/localalloc.h | 3 + + fs/ocfs2/namei.c | 62 +--- + fs/ocfs2/ocfs2.h | 16 + + fs/ocfs2/ocfs2_fs.h | 8 - + fs/ocfs2/quota_global.c | 4 +- + fs/ocfs2/quota_local.c | 50 +-- + fs/ocfs2/refcounttree.c | 20 +- + fs/ocfs2/reservations.c | 857 +++++++++++++++++++++++++++++++++++ + fs/ocfs2/reservations.h | 158 +++++++ + fs/ocfs2/resize.c | 13 +- + fs/ocfs2/suballoc.c | 75 +--- + fs/ocfs2/suballoc.h | 2 + + fs/ocfs2/super.c | 63 +++- + fs/ocfs2/xattr.c | 38 +-- + 30 files changed, 1437 insertions(+), 525 deletions(-) + create mode 100644 fs/ocfs2/reservations.c + create mode 100644 fs/ocfs2/reservations.h +$ git am -3 ../patches/ocfs2__update_gfp_slab.h_includes +Applying: ocfs2: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ocfs2/reservations.c +$ git add . +$ git commit -v -a --amend +[master bfae83a] Merge remote branch 'ocfs2/linux-next' +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Merge made by recursive. + fs/udf/balloc.c | 10 ++++------ + fs/udf/file.c | 2 +- + fs/udf/inode.c | 2 +- + fs/udf/namei.c | 9 ++++++++- + fs/udf/udfdecl.h | 3 ++- + 5 files changed, 16 insertions(+), 10 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Resolved 'fs/9p/vfs_super.c' using previous resolution. +Auto-merging fs/9p/vfs_dir.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging fs/9p/vfs_super.c +CONFLICT (content): Merge conflict in fs/9p/vfs_super.c +Auto-merging net/9p/client.c +Auto-merging net/9p/protocol.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5efde16] Merge remote branch 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/9p/v9fs_vfs.h | 2 + + fs/9p/vfs_dir.c | 8 +++++ + fs/9p/vfs_file.c | 11 ++++++ + fs/9p/vfs_inode.c | 78 ++++++++++++++++++++++++++++++++++++++++------ + fs/9p/vfs_super.c | 55 ++++++++++++++++++++++++++++++++- + include/net/9p/9p.h | 33 ++++++++++++++++++++ + include/net/9p/client.h | 2 + + net/9p/client.c | 70 +++++++++++++++++++++++++++++++++++++++++- + net/9p/protocol.c | 6 ++- + 9 files changed, 249 insertions(+), 16 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Auto-merging fs/xfs/linux-2.6/xfs_buf.c +Auto-merging fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merging fs/xfs/linux-2.6/xfs_ioctl32.c +Auto-merging fs/xfs/linux-2.6/xfs_super.c +Merge made by recursive. + fs/xfs/linux-2.6/xfs_buf.c | 10 +- + fs/xfs/linux-2.6/xfs_buf.h | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 4 + + fs/xfs/linux-2.6/xfs_ioctl32.c | 4 + + fs/xfs/linux-2.6/xfs_super.c | 9 +- + fs/xfs/linux-2.6/xfs_sync.c | 2 +- + fs/xfs/linux-2.6/xfs_trace.h | 9 +- + fs/xfs/quota/xfs_dquot_item.c | 28 +- + fs/xfs/xfs_bmap.c | 2 +- + fs/xfs/xfs_buf_item.c | 55 ++-- + fs/xfs/xfs_extfree_item.c | 18 +- + fs/xfs/xfs_inode.c | 2 + + fs/xfs/xfs_inode_item.c | 21 +- + fs/xfs/xfs_log.c | 668 ++++++++++++++++++++++------------- + fs/xfs/xfs_log.h | 13 + + fs/xfs/xfs_log_priv.h | 8 + + fs/xfs/xfs_trans.c | 760 +++++++++++++++++++--------------------- + fs/xfs/xfs_trans.h | 5 +- + fs/xfs/xfs_trans_buf.c | 3 +- + 19 files changed, 888 insertions(+), 735 deletions(-) +Merging reiserfs-bkl/reiserfs/kill-bkl +$ git merge reiserfs-bkl/reiserfs/kill-bkl +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Resolved 'fs/namei.c' using previous resolution. +Resolved 'fs/nfs/inode.c' using previous resolution. +Resolved 'fs/nfsd/nfs4xdr.c' using previous resolution. +Resolved 'fs/nfsd/vfs.c' using previous resolution. +Resolved 'fs/ufs/inode.c' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_super.c' using previous resolution. +Resolved 'security/tomoyo/realpath.c' using previous resolution. +Auto-merging arch/s390/hypfs/inode.c +Auto-merging drivers/infiniband/core/uverbs.h +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/usb/gadget/f_mass_storage.c +Auto-merging drivers/usb/gadget/file_storage.c +Auto-merging fs/affs/inode.c +Auto-merging fs/autofs4/dev-ioctl.c +Auto-merging fs/autofs4/inode.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/cifs/file.c +Auto-merging fs/dcache.c +Auto-merging fs/exofs/exofs.h +Auto-merging fs/exofs/inode.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/hpfs/dir.c +Auto-merging fs/hpfs/inode.c +Auto-merging fs/jfs/inode.c +Auto-merging fs/jfs/jfs_inode.h +Auto-merging fs/libfs.c +Auto-merging fs/locks.c +Auto-merging fs/namei.c +CONFLICT (content): Merge conflict in fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nfs/inode.c +CONFLICT (content): Merge conflict in fs/nfs/inode.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfsd/nfs4xdr.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/vfs.c +CONFLICT (content): Merge conflict in fs/nfsd/vfs.c +Auto-merging fs/nilfs2/dir.c +Auto-merging fs/ntfs/dir.c +Auto-merging fs/ntfs/file.c +Auto-merging fs/ntfs/super.c +Auto-merging fs/omfs/inode.c +Auto-merging fs/open.c +Auto-merging fs/proc/base.c +Auto-merging fs/proc/generic.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/udf/balloc.c +Auto-merging fs/udf/inode.c +Auto-merging fs/udf/namei.c +Auto-merging fs/udf/symlink.c +Auto-merging fs/udf/udfdecl.h +Auto-merging fs/ufs/inode.c +CONFLICT (content): Merge conflict in fs/ufs/inode.c +Auto-merging fs/xfs/linux-2.6/xfs_super.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c +Auto-merging include/linux/ext3_fs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/mount.h +Auto-merging kernel/audit_tree.c +Auto-merging kernel/sysctl_binary.c +Auto-merging mm/filemap.c +Auto-merging net/sunrpc/rpc_pipe.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/tomoyo/realpath.c +CONFLICT (content): Merge conflict in security/tomoyo/realpath.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d9c2257] Merge remote branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/uverbs_main.c | 1 + + fs/namei.c | 63 +++++++++++++++++---------------- + 2 files changed, 33 insertions(+), 31 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + Documentation/ABI/testing/sysfs-bus-pci | 40 +++++++++++++++++++++++++ + arch/x86/include/asm/pci_x86.h | 2 +- + arch/x86/pci/common.c | 2 +- + arch/x86/pci/direct.c | 16 +++++----- + arch/x86/pci/mmconfig_32.c | 8 ++-- + arch/x86/pci/numaq_32.c | 8 ++-- + arch/x86/pci/pcbios.c | 8 ++-- + drivers/pci/Kconfig | 2 +- + drivers/pci/access.c | 34 +++++++++++----------- + drivers/pci/pci-sysfs.c | 37 +++++++++++++++++++++++ + drivers/pci/pci.c | 2 - + drivers/pci/slot.c | 48 +++++++++++++++++++++++++++++++ + include/linux/ioport.h | 4 ++- + kernel/resource.c | 16 +++++++++- + 14 files changed, 183 insertions(+), 44 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + Documentation/ABI/testing/sysfs-driver-hid-picolcd | 34 + + .../ABI/testing/sysfs-driver-hid-roccat-kone | 111 + + drivers/hid/Kconfig | 37 + + drivers/hid/Makefile | 2 + + drivers/hid/hid-cherry.c | 1 + + drivers/hid/hid-core.c | 32 +- + drivers/hid/hid-ids.h | 6 + + drivers/hid/hid-ntrig.c | 13 +- + drivers/hid/hid-picolcd.c | 2536 ++++++++++++++++++++ + drivers/hid/hid-roccat-kone.c | 1007 ++++++++ + drivers/hid/hid-roccat-kone.h | 214 ++ + drivers/hid/hid-wacom.c | 227 ++- + drivers/hid/hidraw.c | 48 +- + drivers/hid/usbhid/hid-core.c | 8 +- + drivers/hid/usbhid/hiddev.c | 19 +- + drivers/hid/usbhid/usbkbd.c | 1 + + 16 files changed, 4227 insertions(+), 69 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-picolcd + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-kone + create mode 100644 drivers/hid/hid-picolcd.c + create mode 100644 drivers/hid/hid-roccat-kone.c + create mode 100644 drivers/hid/hid-roccat-kone.h +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + Documentation/i2c/busses/i2c-i801 | 8 ++- + Documentation/i2c/writing-clients | 5 + + drivers/i2c/busses/i2c-gpio.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 59 +++++++----- + drivers/i2c/busses/i2c-parport.c | 2 +- + drivers/i2c/busses/i2c-stub.c | 9 +- + drivers/i2c/busses/scx200_acb.c | 2 +- + drivers/i2c/i2c-core.c | 195 ++++++++++++++++++++++-------------- + drivers/i2c/i2c-dev.c | 6 +- + drivers/misc/eeprom/at24.c | 59 +++++++++-- + include/linux/pm_runtime.h | 7 ++ + 11 files changed, 233 insertions(+), 121 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging drivers/acpi/osl.c +Merge made by recursive. + Documentation/hwmon/lm63 | 7 ++ + drivers/acpi/osl.c | 9 ++ + drivers/hwmon/Kconfig | 11 ++- + drivers/hwmon/asus_atk0110.c | 7 ++ + drivers/hwmon/f71882fg.c | 170 ++++++++++++++++++++++++++++++------------ + drivers/hwmon/lm63.c | 16 +++- + drivers/hwmon/lm90.c | 3 +- + drivers/hwmon/sht15.c | 13 ++- + include/linux/acpi.h | 2 + + 9 files changed, 177 insertions(+), 61 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/DocBook/kernel-hacking.tmpl | 350 ++++++++++++++++++++++++----- + 1 files changed, 290 insertions(+), 60 deletions(-) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Resolved 'drivers/media/video/meye.c' using previous resolution. +Resolved 'drivers/media/video/soc_camera.c' using previous resolution. +Resolved 'drivers/staging/cx25821/cx25821-audio-upstream.c' using previous resolution. +Auto-merging drivers/media/IR/ir-keytable.c +Auto-merging drivers/media/IR/ir-sysfs.c +Auto-merging drivers/media/common/tuners/tuner-xc2028.c +Auto-merging drivers/media/dvb/dm1105/dm1105.c +Auto-merging drivers/media/dvb/dvb-usb/af9015.c +Auto-merging drivers/media/dvb/frontends/au8522_dig.c +Auto-merging drivers/media/dvb/frontends/stv090x.c +Auto-merging drivers/media/dvb/frontends/stv6110x.c +Auto-merging drivers/media/dvb/ngene/ngene-core.c +Auto-merging drivers/media/video/bt8xx/bttv-input.c +Auto-merging drivers/media/video/cx231xx/cx231xx-input.c +Auto-merging drivers/media/video/cx23885/cx23885-input.c +Auto-merging drivers/media/video/cx88/cx88-input.c +Auto-merging drivers/media/video/davinci/dm644x_ccdc.c +Auto-merging drivers/media/video/davinci/vpfe_capture.c +Auto-merging drivers/media/video/davinci/vpif_display.c +Auto-merging drivers/media/video/em28xx/em28xx-cards.c +Auto-merging drivers/media/video/em28xx/em28xx-core.c +Auto-merging drivers/media/video/em28xx/em28xx-dvb.c +Auto-merging drivers/media/video/em28xx/em28xx-input.c +Auto-merging drivers/media/video/em28xx/em28xx-video.c +Auto-merging drivers/media/video/gspca/sn9c20x.c +Auto-merging drivers/media/video/gspca/sonixj.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.h +Auto-merging drivers/media/video/ivtv/ivtvfb.c +Auto-merging drivers/media/video/meye.c +CONFLICT (content): Merge conflict in drivers/media/video/meye.c +Auto-merging drivers/media/video/ov7670.c +Auto-merging drivers/media/video/pms.c +Auto-merging drivers/media/video/s2255drv.c +Auto-merging drivers/media/video/saa7134/saa7134-input.c +Auto-merging drivers/media/video/sh_mobile_ceu_camera.c +Auto-merging drivers/media/video/soc_camera.c +CONFLICT (content): Merge conflict in drivers/media/video/soc_camera.c +Auto-merging drivers/media/video/tlg2300/pd-dvb.c +Auto-merging drivers/media/video/tlg2300/pd-video.c +Auto-merging drivers/media/video/tvp514x.c +Auto-merging drivers/media/video/usbvideo/quickcam_messenger.c +Auto-merging drivers/media/video/uvc/uvc_ctrl.c +Auto-merging drivers/media/video/uvc/uvc_driver.c +Auto-merging drivers/media/video/w9966.c +Auto-merging drivers/staging/cx25821/cx25821-alsa.c +Auto-merging drivers/staging/cx25821/cx25821-audio-upstream.c +CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio-upstream.c +Auto-merging drivers/staging/cx25821/cx25821-audups11.c +Auto-merging drivers/staging/cx25821/cx25821-core.c +Auto-merging include/media/davinci/vpfe_capture.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f63345a] Merge remote branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/v4l/compat.xml | 11 + + Documentation/DocBook/v4l/controls.xml | 25 + + Documentation/DocBook/v4l/pixfmt.xml | 12 + + Documentation/DocBook/v4l/videodev2.h.xml | 3 + + Documentation/DocBook/v4l/vidioc-reqbufs.xml | 2 +- + Documentation/video4linux/CARDLIST.cx88 | 1 + + Documentation/video4linux/CARDLIST.em28xx | 4 +- + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/gspca.txt | 5 + + drivers/media/IR/ir-keymaps.c | 455 ++----- + drivers/media/IR/ir-keytable.c | 18 +- + drivers/media/IR/ir-sysfs.c | 99 +- + drivers/media/common/tuners/tuner-xc2028.c | 25 +- + drivers/media/common/tuners/tuner-xc2028.h | 2 + + drivers/media/dvb/bt8xx/dst.c | 2 - + drivers/media/dvb/dm1105/dm1105.c | 4 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 11 +- + drivers/media/dvb/dvb-usb/af9015.c | 13 +- + drivers/media/dvb/dvb-usb/az6027.c | 53 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 8 +- + drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 2 + + drivers/media/dvb/dvb-usb/dvb-usb.h | 7 + + drivers/media/dvb/firewire/firedtv-avc.c | 2 +- + drivers/media/dvb/frontends/atbm8830_priv.h | 2 +- + drivers/media/dvb/frontends/au8522_decoder.c | 7 + + drivers/media/dvb/frontends/au8522_dig.c | 26 + + drivers/media/dvb/frontends/au8522_priv.h | 5 + + drivers/media/dvb/frontends/stv0900_core.c | 16 +- + drivers/media/dvb/frontends/stv090x.c | 94 +- + drivers/media/dvb/frontends/stv090x.h | 1 + + drivers/media/dvb/frontends/stv6110x.c | 24 +- + drivers/media/dvb/frontends/stv6110x.h | 1 + + drivers/media/dvb/mantis/mantis_input.c | 4 +- + drivers/media/dvb/mantis/mantis_vp1041.c | 10 +- + drivers/media/dvb/ngene/ngene-core.c | 52 +- + drivers/media/dvb/ttpci/budget-ci.c | 4 +- + drivers/media/dvb/ttpci/budget.c | 8 + + drivers/media/video/Kconfig | 4 +- + drivers/media/video/arv.c | 524 ++++---- + drivers/media/video/bt8xx/bttv-input.c | 4 +- + drivers/media/video/bw-qcam.c | 452 +++---- + drivers/media/video/c-qcam.c | 483 ++++---- + drivers/media/video/cx18/cx18-av-core.c | 33 +- + drivers/media/video/cx18/cx18-av-core.h | 19 + + drivers/media/video/cx18/cx18-cards.c | 4 +- + drivers/media/video/cx18/cx18-cards.h | 4 +- + drivers/media/video/cx231xx/cx231xx-audio.c | 2 +- + drivers/media/video/cx231xx/cx231xx-input.c | 5 +- + drivers/media/video/cx2341x.c | 14 - + drivers/media/video/cx23885/cimax2.c | 12 +- + drivers/media/video/cx23885/cx23885-input.c | 4 +- + drivers/media/video/cx88/cx88-input.c | 4 +- + drivers/media/video/cx88/cx88.h | 2 +- + drivers/media/video/davinci/dm644x_ccdc.c | 131 ++- + drivers/media/video/davinci/dm644x_ccdc_regs.h | 10 +- + drivers/media/video/davinci/isif_regs.h | 2 +- + drivers/media/video/davinci/vpfe_capture.c | 78 +- + drivers/media/video/davinci/vpif_display.c | 2 +- + drivers/media/video/em28xx/em28xx-audio.c | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 24 +- + drivers/media/video/em28xx/em28xx-core.c | 12 +- + drivers/media/video/em28xx/em28xx-dvb.c | 1 + + drivers/media/video/em28xx/em28xx-input.c | 4 +- + drivers/media/video/em28xx/em28xx-video.c | 61 +- + drivers/media/video/em28xx/em28xx.h | 5 +- + drivers/media/video/gspca/Kconfig | 6 - + drivers/media/video/gspca/cpia1.c | 34 +- + drivers/media/video/gspca/gspca.c | 11 +- + drivers/media/video/gspca/ov534.c | 563 ++++---- + drivers/media/video/gspca/pac207.c | 4 +- + drivers/media/video/gspca/sn9c2028.c | 2 +- + drivers/media/video/gspca/sn9c20x.c | 319 ++--- + drivers/media/video/gspca/sonixj.c | 433 +++++- + drivers/media/video/gspca/spca561.c | 58 +- + drivers/media/video/gspca/t613.c | 172 +++- + drivers/media/video/ir-kbd-i2c.c | 8 +- + drivers/media/video/ivtv/ivtv-driver.c | 5 +- + drivers/media/video/ivtv/ivtv-driver.h | 3 + + drivers/media/video/ivtv/ivtv-ioctl.c | 21 + + drivers/media/video/ivtv/ivtv-irq.c | 8 +- + drivers/media/video/ivtv/ivtv-streams.c | 7 +- + drivers/media/video/ivtv/ivtv-vbi.c | 2 +- + drivers/media/video/ivtv/ivtvfb.c | 2 +- + drivers/media/video/meye.c | 78 +- + drivers/media/video/meye.h | 10 +- + drivers/media/video/mt9t031.c | 66 +- + drivers/media/video/mt9v022.c | 2 +- + drivers/media/video/mx3_camera.c | 4 +- + drivers/media/video/ov7670.c | 286 ++++- + drivers/media/video/ov9640.c | 6 +- + drivers/media/video/pms.c | 18 - + drivers/media/video/rj54n1cb0c.c | 18 +- + drivers/media/video/s2255drv.c | 555 ++++++--- + drivers/media/video/saa7115.c | 31 +- + drivers/media/video/saa7134/saa7134-alsa.c | 2 - + drivers/media/video/saa7134/saa7134-cards.c | 22 + + drivers/media/video/saa7134/saa7134-input.c | 6 +- + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/sh_mobile_ceu_camera.c | 8 +- + drivers/media/video/sn9c102/sn9c102_devtable.h | 18 +- + drivers/media/video/sn9c102/sn9c102_hv7131d.c | 2 +- + drivers/media/video/soc_camera.c | 18 +- + drivers/media/video/tlg2300/pd-dvb.c | 6 +- + drivers/media/video/tlg2300/pd-main.c | 7 +- + drivers/media/video/tlg2300/pd-radio.c | 21 +- + drivers/media/video/tlg2300/pd-video.c | 18 +- + drivers/media/video/tvp514x.c | 13 + + drivers/media/video/usbvideo/quickcam_messenger.c | 3 +- + drivers/media/video/uvc/uvc_ctrl.c | 20 + + drivers/media/video/uvc/uvc_driver.c | 18 + + drivers/media/video/uvc/uvc_queue.c | 8 +- + drivers/media/video/v4l2-common.c | 72 +- + drivers/media/video/v4l2-device.c | 11 + + drivers/media/video/videobuf-core.c | 118 +- + drivers/media/video/videobuf-dma-sg.c | 276 ++-- + drivers/media/video/videobuf-vmalloc.c | 112 +- + drivers/media/video/w9966.c | 1074 +++++++-------- + drivers/media/video/zc0301/zc0301_sensor.h | 2 +- + drivers/media/video/zoran/zoran.h | 24 +- + drivers/media/video/zoran/zoran_driver.c | 16 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/cx25821/cx25821-alsa.c | 102 +- + drivers/staging/cx25821/cx25821-audio-upstream.c | 146 +- + drivers/staging/cx25821/cx25821-audups11.c | 78 +- + drivers/staging/cx25821/cx25821-core.c | 160 ++-- + drivers/staging/cx25821/cx25821-gpio.c | 25 +- + drivers/staging/cx25821/cx25821-i2c.c | 12 +- + drivers/staging/cx25821/cx25821-medusa-video.c | 207 ++-- + drivers/staging/cx25821/cx25821-video.c | 130 +- + drivers/staging/cx25821/cx25821-video.h | 78 +- + drivers/staging/cx25821/cx25821-video0.c | 82 +- + drivers/staging/cx25821/cx25821-video1.c | 82 +- + drivers/staging/cx25821/cx25821-video2.c | 82 +- + drivers/staging/cx25821/cx25821-video3.c | 82 +- + drivers/staging/cx25821/cx25821-video4.c | 82 +- + drivers/staging/cx25821/cx25821-video5.c | 82 +- + drivers/staging/cx25821/cx25821-video6.c | 82 +- + drivers/staging/cx25821/cx25821-video7.c | 82 +- + drivers/staging/cx25821/cx25821-videoioctl.c | 78 +- + drivers/staging/cx25821/cx25821-vidups10.c | 78 +- + drivers/staging/cx25821/cx25821-vidups9.c | 78 +- + drivers/staging/tm6000/Kconfig | 32 + + drivers/staging/tm6000/Makefile | 17 + + drivers/staging/tm6000/README | 11 + + drivers/staging/tm6000/tm6000-alsa.c | 414 ++++++ + drivers/staging/tm6000/tm6000-cards.c | 826 +++++++++++ + drivers/staging/tm6000/tm6000-core.c | 494 +++++++ + drivers/staging/tm6000/tm6000-dvb.c | 346 +++++ + drivers/staging/tm6000/tm6000-i2c.c | 297 ++++ + drivers/staging/tm6000/tm6000-regs.h | 541 +++++++ + drivers/staging/tm6000/tm6000-stds.c | 873 ++++++++++++ + drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + + drivers/staging/tm6000/tm6000-video.c | 1550 +++++++++++++++++++++ + drivers/staging/tm6000/tm6000.h | 283 ++++ + include/linux/meye.h | 12 +- + include/linux/videodev2.h | 11 +- + include/media/davinci/vpfe_capture.h | 2 + + include/media/ir-core.h | 11 +- + include/media/soc_camera.h | 12 +- + include/media/v4l2-chip-ident.h | 120 +- + include/media/v4l2-common.h | 19 + + include/media/v4l2-subdev.h | 2 + + include/media/videobuf-core.h | 10 +- + include/media/videobuf-dma-sg.h | 27 +- + include/media/videobuf-vmalloc.h | 12 +- + 166 files changed, 11212 insertions(+), 4143 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/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 +$ git am -3 ../patches/v4l-dvb__update_gfp_slab.h_includes +Applying: v4l-dvb: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/tm6000/tm6000-alsa.c +M drivers/staging/tm6000/tm6000-cards.c +M drivers/staging/tm6000/tm6000-core.c +M drivers/staging/tm6000/tm6000-dvb.c +$ git add . +$ git commit -v -a --amend +[master 89689a4] Merge remote branch 'v4l-dvb/master' +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging .gitignore +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/ia64/include/asm/percpu.h +Auto-merging arch/ia64/kernel/ivt.S +Auto-merging arch/parisc/include/asm/system.h +Auto-merging arch/s390/kernel/swsusp_asm64.S +Auto-merging arch/x86/kernel/setup_percpu.c +Auto-merging arch/x86/kernel/vmlinux.lds.S +Auto-merging include/asm-generic/percpu.h +Auto-merging include/linux/init_task.h +Auto-merging include/linux/percpu-defs.h +Auto-merging include/linux/spinlock.h +Auto-merging init/Kconfig +Auto-merging kernel/module.c +Auto-merging scripts/kconfig/Makefile +Auto-merging scripts/markup_oops.pl +Merge made by recursive. + .gitignore | 1 + + Documentation/.gitignore | 7 + + Documentation/kbuild/kbuild.txt | 6 +- + Documentation/kbuild/makefiles.txt | 2 +- + Documentation/mutex-design.txt | 4 +- + MAINTAINERS | 5 +- + Makefile | 65 +- + arch/frv/kernel/break.S | 4 +- + arch/frv/kernel/entry.S | 2 +- + arch/frv/kernel/head.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 10 +- + arch/frv/mm/tlb-miss.S | 2 +- + arch/h8300/boot/compressed/head.S | 2 +- + arch/h8300/boot/compressed/vmlinux.lds | 2 +- + arch/ia64/include/asm/asmmacro.h | 12 +- + arch/ia64/include/asm/cache.h | 2 +- + arch/ia64/include/asm/percpu.h | 2 +- + arch/ia64/kernel/Makefile.gate | 2 +- + arch/ia64/kernel/gate-data.S | 2 +- + arch/ia64/kernel/gate.S | 8 +- + arch/ia64/kernel/gate.lds.S | 10 +- + arch/ia64/kernel/init_task.c | 2 +- + arch/ia64/kernel/ivt.S | 2 +- + arch/ia64/kernel/minstate.h | 4 +- + arch/ia64/kernel/paravirtentry.S | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 28 +- + arch/ia64/kvm/vmm_ivt.S | 2 +- + arch/ia64/scripts/unwcheck.py | 2 +- + arch/ia64/xen/gate-data.S | 2 +- + arch/ia64/xen/xensetup.S | 2 +- + arch/m68knommu/kernel/vmlinux.lds.S | 4 +- + arch/m68knommu/platform/68360/head-ram.S | 2 +- + arch/m68knommu/platform/68360/head-rom.S | 2 +- + arch/mips/lasat/image/head.S | 2 +- + arch/mips/lasat/image/romscript.normal | 2 +- + arch/parisc/include/asm/cache.h | 2 +- + arch/parisc/include/asm/system.h | 2 +- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/init_task.c | 6 +- + arch/parisc/kernel/vmlinux.lds.S | 12 +- + arch/powerpc/Makefile | 5 + + arch/powerpc/include/asm/cache.h | 2 +- + arch/powerpc/include/asm/page_64.h | 8 - + arch/powerpc/kernel/vmlinux.lds.S | 10 +- + arch/s390/include/asm/cache.h | 2 +- + arch/s390/kernel/swsusp_asm64.S | 2 +- + arch/sh/boot/compressed/vmlinux.scr | 2 +- + arch/sh/include/asm/cache.h | 2 +- + arch/sparc/boot/btfixupprep.c | 2 +- + arch/sparc/include/asm/cache.h | 2 +- + arch/um/kernel/dyn.lds.S | 2 +- + arch/um/kernel/init_task.c | 2 +- + arch/um/kernel/uml.lds.S | 2 +- + arch/x86/.gitignore | 3 + + arch/x86/boot/compressed/mkpiggy.c | 2 +- + arch/x86/boot/compressed/vmlinux.lds.S | 4 +- + arch/x86/include/asm/cache.h | 2 +- + arch/x86/kernel/acpi/wakeup_32.S | 2 +- + arch/x86/kernel/init_task.c | 2 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 4 +- + include/asm-generic/percpu.h | 10 +- + include/asm-generic/vmlinux.lds.h | 38 +- + include/linux/cache.h | 2 +- + include/linux/init.h | 2 +- + include/linux/init_task.h | 2 +- + include/linux/linkage.h | 8 +- + include/linux/percpu-defs.h | 4 +- + include/linux/spinlock.h | 2 +- + init/Kconfig | 8 + + kernel/module.c | 2 +- + scripts/Makefile.build | 2 +- + scripts/Makefile.lib | 2 +- + scripts/checkincludes.pl | 24 +- + scripts/checkstack.pl | 16 +- + scripts/checkversion.pl | 23 +- + scripts/decodecode | 48 +- + scripts/export_report.pl | 37 +- + scripts/gen_initramfs_list.sh | 3 +- + scripts/genksyms/genksyms.c | 4 +- + scripts/headerdep.pl | 3 +- + scripts/headers_check.pl | 11 +- + scripts/headers_install.pl | 19 +- + scripts/kallsyms.c | 6 +- + scripts/kconfig/Makefile | 16 +- + scripts/kconfig/expr.c | 27 +- + scripts/kconfig/expr.h | 5 +- + scripts/kconfig/lkc.h | 7 +- + scripts/kconfig/lkc_proto.h | 3 +- + scripts/kconfig/mconf.c | 14 +- + scripts/kconfig/menu.c | 16 +- + scripts/kconfig/nconf.c | 1568 ++++++++++++++++++++++++++++++ + scripts/kconfig/nconf.gui.c | 617 ++++++++++++ + scripts/kconfig/nconf.h | 95 ++ + scripts/kconfig/symbol.c | 30 +- + scripts/kconfig/util.c | 2 + + scripts/kconfig/zconf.tab.c_shipped | 4 +- + scripts/kconfig/zconf.y | 4 +- + scripts/markup_oops.pl | 54 +- + scripts/mkcompile_h | 5 +- + scripts/mod/modpost.c | 152 ++-- + scripts/namespace.pl | 65 +- + scripts/package/builddeb | 2 + + scripts/package/mkspec | 2 +- + scripts/profile2linkerlist.pl | 8 +- + scripts/rt-tester/rt-tester.py | 2 +- + scripts/show_delta | 2 +- + scripts/tags.sh | 45 +- + 108 files changed, 2889 insertions(+), 430 deletions(-) + create mode 100644 Documentation/.gitignore + create mode 100644 arch/x86/.gitignore + create mode 100644 scripts/kconfig/nconf.c + create mode 100644 scripts/kconfig/nconf.gui.c + create mode 100644 scripts/kconfig/nconf.h +Merging kconfig/for-next +$ git merge kconfig/for-next +Already uptodate! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Merge made by recursive. + drivers/ide/ide-dma.c | 11 +++-------- + 1 files changed, 3 insertions(+), 8 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/Kconfig | 8 + + drivers/ata/Makefile | 3 +- + drivers/ata/ahci.c | 2542 +++-------------------------------------- + drivers/ata/ahci.h | 333 ++++++ + drivers/ata/ahci_platform.c | 192 ++++ + drivers/ata/libahci.c | 2110 ++++++++++++++++++++++++++++++++++ + drivers/ata/pata_mpc52xx.c | 78 +- + include/linux/ahci_platform.h | 29 + + 8 files changed, 2879 insertions(+), 2416 deletions(-) + create mode 100644 drivers/ata/ahci.h + create mode 100644 drivers/ata/ahci_platform.c + create mode 100644 drivers/ata/libahci.c + create mode 100644 include/linux/ahci_platform.h +Merging infiniband/for-next +$ git merge infiniband/for-next +Auto-merging drivers/infiniband/core/cm.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/core/ucm.c +Auto-merging drivers/infiniband/core/ucma.c +Auto-merging drivers/infiniband/core/user_mad.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/hw/mlx4/mr.c +Auto-merging drivers/infiniband/hw/nes/nes_verbs.c +Merge made by recursive. + drivers/infiniband/core/cm.c | 2 +- + drivers/infiniband/core/cma.c | 1 + + drivers/infiniband/core/ucm.c | 3 +- + drivers/infiniband/core/ucma.c | 4 +- + drivers/infiniband/core/user_mad.c | 12 +- + drivers/infiniband/core/uverbs.h | 19 ++ + drivers/infiniband/core/uverbs_cmd.c | 522 +++++++++++++++++++++++++++++++-- + drivers/infiniband/core/uverbs_main.c | 52 +++- + drivers/infiniband/core/verbs.c | 138 +++++++++- + drivers/infiniband/hw/mlx4/mr.c | 2 +- + drivers/infiniband/hw/nes/nes_verbs.c | 9 +- + include/rdma/ib_user_verbs.h | 35 +++- + include/rdma/ib_verbs.h | 60 ++++- + 13 files changed, 802 insertions(+), 57 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merging arch/x86/pci/acpi.c +Merge made by recursive. + Documentation/acpi/apei/einj.txt | 49 +++ + Documentation/kernel-parameters.txt | 8 +- + arch/ia64/include/asm/acpi.h | 1 - + arch/ia64/pci/pci.c | 5 +- + arch/x86/include/asm/acpi.h | 2 - + arch/x86/kernel/acpi/boot.c | 19 +- + arch/x86/lguest/boot.c | 1 - + arch/x86/pci/acpi.c | 5 +- + drivers/acpi/Kconfig | 2 + + drivers/acpi/Makefile | 3 + + drivers/acpi/acpica/Makefile | 2 +- + drivers/acpi/acpica/acglobal.h | 5 + + drivers/acpi/acpica/acinterp.h | 7 + + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsmthdat.c | 10 +- + drivers/acpi/acpica/dsobject.c | 14 +- + drivers/acpi/acpica/dsopcode.c | 13 +- + drivers/acpi/acpica/dswexec.c | 6 +- + drivers/acpi/acpica/dswstate.c | 10 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evgpe.c | 12 +- + drivers/acpi/acpica/evgpeblk.c | 4 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evxface.c | 4 +- + drivers/acpi/acpica/exconvrt.c | 4 +- + drivers/acpi/acpica/excreate.c | 4 +- + drivers/acpi/acpica/exdebug.c | 261 ++++++++++++++++ + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 16 +- + drivers/acpi/acpica/exmisc.c | 8 +- + drivers/acpi/acpica/exmutex.c | 25 +- + drivers/acpi/acpica/exnames.c | 4 +- + drivers/acpi/acpica/exoparg1.c | 16 +- + drivers/acpi/acpica/exoparg2.c | 10 +- + drivers/acpi/acpica/exoparg3.c | 4 +- + drivers/acpi/acpica/exoparg6.c | 4 +- + drivers/acpi/acpica/exprep.c | 4 +- + drivers/acpi/acpica/exregion.c | 4 +- + drivers/acpi/acpica/exresnte.c | 4 +- + drivers/acpi/acpica/exresolv.c | 11 +- + drivers/acpi/acpica/exresop.c | 8 +- + drivers/acpi/acpica/exstore.c | 218 +------------- + drivers/acpi/acpica/exsystem.c | 2 +- + drivers/acpi/acpica/hwregs.c | 6 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/nsaccess.c | 2 +- + drivers/acpi/acpica/nsdump.c | 4 +- + drivers/acpi/acpica/nsnames.c | 2 +- + drivers/acpi/acpica/nssearch.c | 2 +- + drivers/acpi/acpica/nsutils.c | 4 +- + drivers/acpi/acpica/psargs.c | 4 +- + drivers/acpi/acpica/psloop.c | 3 +- + drivers/acpi/acpica/rscreate.c | 14 +- + drivers/acpi/acpica/rslist.c | 6 +- + drivers/acpi/acpica/rsmisc.c | 4 +- + drivers/acpi/acpica/tbfadt.c | 16 +- + drivers/acpi/acpica/tbutils.c | 4 +- + drivers/acpi/acpica/tbxfroot.c | 6 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utdelete.c | 6 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utmisc.c | 6 +- + drivers/acpi/acpica/utmutex.c | 4 +- + drivers/acpi/acpica/utobject.c | 8 +- + drivers/acpi/apei/Kconfig | 16 + + drivers/acpi/apei/Makefile | 4 + + drivers/acpi/apei/apei-base.c | 589 +++++++++++++++++++++++++++++++++++ + drivers/acpi/apei/apei-internal.h | 97 ++++++ + drivers/acpi/apei/einj.c | 471 ++++++++++++++++++++++++++++ + drivers/acpi/apei/hest.c | 147 +++++++++ + drivers/acpi/atomicio.c | 360 +++++++++++++++++++++ + drivers/acpi/pci_root.c | 67 +++-- + drivers/acpi/tables.c | 4 +- + include/acpi/acoutput.h | 2 + + include/acpi/acpi_bus.h | 2 +- + include/acpi/acpi_drivers.h | 3 +- + include/acpi/acpixf.h | 3 +- + include/acpi/actbl2.h | 27 ++ + include/acpi/apei.h | 13 + + include/acpi/atomicio.h | 10 + + 82 files changed, 2289 insertions(+), 434 deletions(-) + create mode 100644 Documentation/acpi/apei/einj.txt + create mode 100644 drivers/acpi/acpica/exdebug.c + create mode 100644 drivers/acpi/apei/Kconfig + create mode 100644 drivers/acpi/apei/Makefile + create mode 100644 drivers/acpi/apei/apei-base.c + create mode 100644 drivers/acpi/apei/apei-internal.h + create mode 100644 drivers/acpi/apei/einj.c + create mode 100644 drivers/acpi/apei/hest.c + create mode 100644 drivers/acpi/atomicio.c + create mode 100644 include/acpi/apei.h + create mode 100644 include/acpi/atomicio.h +$ git am -3 ../patches/acpi__update_gfp_slab.h_includes +Applying: acpi: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/acpi/apei/apei-base.c +M drivers/acpi/atomicio.c +$ git add . +$ git commit -v -a --amend +[master 2ca58a8] Merge remote branch 'acpi/test' +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging arch/ia64/kvm/kvm-ia64.c +Auto-merging arch/powerpc/kvm/book3s.c +Auto-merging arch/powerpc/kvm/booke.c +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/x86/kvm/i8259.c +Auto-merging 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/assigned-dev.c +Auto-merging virt/kvm/coalesced_mmio.c +Auto-merging virt/kvm/kvm_main.c +Merge made by recursive. + Documentation/kvm/api.txt | 164 ++++- + arch/ia64/kvm/kvm-ia64.c | 6 +- + arch/powerpc/include/asm/kvm.h | 10 + + arch/powerpc/include/asm/kvm_asm.h | 1 + + arch/powerpc/include/asm/kvm_book3s.h | 54 +- + arch/powerpc/include/asm/kvm_fpu.h | 85 ++ + arch/powerpc/include/asm/kvm_host.h | 18 +- + arch/powerpc/include/asm/kvm_ppc.h | 41 +- + arch/powerpc/include/asm/reg.h | 10 + + arch/powerpc/kernel/ppc_ksyms.c | 4 + + arch/powerpc/kvm/Makefile | 2 + + arch/powerpc/kvm/book3s.c | 285 +++++-- + arch/powerpc/kvm/book3s_32_mmu.c | 32 +- + arch/powerpc/kvm/book3s_64_emulate.c | 236 +++++- + arch/powerpc/kvm/book3s_64_interrupts.S | 2 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 16 +- + arch/powerpc/kvm/book3s_64_rmhandlers.S | 13 +- + arch/powerpc/kvm/book3s_64_slb.S | 2 +- + arch/powerpc/kvm/book3s_paired_singles.c | 1289 +++++++++++++++++++++++++++ + arch/powerpc/kvm/booke.c | 6 + + arch/powerpc/kvm/emulate.c | 38 +- + arch/powerpc/kvm/fpu.S | 273 ++++++ + arch/powerpc/kvm/powerpc.c | 108 +++- + arch/s390/kvm/kvm-s390.c | 4 +- + arch/x86/include/asm/kvm.h | 17 +- + arch/x86/include/asm/kvm_emulate.h | 45 +- + arch/x86/include/asm/kvm_host.h | 54 +- + arch/x86/include/asm/svm.h | 4 + + arch/x86/kvm/emulate.c | 1212 +++++++++++++++++++------- + arch/x86/kvm/i8259.c | 53 +- + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/kvm_timer.h | 4 +- + arch/x86/kvm/mmu.c | 94 ++- + arch/x86/kvm/mmutrace.h | 7 +- + arch/x86/kvm/paging_tmpl.h | 25 +- + arch/x86/kvm/svm.c | 822 ++++++++++++------ + arch/x86/kvm/timer.c | 3 +- + arch/x86/kvm/trace.h | 79 ++- + arch/x86/kvm/vmx.c | 161 ++-- + arch/x86/kvm/x86.c | 1427 ++++++++++-------------------- + include/linux/kvm.h | 26 + + include/linux/kvm_host.h | 2 +- + include/trace/events/kvm.h | 1 - + virt/kvm/assigned-dev.c | 8 +- + virt/kvm/coalesced_mmio.c | 6 +- + virt/kvm/kvm_main.c | 27 +- + 46 files changed, 4889 insertions(+), 1888 deletions(-) + create mode 100644 arch/powerpc/include/asm/kvm_fpu.h + create mode 100644 arch/powerpc/kvm/book3s_paired_singles.c + create mode 100644 arch/powerpc/kvm/fpu.S +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Auto-merging arch/x86/kernel/setup.c +Auto-merging drivers/firmware/iscsi_ibft_find.c +Merge made by recursive. +Merging scsi/master +$ git merge scsi/master +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/lpfc/lpfc_bsg.c +Merge made by recursive. + MAINTAINERS | 15 +- + drivers/message/fusion/mptctl.c | 13 +- + drivers/scsi/3w-9xxx.c | 24 +- + drivers/scsi/3w-9xxx.h | 9 +- + drivers/scsi/3w-xxxx.c | 23 +- + drivers/scsi/3w-xxxx.h | 8 +- + drivers/scsi/bfa/bfad_im.c | 1 - + drivers/scsi/fcoe/fcoe.c | 82 ++-- + drivers/scsi/fcoe/libfcoe.c | 65 +-- + drivers/scsi/gdth.c | 2 +- + drivers/scsi/libfc/fc_exch.c | 39 +- + drivers/scsi/libfc/fc_fcp.c | 74 ++- + drivers/scsi/libfc/fc_lport.c | 13 +- + drivers/scsi/libfc/fc_npiv.c | 3 + + drivers/scsi/libfc/fc_rport.c | 195 +++---- + drivers/scsi/lpfc/lpfc.h | 4 + + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_bsg.c | 257 +++++++-- + drivers/scsi/lpfc/lpfc_bsg.h | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 20 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 64 ++- + drivers/scsi/lpfc/lpfc_hw.h | 10 +- + drivers/scsi/lpfc/lpfc_hw4.h | 7 + + drivers/scsi/lpfc/lpfc_init.c | 147 +++--- + drivers/scsi/lpfc/lpfc_mbox.c | 51 ++- + drivers/scsi/lpfc/lpfc_nportdisc.c | 43 ++- + drivers/scsi/lpfc/lpfc_sli.c | 91 +++- + drivers/scsi/lpfc/lpfc_sli.h | 3 + + drivers/scsi/lpfc/lpfc_sli4.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt2sas/Kconfig | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2.h | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_init.h | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 81 ++- + drivers/scsi/mpt2sas/mpt2sas_base.h | 32 +- + drivers/scsi/mpt2sas/mpt2sas_config.c | 8 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 39 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 868 ++++++++++++++++------------- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 5 +- + drivers/scsi/pm8001/pm8001_hwi.c | 1 - + drivers/scsi/pmcraid.c | 6 - + drivers/scsi/scsi_transport_fc.c | 10 +- + include/scsi/fc/fc_fcp.h | 1 + + include/scsi/libfc.h | 9 - + include/scsi/libfcoe.h | 8 +- + 51 files changed, 1412 insertions(+), 946 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/at_hdmac.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/fsldma.c +Auto-merging drivers/dma/ioat/dma.c +Auto-merging drivers/dma/ioat/dma_v2.c +Auto-merging drivers/dma/ioat/dma_v3.c +Auto-merging drivers/dma/iop-adma.c +Auto-merging drivers/dma/mpc512x_dma.c +Auto-merging drivers/dma/mv_xor.c +Auto-merging drivers/dma/ppc4xx/adma.c +Auto-merging drivers/dma/shdma.c +Auto-merging drivers/mmc/host/atmel-mci.c +Auto-merging drivers/serial/sh-sci.c +Auto-merging sound/soc/txx9/txx9aclc.c +Merge made by recursive. + arch/arm/mach-u300/include/mach/coh901318.h | 21 - + drivers/dma/Kconfig | 7 + + drivers/dma/Makefile | 1 + + drivers/dma/at_hdmac.c | 34 +- + drivers/dma/coh901318.c | 262 ++++++--- + drivers/dma/dmaengine.c | 4 +- + drivers/dma/dw_dmac.c | 23 +- + drivers/dma/fsldma.c | 28 +- + drivers/dma/ioat/dma.c | 12 +- + drivers/dma/ioat/dma.h | 18 +- + drivers/dma/ioat/dma_v2.c | 2 +- + drivers/dma/ioat/dma_v3.c | 20 +- + drivers/dma/iop-adma.c | 39 +- + drivers/dma/ipu/ipu_idmac.c | 32 +- + drivers/dma/mpc512x_dma.c | 13 +- + drivers/dma/mv_xor.c | 25 +- + drivers/dma/ppc4xx/adma.c | 19 +- + drivers/dma/shdma.c | 26 +- + drivers/dma/timb_dma.c | 859 +++++++++++++++++++++++++++ + drivers/dma/txx9dmac.c | 22 +- + drivers/mmc/host/atmel-mci.c | 2 +- + drivers/serial/sh-sci.c | 2 +- + drivers/video/mx3fb.c | 3 +- + include/linux/dmaengine.h | 66 ++- + include/linux/timb_dma.h | 55 ++ + sound/soc/txx9/txx9aclc.c | 6 +- + 26 files changed, 1329 insertions(+), 272 deletions(-) + create mode 100644 drivers/dma/timb_dma.c + create mode 100644 include/linux/timb_dma.h +Merging net/master +$ git merge net/master +Auto-merging MAINTAINERS +Auto-merging drivers/infiniband/hw/nes/nes_nic.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_multicast.c +Auto-merging drivers/net/3c505.c +Auto-merging drivers/net/3c523.c +Auto-merging drivers/net/7990.c +Auto-merging drivers/net/8139cp.c +Auto-merging drivers/net/8139too.c +Auto-merging drivers/net/82596.c +Auto-merging drivers/net/a2065.c +Auto-merging drivers/net/acenic.c +Auto-merging drivers/net/amd8111e.c +Auto-merging drivers/net/arm/at91_ether.c +Auto-merging drivers/net/arm/ixp4xx_eth.c +Auto-merging drivers/net/arm/ks8695net.c +Auto-merging drivers/net/arm/w90p910_ether.c +Auto-merging drivers/net/at1700.c +Auto-merging drivers/net/atlx/atl2.c +Auto-merging drivers/net/atp.c +Auto-merging drivers/net/b44.c +Auto-merging drivers/net/bcm63xx_enet.c +Auto-merging drivers/net/benet/be.h +Auto-merging drivers/net/bmac.c +Auto-merging drivers/net/can/mcp251x.c +Auto-merging drivers/net/chelsio/pm3393.c +Auto-merging drivers/net/cris/eth_v10.c +Auto-merging drivers/net/dm9000.c +Auto-merging drivers/net/e1000e/netdev.c +Auto-merging drivers/net/eepro.c +Auto-merging drivers/net/eexpress.c +Auto-merging drivers/net/ehea/ehea_main.c +Auto-merging drivers/net/enic/vnic_dev.c +Auto-merging drivers/net/enic/vnic_rq.c +Auto-merging drivers/net/enic/vnic_wq.c +Auto-merging drivers/net/epic100.c +Auto-merging drivers/net/ethoc.c +Auto-merging drivers/net/fealnx.c +Auto-merging drivers/net/fec_mpc52xx.c +Auto-merging drivers/net/forcedeth.c +Auto-merging drivers/net/fs_enet/mac-fcc.c +Auto-merging drivers/net/fs_enet/mac-fec.c +Auto-merging drivers/net/fs_enet/mac-scc.c +Auto-merging drivers/net/greth.c +Auto-merging drivers/net/hamachi.c +Auto-merging drivers/net/hp100.c +Auto-merging drivers/net/ibm_newemac/core.c +Auto-merging drivers/net/ibmlana.c +Auto-merging drivers/net/ibmveth.c +Auto-merging drivers/net/igb/e1000_82575.c +Auto-merging drivers/net/igb/igb_ethtool.c +Auto-merging drivers/net/igb/igb_main.c +Auto-merging drivers/net/igbvf/netdev.c +Auto-merging drivers/net/ioc3-eth.c +Auto-merging drivers/net/ipg.c +Auto-merging drivers/net/irda/ali-ircc.c +Auto-merging drivers/net/irda/sh_sir.c +Auto-merging drivers/net/iseries_veth.c +Auto-merging drivers/net/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ixgbevf/ixgbevf_main.c +Auto-merging drivers/net/jme.c +Auto-merging drivers/net/ks8851_mll.c +Auto-merging drivers/net/ksz884x.c +Auto-merging drivers/net/lib82596.c +Auto-merging drivers/net/ll_temac_main.c +Auto-merging drivers/net/mace.c +Auto-merging drivers/net/macmace.c +Auto-merging drivers/net/mlx4/en_netdev.c +Auto-merging drivers/net/mv643xx_eth.c +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/netxen/netxen_nic_hw.c +Auto-merging drivers/net/netxen/netxen_nic_init.c +Auto-merging drivers/net/netxen/netxen_nic_main.c +Auto-merging drivers/net/ni52.c +Auto-merging drivers/net/niu.c +Auto-merging drivers/net/octeon/octeon_mgmt.c +Auto-merging drivers/net/pcmcia/axnet_cs.c +Auto-merging drivers/net/phy/cicada.c +Auto-merging drivers/net/phy/davicom.c +Auto-merging drivers/net/phy/et1011c.c +Auto-merging drivers/net/phy/icplus.c +Auto-merging drivers/net/phy/lxt.c +Auto-merging drivers/net/phy/marvell.c +Auto-merging drivers/net/phy/mdio-bitbang.c +Auto-merging drivers/net/phy/qsemi.c +Auto-merging drivers/net/ppp_generic.c +Removing drivers/net/pppol2tp.c +Auto-merging drivers/net/ps3_gelic_net.c +Auto-merging drivers/net/ps3_gelic_wireless.c +Auto-merging drivers/net/qlcnic/qlcnic_hw.c +Auto-merging drivers/net/qlcnic/qlcnic_init.c +Auto-merging drivers/net/qlcnic/qlcnic_main.c +Auto-merging drivers/net/qlge/qlge_dbg.c +Auto-merging drivers/net/r6040.c +Auto-merging drivers/net/s2io.c +Auto-merging drivers/net/sfc/efx.c +Auto-merging drivers/net/sis190.c +Auto-merging drivers/net/skfp/skfddi.c +Auto-merging drivers/net/skge.c +Auto-merging drivers/net/sky2.c +Auto-merging drivers/net/smc911x.c +Auto-merging drivers/net/smc9194.c +Auto-merging drivers/net/smc91x.c +Auto-merging drivers/net/smsc911x.c +Auto-merging drivers/net/smsc9420.c +Auto-merging drivers/net/spider_net.c +Auto-merging drivers/net/stmmac/dwmac100.c +Auto-merging drivers/net/stmmac/dwmac1000_core.c +Auto-merging drivers/net/stmmac/stmmac_main.c +CONFLICT (content): Merge conflict in drivers/net/stmmac/stmmac_main.c +Auto-merging drivers/net/sun3_82586.c +Auto-merging drivers/net/sunbmac.c +Auto-merging drivers/net/sundance.c +Auto-merging drivers/net/sungem.c +Auto-merging drivers/net/sunlance.c +Auto-merging drivers/net/tokenring/3c359.c +Auto-merging drivers/net/tokenring/lanstreamer.c +Auto-merging drivers/net/tokenring/tms380tr.c +Auto-merging drivers/net/tsi108_eth.c +Auto-merging drivers/net/tulip/de2104x.c +Auto-merging drivers/net/tulip/de4x5.c +Auto-merging drivers/net/tulip/dmfe.c +Auto-merging drivers/net/tulip/tulip_core.c +Auto-merging drivers/net/tulip/uli526x.c +Auto-merging drivers/net/tulip/winbond-840.c +Auto-merging drivers/net/typhoon.c +Auto-merging drivers/net/usb/asix.c +Auto-merging drivers/net/usb/catc.c +Auto-merging drivers/net/usb/dm9601.c +Auto-merging drivers/net/usb/mcs7830.c +Auto-merging drivers/net/usb/smsc75xx.c +Auto-merging drivers/net/usb/smsc95xx.c +Auto-merging drivers/net/usb/usbnet.c +Auto-merging drivers/net/via-rhine.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/vxge/vxge-config.c +Auto-merging drivers/net/vxge/vxge-config.h +Auto-merging drivers/net/vxge/vxge-ethtool.c +Auto-merging drivers/net/vxge/vxge-main.c +Auto-merging drivers/net/wan/pc300_drv.c +Auto-merging drivers/net/wimax/i2400m/tx.c +Auto-merging drivers/net/wireless/adm8211.c +Auto-merging drivers/net/wireless/ath/ar9170/main.c +Auto-merging drivers/net/wireless/ath/ath5k/attach.c +Auto-merging drivers/net/wireless/ath/ath5k/base.c +Auto-merging drivers/net/wireless/ath/ath5k/eeprom.c +Auto-merging drivers/net/wireless/ath/ath5k/phy.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/wireless/ath/ath9k/init.c +Auto-merging drivers/net/wireless/ath/ath9k/rc.c +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/wireless/b43/phy_n.c +Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945-rs.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-agn-rs.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-core.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-debugfs.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-rx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-scan.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/debugfs.c +Auto-merging drivers/net/wireless/iwmc3200wifi/hal.c +Auto-merging drivers/net/wireless/iwmc3200wifi/main.c +Auto-merging drivers/net/wireless/iwmc3200wifi/rx.c +Auto-merging drivers/net/wireless/iwmc3200wifi/tx.c +Auto-merging drivers/net/wireless/libertas/assoc.c +Auto-merging drivers/net/wireless/libertas/main.c +Auto-merging drivers/net/wireless/libertas/rx.c +Auto-merging drivers/net/wireless/libertas/wext.c +Auto-merging drivers/net/wireless/libertas_tf/main.c +Auto-merging drivers/net/wireless/mwl8k.c +Auto-merging drivers/net/wireless/orinoco/wext.c +Auto-merging drivers/net/wireless/p54/main.c +Auto-merging drivers/net/wireless/ray_cs.c +Auto-merging drivers/net/wireless/rndis_wlan.c +Auto-merging drivers/net/wireless/rtl818x/rtl8180_dev.c +Auto-merging drivers/net/wireless/rtl818x/rtl8187_dev.c +Auto-merging drivers/net/wireless/wl12xx/wl1251_boot.c +Auto-merging drivers/net/wireless/wl12xx/wl1251_main.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_acx.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_boot.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_cmd.c +CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_cmd.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_debugfs.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_init.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_main.c +Recorded preimage for 'drivers/net/stmmac/stmmac_main.c' +Resolved 'drivers/net/wireless/wl12xx/wl1271_cmd.c' using previous resolution. +Resolved 'drivers/net/wireless/wl12xx/wl1271_main.c' using previous resolution. +Resolved 'drivers/net/wireless/wl12xx/wl1271_spi.c' using previous resolution. +Resolved 'net/mac80211/scan.c' using previous resolution. +CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_main.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_rx.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_spi.c +CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_spi.c +Removing drivers/net/wireless/wl12xx/wl1271_spi.h +Auto-merging drivers/net/wireless/wl12xx/wl1271_testmode.c +Auto-merging drivers/net/wireless/zd1201.c +Auto-merging drivers/net/wireless/zd1211rw/zd_mac.c +Auto-merging drivers/net/xilinx_emaclite.c +Auto-merging drivers/net/yellowfin.c +Auto-merging drivers/s390/net/qeth_l2_main.c +Auto-merging drivers/s390/net/qeth_l3_main.c +Auto-merging drivers/scsi/fcoe/fcoe.c +Auto-merging drivers/staging/et131x/et131x_netdev.c +Auto-merging drivers/staging/vt6655/device_main.c +Auto-merging drivers/staging/wlags49_h2/wl_netdev.c +Auto-merging include/net/xfrm.h +Auto-merging net/802/garp.c +Auto-merging net/8021q/vlan.c +Auto-merging net/8021q/vlan_dev.c +Auto-merging net/appletalk/ddp.c +Auto-merging net/atm/proc.c +Auto-merging net/bluetooth/bnep/netdev.c +Auto-merging net/bridge/br_if.c +Auto-merging net/bridge/br_input.c +Auto-merging net/bridge/br_multicast.c +Auto-merging net/core/dev.c +Removing net/core/dev_mcast.c +Auto-merging net/core/dst.c +Auto-merging net/core/ethtool.c +CONFLICT (content): Merge conflict in net/core/ethtool.c +Auto-merging net/core/fib_rules.c +Auto-merging net/core/net-sysfs.c +Auto-merging net/dccp/input.c +Auto-merging net/decnet/dn_dev.c +Auto-merging net/ipv4/af_inet.c +Auto-merging net/ipv4/devinet.c +Auto-merging net/ipv4/icmp.c +Auto-merging net/ipv4/igmp.c +Auto-merging net/ipv4/ip_sockglue.c +Auto-merging net/ipv4/ipconfig.c +Auto-merging net/ipv4/netfilter/ipt_CLUSTERIP.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/ipv4/tcp_minisocks.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv6/icmp.c +Auto-merging net/ipv6/ip6_fib.c +Auto-merging net/ipv6/mcast.c +Auto-merging net/irda/ircomm/ircomm_param.c +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/ibss.c +Auto-merging net/mac80211/iface.c +Auto-merging net/mac80211/main.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/rc80211_minstrel.c +Auto-merging net/mac80211/rc80211_minstrel_debugfs.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/scan.c +CONFLICT (content): Merge conflict in net/mac80211/scan.c +Auto-merging net/netlink/genetlink.c +Auto-merging net/packet/af_packet.c +Auto-merging net/rds/af_rds.c +Auto-merging net/rds/cong.c +Auto-merging net/rds/ib_cm.c +Auto-merging net/rds/ib_rdma.c +Auto-merging net/rds/ib_recv.c +Auto-merging net/rds/iw_cm.c +Auto-merging net/rds/iw_recv.c +Auto-merging net/rds/loop.c +Auto-merging net/rds/rdma.c +Auto-merging net/rds/send.c +Auto-merging net/rds/tcp_recv.c +Auto-merging net/rfkill/core.c +Auto-merging net/sched/act_api.c +Auto-merging net/sched/cls_api.c +Auto-merging net/sched/cls_u32.c +Auto-merging net/sched/sch_api.c +Auto-merging net/sched/sch_generic.c +Auto-merging net/sctp/ipv6.c +Auto-merging net/sctp/socket.c +Auto-merging net/socket.c +Auto-merging net/sunrpc/bc_svc.c +Auto-merging net/wireless/mlme.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/wext-core.c +Auto-merging net/xfrm/xfrm_state.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/stmmac/stmmac_main.c'. +Recorded resolution for 'net/core/ethtool.c'. +[master f87c569] Merge remote branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/obsolete/sysfs-class-rfkill | 29 + + Documentation/ABI/stable/sysfs-class-rfkill | 67 + + Documentation/feature-removal-schedule.txt | 19 + + Documentation/networking/caif/Linux-CAIF.txt | 212 ++ + Documentation/networking/caif/README | 109 + + Documentation/networking/l2tp.txt | 247 ++- + Documentation/rfkill.txt | 44 +- + MAINTAINERS | 9 +- + arch/arm/mach-pxa/icontrol.c | 9 +- + arch/arm/mach-pxa/zeus.c | 4 +- + drivers/infiniband/hw/nes/nes_nic.c | 7 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 15 +- + drivers/media/dvb/dvb-core/dvb_net.c | 14 +- + drivers/net/3c503.c | 42 +- + drivers/net/3c505.c | 7 +- + drivers/net/3c523.c | 7 +- + drivers/net/3c527.c | 6 +- + drivers/net/7990.c | 6 +- + drivers/net/8139cp.c | 6 +- + drivers/net/8139too.c | 6 +- + drivers/net/82596.c | 6 +- + drivers/net/Kconfig | 23 +- + drivers/net/Makefile | 3 +- + drivers/net/a2065.c | 6 +- + drivers/net/acenic.c | 42 +- + drivers/net/acenic.h | 6 +- + drivers/net/amd8111e.c | 6 +- + drivers/net/arm/am79c961a.c | 6 +- + drivers/net/arm/at91_ether.c | 6 +- + drivers/net/arm/ixp4xx_eth.c | 8 +- + drivers/net/arm/ks8695net.c | 10 +- + drivers/net/arm/w90p910_ether.c | 1 - + drivers/net/at1700.c | 6 +- + drivers/net/atl1c/atl1c_main.c | 7 +- + drivers/net/atl1e/atl1e_main.c | 7 +- + drivers/net/atlx/atl2.c | 7 +- + drivers/net/atlx/atlx.c | 6 +- + drivers/net/atp.c | 6 +- + drivers/net/au1000_eth.c | 259 ++-- + drivers/net/au1000_eth.h | 4 +- + drivers/net/b44.c | 6 +- + drivers/net/bcm63xx_enet.c | 7 +- + drivers/net/benet/be.h | 11 +- + drivers/net/benet/be_cmds.c | 10 +- + drivers/net/benet/be_cmds.h | 2 +- + drivers/net/benet/be_ethtool.c | 2 +- + drivers/net/benet/be_hw.h | 3 + + drivers/net/benet/be_main.c | 303 ++- + drivers/net/bfin_mac.c | 6 +- + drivers/net/bmac.c | 12 +- + drivers/net/bnx2.c | 45 +- + drivers/net/bnx2.h | 6 +- + drivers/net/bnx2x.h | 4 +- + drivers/net/bnx2x_link.c | 12 +- + drivers/net/bnx2x_main.c | 148 +- + drivers/net/bonding/bond_ipv6.c | 9 +- + drivers/net/bonding/bond_main.c | 176 +- + drivers/net/bonding/bonding.h | 2 +- + drivers/net/caif/Kconfig | 17 + + drivers/net/caif/Makefile | 12 + + drivers/net/caif/caif_serial.c | 446 ++++ + drivers/net/can/mcp251x.c | 14 + + drivers/net/can/sja1000/sja1000_platform.c | 44 +- + drivers/net/cassini.c | 12 +- + drivers/net/chelsio/pm3393.c | 7 +- + drivers/net/cpmac.c | 16 +- + drivers/net/cris/eth_v10.c | 6 +- + drivers/net/cxgb3/xgmac.c | 8 +- + drivers/net/cxgb4/cxgb4_main.c | 8 +- + drivers/net/davinci_emac.c | 7 +- + drivers/net/declance.c | 6 +- + drivers/net/defxx.c | 6 +- + drivers/net/depca.c | 6 +- + drivers/net/dl2k.c | 6 +- + drivers/net/dm9000.c | 6 +- + drivers/net/dnet.c | 2 +- + drivers/net/e100.c | 189 +- + drivers/net/e1000/e1000_hw.c | 4 +- + drivers/net/e1000/e1000_main.c | 7 +- + drivers/net/e1000e/82571.c | 2 +- + drivers/net/e1000e/e1000.h | 24 +- + drivers/net/e1000e/ich8lan.c | 6 +- + drivers/net/e1000e/lib.c | 21 +- + drivers/net/e1000e/netdev.c | 198 ++- + drivers/net/eepro.c | 10 +- + drivers/net/eexpress.c | 6 +- + drivers/net/ehea/ehea_main.c | 6 +- + drivers/net/enic/cq_enet_desc.h | 12 +- + drivers/net/enic/enic.h | 4 +- + drivers/net/enic/enic_main.c | 11 +- + drivers/net/enic/vnic_dev.c | 52 +- + drivers/net/enic/vnic_dev.h | 3 + + drivers/net/enic/vnic_rq.c | 4 +- + drivers/net/enic/vnic_wq.c | 4 +- + drivers/net/epic100.c | 6 +- + drivers/net/ethoc.c | 6 +- + drivers/net/ewrk3.c | 9 +- + drivers/net/fealnx.c | 6 +- + drivers/net/fec.c | 1138 +++-------- + drivers/net/fec_mpc52xx.c | 7 +- + drivers/net/forcedeth.c | 10 +- + drivers/net/fs_enet/mac-fcc.c | 6 +- + drivers/net/fs_enet/mac-fec.c | 6 +- + drivers/net/fs_enet/mac-scc.c | 6 +- + drivers/net/gianfar.c | 9 +- + drivers/net/greth.c | 7 +- + drivers/net/hamachi.c | 8 +- + drivers/net/hamradio/baycom_ser_fdx.c | 2 +- + drivers/net/hp100.c | 6 +- + drivers/net/ibm_newemac/core.c | 12 +- + drivers/net/ibmlana.c | 8 +- + drivers/net/ibmveth.c | 6 +- + drivers/net/igb/e1000_82575.c | 33 +- + drivers/net/igb/e1000_82575.h | 9 +- + drivers/net/igb/e1000_defines.h | 1 + + drivers/net/igb/e1000_hw.h | 17 +- + drivers/net/igb/igb.h | 2 + + drivers/net/igb/igb_ethtool.c | 50 + + drivers/net/igb/igb_main.c | 123 +- + drivers/net/igbvf/netdev.c | 6 +- + drivers/net/ioc3-eth.c | 6 +- + drivers/net/ipg.c | 11 +- + drivers/net/ipg.h | 109 +- + drivers/net/irda/Kconfig | 6 + + drivers/net/irda/Makefile | 1 + + drivers/net/irda/ali-ircc.c | 32 +- + drivers/net/irda/irda-usb.c | 2 +- + drivers/net/irda/sh_irda.c | 865 ++++++++ + drivers/net/irda/sh_sir.c | 12 +- + drivers/net/irda/vlsi_ir.c | 4 +- + drivers/net/iseries_veth.c | 6 +- + drivers/net/ixgb/ixgb_main.c | 6 +- + drivers/net/ixgbe/ixgbe_82599.c | 2 +- + drivers/net/ixgbe/ixgbe_common.c | 16 +- + drivers/net/ixgbe/ixgbe_common.h | 5 +- + drivers/net/ixgbe/ixgbe_main.c | 30 +- + drivers/net/ixgbe/ixgbe_phy.c | 4 +- + drivers/net/ixgbe/ixgbe_type.h | 3 +- + drivers/net/ixgbevf/ixgbevf_main.c | 32 +- + drivers/net/ixgbevf/vf.c | 24 +- + drivers/net/ixgbevf/vf.h | 4 +- + drivers/net/jme.c | 6 +- + drivers/net/korina.c | 12 +- + drivers/net/ks8842.c | 8 +- + drivers/net/ks8851.c | 94 +- + drivers/net/ks8851_mll.c | 63 +- + drivers/net/ksz884x.c | 79 +- + drivers/net/lib82596.c | 6 +- + drivers/net/lib8390.c | 6 +- + drivers/net/ll_temac_main.c | 16 +- + drivers/net/lp486e.c | 6 +- + drivers/net/macb.c | 7 +- + drivers/net/mace.c | 6 +- + drivers/net/macmace.c | 6 +- + drivers/net/macvlan.c | 13 +- + drivers/net/mlx4/en_netdev.c | 53 +- + drivers/net/mlx4/mlx4_en.h | 3 +- + drivers/net/mv643xx_eth.c | 6 +- + drivers/net/myri10ge/myri10ge.c | 8 +- + drivers/net/natsemi.c | 6 +- + drivers/net/netxen/netxen_nic.h | 1 - + drivers/net/netxen/netxen_nic_ethtool.c | 6 + + drivers/net/netxen/netxen_nic_hw.c | 12 +- + drivers/net/netxen/netxen_nic_init.c | 164 ++- + drivers/net/netxen/netxen_nic_main.c | 29 +- + drivers/net/ni52.c | 6 +- + drivers/net/niu.c | 5 +- + drivers/net/octeon/octeon_mgmt.c | 6 +- + drivers/net/pci-skeleton.c | 6 +- + drivers/net/pcmcia/3c589_cs.c | 286 ++-- + drivers/net/pcmcia/axnet_cs.c | 6 +- + drivers/net/pcmcia/fmvj18x_cs.c | 6 +- + drivers/net/pcmcia/nmclan_cs.c | 6 +- + drivers/net/pcmcia/smc91c92_cs.c | 8 +- + drivers/net/pcmcia/xirc2ps_cs.c | 6 +- + drivers/net/pcnet32.c | 6 +- + drivers/net/phy/bcm63xx.c | 8 + + drivers/net/phy/broadcom.c | 16 + + drivers/net/phy/cicada.c | 8 + + drivers/net/phy/davicom.c | 9 + + drivers/net/phy/et1011c.c | 7 + + drivers/net/phy/icplus.c | 7 + + drivers/net/phy/lxt.c | 8 + + drivers/net/phy/marvell.c | 13 + + drivers/net/phy/mdio-bitbang.c | 60 +- + drivers/net/phy/mdio_bus.c | 4 +- + drivers/net/phy/national.c | 7 + + drivers/net/phy/phy_device.c | 12 + + drivers/net/phy/qsemi.c | 7 + + drivers/net/phy/realtek.c | 7 + + drivers/net/phy/smsc.c | 11 + + drivers/net/phy/ste10Xp.c | 8 + + drivers/net/phy/vitesse.c | 8 + + drivers/net/ppp_generic.c | 19 + + drivers/net/pppol2tp.c | 2680 ----------------------- + drivers/net/ps3_gelic_net.c | 10 +- + drivers/net/ps3_gelic_wireless.c | 69 +- + drivers/net/qla3xxx.c | 2 +- + drivers/net/qlcnic/qlcnic.h | 21 +- + drivers/net/qlcnic/qlcnic_ethtool.c | 16 + + drivers/net/qlcnic/qlcnic_hdr.h | 7 +- + drivers/net/qlcnic/qlcnic_hw.c | 131 +- + drivers/net/qlcnic/qlcnic_init.c | 34 +- + drivers/net/qlcnic/qlcnic_main.c | 100 +- + drivers/net/qlge/qlge_dbg.c | 4 +- + drivers/net/qlge/qlge_main.c | 6 +- + drivers/net/r6040.c | 10 +- + drivers/net/r8169.c | 180 ++- + drivers/net/s2io.c | 8 +- + drivers/net/s6gmac.c | 1 - + drivers/net/sb1250-mac.c | 7 +- + drivers/net/sc92031.c | 6 +- + drivers/net/sfc/efx.c | 6 +- + drivers/net/sis190.c | 6 +- + drivers/net/sis900.c | 14 +- + drivers/net/skfp/fplustm.c | 2 +- + drivers/net/skfp/pcmplc.c | 4 +- + drivers/net/skfp/skfddi.c | 12 +- + drivers/net/skfp/srf.c | 2 +- + drivers/net/skge.c | 14 +- + drivers/net/sky2.c | 26 +- + drivers/net/sky2.h | 20 +- + drivers/net/smc911x.c | 19 +- + drivers/net/smc9194.c | 53 +- + drivers/net/smc91x.c | 10 +- + drivers/net/smsc911x.c | 6 +- + drivers/net/smsc9420.c | 6 +- + drivers/net/sonic.c | 6 +- + drivers/net/spider_net.c | 6 +- + drivers/net/starfire.c | 10 +- + drivers/net/stmmac/dwmac100.c | 8 +- + drivers/net/stmmac/dwmac1000_core.c | 6 +- + drivers/net/stmmac/stmmac_main.c | 5 +- + drivers/net/sun3_82586.c | 6 +- + drivers/net/sunbmac.c | 6 +- + drivers/net/sundance.c | 6 +- + drivers/net/sungem.c | 6 +- + drivers/net/sunhme.c | 12 +- + drivers/net/sunlance.c | 6 +- + drivers/net/sunqe.c | 6 +- + drivers/net/sunvnet.c | 8 +- + drivers/net/tc35815.c | 6 +- + drivers/net/tehuti.c | 7 +- + drivers/net/tg3.c | 679 +++---- + drivers/net/tg3.h | 8 +- + drivers/net/tlan.c | 10 +- + drivers/net/tokenring/3c359.c | 112 +- + drivers/net/tokenring/ibmtr.c | 12 +- + drivers/net/tokenring/lanstreamer.c | 58 +- + drivers/net/tokenring/olympic.c | 74 +- + drivers/net/tokenring/tms380tr.c | 16 +- + drivers/net/tsi108_eth.c | 12 +- + drivers/net/tulip/de2104x.c | 12 +- + drivers/net/tulip/de4x5.c | 14 +- + drivers/net/tulip/dmfe.c | 12 +- + drivers/net/tulip/tulip_core.c | 27 +- + drivers/net/tulip/uli526x.c | 6 +- + drivers/net/tulip/winbond-840.c | 12 +- + drivers/net/tulip/xircom_cb.c | 6 +- + drivers/net/typhoon.c | 6 +- + drivers/net/ucc_geth.c | 10 +- + drivers/net/usb/asix.c | 16 +- + drivers/net/usb/catc.c | 6 +- + drivers/net/usb/dm9601.c | 6 +- + drivers/net/usb/mcs7830.c | 6 +- + drivers/net/usb/smsc75xx.c | 6 +- + drivers/net/usb/smsc95xx.c | 6 +- + drivers/net/usb/usbnet.c | 15 +- + drivers/net/via-rhine.c | 6 +- + drivers/net/via-velocity.c | 120 +- + drivers/net/via-velocity.h | 77 +- + drivers/net/virtio_net.c | 55 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 6 +- + drivers/net/vxge/vxge-config.c | 24 +- + drivers/net/vxge/vxge-config.h | 34 +- + drivers/net/vxge/vxge-ethtool.c | 5 +- + drivers/net/vxge/vxge-main.c | 241 ++- + drivers/net/vxge/vxge-main.h | 6 + + drivers/net/vxge/vxge-traffic.c | 53 +- + drivers/net/vxge/vxge-traffic.h | 50 +- + drivers/net/vxge/vxge-version.h | 4 +- + drivers/net/wan/pc300_drv.c | 2 +- + drivers/net/wan/pc300_tty.c | 2 +- + drivers/net/wan/sdla.c | 2 +- + drivers/net/wimax/i2400m/tx.c | 2 +- + drivers/net/wireless/adm8211.c | 12 +- + drivers/net/wireless/airo.c | 37 +- + drivers/net/wireless/ath/Kconfig | 2 +- + drivers/net/wireless/ath/ar9170/main.c | 14 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 257 +-- + drivers/net/wireless/ath/ath5k/attach.c | 5 +- + drivers/net/wireless/ath/ath5k/base.c | 167 ++- + drivers/net/wireless/ath/ath5k/base.h | 20 + + drivers/net/wireless/ath/ath5k/caps.c | 3 - + drivers/net/wireless/ath/ath5k/debug.c | 212 ++ + drivers/net/wireless/ath/ath5k/debug.h | 2 + + drivers/net/wireless/ath/ath5k/desc.c | 18 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/eeprom.h | 88 +- + drivers/net/wireless/ath/ath5k/pcu.c | 306 +--- + drivers/net/wireless/ath/ath5k/phy.c | 38 +- + drivers/net/wireless/ath/ath5k/qcu.c | 17 - + drivers/net/wireless/ath/ath5k/reg.h | 2 +- + drivers/net/wireless/ath/ath5k/reset.c | 38 +- + drivers/net/wireless/ath/ath9k/Kconfig | 21 + + drivers/net/wireless/ath/ath9k/Makefile | 10 + + drivers/net/wireless/ath/ath9k/calib.c | 25 +- + drivers/net/wireless/ath/ath9k/common.c | 421 ++++ + drivers/net/wireless/ath/ath9k/common.h | 17 + + drivers/net/wireless/ath/ath9k/hif_usb.c | 993 +++++++++ + drivers/net/wireless/ath/ath9k/hif_usb.h | 105 + + drivers/net/wireless/ath/ath9k/htc.h | 441 ++++ + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 260 +++ + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 713 ++++++ + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1626 ++++++++++++++ + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 604 +++++ + drivers/net/wireless/ath/ath9k/htc_hst.c | 463 ++++ + drivers/net/wireless/ath/ath9k/htc_hst.h | 246 +++ + drivers/net/wireless/ath/ath9k/hw.c | 150 +- + drivers/net/wireless/ath/ath9k/hw.h | 9 + + drivers/net/wireless/ath/ath9k/init.c | 3 + + drivers/net/wireless/ath/ath9k/initvals.h | 141 +- + drivers/net/wireless/ath/ath9k/mac.c | 8 +- + drivers/net/wireless/ath/ath9k/mac.h | 26 + + drivers/net/wireless/ath/ath9k/rc.c | 8 +- + drivers/net/wireless/ath/ath9k/rc.h | 5 +- + drivers/net/wireless/ath/ath9k/reg.h | 3 + + drivers/net/wireless/ath/ath9k/wmi.c | 319 +++ + drivers/net/wireless/ath/ath9k/wmi.h | 126 ++ + drivers/net/wireless/ath/ath9k/xmit.c | 4 +- + drivers/net/wireless/ath/debug.h | 1 + + drivers/net/wireless/b43/b43.h | 1 + + drivers/net/wireless/b43/main.c | 5 +- + drivers/net/wireless/b43/phy_n.c | 463 +++- + drivers/net/wireless/b43/phy_n.h | 21 +- + drivers/net/wireless/b43/tables_nphy.h | 9 + + drivers/net/wireless/ipw2x00/ipw2100.c | 10 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 101 +- + drivers/net/wireless/ipw2x00/libipw.h | 14 +- + drivers/net/wireless/ipw2x00/libipw_module.c | 13 +- + drivers/net/wireless/iwlwifi/Makefile | 2 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 2 + + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 89 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 64 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 1 - + drivers/net/wireless/iwlwifi/iwl-4965.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 68 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 305 +++ + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 137 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 262 +-- + drivers/net/wireless/iwlwifi/iwl-agn.h | 74 + + drivers/net/wireless/iwlwifi/iwl-core.c | 520 ++---- + drivers/net/wireless/iwlwifi/iwl-core.h | 27 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 82 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 113 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 3 + + drivers/net/wireless/iwlwifi/iwl-prph.h | 14 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 179 ++- + drivers/net/wireless/iwlwifi/iwl-scan.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 648 ++++--- + drivers/net/wireless/iwlwifi/iwl-sta.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 117 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 150 +- + drivers/net/wireless/iwmc3200wifi/Kconfig | 9 +- + drivers/net/wireless/iwmc3200wifi/Makefile | 3 + + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 17 +- + drivers/net/wireless/iwmc3200wifi/commands.c | 14 +- + drivers/net/wireless/iwmc3200wifi/commands.h | 1 + + drivers/net/wireless/iwmc3200wifi/debugfs.c | 13 +- + drivers/net/wireless/iwmc3200wifi/hal.c | 15 +- + drivers/net/wireless/iwmc3200wifi/hal.h | 5 +- + drivers/net/wireless/iwmc3200wifi/iwm.h | 3 + + drivers/net/wireless/iwmc3200wifi/main.c | 9 +- + drivers/net/wireless/iwmc3200wifi/rx.c | 76 +- + drivers/net/wireless/iwmc3200wifi/trace.c | 3 + + drivers/net/wireless/iwmc3200wifi/trace.h | 283 +++ + drivers/net/wireless/iwmc3200wifi/tx.c | 8 +- + drivers/net/wireless/iwmc3200wifi/umac.h | 2 +- + drivers/net/wireless/libertas/assoc.c | 22 +- + drivers/net/wireless/libertas/dev.h | 1 + + drivers/net/wireless/libertas/main.c | 13 +- + drivers/net/wireless/libertas/rx.c | 50 +- + drivers/net/wireless/libertas/wext.c | 4 + + drivers/net/wireless/libertas_tf/main.c | 14 +- + drivers/net/wireless/mwl8k.c | 24 +- + drivers/net/wireless/orinoco/Kconfig | 13 +- + drivers/net/wireless/orinoco/hw.c | 13 +- + drivers/net/wireless/orinoco/hw.h | 1 - + drivers/net/wireless/orinoco/orinoco_cs.c | 79 +- + drivers/net/wireless/orinoco/wext.c | 94 +- + drivers/net/wireless/p54/main.c | 1 + + drivers/net/wireless/ray_cs.c | 224 +- + drivers/net/wireless/rndis_wlan.c | 370 +++- + drivers/net/wireless/rt2x00/rt2800pci.c | 93 +- + drivers/net/wireless/rtl818x/rtl8180_dev.c | 6 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 4 +- + drivers/net/wireless/wl12xx/Kconfig | 24 + + drivers/net/wireless/wl12xx/Makefile | 6 +- + drivers/net/wireless/wl12xx/wl1251.h | 2 + + drivers/net/wireless/wl12xx/wl1251_boot.c | 3 +- + drivers/net/wireless/wl12xx/wl1251_io.h | 20 + + drivers/net/wireless/wl12xx/wl1251_main.c | 4 +- + drivers/net/wireless/wl12xx/wl1251_ps.c | 8 +- + drivers/net/wireless/wl12xx/wl1251_sdio.c | 52 +- + drivers/net/wireless/wl12xx/wl1271.h | 40 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 33 +- + drivers/net/wireless/wl12xx/wl1271_acx.h | 68 +- + drivers/net/wireless/wl12xx/wl1271_boot.c | 11 +- + drivers/net/wireless/wl12xx/wl1271_cmd.c | 226 +-- + drivers/net/wireless/wl12xx/wl1271_cmd.h | 14 +- + drivers/net/wireless/wl12xx/wl1271_conf.h | 330 +++- + drivers/net/wireless/wl12xx/wl1271_debugfs.c | 12 +- + drivers/net/wireless/wl12xx/wl1271_event.c | 3 +- + drivers/net/wireless/wl12xx/wl1271_init.c | 4 +- + drivers/net/wireless/wl12xx/wl1271_io.c | 87 +- + drivers/net/wireless/wl12xx/wl1271_io.h | 135 +- + drivers/net/wireless/wl12xx/wl1271_main.c | 855 ++++---- + drivers/net/wireless/wl12xx/wl1271_ps.c | 1 - + drivers/net/wireless/wl12xx/wl1271_rx.c | 11 +- + drivers/net/wireless/wl12xx/wl1271_sdio.c | 291 +++ + drivers/net/wireless/wl12xx/wl1271_spi.c | 250 ++- + drivers/net/wireless/wl12xx/wl1271_spi.h | 96 - + drivers/net/wireless/wl12xx/wl1271_testmode.c | 1 - + drivers/net/wireless/wl12xx/wl1271_tx.c | 94 +- + drivers/net/wireless/wl12xx/wl1271_tx.h | 7 +- + drivers/net/wireless/wl3501_cs.c | 52 +- + drivers/net/wireless/zd1201.c | 6 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 13 +- + drivers/net/xilinx_emaclite.c | 1 - + drivers/net/yellowfin.c | 12 +- + drivers/s390/net/qeth_l2_main.c | 5 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + drivers/scsi/fcoe/fcoe.c | 18 +- + drivers/ssb/driver_chipcommon.c | 1 + + drivers/staging/arlan/arlan-main.c | 9 +- + drivers/staging/et131x/et131x_netdev.c | 6 +- + drivers/staging/slicoss/slicoss.c | 6 +- + drivers/staging/vt6655/device_main.c | 6 +- + drivers/staging/vt6656/main_usb.c | 6 +- + drivers/staging/wavelan/wavelan.c | 10 +- + drivers/staging/wavelan/wavelan_cs.c | 12 +- + drivers/staging/winbond/wbusb.c | 6 +- + drivers/staging/wlags49_h2/wl_netdev.c | 12 +- + include/linux/caif/caif_socket.h | 164 ++ + include/linux/caif/if_caif.h | 34 + + include/linux/can/platform/mcp251x.h | 4 +- + include/linux/ethtool.h | 116 +- + include/linux/genetlink.h | 8 + + include/linux/if_arp.h | 1 + + include/linux/if_ether.h | 1 + + include/linux/if_link.h | 33 + + include/linux/if_pppol2tp.h | 16 +- + include/linux/if_pppox.h | 9 + + include/linux/l2tp.h | 163 ++ + include/linux/mod_devicetable.h | 26 + + include/linux/netdevice.h | 138 +- + include/linux/nl80211.h | 50 + + include/linux/notifier.h | 9 +- + include/linux/phy.h | 13 +- + include/linux/ppp_channel.h | 3 + + include/linux/rculist.h | 13 + + include/linux/skbuff.h | 3 + + include/linux/snmp.h | 2 + + include/linux/socket.h | 5 +- + include/linux/tipc.h | 30 +- + include/linux/tty.h | 4 +- + include/linux/wireless.h | 4 +- + include/net/caif/caif_dev.h | 90 + + include/net/caif/caif_device.h | 55 + + include/net/caif/caif_layer.h | 283 +++ + include/net/caif/cfcnfg.h | 133 ++ + include/net/caif/cfctrl.h | 138 ++ + include/net/caif/cffrml.h | 16 + + include/net/caif/cfmuxl.h | 22 + + include/net/caif/cfpkt.h | 274 +++ + include/net/caif/cfserl.h | 12 + + include/net/caif/cfsrvl.h | 34 + + include/net/cfg80211.h | 19 + + include/net/dn_fib.h | 4 - + include/net/flow.h | 23 +- + include/net/if_inet6.h | 13 +- + include/net/ip6_fib.h | 29 +- + include/net/ipv6.h | 2 +- + include/net/mac80211.h | 60 +- + include/net/pkt_sched.h | 2 +- + include/net/sch_generic.h | 1 + + include/net/sctp/sctp.h | 2 +- + include/net/snmp.h | 29 +- + include/net/xfrm.h | 19 +- + net/802/garp.c | 4 +- + net/8021q/vlan.c | 8 +- + net/8021q/vlan_dev.c | 14 +- + net/Kconfig | 8 + + net/Makefile | 2 + + net/appletalk/ddp.c | 2 +- + net/atm/proc.c | 10 +- + net/bluetooth/bnep/netdev.c | 14 +- + net/bridge/br_device.c | 43 +- + net/bridge/br_if.c | 6 + + net/bridge/br_input.c | 6 +- + net/bridge/br_multicast.c | 2 - + net/bridge/br_notify.c | 4 + + net/bridge/br_private.h | 8 + + net/caif/Kconfig | 48 + + net/caif/Makefile | 26 + + net/caif/caif_config_util.c | 87 + + net/caif/caif_dev.c | 413 ++++ + net/caif/caif_socket.c | 1391 ++++++++++++ + net/caif/cfcnfg.c | 530 +++++ + net/caif/cfctrl.c | 664 ++++++ + net/caif/cfdbgl.c | 40 + + net/caif/cfdgml.c | 108 + + net/caif/cffrml.c | 151 ++ + net/caif/cfmuxl.c | 246 +++ + net/caif/cfpkt_skbuff.c | 571 +++++ + net/caif/cfrfml.c | 108 + + net/caif/cfserl.c | 192 ++ + net/caif/cfsrvl.c | 185 ++ + net/caif/cfutill.c | 115 + + net/caif/cfveil.c | 107 + + net/caif/cfvidl.c | 65 + + net/caif/chnl_net.c | 451 ++++ + net/core/Makefile | 2 +- + net/core/dev.c | 1006 ++++------ + net/core/dev_addr_lists.c | 741 +++++++ + net/core/dev_mcast.c | 232 -- + net/core/dst.c | 41 +- + net/core/ethtool.c | 148 +- + net/core/fib_rules.c | 10 +- + net/core/flow.c | 405 ++-- + net/core/net-sysfs.c | 230 ++- + net/core/pktgen.c | 58 +- + net/core/rtnetlink.c | 44 +- + net/core/skbuff.c | 2 + + net/dccp/ccids/ccid3.c | 2 +- + net/dccp/dccp.h | 2 +- + net/dccp/input.c | 2 +- + net/decnet/dn_dev.c | 12 +- + net/dsa/slave.c | 14 +- + net/ipv4/Kconfig | 8 + + net/ipv4/af_inet.c | 4 +- + net/ipv4/devinet.c | 4 +- + net/ipv4/icmp.c | 5 +- + net/ipv4/igmp.c | 4 +- + net/ipv4/ip_sockglue.c | 4 - + net/ipv4/ipconfig.c | 2 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 +- + net/ipv4/proc.c | 1 + + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_minisocks.c | 1 + + net/ipv4/xfrm4_policy.c | 22 - + net/ipv6/addrconf.c | 795 ++++---- + net/ipv6/icmp.c | 2 + + net/ipv6/ip6_fib.c | 15 +- + net/ipv6/mcast.c | 4 +- + net/ipv6/netfilter/ip6t_hbh.c | 4 +- + net/ipv6/proc.c | 1 + + net/ipv6/xfrm6_policy.c | 31 - + net/irda/ircomm/ircomm_param.c | 2 +- + net/l2tp/Kconfig | 107 + + net/l2tp/Makefile | 12 + + net/l2tp/l2tp_core.c | 1692 ++++++++++++++ + net/l2tp/l2tp_core.h | 304 +++ + net/l2tp/l2tp_debugfs.c | 341 +++ + net/l2tp/l2tp_eth.c | 361 +++ + net/l2tp/l2tp_ip.c | 679 ++++++ + net/l2tp/l2tp_netlink.c | 840 +++++++ + net/l2tp/l2tp_ppp.c | 1837 ++++++++++++++++ + net/llc/llc_core.c | 6 - + net/mac80211/Kconfig | 9 + + net/mac80211/cfg.c | 27 + + net/mac80211/debugfs_sta.c | 2 - + net/mac80211/driver-ops.h | 8 +- + net/mac80211/ibss.c | 16 +- + net/mac80211/ieee80211_i.h | 8 +- + net/mac80211/iface.c | 124 +- + net/mac80211/main.c | 5 +- + net/mac80211/mlme.c | 79 +- + net/mac80211/rc80211_minstrel.c | 2 +- + net/mac80211/rc80211_minstrel.h | 11 + + net/mac80211/rc80211_minstrel_debugfs.c | 41 +- + net/mac80211/rx.c | 9 - + net/mac80211/scan.c | 71 +- + net/mac80211/sta_info.h | 2 - + net/mac80211/status.c | 14 +- + net/mac80211/tx.c | 2 - + net/netlink/af_netlink.c | 2 +- + net/netlink/genetlink.c | 6 +- + net/packet/af_packet.c | 8 +- + net/rds/af_rds.c | 9 +- + net/rds/cong.c | 2 - + net/rds/ib_cm.c | 3 +- + net/rds/ib_rdma.c | 5 +- + net/rds/ib_recv.c | 4 +- + net/rds/ib_send.c | 20 +- + net/rds/iw_cm.c | 4 +- + net/rds/iw_recv.c | 4 +- + net/rds/iw_send.c | 3 +- + net/rds/loop.c | 7 - + net/rds/rdma.c | 4 +- + net/rds/rdma_transport.c | 5 +- + net/rds/rds.h | 2 + + net/rds/send.c | 38 +- + net/rds/tcp_recv.c | 1 + + net/rds/tcp_send.c | 4 +- + net/rds/threads.c | 2 +- + net/rfkill/core.c | 53 +- + net/sched/act_api.c | 45 +- + net/sched/cls_api.c | 30 +- + net/sched/cls_u32.c | 4 +- + net/sched/sch_api.c | 112 +- + net/sched/sch_generic.c | 15 +- + net/sctp/ipv6.c | 25 +- + net/sctp/socket.c | 1 - + net/socket.c | 5 +- + net/sunrpc/auth_gss/gss_spkm3_token.c | 2 +- + net/sunrpc/bc_svc.c | 2 +- + net/tipc/bcast.c | 35 +- + net/tipc/core.c | 2 +- + net/tipc/link.c | 19 +- + net/tipc/net.c | 4 +- + net/tipc/node.c | 2 +- + net/tipc/subscr.c | 15 +- + net/wimax/op-reset.c | 2 - + net/wimax/op-state-get.c | 2 - + net/wireless/mlme.c | 13 + + net/wireless/nl80211.c | 131 ++ + net/wireless/nl80211.h | 6 + + net/wireless/wext-core.c | 134 +- + net/xfrm/xfrm_policy.c | 847 ++++---- + net/xfrm/xfrm_state.c | 5 +- + net/xfrm/xfrm_user.c | 10 +- + scripts/mod/file2alias.c | 26 + + 636 files changed, 35348 insertions(+), 13029 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-class-rfkill + create mode 100644 Documentation/ABI/stable/sysfs-class-rfkill + create mode 100644 Documentation/networking/caif/Linux-CAIF.txt + create mode 100644 Documentation/networking/caif/README + create mode 100644 drivers/net/caif/Kconfig + create mode 100644 drivers/net/caif/Makefile + create mode 100644 drivers/net/caif/caif_serial.c + create mode 100644 drivers/net/irda/sh_irda.c + delete mode 100644 drivers/net/pppol2tp.c + create mode 100644 drivers/net/wireless/ath/ath9k/hif_usb.c + create mode 100644 drivers/net/wireless/ath/ath9k/hif_usb.h + create mode 100644 drivers/net/wireless/ath/ath9k/htc.h + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_init.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_main.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_hst.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_hst.h + create mode 100644 drivers/net/wireless/ath/ath9k/wmi.c + create mode 100644 drivers/net/wireless/ath/ath9k/wmi.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ict.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn.h + create mode 100644 drivers/net/wireless/iwmc3200wifi/trace.c + create mode 100644 drivers/net/wireless/iwmc3200wifi/trace.h + create mode 100644 drivers/net/wireless/wl12xx/wl1271_sdio.c + delete mode 100644 drivers/net/wireless/wl12xx/wl1271_spi.h + create mode 100644 include/linux/caif/caif_socket.h + create mode 100644 include/linux/caif/if_caif.h + create mode 100644 include/linux/l2tp.h + create mode 100644 include/net/caif/caif_dev.h + create mode 100644 include/net/caif/caif_device.h + create mode 100644 include/net/caif/caif_layer.h + create mode 100644 include/net/caif/cfcnfg.h + create mode 100644 include/net/caif/cfctrl.h + create mode 100644 include/net/caif/cffrml.h + create mode 100644 include/net/caif/cfmuxl.h + create mode 100644 include/net/caif/cfpkt.h + create mode 100644 include/net/caif/cfserl.h + create mode 100644 include/net/caif/cfsrvl.h + create mode 100644 net/caif/Kconfig + create mode 100644 net/caif/Makefile + create mode 100644 net/caif/caif_config_util.c + create mode 100644 net/caif/caif_dev.c + create mode 100644 net/caif/caif_socket.c + create mode 100644 net/caif/cfcnfg.c + create mode 100644 net/caif/cfctrl.c + create mode 100644 net/caif/cfdbgl.c + create mode 100644 net/caif/cfdgml.c + create mode 100644 net/caif/cffrml.c + create mode 100644 net/caif/cfmuxl.c + create mode 100644 net/caif/cfpkt_skbuff.c + create mode 100644 net/caif/cfrfml.c + create mode 100644 net/caif/cfserl.c + create mode 100644 net/caif/cfsrvl.c + create mode 100644 net/caif/cfutill.c + create mode 100644 net/caif/cfveil.c + create mode 100644 net/caif/cfvidl.c + create mode 100644 net/caif/chnl_net.c + create mode 100644 net/core/dev_addr_lists.c + delete mode 100644 net/core/dev_mcast.c + create mode 100644 net/l2tp/Kconfig + create mode 100644 net/l2tp/Makefile + create mode 100644 net/l2tp/l2tp_core.c + create mode 100644 net/l2tp/l2tp_core.h + create mode 100644 net/l2tp/l2tp_debugfs.c + create mode 100644 net/l2tp/l2tp_eth.c + create mode 100644 net/l2tp/l2tp_ip.c + create mode 100644 net/l2tp/l2tp_netlink.c + create mode 100644 net/l2tp/l2tp_ppp.c +Merging wireless/master +$ git merge wireless/master +Recorded preimage for 'Documentation/feature-removal-schedule.txt' +Recorded preimage for 'drivers/net/wireless/ath/ath5k/phy.c' +Recorded preimage for 'drivers/net/wireless/iwlwifi/iwl-4965.c' +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging drivers/net/wireless/ath/ar9170/main.c +Auto-merging drivers/net/wireless/ath/ath5k/attach.c +Auto-merging drivers/net/wireless/ath/ath5k/base.c +Auto-merging drivers/net/wireless/ath/ath5k/phy.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath5k/phy.c +Auto-merging drivers/net/wireless/ath/ath9k/debug.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/wireless/ath/ath9k/virtual.c +Auto-merging drivers/net/wireless/ath/regd.c +Auto-merging drivers/net/wireless/b43/phy_n.c +Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945-rs.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rs.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-calib.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-devtrace.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-io.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-power.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-rx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-scan.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/libertas/debugfs.c +Auto-merging drivers/net/wireless/libertas/if_sdio.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/prism54/islpci_dev.c +Auto-merging drivers/net/wireless/prism54/islpci_eth.c +Auto-merging drivers/net/wireless/prism54/islpci_mgt.c +Auto-merging drivers/net/wireless/prism54/oid_mgt.c +Auto-merging drivers/net/wireless/ray_cs.c +Auto-merging drivers/net/wireless/rt2x00/rt2400pci.c +Auto-merging drivers/net/wireless/rt2x00/rt2500pci.c +Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c +Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c +Auto-merging drivers/net/wireless/rt2x00/rt61pci.c +Auto-merging drivers/net/wireless/rt2x00/rt73usb.c +Auto-merging drivers/net/wireless/wl12xx/wl1251_spi.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_acx.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_boot.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_cmd.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_init.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_main.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_rx.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_spi.c +Auto-merging include/linux/mmc/sdio.h +Auto-merging include/net/mac80211.h +Auto-merging net/mac80211/agg-rx.c +Auto-merging net/mac80211/agg-tx.c +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/debugfs_netdev.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/main.c +Auto-merging net/mac80211/mesh.c +Auto-merging net/mac80211/mesh_hwmp.c +Auto-merging net/mac80211/mesh_plink.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/scan.c +Auto-merging net/wireless/mlme.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/sme.c +Auto-merging net/wireless/util.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/feature-removal-schedule.txt'. +Recorded resolution for 'drivers/net/wireless/ath/ath5k/phy.c'. +Recorded resolution for 'drivers/net/wireless/iwlwifi/iwl-4965.c'. +[master 434e02a] Merge remote branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 23 + + drivers/net/wireless/ath/ar9170/cmd.h | 2 +- + drivers/net/wireless/ath/ar9170/eeprom.h | 4 +- + drivers/net/wireless/ath/ar9170/hw.h | 1 + + drivers/net/wireless/ath/ar9170/main.c | 13 +- + drivers/net/wireless/ath/ath.h | 13 +- + drivers/net/wireless/ath/ath5k/Makefile | 1 + + drivers/net/wireless/ath/ath5k/ani.c | 744 ++++++++++++ + drivers/net/wireless/ath/ath5k/ani.h | 104 ++ + drivers/net/wireless/ath/ath5k/ath5k.h | 68 +- + drivers/net/wireless/ath/ath5k/attach.c | 2 + + drivers/net/wireless/ath/ath5k/base.c | 111 ++- + drivers/net/wireless/ath/ath5k/base.h | 20 +- + drivers/net/wireless/ath/ath5k/caps.c | 6 + + drivers/net/wireless/ath/ath5k/debug.c | 170 +++ + drivers/net/wireless/ath/ath5k/debug.h | 2 + + drivers/net/wireless/ath/ath5k/desc.c | 1 + + drivers/net/wireless/ath/ath5k/desc.h | 35 +- + drivers/net/wireless/ath/ath5k/pcu.c | 40 +- + drivers/net/wireless/ath/ath5k/phy.c | 37 +- + drivers/net/wireless/ath/ath5k/reg.h | 36 +- + drivers/net/wireless/ath/ath9k/ahb.c | 1 + + drivers/net/wireless/ath/ath9k/ath9k.h | 4 - + drivers/net/wireless/ath/ath9k/beacon.c | 35 +- + drivers/net/wireless/ath/ath9k/calib.c | 59 +- + drivers/net/wireless/ath/ath9k/common.c | 85 +-- + drivers/net/wireless/ath/ath9k/common.h | 4 - + drivers/net/wireless/ath/ath9k/debug.c | 39 +- + drivers/net/wireless/ath/ath9k/debug.h | 9 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 2 +- + drivers/net/wireless/ath/ath9k/gpio.c | 17 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 170 ++-- + drivers/net/wireless/ath/ath9k/hif_usb.h | 10 +- + drivers/net/wireless/ath/ath9k/htc.h | 25 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 41 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 12 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 149 +++- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 112 ++- + drivers/net/wireless/ath/ath9k/htc_hst.c | 9 +- + drivers/net/wireless/ath/ath9k/hw.c | 139 +-- + drivers/net/wireless/ath/ath9k/hw.h | 5 +- + drivers/net/wireless/ath/ath9k/initvals.h | 109 ++- + drivers/net/wireless/ath/ath9k/mac.c | 149 ++-- + drivers/net/wireless/ath/ath9k/mac.h | 14 +- + drivers/net/wireless/ath/ath9k/main.c | 60 +- + drivers/net/wireless/ath/ath9k/pci.c | 1 + + drivers/net/wireless/ath/ath9k/phy.h | 14 +- + drivers/net/wireless/ath/ath9k/rc.h | 6 +- + drivers/net/wireless/ath/ath9k/recv.c | 26 +- + drivers/net/wireless/ath/ath9k/reg.h | 13 +- + drivers/net/wireless/ath/ath9k/virtual.c | 2 +- + drivers/net/wireless/ath/ath9k/xmit.c | 113 +- + drivers/net/wireless/ath/hw.c | 4 +- + drivers/net/wireless/ath/regd.c | 3 +- + drivers/net/wireless/b43/phy_n.c | 54 +- + drivers/net/wireless/b43/tables_nphy.c | 20 +- + drivers/net/wireless/b43/tables_nphy.h | 28 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 38 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 87 +- + drivers/net/wireless/iwlwifi/Makefile | 2 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 76 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 5 - + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 69 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 24 - + drivers/net/wireless/iwlwifi/iwl-4965.c | 58 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 33 - + drivers/net/wireless/iwlwifi/iwl-5000.c | 1371 ++--------------------- + drivers/net/wireless/iwlwifi/iwl-6000.c | 188 ++-- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 274 +++++ + drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 118 ++ + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1103 ++++++++++++++++++ + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 1314 ++++++++++++++++++++++ + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 416 +++++++ + drivers/net/wireless/iwlwifi/iwl-agn.c | 145 ++- + drivers/net/wireless/iwlwifi/iwl-agn.h | 75 ++ + drivers/net/wireless/iwlwifi/iwl-calib.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 267 +---- + drivers/net/wireless/iwlwifi/iwl-core.h | 30 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 71 +-- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 1 + + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 17 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 758 +------------- + drivers/net/wireless/iwlwifi/iwl-scan.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 1070 +------------------ + drivers/net/wireless/iwlwifi/iwl3945-base.c | 15 +- + drivers/net/wireless/libertas/debugfs.c | 2 +- + drivers/net/wireless/libertas/if_sdio.c | 22 + + drivers/net/wireless/mac80211_hwsim.c | 45 +- + drivers/net/wireless/p54/txrx.c | 2 +- + drivers/net/wireless/prism54/islpci_dev.c | 16 +- + drivers/net/wireless/prism54/islpci_eth.c | 8 +- + drivers/net/wireless/prism54/islpci_mgt.c | 8 +- + drivers/net/wireless/prism54/oid_mgt.c | 2 +- + drivers/net/wireless/ray_cs.c | 12 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 4 + + drivers/net/wireless/rt2x00/rt2500pci.c | 4 + + drivers/net/wireless/rt2x00/rt2500usb.c | 9 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 7 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 18 + + drivers/net/wireless/rt2x00/rt2800usb.c | 65 +- + drivers/net/wireless/rt2x00/rt61pci.c | 14 + + drivers/net/wireless/rt2x00/rt73usb.c | 6 +- + drivers/net/wireless/wl12xx/wl1251_spi.c | 2 +- + drivers/net/wireless/wl12xx/wl1271.h | 15 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 75 ++- + drivers/net/wireless/wl12xx/wl1271_acx.h | 33 +- + drivers/net/wireless/wl12xx/wl1271_boot.c | 14 +- + drivers/net/wireless/wl12xx/wl1271_boot.h | 7 +- + drivers/net/wireless/wl12xx/wl1271_cmd.c | 127 ++- + drivers/net/wireless/wl12xx/wl1271_cmd.h | 13 +- + drivers/net/wireless/wl12xx/wl1271_conf.h | 55 + + drivers/net/wireless/wl12xx/wl1271_event.c | 44 +- + drivers/net/wireless/wl12xx/wl1271_init.c | 48 +- + drivers/net/wireless/wl12xx/wl1271_main.c | 312 +++++- + drivers/net/wireless/wl12xx/wl1271_rx.c | 83 +-- + drivers/net/wireless/wl12xx/wl1271_rx.h | 2 +- + drivers/net/wireless/wl12xx/wl1271_sdio.c | 6 +- + drivers/net/wireless/wl12xx/wl1271_spi.c | 71 +- + drivers/net/wireless/wl12xx/wl1271_tx.c | 43 +- + drivers/net/wireless/wl12xx/wl1271_tx.h | 2 + + include/linux/ieee80211.h | 3 +- + include/linux/mmc/sdio.h | 2 + + include/linux/nl80211.h | 8 + + include/net/cfg80211.h | 11 + + include/net/iw_handler.h | 2 +- + include/net/mac80211.h | 10 +- + net/mac80211/Kconfig | 8 +- + net/mac80211/agg-rx.c | 72 +- + net/mac80211/agg-tx.c | 14 +- + net/mac80211/cfg.c | 13 +- + net/mac80211/debugfs_netdev.c | 12 + + net/mac80211/debugfs_sta.c | 10 +- + net/mac80211/driver-trace.h | 275 +++++ + net/mac80211/ht.c | 3 +- + net/mac80211/ieee80211_i.h | 21 +- + net/mac80211/main.c | 2 + + net/mac80211/mesh.c | 4 +- + net/mac80211/mesh.h | 2 - + net/mac80211/mesh_hwmp.c | 4 +- + net/mac80211/mesh_plink.c | 2 +- + net/mac80211/mlme.c | 106 ++- + net/mac80211/pm.c | 2 +- + net/mac80211/rx.c | 89 ++- + net/mac80211/scan.c | 2 + + net/mac80211/sta_info.c | 75 +- + net/mac80211/sta_info.h | 10 +- + net/mac80211/tx.c | 7 +- + net/mac80211/util.c | 11 +- + net/wireless/core.h | 15 +- + net/wireless/mlme.c | 39 +- + net/wireless/nl80211.c | 22 +- + net/wireless/reg.c | 6 +- + net/wireless/sme.c | 15 +- + net/wireless/util.c | 24 +- + 163 files changed, 7561 insertions(+), 5201 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath5k/ani.c + create mode 100644 drivers/net/wireless/ath/ath5k/ani.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hw.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-lib.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tx.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c +$ git am -3 ../patches/wireless__update_gfp_slab.h_includes +Applying: wireless: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/wireless/ath/ath9k/htc.h +M drivers/net/wireless/iwlwifi/iwl-agn-ict.c +$ git add . +$ git commit -v -a --amend +[master 3efac53] Merge remote branch 'wireless/master' +Merging mtd/master +$ git merge mtd/master +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/devices/block2mtd.c +Auto-merging drivers/mtd/maps/bfin-async-flash.c +Auto-merging drivers/mtd/maps/physmap_of.c +Auto-merging drivers/mtd/maps/pismo.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/mtd/nand/bcm_umi_nand.c +Auto-merging drivers/mtd/nand/cafe_nand.c +Auto-merging drivers/mtd/nand/davinci_nand.c +Auto-merging drivers/mtd/nand/fsl_upm.c +Auto-merging drivers/mtd/nand/nomadik_nand.c +Auto-merging drivers/mtd/nand/omap2.c +Auto-merging drivers/mtd/nand/sh_flctl.c +Auto-merging drivers/mtd/nand/tmio_nand.c +Removing drivers/mtd/nand/ts7250.c +Auto-merging drivers/mtd/onenand/omap2.c +Merge made by recursive. + MAINTAINERS | 6 + + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 19 - + arch/arm/mach-ep93xx/ts72xx.c | 190 ++- + drivers/mtd/Kconfig | 13 + + drivers/mtd/Makefile | 1 + + drivers/mtd/chips/cfi_cmdset_0001.c | 6 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 20 +- + drivers/mtd/devices/Makefile | 2 +- + drivers/mtd/devices/block2mtd.c | 4 +- + drivers/mtd/devices/pmc551.c | 4 +- + drivers/mtd/ftl.c | 1 - + drivers/mtd/inftlcore.c | 1 - + drivers/mtd/inftlmount.c | 7 +- + drivers/mtd/maps/bfin-async-flash.c | 16 +- + drivers/mtd/maps/ceiva.c | 2 +- + drivers/mtd/maps/ixp4xx.c | 4 +- + drivers/mtd/maps/physmap_of.c | 2 +- + drivers/mtd/maps/pismo.c | 8 +- + drivers/mtd/mtd_blkdevs.c | 335 ++++-- + drivers/mtd/mtdblock.c | 72 +- + drivers/mtd/mtdblock_ro.c | 4 +- + drivers/mtd/mtdchar.c | 12 +- + drivers/mtd/mtdcore.c | 284 +++-- + drivers/mtd/mtdcore.h | 7 +- + drivers/mtd/mtdoops.c | 5 - + drivers/mtd/mtdsuper.c | 18 +- + drivers/mtd/nand/Kconfig | 50 +- + drivers/mtd/nand/Makefile | 9 +- + drivers/mtd/nand/alauda.c | 2 +- + drivers/mtd/nand/atmel_nand.c | 2 +- + drivers/mtd/nand/au1550nd.c | 12 +- + drivers/mtd/nand/bcm_umi_nand.c | 2 +- + drivers/mtd/nand/cafe_nand.c | 4 +- + drivers/mtd/nand/davinci_nand.c | 6 +- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/fsl_upm.c | 4 +- + drivers/mtd/nand/gpio.c | 12 +- + drivers/mtd/nand/mpc5121_nfc.c | 916 ++++++++++++++ + drivers/mtd/nand/mxc_nand.c | 22 +- + drivers/mtd/nand/nand_base.c | 312 ++++- + drivers/mtd/nand/nand_bbt.c | 26 +- + drivers/mtd/nand/nand_bcm_umi.h | 71 +- + drivers/mtd/nand/nandsim.c | 11 +- + drivers/mtd/nand/nomadik_nand.c | 6 +- + drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} | 144 ++-- + drivers/mtd/nand/omap2.c | 16 +- + drivers/mtd/nand/orion_nand.c | 10 +- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/r852.c | 1139 +++++++++++++++++ + drivers/mtd/nand/r852.h | 163 +++ + drivers/mtd/nand/s3c2410.c | 5 +- + drivers/mtd/nand/sh_flctl.c | 2 +- + drivers/mtd/nand/sm_common.c | 143 +++ + drivers/mtd/nand/sm_common.h | 61 + + drivers/mtd/nand/socrates_nand.c | 4 +- + drivers/mtd/nand/tmio_nand.c | 14 +- + drivers/mtd/nand/ts7250.c | 207 ---- + drivers/mtd/nand/txx9ndfmc.c | 2 +- + drivers/mtd/nftlcore.c | 1 - + drivers/mtd/onenand/omap2.c | 4 +- + drivers/mtd/rfd_ftl.c | 1 - + drivers/mtd/sm_ftl.c | 1284 ++++++++++++++++++++ + drivers/mtd/sm_ftl.h | 94 ++ + drivers/mtd/ssfdc.c | 1 - + fs/jffs2/fs.c | 10 +- + fs/jffs2/nodelist.h | 8 +- + include/linux/jffs2.h | 4 +- + include/linux/mtd/blktrans.h | 15 +- + include/linux/mtd/cfi.h | 14 +- + include/linux/mtd/mtd.h | 8 +- + include/linux/mtd/nand.h | 21 +- + lib/idr.c | 2 +- + 72 files changed, 4953 insertions(+), 940 deletions(-) + create mode 100644 drivers/mtd/nand/mpc5121_nfc.c + rename drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} (63%) + create mode 100644 drivers/mtd/nand/r852.c + create mode 100644 drivers/mtd/nand/r852.h + create mode 100644 drivers/mtd/nand/sm_common.c + create mode 100644 drivers/mtd/nand/sm_common.h + delete mode 100644 drivers/mtd/nand/ts7250.c + create mode 100644 drivers/mtd/sm_ftl.c + create mode 100644 drivers/mtd/sm_ftl.h +$ git am -3 ../patches/mtd__update_gfp_slab.h_includes +Applying: mtd: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/mtd/mtdcore.c +M drivers/mtd/nand/mpc5121_nfc.c +M drivers/mtd/nand/r852.c +$ git add . +$ git commit -v -a --amend +[master 37df35c] Merge remote branch 'mtd/master' +Merging crypto/master +$ git merge crypto/master +Auto-merging crypto/tcrypt.c +Auto-merging kernel/padata.c +Merge made by recursive. + arch/x86/crypto/aesni-intel_asm.S | 115 +++++++++++++++++++++++++++++++ + arch/x86/crypto/aesni-intel_glue.c | 130 ++++++++++++++++++++++++++++++++++-- + arch/x86/include/asm/inst.h | 96 +++++++++++++++++++++++++- + crypto/internal.h | 2 +- + crypto/pcrypt.c | 11 +-- + crypto/tcrypt.c | 7 ++ + crypto/tcrypt.h | 29 ++++++++ + crypto/testmgr.h | 64 +++++++++++++++++- + crypto/vmac.c | 75 ++++++++++----------- + kernel/padata.c | 4 +- + 10 files changed, 470 insertions(+), 63 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Auto-merging arch/arm/mach-davinci/board-dm365-evm.c +Auto-merging arch/arm/plat-omap/mcbsp.c +Auto-merging drivers/gpio/wm8994-gpio.c +Auto-merging drivers/mfd/wm8994-core.c +Auto-merging sound/core/jack.c +CONFLICT (delete/modify): sound/soc/codecs/ad1938.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/codecs/ad1938.c left in tree. +Removing sound/soc/codecs/ad1938.h +Auto-merging sound/soc/codecs/ak4642.c +Auto-merging sound/soc/codecs/da7210.c +Auto-merging sound/soc/codecs/ssm2602.c +Auto-merging sound/soc/codecs/tlv320dac33.c +Auto-merging sound/soc/codecs/twl4030.c +Auto-merging sound/soc/codecs/wm8350.c +Auto-merging sound/soc/codecs/wm8750.c +Auto-merging sound/soc/codecs/wm8903.c +Auto-merging sound/soc/codecs/wm8904.c +Auto-merging sound/soc/codecs/wm8960.c +Auto-merging sound/soc/codecs/wm8994.c +Auto-merging sound/soc/omap/mcpdm.c +Auto-merging sound/soc/sh/fsi.c +Auto-merging sound/soc/soc-core.c +Auto-merging sound/soc/soc-dapm.c +Auto-merging sound/usb/caiaq/device.c +Removing sound/usb/usbaudio.c +Auto-merging sound/usb/usx2y/us122l.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f sound/soc/codecs/ad1938.c +sound/soc/codecs/ad1938.c: needs merge +rm 'sound/soc/codecs/ad1938.c' +$ git commit -v -a +[master 4bb5d74] Merge remote branch 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/sound/alsa/HD-Audio.txt | 4 +- + arch/arm/mach-davinci/board-dm365-evm.c | 4 + + arch/arm/plat-omap/include/plat/mcbsp.h | 6 + + arch/arm/plat-omap/mcbsp.c | 55 + + drivers/gpio/wm8994-gpio.c | 12 + + drivers/mfd/Kconfig | 8 +- + drivers/mfd/Makefile | 3 +- + drivers/mfd/davinci_voicecodec.c | 190 + + drivers/mfd/twl-core.c | 4 +- + drivers/mfd/wm8994-core.c | 43 +- + drivers/mfd/wm8994-irq.c | 310 ++ + include/linux/i2c/twl.h | 6 +- + include/linux/mfd/davinci_voicecodec.h | 126 + + include/linux/mfd/wm8350/audio.h | 2 + + include/linux/mfd/wm8994/core.h | 53 +- + include/linux/mfd/wm8994/pdata.h | 1 + + include/linux/usb/audio-v2.h | 366 ++ + include/linux/usb/audio.h | 210 +- + include/sound/jack.h | 8 + + include/sound/soc-dai.h | 7 +- + include/sound/soc-dapm.h | 5 +- + include/sound/soc.h | 20 +- + include/sound/tlv320dac33-plat.h | 1 + + include/sound/wm8903.h | 249 ++ + include/sound/wm8904.h | 110 +- + include/sound/wm8960.h | 24 + + sound/atmel/Kconfig | 2 +- + sound/atmel/ac97c.c | 355 ++- + sound/core/jack.c | 71 +- + sound/core/pcm_native.c | 30 +- + sound/pci/hda/hda_codec.c | 76 +- + sound/pci/hda/hda_codec.h | 3 + + sound/pci/hda/hda_intel.c | 24 +- + sound/pci/hda/patch_analog.c | 21 +- + sound/pci/hda/patch_realtek.c | 286 ++- + sound/pci/ice1712/aureon.c | 89 +- + sound/ppc/tumbler.c | 12 +- + sound/soc/atmel/atmel-pcm.c | 14 +- + sound/soc/blackfin/Kconfig | 9 +- + sound/soc/blackfin/Makefile | 4 +- + .../blackfin/{bf5xx-ad1938.c => bf5xx-ad193x.c} | 66 +- + sound/soc/blackfin/bf5xx-sport.h | 28 +- + sound/soc/codecs/Kconfig | 12 +- + sound/soc/codecs/Makefile | 8 +- + sound/soc/codecs/ad1938.c | 522 --- + sound/soc/codecs/ad1938.h | 100 - + sound/soc/codecs/ad193x.c | 545 +++ + sound/soc/codecs/ad193x.h | 81 + + sound/soc/codecs/ak4642.c | 175 +- + sound/soc/codecs/cq93vc.c | 299 ++ + sound/soc/codecs/cq93vc.h | 29 + + sound/soc/codecs/da7210.c | 153 +- + sound/soc/codecs/ssm2602.c | 4 +- + sound/soc/codecs/tlv320dac33.c | 38 +- + sound/soc/codecs/twl4030.c | 72 +- + sound/soc/codecs/twl6040.c | 1228 ++++++ + sound/soc/codecs/twl6040.h | 141 + + sound/soc/codecs/wm8350.c | 74 +- + sound/soc/codecs/wm8350.h | 3 + + sound/soc/codecs/wm8750.c | 53 +- + sound/soc/codecs/wm8903.c | 202 +- + sound/soc/codecs/wm8903.h | 221 +-- + sound/soc/codecs/wm8904.c | 17 + + sound/soc/codecs/wm8904.h | 97 - + sound/soc/codecs/wm8960.c | 209 +- + sound/soc/codecs/wm8960.h | 10 - + sound/soc/codecs/wm8994.c | 175 +- + sound/soc/codecs/wm8994.h | 3 + + sound/soc/davinci/Kconfig | 27 +- + sound/soc/davinci/Makefile | 2 + + sound/soc/davinci/davinci-evm.c | 61 +- + sound/soc/davinci/davinci-vcif.c | 274 ++ + sound/soc/davinci/davinci-vcif.h | 28 + + sound/soc/imx/Kconfig | 8 + + sound/soc/imx/Makefile | 3 + + sound/soc/imx/wm1133-ev1.c | 308 ++ + sound/soc/omap/mcpdm.c | 548 ++-- + sound/soc/omap/omap-mcbsp.c | 38 +- + sound/soc/s3c24xx/s3c-i2s-v2.c | 120 +- + sound/soc/s3c24xx/s3c-i2s-v2.h | 4 + + sound/soc/s3c24xx/s3c2412-i2s.c | 40 + + sound/soc/s3c24xx/s3c2412-i2s.h | 4 +- + sound/soc/s3c24xx/s3c64xx-i2s.c | 12 - + sound/soc/s3c24xx/s3c64xx-i2s.h | 15 +- + sound/soc/sh/Kconfig | 3 +- + sound/soc/sh/fsi-ak4642.c | 14 + + sound/soc/sh/fsi.c | 191 +- + sound/soc/soc-cache.c | 122 +- + sound/soc/soc-core.c | 115 +- + sound/soc/soc-dapm.c | 135 +- + sound/soc/soc-jack.c | 38 + + sound/usb/Kconfig | 4 +- + sound/usb/Makefile | 26 +- + sound/usb/caiaq/control.c | 99 +- + sound/usb/caiaq/device.c | 8 +- + sound/usb/caiaq/device.h | 24 +- + sound/usb/caiaq/input.c | 163 +- + sound/usb/card.c | 652 ++++ + sound/usb/card.h | 105 + + sound/usb/debug.h | 15 + + sound/usb/endpoint.c | 362 ++ + sound/usb/endpoint.h | 11 + + sound/usb/format.c | 432 +++ + sound/usb/format.h | 8 + + sound/usb/helper.c | 113 + + sound/usb/helper.h | 32 + + sound/usb/{usbmidi.c => midi.c} | 3 +- + sound/usb/midi.h | 48 + + sound/usb/misc/Makefile | 2 + + sound/usb/{ => misc}/ua101.c | 3 +- + sound/usb/{usbmixer.c => mixer.c} | 847 ++--- + sound/usb/mixer.h | 55 + + sound/usb/{usbmixer_maps.c => mixer_maps.c} | 4 +- + sound/usb/mixer_quirks.c | 412 ++ + sound/usb/mixer_quirks.h | 13 + + sound/usb/pcm.c | 935 +++++ + sound/usb/pcm.h | 14 + + sound/usb/proc.c | 168 + + sound/usb/proc.h | 8 + + sound/usb/{usbquirks.h => quirks-table.h} | 68 +- + sound/usb/quirks.c | 594 +++ + sound/usb/quirks.h | 23 + + sound/usb/urb.c | 995 +++++ + sound/usb/urb.h | 21 + + sound/usb/usbaudio.c | 4050 -------------------- + sound/usb/usbaudio.h | 93 +- + sound/usb/usx2y/us122l.c | 1 + + sound/usb/usx2y/usbusx2y.h | 1 + + 128 files changed, 13120 insertions(+), 6790 deletions(-) + create mode 100644 drivers/mfd/davinci_voicecodec.c + create mode 100644 drivers/mfd/wm8994-irq.c + create mode 100644 include/linux/mfd/davinci_voicecodec.h + create mode 100644 include/linux/usb/audio-v2.h + create mode 100644 include/sound/wm8903.h + create mode 100644 include/sound/wm8960.h + rename sound/soc/blackfin/{bf5xx-ad1938.c => bf5xx-ad193x.c} (65%) + delete mode 100644 sound/soc/codecs/ad1938.c + delete mode 100644 sound/soc/codecs/ad1938.h + create mode 100644 sound/soc/codecs/ad193x.c + create mode 100644 sound/soc/codecs/ad193x.h + create mode 100644 sound/soc/codecs/cq93vc.c + create mode 100644 sound/soc/codecs/cq93vc.h + create mode 100644 sound/soc/codecs/twl6040.c + create mode 100644 sound/soc/codecs/twl6040.h + create mode 100644 sound/soc/davinci/davinci-vcif.c + create mode 100644 sound/soc/davinci/davinci-vcif.h + create mode 100644 sound/soc/imx/wm1133-ev1.c + create mode 100644 sound/usb/card.c + create mode 100644 sound/usb/card.h + create mode 100644 sound/usb/debug.h + create mode 100644 sound/usb/endpoint.c + create mode 100644 sound/usb/endpoint.h + create mode 100644 sound/usb/format.c + create mode 100644 sound/usb/format.h + create mode 100644 sound/usb/helper.c + create mode 100644 sound/usb/helper.h + rename sound/usb/{usbmidi.c => midi.c} (99%) + create mode 100644 sound/usb/midi.h + create mode 100644 sound/usb/misc/Makefile + rename sound/usb/{ => misc}/ua101.c (99%) + rename sound/usb/{usbmixer.c => mixer.c} (72%) + create mode 100644 sound/usb/mixer.h + rename sound/usb/{usbmixer_maps.c => mixer_maps.c} (98%) + create mode 100644 sound/usb/mixer_quirks.c + create mode 100644 sound/usb/mixer_quirks.h + create mode 100644 sound/usb/pcm.c + create mode 100644 sound/usb/pcm.h + create mode 100644 sound/usb/proc.c + create mode 100644 sound/usb/proc.h + rename sound/usb/{usbquirks.h => quirks-table.h} (97%) + create mode 100644 sound/usb/quirks.c + create mode 100644 sound/usb/quirks.h + create mode 100644 sound/usb/urb.c + create mode 100644 sound/usb/urb.h + delete mode 100644 sound/usb/usbaudio.c +$ git am -3 ../patches/0001-sound-ASoC-merge-fixup-for-slab.h-changes.patch +Applying: sound: ASoC; merge fixup for slab.h changes +$ git reset HEAD^ +Unstaged changes after reset: +M sound/soc/codecs/ad193x.c +$ git add . +$ git commit -v -a --amend +[master f325d5f] Merge remote branch 'sound/for-next' +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merging Documentation/feature-removal-schedule.txt +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 10 -------- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 + + drivers/cpufreq/cpufreq.c | 10 ++------ + drivers/cpufreq/cpufreq_ondemand.c | 33 +++++++++++++++------------ + include/linux/cpufreq.h | 5 ---- + 5 files changed, 23 insertions(+), 37 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Resolved 'include/linux/mod_devicetable.h' using previous resolution. +Resolved 'scripts/mod/file2alias.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/lguest/boot.c +Auto-merging include/linux/mod_devicetable.h +CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h +Auto-merging kernel/module.c +Auto-merging scripts/mod/file2alias.c +CONFLICT (content): Merge conflict in scripts/mod/file2alias.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 03cf00f] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/cpu-hotplug.txt | 2 +- + arch/x86/include/asm/lguest_hcall.h | 29 +++++++++++++--- + arch/x86/lguest/boot.c | 61 +++++++++++++++++------------------ + arch/x86/lguest/i386_head.S | 2 +- + drivers/block/virtio_blk.c | 40 +++++++++++++++++++++++ + drivers/isdn/hisax/hisax_fcpcipnp.c | 3 +- + drivers/lguest/lguest_device.c | 4 +- + drivers/lguest/x86/core.c | 12 +++++++ + include/linux/isapnp.h | 8 +---- + include/linux/mod_devicetable.h | 7 ++++ + include/linux/virtio_blk.h | 5 +++ + kernel/module.c | 57 ++++++++++++++++++++------------ + kernel/params.c | 20 ++---------- + scripts/mod/file2alias.c | 17 ++++++++++ + 14 files changed, 180 insertions(+), 87 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Resolved 'drivers/char/sysrq.c' using previous resolution. +Auto-merging drivers/char/sysrq.c +CONFLICT (content): Merge conflict in drivers/char/sysrq.c +Auto-merging drivers/input/keyboard/lm8323.c +Removing drivers/input/touchscreen/corgi_ts.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0c0ab8b] Merge remote branch 'input/next' +$ git diff -M --stat --summary HEAD^.. + drivers/char/keyboard.c | 325 ++++----- + drivers/char/sysrq.c | 243 ++++++- + drivers/input/keyboard/lm8323.c | 6 +- + drivers/input/misc/Kconfig | 40 + + drivers/input/misc/Makefile | 4 + + drivers/input/misc/ad714x-i2c.c | 140 ++++ + drivers/input/misc/ad714x-spi.c | 103 +++ + drivers/input/misc/ad714x.c | 1347 ++++++++++++++++++++++++++++++++++ + drivers/input/misc/ad714x.h | 26 + + drivers/input/misc/pcf8574_keypad.c | 227 ++++++ + drivers/input/tablet/wacom.h | 36 +- + drivers/input/tablet/wacom_sys.c | 316 +++------ + drivers/input/tablet/wacom_wac.c | 1047 +++++++++++++++------------ + drivers/input/tablet/wacom_wac.h | 13 +- + drivers/input/touchscreen/Kconfig | 16 - + drivers/input/touchscreen/Makefile | 1 - + drivers/input/touchscreen/corgi_ts.c | 385 ---------- + drivers/input/touchscreen/tsc2007.c | 2 + + include/linux/input.h | 1 + + include/linux/input/ad714x.h | 63 ++ + include/linux/sysrq.h | 23 +- + kernel/sysctl.c | 23 +- + 22 files changed, 3070 insertions(+), 1317 deletions(-) + create mode 100644 drivers/input/misc/ad714x-i2c.c + create mode 100644 drivers/input/misc/ad714x-spi.c + create mode 100644 drivers/input/misc/ad714x.c + create mode 100644 drivers/input/misc/ad714x.h + create mode 100644 drivers/input/misc/pcf8574_keypad.c + delete mode 100644 drivers/input/touchscreen/corgi_ts.c + create mode 100644 include/linux/input/ad714x.h +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging block/blk-settings.c +Auto-merging block/blk-sysfs.c +Auto-merging block/cfq-iosched.c +Auto-merging drivers/block/drbd/drbd_bitmap.c +Auto-merging drivers/block/loop.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/scsi/sd.c +Auto-merging fs/fs-writeback.c +Merge made by recursive. + Documentation/DocBook/tracepoint.tmpl | 13 +++ + Documentation/block/biodoc.txt | 4 +- + block/Kconfig | 3 +- + block/blk-settings.c | 11 +-- + block/blk-sysfs.c | 25 +++++ + block/cfq-iosched.c | 34 +++++-- + block/elevator.c | 2 +- + drivers/block/DAC960.c | 1 - + drivers/block/drbd/drbd_actlog.c | 19 +++- + drivers/block/drbd/drbd_bitmap.c | 10 +- + drivers/block/drbd/drbd_int.h | 12 ++- + drivers/block/drbd/drbd_main.c | 20 ++++- + drivers/block/drbd/drbd_nl.c | 44 +++++----- + drivers/block/drbd/drbd_receiver.c | 34 ++++++- + drivers/block/drbd/drbd_worker.c | 18 +++- + drivers/block/loop.c | 2 + + drivers/block/paride/pcd.c | 4 +- + drivers/block/paride/pf.c | 4 +- + drivers/block/paride/pt.c | 4 +- + drivers/block/virtio_blk.c | 5 +- + drivers/scsi/sd.c | 2 +- + fs/bio.c | 4 +- + fs/fs-writeback.c | 133 +++++++++++++++------------ + include/linux/blkdev.h | 35 +------ + include/linux/drbd.h | 2 +- + include/linux/drbd_nl.h | 3 +- + include/linux/genhd.h | 2 +- + include/linux/i2o.h | 1 - + include/linux/lcm.h | 8 ++ + include/linux/writeback.h | 3 + + include/trace/events/block.h | 164 +++++++++++++++++++++++++++++++++ + lib/Makefile | 2 +- + lib/lcm.c | 15 +++ + mm/backing-dev.c | 3 + + 34 files changed, 470 insertions(+), 176 deletions(-) + create mode 100644 include/linux/lcm.h + create mode 100644 lib/lcm.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + Documentation/device-mapper/dm-flakey.txt | 18 +++ + drivers/md/Kconfig | 6 + + drivers/md/Makefile | 1 + + drivers/md/dm-flakey.c | 214 +++++++++++++++++++++++++++++ + 4 files changed, 239 insertions(+), 0 deletions(-) + create mode 100644 Documentation/device-mapper/dm-flakey.txt + create mode 100644 drivers/md/dm-flakey.c +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 +Resolved 'drivers/net/pcmcia/3c589_cs.c' using previous resolution. +Resolved 'drivers/pcmcia/pcmcia_resource.c' using previous resolution. +Auto-merging drivers/ata/pata_pcmcia.c +Auto-merging drivers/net/pcmcia/3c589_cs.c +CONFLICT (content): Merge conflict in drivers/net/pcmcia/3c589_cs.c +Auto-merging drivers/net/pcmcia/axnet_cs.c +Auto-merging drivers/net/pcmcia/fmvj18x_cs.c +Auto-merging drivers/net/pcmcia/nmclan_cs.c +Auto-merging drivers/net/pcmcia/pcnet_cs.c +Auto-merging drivers/net/pcmcia/smc91c92_cs.c +Auto-merging drivers/net/pcmcia/xirc2ps_cs.c +Auto-merging drivers/net/wireless/b43/pcmcia.c +Auto-merging drivers/net/wireless/hostap/hostap_cs.c +Auto-merging drivers/net/wireless/libertas/if_cs.c +Auto-merging drivers/net/wireless/orinoco/orinoco_cs.c +Auto-merging drivers/net/wireless/ray_cs.c +Auto-merging drivers/net/wireless/wl3501_cs.c +Auto-merging drivers/pcmcia/bfin_cf_pcmcia.c +Auto-merging drivers/pcmcia/db1xxx_ss.c +Auto-merging drivers/pcmcia/ds.c +Auto-merging drivers/pcmcia/omap_cf.c +Auto-merging drivers/pcmcia/pcmcia_ioctl.c +Auto-merging drivers/pcmcia/pcmcia_resource.c +CONFLICT (content): Merge conflict in drivers/pcmcia/pcmcia_resource.c +Auto-merging drivers/pcmcia/rsrc_mgr.c +Auto-merging drivers/pcmcia/yenta_socket.c +Auto-merging drivers/ssb/main.c +Auto-merging drivers/staging/comedi/drivers/cb_das16_cs.c +Auto-merging drivers/staging/comedi/drivers/das08_cs.c +Auto-merging drivers/staging/comedi/drivers/ni_daq_700.c +Auto-merging drivers/staging/comedi/drivers/ni_daq_dio24.c +Auto-merging drivers/staging/comedi/drivers/ni_labpc_cs.c +Auto-merging drivers/staging/netwave/netwave_cs.c +Auto-merging drivers/staging/wavelan/wavelan_cs.c +Auto-merging drivers/staging/wlags49_h2/wl_cs.c +Removing include/pcmcia/mem_op.h +Auto-merging sound/pcmcia/vx/vxpocket.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fe87f5c] Merge remote branch 'pcmcia/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/pcmcia/driver-changes.txt | 13 + + drivers/ata/pata_pcmcia.c | 47 +-- + drivers/bluetooth/bluecard_cs.c | 11 +- + drivers/bluetooth/bt3c_cs.c | 11 +- + drivers/bluetooth/btuart_cs.c | 11 +- + drivers/bluetooth/dtl1_cs.c | 11 +- + drivers/char/pcmcia/cm4000_cs.c | 9 +- + drivers/char/pcmcia/cm4040_cs.c | 5 - + drivers/char/pcmcia/ipwireless/main.c | 19 +- + drivers/char/pcmcia/ipwireless/main.h | 1 - + drivers/char/pcmcia/ipwireless/tty.c | 19 +- + drivers/char/pcmcia/ipwireless/tty.h | 3 +- + drivers/char/pcmcia/synclink_cs.c | 22 +- + drivers/ide/ide-cs.c | 20 +- + drivers/isdn/hardware/avm/avm_cs.c | 76 +--- + drivers/isdn/hisax/avma1_cs.c | 63 +-- + drivers/isdn/hisax/elsa_cs.c | 40 +-- + drivers/isdn/hisax/sedlbauer_cs.c | 60 +-- + drivers/isdn/hisax/teles_cs.c | 50 +-- + drivers/mtd/maps/pcmciamtd.c | 3 - + drivers/net/pcmcia/3c574_cs.c | 15 +- + drivers/net/pcmcia/3c589_cs.c | 16 +- + drivers/net/pcmcia/axnet_cs.c | 21 +- + drivers/net/pcmcia/com20020_cs.c | 29 +- + drivers/net/pcmcia/fmvj18x_cs.c | 18 +- + drivers/net/pcmcia/ibmtr_cs.c | 16 +- + drivers/net/pcmcia/nmclan_cs.c | 14 +- + drivers/net/pcmcia/pcnet_cs.c | 16 +- + drivers/net/pcmcia/smc91c92_cs.c | 17 +- + drivers/net/pcmcia/xirc2ps_cs.c | 36 +-- + drivers/net/wireless/airo_cs.c | 72 +--- + drivers/net/wireless/atmel_cs.c | 70 +--- + drivers/net/wireless/b43/pcmcia.c | 5 +- + drivers/net/wireless/hostap/hostap_cs.c | 38 +- + drivers/net/wireless/libertas/if_cs.c | 21 +- + drivers/net/wireless/orinoco/orinoco_cs.c | 27 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 27 +- + drivers/net/wireless/ray_cs.c | 15 +- + drivers/net/wireless/ray_cs.h | 1 - + drivers/net/wireless/wl3501.h | 1 - + drivers/net/wireless/wl3501_cs.c | 23 +- + drivers/parport/parport_cs.c | 13 +- + drivers/pcmcia/Kconfig | 22 +- + drivers/pcmcia/Makefile | 9 +- + drivers/pcmcia/bfin_cf_pcmcia.c | 2 +- + drivers/pcmcia/cardbus.c | 1 - + drivers/pcmcia/cistpl.c | 121 +---- + drivers/pcmcia/cs.c | 1 - + drivers/pcmcia/cs_internal.h | 22 +- + drivers/pcmcia/db1xxx_ss.c | 4 +- + drivers/pcmcia/ds.c | 34 +- + drivers/pcmcia/omap_cf.c | 2 +- + drivers/pcmcia/pcmcia_cis.c | 356 ++++++++++++ + drivers/pcmcia/pcmcia_ioctl.c | 23 +- + drivers/pcmcia/pcmcia_resource.c | 635 ++++++---------------- + drivers/pcmcia/rsrc_iodyn.c | 172 ++++++ + drivers/pcmcia/rsrc_mgr.c | 112 +---- + drivers/pcmcia/rsrc_nonstatic.c | 164 +++++-- + drivers/pcmcia/yenta_socket.c | 7 - + drivers/scsi/pcmcia/aha152x_stub.c | 9 +- + drivers/scsi/pcmcia/fdomain_stub.c | 9 +- + drivers/scsi/pcmcia/nsp_cs.c | 23 +- + drivers/scsi/pcmcia/nsp_cs.h | 1 - + drivers/scsi/pcmcia/qlogic_stub.c | 13 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 9 +- + drivers/serial/serial_cs.c | 36 +- + drivers/ssb/main.c | 2 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 26 +- + drivers/staging/comedi/drivers/das08_cs.c | 16 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 23 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 23 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 23 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 9 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 22 +- + drivers/staging/netwave/netwave_cs.c | 9 +- + drivers/staging/wavelan/wavelan_cs.c | 15 +- + drivers/staging/wlags49_h2/wl_cs.c | 9 +- + drivers/telephony/ixj_pcmcia.c | 3 - + drivers/usb/host/sl811_cs.c | 28 +- + include/pcmcia/cs.h | 19 +- + include/pcmcia/ds.h | 29 +- + include/pcmcia/mem_op.h | 116 ---- + include/pcmcia/ss.h | 6 +- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 12 +- + sound/pcmcia/pdaudiocf/pdaudiocf.h | 1 - + sound/pcmcia/vx/vxpocket.c | 10 +- + sound/pcmcia/vx/vxpocket.h | 1 - + 87 files changed, 1162 insertions(+), 2032 deletions(-) + create mode 100644 drivers/pcmcia/pcmcia_cis.c + create mode 100644 drivers/pcmcia/rsrc_iodyn.c + delete mode 100644 include/pcmcia/mem_op.h +Merging battery/master +$ git merge battery/master +Auto-merging drivers/power/ds2782_battery.c +Auto-merging drivers/power/wm831x_power.c +Merge made by recursive. + drivers/power/Kconfig | 6 + + drivers/power/Makefile | 1 + + drivers/power/ds2782_battery.c | 3 - + drivers/power/wm831x_power.c | 33 ++-- + drivers/power/z2_battery.c | 328 ++++++++++++++++++++++++++++++++++++++++ + include/linux/z2_battery.h | 17 ++ + 6 files changed, 368 insertions(+), 20 deletions(-) + create mode 100644 drivers/power/z2_battery.c + create mode 100644 include/linux/z2_battery.h +Merging leds/for-mm +$ git merge leds/for-mm +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/x86/kernel/kgdb.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging drivers/serial/8250.c +Auto-merging drivers/serial/amba-pl011.c +Auto-merging drivers/serial/sh-sci.c +Auto-merging init/main.c +Auto-merging kernel/kallsyms.c +Removing kernel/kgdb.c +Auto-merging kernel/module.c +Auto-merging kernel/sched.c +Merge made by recursive. + Documentation/DocBook/kgdb.tmpl | 692 ++++++-- + Documentation/kernel-parameters.txt | 31 +- + MAINTAINERS | 6 +- + arch/arm/include/asm/kmap_types.h | 1 + + arch/arm/kernel/kgdb.c | 5 + + arch/blackfin/kernel/kgdb.c | 5 + + arch/mips/include/asm/kgdb.h | 2 + + arch/mips/kernel/kgdb.c | 27 +- + arch/mips/kernel/traps.c | 13 + + arch/powerpc/include/asm/kmap_types.h | 1 + + arch/powerpc/kernel/kgdb.c | 11 +- + arch/powerpc/kernel/traps.c | 7 +- + arch/sh/kernel/kgdb.c | 14 +- + arch/sparc/kernel/kgdb_32.c | 6 + + arch/sparc/kernel/kgdb_64.c | 6 + + arch/x86/include/asm/kgdb.h | 3 + + arch/x86/include/asm/processor.h | 2 + + arch/x86/kernel/cpu/common.c | 29 +- + arch/x86/kernel/early_printk.c | 8 + + arch/x86/kernel/kgdb.c | 103 +- + arch/x86/kernel/setup.c | 1 + + arch/x86/kernel/traps.c | 20 +- + drivers/serial/8250.c | 4 +- + drivers/serial/amba-pl011.c | 6 +- + drivers/serial/kgdboc.c | 94 +- + drivers/serial/sh-sci.c | 6 +- + drivers/serial/sunzilog.c | 50 + + drivers/usb/early/ehci-dbgp.c | 120 ++- + include/asm-generic/kmap_types.h | 3 +- + include/linux/kdb.h | 117 ++ + include/linux/kgdb.h | 55 +- + include/linux/serial_core.h | 1 + + init/main.c | 2 + + kernel/Makefile | 2 +- + kernel/debug/Makefile | 6 + + kernel/debug/debug_core.c | 982 ++++++++++++ + kernel/debug/debug_core.h | 81 + + kernel/debug/gdbstub.c | 1017 ++++++++++++ + kernel/debug/kdb/.gitignore | 1 + + kernel/debug/kdb/Makefile | 25 + + kernel/debug/kdb/kdb_bp.c | 564 +++++++ + kernel/debug/kdb/kdb_bt.c | 210 +++ + kernel/debug/kdb/kdb_cmds | 35 + + kernel/debug/kdb/kdb_debugger.c | 169 ++ + kernel/debug/kdb/kdb_io.c | 826 ++++++++++ + kernel/debug/kdb/kdb_keyboard.c | 212 +++ + kernel/debug/kdb/kdb_main.c | 2852 +++++++++++++++++++++++++++++++++ + kernel/debug/kdb/kdb_private.h | 300 ++++ + kernel/debug/kdb/kdb_support.c | 927 +++++++++++ + kernel/kallsyms.c | 21 + + kernel/kgdb.c | 1764 -------------------- + kernel/module.c | 4 + + kernel/printk.c | 25 + + kernel/sched.c | 7 +- + kernel/signal.c | 40 + + lib/Kconfig.kgdb | 24 +- + 56 files changed, 9495 insertions(+), 2050 deletions(-) + create mode 100644 include/linux/kdb.h + create mode 100644 kernel/debug/Makefile + create mode 100644 kernel/debug/debug_core.c + create mode 100644 kernel/debug/debug_core.h + create mode 100644 kernel/debug/gdbstub.c + create mode 100644 kernel/debug/kdb/.gitignore + create mode 100644 kernel/debug/kdb/Makefile + create mode 100644 kernel/debug/kdb/kdb_bp.c + create mode 100644 kernel/debug/kdb/kdb_bt.c + create mode 100644 kernel/debug/kdb/kdb_cmds + create mode 100644 kernel/debug/kdb/kdb_debugger.c + create mode 100644 kernel/debug/kdb/kdb_io.c + create mode 100644 kernel/debug/kdb/kdb_keyboard.c + create mode 100644 kernel/debug/kdb/kdb_main.c + create mode 100644 kernel/debug/kdb/kdb_private.h + create mode 100644 kernel/debug/kdb/kdb_support.c + delete mode 100644 kernel/kgdb.c +$ git am -3 ../patches/0001-kgdb-update-for-sysrq-handling-change.patch +Applying: kgdb: update for sysrq handling change +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/debug/kdb/kdb_main.c +$ git add . +$ git commit -v -a --amend +[master d6c52a4] Merge remote branch 'kgdb/kgdb-next' +$ git am -3 ../patches/kdb__update_gfp_slab.h_includes +Applying: kdb: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/debug/kdb/kdb_main.c +$ git add . +$ git commit -v -a --amend +[master 098cb18] Merge remote branch 'kgdb/kgdb-next' +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/slab.h | 1 + + mm/slab.c | 179 ++++++++++++++++++++++++++++++++++++------------- + mm/slub.c | 30 ++++++--- + mm/util.c | 21 ++++++ + 4 files changed, 173 insertions(+), 58 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merging drivers/md/faulty.c +Auto-merging drivers/md/multipath.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid5.c +Merge made by recursive. + drivers/md/bitmap.c | 37 ++++++++++++++++++++++++++++++++----- + drivers/md/bitmap.h | 1 + + drivers/md/faulty.c | 6 +++--- + drivers/md/md.h | 3 --- + drivers/md/multipath.c | 2 +- + drivers/md/raid1.c | 8 ++++---- + drivers/md/raid10.c | 8 ++++---- + drivers/md/raid5.c | 10 +++++----- + 8 files changed, 50 insertions(+), 25 deletions(-) +Merging mfd/for-next +$ git merge mfd/for-next +Resolved 'drivers/dma/timb_dma.c' using previous resolution. +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Removing arch/x86/include/asm/rdc321x_defs.h +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/timb_dma.c +CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7e93f1e] Merge remote branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-davinci/board-da850-evm.c | 19 +- + arch/x86/include/asm/rdc321x_defs.h | 12 - + drivers/gpio/Kconfig | 18 + + drivers/gpio/Makefile | 4 +- + drivers/gpio/janz-ttl.c | 258 +++++ + drivers/gpio/rdc321x-gpio.c | 246 +++++ + drivers/input/touchscreen/Kconfig | 13 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/tps6507x-ts.c | 400 +++++++ + drivers/mfd/88pm860x-core.c | 6 +- + drivers/mfd/88pm860x-i2c.c | 1 + + drivers/mfd/Kconfig | 31 + + drivers/mfd/Makefile | 5 +- + drivers/mfd/ab3100-core.c | 2 + + drivers/mfd/da903x.c | 1 + + drivers/mfd/janz-cmodio.c | 304 +++++ + drivers/mfd/menelaus.c | 3 +- + drivers/mfd/mfd-core.c | 2 +- + drivers/mfd/pcf50633-core.c | 5 +- + drivers/mfd/rdc321x-southbridge.c | 123 +++ + drivers/mfd/t7l66xb.c | 3 + + drivers/mfd/timberdale.c | 138 +++- + drivers/mfd/timberdale.h | 16 +- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/tps6507x.c | 159 +++ + drivers/mfd/wm831x-core.c | 109 ++- + drivers/mfd/wm831x-irq.c | 18 +- + drivers/mfd/wm8350-core.c | 4 + + drivers/mfd/wm8350-i2c.c | 2 + + drivers/net/can/Kconfig | 10 + + drivers/net/can/Makefile | 1 + + drivers/net/can/janz-ican3.c | 1830 +++++++++++++++++++++++++++++++ + drivers/regulator/tps6507x-regulator.c | 373 +++---- + drivers/watchdog/rdc321x_wdt.c | 53 +- + include/linux/input/tps6507x-ts.h | 24 + + include/linux/mfd/88pm860x.h | 4 +- + include/linux/mfd/janz.h | 54 + + include/linux/mfd/rdc321x.h | 26 + + include/linux/mfd/tps6507x.h | 169 +++ + include/linux/mfd/wm831x/core.h | 5 +- + 40 files changed, 4162 insertions(+), 292 deletions(-) + delete mode 100644 arch/x86/include/asm/rdc321x_defs.h + create mode 100644 drivers/gpio/janz-ttl.c + create mode 100644 drivers/gpio/rdc321x-gpio.c + create mode 100644 drivers/input/touchscreen/tps6507x-ts.c + create mode 100644 drivers/mfd/janz-cmodio.c + create mode 100644 drivers/mfd/rdc321x-southbridge.c + create mode 100644 drivers/mfd/tps6507x.c + create mode 100644 drivers/net/can/janz-ican3.c + create mode 100644 include/linux/input/tps6507x-ts.h + create mode 100644 include/linux/mfd/janz.h + create mode 100644 include/linux/mfd/rdc321x.h + create mode 100644 include/linux/mfd/tps6507x.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/radeon/r300.c' using previous resolution. +Auto-merging arch/x86/mm/pageattr.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_sysfs.c +Auto-merging drivers/gpu/drm/i915/i915_dma.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_fb.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_state.c +Auto-merging drivers/gpu/drm/radeon/atom.c +Auto-merging drivers/gpu/drm/radeon/evergreen.c +Auto-merging drivers/gpu/drm/radeon/r100.c +Auto-merging drivers/gpu/drm/radeon/r300.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r300.c +Auto-merging drivers/gpu/drm/radeon/r420.c +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/radeon/radeon_fb.c +Auto-merging drivers/gpu/drm/radeon/radeon_fence.c +Auto-merging drivers/gpu/drm/radeon/radeon_object.c +Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c +Auto-merging drivers/gpu/drm/radeon/rs400.c +Auto-merging drivers/gpu/drm/radeon/rv515.c +Auto-merging drivers/gpu/drm/radeon/rv770.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +Auto-merging drivers/gpu/drm/ttm/ttm_memory.c +Auto-merging drivers/gpu/drm/ttm/ttm_tt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6038e35] Merge remote branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/cacheflush.h | 2 + + arch/x86/mm/pageattr.c | 53 ++- + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/drm_crtc.c | 9 +- + drivers/gpu/drm/drm_crtc_helper.c | 395 +---------- + drivers/gpu/drm/drm_edid.c | 791 ++++++++++++++------ + drivers/gpu/drm/drm_fb_helper.c | 913 ++++++++++++++++------- + drivers/gpu/drm/drm_modes.c | 102 ++- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/gpu/drm/i915/i915_dma.c | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 5 + + drivers/gpu/drm/i915/i915_irq.c | 1 + + drivers/gpu/drm/i915/intel_display.c | 37 +- + drivers/gpu/drm/i915/intel_drv.h | 15 +- + drivers/gpu/drm/i915/intel_fb.c | 202 +++--- + drivers/gpu/drm/nouveau/nouveau_bo.c | 122 +++- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 3 + + drivers/gpu/drm/nouveau/nouveau_display.c | 41 +- + drivers/gpu/drm/nouveau/nouveau_drv.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_fb.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 198 ++++-- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 19 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_irq.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_state.c | 5 +- + drivers/gpu/drm/nouveau/nv04_fbcon.c | 16 +- + drivers/gpu/drm/nouveau/nv50_display.c | 3 + + drivers/gpu/drm/nouveau/nv50_fbcon.c | 16 +- + drivers/gpu/drm/radeon/atom.c | 7 +- + drivers/gpu/drm/radeon/evergreen.c | 13 +- + drivers/gpu/drm/radeon/r100.c | 253 ++++--- + drivers/gpu/drm/radeon/r100d.h | 128 ++++ + drivers/gpu/drm/radeon/r300.c | 161 +++-- + drivers/gpu/drm/radeon/r300d.h | 47 ++- + drivers/gpu/drm/radeon/r420.c | 4 +- + drivers/gpu/drm/radeon/r520.c | 5 +- + drivers/gpu/drm/radeon/r600.c | 88 +-- + drivers/gpu/drm/radeon/r600_blit_kms.c | 3 + + drivers/gpu/drm/radeon/radeon.h | 114 ++-- + drivers/gpu/drm/radeon/radeon_asic.c | 42 +- + drivers/gpu/drm/radeon/radeon_asic.h | 21 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 11 +- + drivers/gpu/drm/radeon/radeon_combios.c | 28 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 52 +- + drivers/gpu/drm/radeon/radeon_cp.c | 10 +- + drivers/gpu/drm/radeon/radeon_cs.c | 4 - + drivers/gpu/drm/radeon/radeon_device.c | 33 +- + drivers/gpu/drm/radeon/radeon_display.c | 42 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 21 +- + drivers/gpu/drm/radeon/radeon_fb.c | 352 +++++---- + drivers/gpu/drm/radeon/radeon_fence.c | 107 ++-- + drivers/gpu/drm/radeon/radeon_gart.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 3 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 + + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 58 +- + drivers/gpu/drm/radeon/radeon_mode.h | 23 +- + drivers/gpu/drm/radeon/radeon_object.c | 32 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 124 +++- + drivers/gpu/drm/radeon/rs400.c | 6 +- + drivers/gpu/drm/radeon/rs600.c | 77 ++- + drivers/gpu/drm/radeon/rs600d.h | 46 ++ + drivers/gpu/drm/radeon/rs690.c | 6 +- + drivers/gpu/drm/radeon/rv515.c | 96 +--- + drivers/gpu/drm/radeon/rv515d.h | 46 ++ + drivers/gpu/drm/radeon/rv770.c | 11 - + drivers/gpu/drm/ttm/Makefile | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 84 +-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 130 +--- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 41 +- + drivers/gpu/drm/ttm/ttm_memory.c | 7 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 845 +++++++++++++++++++++ + drivers/gpu/drm/ttm/ttm_tt.c | 44 +- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 55 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 - + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- + include/drm/drm_crtc.h | 24 +- + include/drm/drm_crtc_helper.h | 6 +- + include/drm/drm_edid.h | 3 - + include/drm/drm_fb_helper.h | 76 ++- + include/drm/ttm/ttm_bo_api.h | 33 +- + include/drm/ttm/ttm_bo_driver.h | 57 +- + include/drm/ttm/ttm_page_alloc.h | 74 ++ + 86 files changed, 4201 insertions(+), 2370 deletions(-) + create mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc.c + create mode 100644 include/drm/ttm/ttm_page_alloc.h +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging drivers/regulator/core.c +Auto-merging drivers/regulator/lp3971.c +Merge made by recursive. +Merging security-testing/next +$ git merge security-testing/next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/char/tpm/tpm.c +Auto-merging security/integrity/ima/ima_iint.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/selinux/netlabel.c +Auto-merging security/selinux/netlink.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/tomoyo/common.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 10 ++++ + drivers/char/tpm/tpm.c | 47 +++++++++++++++++--- + scripts/selinux/genheaders/genheaders.c | 2 +- + security/integrity/ima/ima_iint.c | 6 +- + security/integrity/ima/ima_main.c | 2 +- + security/keys/keyring.c | 13 ++--- + security/security.c | 2 +- + security/selinux/hooks.c | 52 +++++++++++----------- + security/selinux/include/initial_sid_to_string.h | 2 +- + security/selinux/include/netlabel.h | 8 ++-- + security/selinux/netlabel.c | 14 +++--- + security/selinux/netlink.c | 1 - + security/selinux/nlmsgtab.c | 1 - + security/selinux/ss/avtab.h | 2 +- + security/selinux/ss/policydb.c | 2 +- + security/smack/smack_lsm.c | 10 ---- + security/tomoyo/common.c | 10 +--- + 17 files changed, 104 insertions(+), 80 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Merge made by recursive. + drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ + drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- + drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ + drivers/uwb/wlp/wlp-lc.c | 12 +++++----- + include/linux/wlp.h | 2 +- + 5 files changed, 58 insertions(+), 58 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merging drivers/pci/dmar.c +Merge made by recursive. + drivers/pci/dmar.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging MAINTAINERS +Auto-merging arch/mips/sibyte/bcm1480/irq.c +Auto-merging arch/mips/sibyte/sb1250/irq.c +Auto-merging drivers/acpi/osl.c +Auto-merging drivers/acpi/power.c +Auto-merging drivers/ata/ata_piix.c +Auto-merging drivers/char/bsr.c +Auto-merging drivers/firewire/ohci.c +Auto-merging drivers/gpu/drm/drm_bufs.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/isdn/hardware/mISDN/hfcmulti.c +Auto-merging drivers/isdn/hisax/hfc4s8s_l1.c +Auto-merging drivers/macintosh/windfarm_pm81.c +Auto-merging drivers/net/ps3_gelic_wireless.c +Auto-merging drivers/net/smsc911x.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/regulator/core.c +Auto-merging drivers/scsi/bfa/include/defs/bfa_defs_cee.h +Auto-merging drivers/scsi/bfa/include/defs/bfa_defs_status.h +Auto-merging drivers/scsi/wd7000.c +Auto-merging drivers/spi/spi_mpc8xxx.c +Auto-merging drivers/usb/wusbcore/wa-xfer.c +Auto-merging drivers/virtio/virtio_pci.c +Auto-merging fs/jfs/jfs_dmap.c +Auto-merging fs/omfs/inode.c +Auto-merging include/linux/i2c/twl.h +Auto-merging include/linux/kfifo.h +Auto-merging kernel/cgroup.c +Auto-merging mm/memcontrol.c +Auto-merging net/ipv4/ipmr.c +Auto-merging scripts/kconfig/util.c +Auto-merging scripts/package/mkspec +Merge made by recursive. + Documentation/cgroups/cgroups.txt | 2 +- + Documentation/cgroups/cpusets.txt | 38 +++++++++++----------- + Documentation/filesystems/proc.txt | 2 +- + Documentation/kbuild/kconfig.txt | 2 +- + Documentation/powerpc/dts-bindings/xilinx.txt | 2 +- + Documentation/sysfs-rules.txt | 2 +- + Documentation/trace/events.txt | 8 ++-- + MAINTAINERS | 8 +--- + arch/mips/sibyte/bcm1480/irq.c | 2 +- + arch/mips/sibyte/sb1250/irq.c | 2 +- + crypto/Kconfig | 2 +- + drivers/acpi/osl.c | 4 +- + drivers/acpi/power.c | 1 - + drivers/ata/ata_piix.c | 2 +- + drivers/char/bsr.c | 2 +- + drivers/firewire/ohci.c | 2 +- + drivers/gpu/drm/drm_bufs.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 4 +- + drivers/gpu/drm/radeon/atombios.h | 4 +- + drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +- + drivers/infiniband/hw/ipath/ipath_iba6120.c | 4 +- + drivers/infiniband/hw/ipath/ipath_iba7220.c | 2 +- + drivers/isdn/hardware/mISDN/hfcmulti.c | 2 +- + drivers/isdn/hisax/hfc4s8s_l1.c | 2 +- + drivers/macintosh/windfarm_pm81.c | 2 +- + drivers/media/dvb/dvb-usb/friio-fe.c | 2 +- + drivers/net/bnx2x_hsi.h | 2 +- + drivers/net/ps3_gelic_wireless.c | 2 +- + drivers/net/smsc911x.c | 4 +- + drivers/pci/hotplug/cpqphp_core.c | 2 +- + drivers/pci/pci.c | 2 +- + drivers/ps3/ps3-sys-manager.c | 2 +- + drivers/regulator/core.c | 2 +- + drivers/s390/char/sclp_cpi_sys.c | 2 +- + drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 2 +- + drivers/scsi/bfa/include/defs/bfa_defs_status.h | 4 +- + drivers/scsi/wd7000.c | 2 +- + drivers/spi/spi_mpc8xxx.c | 2 +- + drivers/staging/vt6655/rxtx.c | 14 ++++---- + drivers/staging/vt6656/rxtx.c | 6 ++-- + drivers/usb/wusbcore/wa-xfer.c | 2 +- + drivers/virtio/virtio_pci.c | 2 +- + fs/jfs/jfs_dmap.c | 2 +- + fs/omfs/inode.c | 1 - + include/linux/i2c/twl.h | 8 ++-- + include/linux/kfifo.h | 4 +- + include/linux/kobj_map.h | 9 +++++ + include/linux/kref.h | 2 +- + kernel/cgroup.c | 2 +- + mm/memcontrol.c | 2 +- + mm/page_alloc.c | 2 +- + net/ipv4/ipmr.c | 2 +- + net/wimax/op-rfkill.c | 2 +- + scripts/kconfig/util.c | 2 +- + scripts/package/mkspec | 2 +- + sound/pci/emu10k1/emu10k1_main.c | 2 +- + sound/pci/hda/hda_local.h | 2 +- + 57 files changed, 103 insertions(+), 100 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +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 +Merge made by recursive. + Documentation/power/devices.txt | 847 ++++++++++++++++++++++----------------- + drivers/base/power/runtime.c | 10 +- + include/linux/pm_wakeup.h | 38 ++- + 3 files changed, 512 insertions(+), 383 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Resolved 'fs/notify/inotify/inotify_user.c' using previous resolution. +Resolved 'include/linux/fsnotify.h' using previous resolution. +Resolved 'kernel/audit_tree.c' using previous resolution. +Resolved 'kernel/audit_watch.c' using previous resolution. +Resolved 'kernel/sysctl.c' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/ia32/sys_ia32.c +Auto-merging arch/x86/include/asm/sys_ia32.h +Auto-merging arch/x86/include/asm/unistd_32.h +Auto-merging arch/x86/include/asm/unistd_64.h +Auto-merging arch/x86/kernel/syscall_table_32.S +Auto-merging fs/compat.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/exec.c +Auto-merging fs/inode.c +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/fsnotify.c +Auto-merging fs/notify/inode_mark.c +Removing fs/notify/inotify/inotify.c +Auto-merging fs/notify/inotify/inotify_user.c +CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c +Auto-merging fs/open.c +Auto-merging fs/read_write.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/fsnotify.h +CONFLICT (content): Merge conflict in include/linux/fsnotify.h +Auto-merging include/linux/mount.h +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/audit.c +Auto-merging kernel/audit_tree.c +CONFLICT (content): Merge conflict in kernel/audit_tree.c +Auto-merging kernel/audit_watch.c +CONFLICT (content): Merge conflict in kernel/audit_watch.c +Auto-merging kernel/auditfilter.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/sys_ni.c +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7c49441] Merge remote branch 'fsnotify/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 - + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/ia32/sys_ia32.c | 9 + + arch/x86/include/asm/sys_ia32.h | 3 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/inode.c | 8 +- + fs/namei.c | 2 +- + fs/namespace.c | 5 + + fs/nfsd/vfs.c | 4 +- + fs/notify/Kconfig | 1 + + fs/notify/Makefile | 4 +- + fs/notify/dnotify/dnotify.c | 198 +++---- + fs/notify/fanotify/Kconfig | 26 + + fs/notify/fanotify/Makefile | 1 + + fs/notify/fanotify/fanotify.c | 255 ++++++++ + fs/notify/fanotify/fanotify_user.c | 776 +++++++++++++++++++++++ + fs/notify/fsnotify.c | 141 ++++- + fs/notify/fsnotify.h | 33 +- + fs/notify/group.c | 178 +++--- + fs/notify/inode_mark.c | 309 +++------- + fs/notify/inotify/Kconfig | 15 - + fs/notify/inotify/Makefile | 1 - + fs/notify/inotify/inotify.c | 933 ---------------------------- + fs/notify/inotify/inotify.h | 7 +- + fs/notify/inotify/inotify_fsnotify.c | 114 +++- + fs/notify/inotify/inotify_user.c | 305 ++++++---- + fs/notify/mark.c | 325 ++++++++++ + fs/notify/notification.c | 180 +++--- + fs/notify/vfsmount_mark.c | 176 ++++++ + fs/open.c | 3 +- + fs/read_write.c | 8 +- + include/asm-generic/fcntl.h | 8 + + include/linux/Kbuild | 1 + + include/linux/dnotify.h | 1 + + include/linux/fanotify.h | 105 ++++ + include/linux/fs.h | 16 +- + include/linux/fsnotify.h | 164 +++--- + include/linux/fsnotify_backend.h | 169 ++++-- + include/linux/inotify.h | 175 +----- + include/linux/mount.h | 6 +- + include/linux/security.h | 1 + + include/linux/syscalls.h | 5 + + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 +- + kernel/audit_tree.c | 232 ++++--- + kernel/audit_watch.c | 295 +++++---- + kernel/auditfilter.c | 39 +- + kernel/auditsc.c | 10 +- + kernel/sys_ni.c | 4 + + kernel/sysctl.c | 8 +- + security/security.c | 16 +- + 57 files changed, 3097 insertions(+), 2249 deletions(-) + create mode 100644 fs/notify/fanotify/Kconfig + create mode 100644 fs/notify/fanotify/Makefile + create mode 100644 fs/notify/fanotify/fanotify.c + create mode 100644 fs/notify/fanotify/fanotify_user.c + delete mode 100644 fs/notify/inotify/inotify.c + create mode 100644 fs/notify/mark.c + create mode 100644 fs/notify/vfsmount_mark.c + create mode 100644 include/linux/fanotify.h +$ git am -3 ../patches/fsnotify__update_gfp_slab.h_includes +Applying: fsnotify: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/notify/fanotify/fanotify_user.c +M fs/notify/mark.c +M fs/notify/vfsmount_mark.c +$ git add . +$ git commit -v -a --amend +[master cf7649a] Merge remote branch 'fsnotify/for-next' +Merging irda/for-next +$ git merge irda/for-next +Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. +Auto-merging drivers/net/irda/irda-usb.c +CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5f5971d] Merge remote branch 'irda/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging drbd/for-jens +$ git merge drbd/for-jens +Merge made by recursive. +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'include/linux/Kbuild' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in 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 d799cdd] 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 | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 247 +++++++ + drivers/vbus/pci-bridge.c | 1015 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4387 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 +$ git am -3 ../patches/0001-vbus-use-of-kzalloc-kfree-requires-the-include-of-sl.patch +Applying: vbus: use of kzalloc/kfree requires the include of slab.h +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/vbus/bus-proxy.c +$ git add . +$ git commit -v -a --amend +[master 9812885] Merge remote branch 'alacrity/linux-next' +$ git am -3 ../patches/vbus__update_gfp_slab.h_includes +Applying: vbus: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/vbus/pci-bridge.c +$ git add . +$ git commit -v -a --amend +[master 6da2b08] Merge remote branch 'alacrity/linux-next' +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging Documentation/edac.txt +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/pci/legacy.c +Auto-merging drivers/edac/edac_core.h +Auto-merging drivers/edac/edac_mc_sysfs.c +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 | 42 +- + 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 | 1977 ++++++++++++++++++++++++++++++++++++++ + include/linux/edac_mce.h | 31 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 19 + + 13 files changed, 2465 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 +Auto-merging drivers/of/fdt.c +Merge made by recursive. + drivers/of/fdt.c | 15 +++++++++++++++ + include/linux/of_device.h | 2 ++ + include/linux/of_fdt.h | 4 ++++ + include/linux/of_platform.h | 2 ++ + 4 files changed, 23 insertions(+), 0 deletions(-) +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging limits/writable_limits +$ git merge limits/writable_limits +Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. +Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. +Auto-merging Documentation/filesystems/proc.txt +Auto-merging arch/x86/ia32/ia32entry.S +CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/include/asm/unistd_32.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h +Auto-merging arch/x86/include/asm/unistd_64.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h +Auto-merging arch/x86/kernel/syscall_table_32.S +CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S +Auto-merging fs/proc/base.c +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging kernel/compat.c +Auto-merging kernel/posix-cpu-timers.c +Auto-merging kernel/sys.c +Auto-merging security/capability.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a6692a4] Merge remote branch 'limits/writable_limits' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/proc.txt | 11 +++ + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + fs/proc/base.c | 101 ++++++++++++++++++++++-- + include/asm-generic/unistd.h | 6 +- + include/linux/posix-timers.h | 2 +- + include/linux/resource.h | 2 + + include/linux/security.h | 9 ++- + include/linux/syscalls.h | 4 + + kernel/compat.c | 98 +++++++++++++++++------- + kernel/posix-cpu-timers.c | 10 +- + kernel/sys.c | 151 ++++++++++++++++++++++++++++++------ + security/capability.c | 3 +- + security/security.c | 5 +- + security/selinux/hooks.c | 10 ++- + 17 files changed, 346 insertions(+), 78 deletions(-) +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Already uptodate! +Merge made by recursive. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + kernel/workqueue.c | 27 ++++++++++++++++++++++++++- + 1 files changed, 26 insertions(+), 1 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Resolved 'drivers/base/platform.c' using previous resolution. +Auto-merging drivers/base/devtmpfs.c +Auto-merging drivers/base/firmware_class.c +Auto-merging drivers/base/module.c +Auto-merging drivers/base/platform.c +CONFLICT (content): Merge conflict in drivers/base/platform.c +Auto-merging drivers/staging/comedi/drivers/quatech_daqp_cs.c +Auto-merging fs/ramfs/inode.c +Auto-merging include/linux/device.h +Auto-merging include/linux/kref.h +Auto-merging lib/kref.c +Auto-merging security/integrity/ima/ima_iint.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 267af42] Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + drivers/base/Kconfig | 7 +++++-- + drivers/base/core.c | 4 +--- + drivers/base/dd.c | 4 ++-- + drivers/base/devtmpfs.c | 5 +++++ + drivers/base/firmware_class.c | 5 ++--- + drivers/base/module.c | 4 +--- + drivers/base/platform.c | 8 ++++---- + drivers/net/mlx4/mlx4.h | 1 + + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + + drivers/usb/core/usb.c | 2 +- + fs/ramfs/inode.c | 2 +- + include/linux/device.h | 9 ++++----- + include/linux/kref.h | 1 - + include/linux/ramfs.h | 2 ++ + kernel/user_namespace.c | 4 ++-- + lib/kref.c | 15 ++------------- + security/integrity/ima/ima_iint.c | 4 ++-- + 17 files changed, 36 insertions(+), 42 deletions(-) +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Auto-merging drivers/hid/usbhid/hid-core.c +Auto-merging drivers/hid/usbhid/usbkbd.c +Auto-merging drivers/usb/host/r8a66597-hcd.c +Auto-merging drivers/usb/musb/blackfin.c +Auto-merging drivers/usb/musb/davinci.c +Auto-merging drivers/usb/musb/musb_virthub.c +Auto-merging drivers/usb/musb/omap2430.c +Auto-merging drivers/usb/storage/transport.c +Auto-merging drivers/usb/wusbcore/wa-xfer.c +Merge made by recursive. + drivers/hid/usbhid/hid-core.c | 8 +- + drivers/hid/usbhid/usbhid.h | 1 - + drivers/hid/usbhid/usbkbd.c | 8 +- + drivers/input/misc/cm109.c | 12 +- + drivers/input/misc/powermate.c | 9 +- + drivers/input/misc/yealink.c | 11 +- + drivers/usb/class/cdc-acm.h | 4 +- + drivers/usb/core/hcd.c | 1 - + drivers/usb/core/hub.c | 10 +- + drivers/usb/core/hub.h | 7 +- + drivers/usb/core/urb.c | 4 +- + drivers/usb/core/usb.c | 18 +-- + drivers/usb/gadget/f_mass_storage.c | 23 ++- + drivers/usb/host/ehci-au1xxx.c | 11 ++- + drivers/usb/host/ehci-hub.c | 24 ++-- + drivers/usb/host/ehci.h | 8 +- + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/isp1760-hcd.c | 20 ++-- + drivers/usb/host/oxu210hp-hcd.c | 28 ++-- + drivers/usb/host/r8a66597-hcd.c | 37 ++--- + drivers/usb/host/sl811-hcd.c | 58 ++++---- + drivers/usb/host/xhci-hub.c | 24 ++-- + drivers/usb/misc/sisusbvga/sisusb.c | 4 +- + drivers/usb/misc/usbtest.c | 9 +- + drivers/usb/musb/Kconfig | 6 +- + drivers/usb/musb/Makefile | 8 + + drivers/usb/musb/blackfin.c | 10 +- + drivers/usb/musb/davinci.c | 2 +- + drivers/usb/musb/musb_core.c | 56 ++++---- + drivers/usb/musb/musb_core.h | 8 +- + drivers/usb/musb/musb_debug.h | 13 ++ + drivers/usb/musb/musb_debugfs.c | 295 +++++++++++++++++++++++++++++++++++ + drivers/usb/musb/musb_gadget_ep0.c | 25 +++ + drivers/usb/musb/musb_virthub.c | 4 +- + drivers/usb/musb/musbhsdma.h | 16 +-- + drivers/usb/musb/omap2430.c | 13 ++- + drivers/usb/musb/tusb6010.c | 2 +- + drivers/usb/serial/console.c | 27 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + drivers/usb/serial/generic.c | 4 +- + drivers/usb/serial/pl2303.c | 2 +- + drivers/usb/serial/usb-serial.c | 4 +- + drivers/usb/storage/isd200.c | 4 +- + drivers/usb/storage/transport.c | 2 - + drivers/usb/storage/usb.c | 15 +-- + drivers/usb/storage/usb.h | 3 +- + drivers/usb/wusbcore/wa-xfer.c | 2 - + include/linux/usb/musb.h | 36 +++++ + include/linux/usb/serial.h | 2 - + 49 files changed, 624 insertions(+), 278 deletions(-) + create mode 100644 drivers/usb/musb/musb_debugfs.c +$ git am -3 ../patches/usb__update_gfp_slab.h_includes +Applying: usb: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/musb/musb_debugfs.c +$ git add . +$ git commit -v -a --amend +[master 4cc8468] Merge branch 'quilt/usb' +Merging quilt/staging +$ git merge quilt/staging +Already up-to-date. +$ git am -3 ../patches/staging__update_gfp_slab.h_includes +Applying: staging: update gfp/slab.h includes +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/comedi/drivers/quatech_daqp_cs.c +$ git add . +$ git commit -v -a --amend +[master 0d16cef4] Merge branch 'quilt/usb' +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..642cc282beb9 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,51 @@ +Importing driver-core.current based on 2.6.34-rc2 +Unchanged quilt series driver-core.current +Importing tty.current based on quilt/driver-core.current +Unchanged quilt series tty.current +Importing usb.current based on quilt/tty.current +Unchanged quilt series usb.current +Importing staging.current based on quilt/usb.current +Unchanged quilt series staging.current +Importing i2c based on 2.6.34-rc3-git6 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 2.6.34-rc3-git6 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 2.6.34-rc2 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.34-rc3-380-g48de8cb +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 48de8cb7847d040c8892701c1ff3c55eff1f46b4 +HEAD is now at 48de8cb Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +modules:isapnp-mod_devicetable.h.patch +hisax:device-table-fix.patch +module:device_table_isapnp_does_nothing.patch +lguest:dont-use-vmcall.patch +lguest:fake-up-cli.patch +virtio:maintainers_put_the_console_entry_in_correct_alphabetical_order.patch +virtio:console_fix_early_put_chars_usage.patch +virtio:fix-console-send_buf.patch +virtio:disable_multiport_console_support.patch +misc:hvc_console_fix_race_between_hvc_close_and_hvc_remove.patch +module:drop-lock-while-waiting.patch +virtio:add_disk_identification_support.patch +virtio:add_disk_identification_ioctl.patch +misc:fix-email.patch +kernel-params_c-check-null-for-non-bool.diff +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/rr +From ../quilt-tmp + + 9a2368e...3ec4a3d master -> quilt/rr (forced update) +Importing device-mapper based on v2.6.33-5070-g64ba992 +Unchanged quilt series device-mapper +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current +Unchanged quilt series driver-core +Importing tty based on quilt/driver-core +Unchanged quilt series tty +Importing usb based on quilt/tty +Unchanged quilt series usb +Importing staging based on quilt/usb +Unchanged quilt series staging diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..af7363e13a72 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20100409 |