diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-17 19:26:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-17 19:26:35 +1100 |
| commit | 918a6c828c77783a11abc6f38fb48a60038feb2c (patch) | |
| tree | 2e0498ba8771ecefd8b926c9ef1c6fc18443f1c7 | |
| parent | 1ebb6c6b54a0b69b94982ce7da867e267a33af13 (diff) | |
Add linux-next specific files for 20081017next-20081017
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 122 | ||||
| -rw-r--r-- | Next/Trees | 124 | ||||
| -rw-r--r-- | Next/merge.log | 4619 | ||||
| -rw-r--r-- | Next/quilt-import.log | 97 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4963 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..430644132130 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,122 @@ +Name SHA1 +---- ---- +origin 73b4a24f5ff09389ba6277c53a266b142f655ed2 +powerpc-merge 61e9916eba35dfb76d38013a5aae9a59cc50877a +scsi-rc-fixes c9eeb248f3b44939532a9716bc06413383aa5d63 +net-current dc976c09da4e13b2b3fda23cca9d0682d1de7213 +sparc-current 615c9136b385d5225d3ece20aa30b28a90c438d6 +sound-current af31ed217a0fe433e06c83b978bcb805ada6295a +arm-current 278429cff8809958d25415ba0ed32b59866ab1a8 +pci-current 278429cff8809958d25415ba0ed32b59866ab1a8 +wireless-current 8713a7ccd88d93d9f8a72436088d6627c82490db +kbuild-current 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc +driver-core.current 94d35affffc09074f86db177cd16c0abc90b9c50 +usb.current d0c4dbdc1dbed9abbd4a2aac915e659348011b8f +cpufreq-current 8d5922572038bae9f7b16fcb974eee806727b44c +input-current 4c0e799a9a6dc64426ddb6c03aea1a154357658f +md-current 7a1fc53c5adb910751a9b212af90302eb4ffb527 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 4249d00bde7a2ba45d27cdb61315356737a5a069 +avr32 22a304363ea6bf3100504606393e20a252173fd2 +blackfin 1390da4ee75168b6e4d8354e93e3b5f0a0291f2f +cris 8f808417fe211648c0816e28947cdc74eb1e1032 +ia64 a447c0932445f92ce6f4c1bd020f62c5097a7842 +m68k 79f81a46ae7553e874e89b974c11d55ed3d0b65f +m68knommu 7680a920c75b242adaedf3d93b7f6d253db56792 +mips d3a47e82b6bc3724dd60f3ee4e84fe4479104382 +parisc 235a92b14ee121ada0454f24d8899dc14273b4aa +powerpc 6dc6472581f693b5fc95aebedf67b4960fb85cf0 +4xx 22d660ffd0db8d136b122751287d186e869ca474 +galak 6dc6472581f693b5fc95aebedf67b4960fb85cf0 +pxa 45e9c0de2e86485f8b6633fd64ab19cfbff167f6 +s390 cb78f289c0cae52d629c7d30dd23af2433510f16 +sh 14866543ad22014a0b12e10657a917eb6b487248 +sparc 4480f15b3306f43bbb0310d461142b4e897ca45b +x86 113455f80fae63de7044f93a6624b498d5c6b8a0 +xtensa dbd3dca3d7d5b1cd36a3df2ee9ed2c46d99b7f64 +driver-core e449d4fe051818602429d4d90827918f9bd5cd40 +usb bec2f5dbfbf46cf6fc3cc7b8cff5eb02834afaa9 +tip-core f55b84c11bf03809ab2fcf8626035d67ae93719e +cpus4096 4145ddda112a16b870e6bc5461625afd28d9df1f +ftrace 98d9c66ab07471006fd7910cb16453581c41a3e7 +genirq 14a6b3e8964be7b82c6cb4246fe4e0d9f6ddc9d5 +safe-poison-pointers ad666554bd18330eec5fcbcb89c80ef5bb2f4797 +sched 202fb5378a17e8d100079a2c13d092f1d88ef766 +stackprotector c2d98093cf3fd7a9ef34b1ae9aa12a4a5b061872 +timers eeb2d0fcb69ea2dccaf1c1fdfc510cb1973c9b7f +pci 913d3708831ec551ca8560ea2cc793f738df88d6 +device-mapper 93a5c36ca515288dc1815690fedf00b90153686b +hid 278429cff8809958d25415ba0ed32b59866ab1a8 +i2c 9ca5623124ee677ef2f9b267f84a830bc71d1435 +jdelvare-hwmon e3b370b311a4d9662e1e41d6c9ad33eb5ddbbbae +kernel-doc a881214af7025692df7329c477edb044a3920bb4 +v4l-dvb 828687a7b6699fbc6bc62d03f381e3cd468134ab +jfs ec1aef33668448718fcba79e4e981592bfd7e0a3 +kbuild 56b2f0706d82535fd8d85503f2dcc0be40c8e55d +ide ec5305b930766bd51938bcadbc8c1107e6f2e4e1 +libata a551b98d5f6fce5897d497abd8bfb262efb33d2a +nfs 011935a0a710c20bb7ae63523b78856848db1926 +xfs d3503eed0388a626544326ca9a8c5d74735d0786 +infiniband af713b499f830a630f554b7df3fa0e81be848963 +acpi 9a142ff0c0c894e69e47268624d8c977fdd2689b +nfsd 04ab591808565f968d4406f6435090ad671ebdab +ieee1394 7365c004cc40c9f5776c8cc7aeca547c3b30e38a +ubi 762a9f291bfdf9e4d5c2b80d730d79055c8d8c99 +kvm c6d66d22e20cc8fa85e1ae8286fbf9f2b5275337 +dlm 27eccf46491e1f77f9af9bbe0778122ce6882890 +scsi 4c393e6e457fb41169dd110c1b96a138394c2d7b +tests 94a97a3018e55a27d1c29e011b3c38fee01a967f +ocfs2 fd350473bd20282b725f336721751c80b724efd5 +ext4 ebdc643ffb506dfc1a6b1a417afb96eb94325363 +async_tx 77cd62e8082b9743b59ee1946a4c3ee2e3cd2bce +udf 5c89468c12899b84886cb47eec93f0c88e0f896a +net 4480f15b3306f43bbb0310d461142b4e897ca45b +mtd 6028aa01f759a1dae11e5d0e495b3dc9d2b0a47b +wireless ad788b5e079484aa1d48aa90a3ebd7d954d2e7db +crypto 4c61f406471d6de3a6963c90ab4953f8f1daf9a6 +vfs 33e3239775fdd1ab95a5dc40dda9c8332a8acf01 +sound 4f3a6e19bbc0dde15b900b90bbb1a7447820a122 +cpufreq 4f6e6b9f97b0ce98a8d1da65adbaf743bd0486a9 +v9fs abbdcfca9b72500e310d3485988300907ff222b1 +rr 656e026c14dea833b3494434be42222b601280d3 +cifs 469ee614aaa367d9cde01cbdd2027212f56c6cc6 +mmc 6ee6c6adf1cfebbf432b8d1f204c7f96e395933e +gfs2 c59f927e7facd5a911c6bc68e56e3bda8de5d65e +input b8d055a878ee0f997ded40649701089d2486f850 +semaphore b552068999b0b05087c454e525b30b785c79dc9b +semaphore-removal 9ac2f04936e1140d7a28a01b84e086458e191b49 +bkl-removal 46006b35f9e32479181c4ede98980a30ef536a49 +trivial 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 +ubifs be2f6bd62d0d4246a9227dacbe2469e1f0eccf26 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 652dfc4ae741aa7268b16433c90293d59fff69d7 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 0105f18683fde1df6ef69e7812582a52701e8a54 +pcmcia a45b3fb19ba1e4dfc3fc53563a072612092930a9 +battery 8aef7e8f8de2d900da892085edbf14ea35fe6881 +leds bfd34c4804433451929ca59db8b48456da9a899f +backlight e488bf8c4089681d5b905a9ef5c3409e697d7285 +kgdb 39465d79f822869f8969ab12aa97a9b20178dde3 +slab da80c74496079d89f24a1a02b5fffc507bb2f681 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 97ce0a7f9caf9d715cee815a016ee21575f71c95 +kmemcheck fb46cf6fb9dbf4cf58e4fd6939b77de1c39d40d2 +generic-ipi 85ba94ba0592296053f7f2846812173424afe1cb +mfd 6ef091dced2752d93f9a57c83fbd248b31d4382d +hdlc 2be365f597591ca097ff36ce031cc9f79d9ec1e0 +drm b379ef538c692692a6dd2c60d27e738b06a162b3 +voltage 02bdc62abff3fe77bc57372196efb58216a9b248 +security-testing 0da939b0058742ad2d8580b7db6b966d0fc72252 +lblnet 7591103c08abade60aeddb432ed0686ddd0de1c6 +ttydev dce1236e68e96a4649263d51b7a35aba47580480 +agp a64d2b37c2259e169759c1701ac565f0a11dc0ea +creds ce9a1ed09a293fac3bee3fdb7d5412ca17bc4da9 +oprofile c8145f94f83b98ed42241f6a8b91763e7a6aebaa +fastboot 4bca8a4b21ae2a9cac26b9027d5b5db682e624e2 +sparseirq 278429cff8809958d25415ba0ed32b59866ab1a8 +iommu 4480f15b3306f43bbb0310d461142b4e897ca45b +uwb 8092d7c9789581eea478c40d615a2632c3af17bb +watchdog 821c9a396f7b833cd8b86cc6683a947a113c16d7 +proc 7872d35671c5b6c3f57433c092dee2ea6b057268 +scsi-post-merge 04ab591808565f968d4406f6435090ad671ebdab +bdev a390554d92a96e91c0fc568902d87afd13d4e49a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..339bc2088a64 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,124 @@ +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 +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +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 +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-2.6.26 +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k quilt http://www.kernel.org/pub/linux/kernel/people/geert/linux-m68k-patches-2.6/ +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-x86-next +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-timers-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#stable +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/~dedekind/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/test.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next +ubifs git git://git.infradead.org/~dedekind/ubifs-2.6.git#linux-next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-linus +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +creds git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next-creds-subsys +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next +fastboot git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next +sparseirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-iommu-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +proc git git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git#proc +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev-next.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..fa64e1f22077 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4619 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 04ab591 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus +Merging origin/master +$ git merge origin/master +Updating 04ab591..73b4a24 +Fast forward + Documentation/00-INDEX | 3 + + Documentation/ABI/testing/sysfs-profiling | 13 + + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/procfs-guide.tmpl | 29 +- + Documentation/DocBook/procfs_example.c | 20 +- + Documentation/DocBook/videobook.tmpl | 1654 ----------- + Documentation/HOWTO | 4 +- + Documentation/SAK.txt | 2 +- + Documentation/SubmitChecklist | 3 + + Documentation/SubmittingDrivers | 2 +- + Documentation/SubmittingPatches | 11 +- + Documentation/block/data-integrity.txt | 4 +- + Documentation/cris/README | 2 +- + Documentation/development-process/1.Intro | 274 ++ + Documentation/development-process/2.Process | 459 ++++ + Documentation/development-process/3.Early-stage | 195 ++ + Documentation/development-process/4.Coding | 384 +++ + Documentation/development-process/5.Posting | 278 ++ + Documentation/development-process/6.Followthrough | 202 ++ + Documentation/development-process/7.AdvancedTopics | 173 ++ + Documentation/development-process/8.Conclusion | 74 + + Documentation/dontdiff | 59 +- + Documentation/fb/intelfb.txt | 1 + + Documentation/fb/uvesafb.txt | 4 +- + Documentation/fb/viafb.modes | 870 ++++++ + Documentation/fb/viafb.txt | 214 ++ + Documentation/feature-removal-schedule.txt | 9 + + .../filesystems/autofs4-mount-control.txt | 393 +++ + Documentation/filesystems/ext3.txt | 3 +- + Documentation/filesystems/nfsroot.txt | 2 +- + Documentation/filesystems/proc.txt | 12 + + .../filesystems/ramfs-rootfs-initramfs.txt | 2 +- + Documentation/gpio.txt | 9 +- + Documentation/ia64/kvm.txt | 9 +- + Documentation/kernel-parameters.txt | 6 + + Documentation/kobject.txt | 4 + + Documentation/networking/cs89x0.txt | 4 +- + Documentation/networking/phonet.txt | 4 +- + Documentation/networking/vortex.txt | 9 +- + Documentation/power/s2ram.txt | 18 + + Documentation/scsi/ChangeLog.megaraid | 6 +- + Documentation/spi/pxa2xx | 34 +- + Documentation/w1/00-INDEX | 2 + + Documentation/w1/masters/ds2490 | 52 + + Documentation/w1/slaves/00-INDEX | 4 + + Documentation/w1/slaves/w1_therm | 41 + + Documentation/w1/w1.generic | 11 +- + MAINTAINERS | 24 +- + arch/Kconfig | 18 +- + arch/alpha/Kconfig | 3 +- + arch/alpha/include/asm/a.out.h | 2 +- + arch/alpha/include/asm/elf.h | 4 +- + arch/alpha/kernel/pci_iommu.c | 17 +- + arch/alpha/kernel/smp.c | 1 + + arch/arm/Makefile | 3 +- + arch/arm/configs/omap3_beagle_defconfig | 1321 +++++++++ + arch/arm/configs/omap_ldp_defconfig | 1044 +++++++ + arch/arm/configs/overo_defconfig | 1885 +++++++++++++ + arch/arm/include/asm/elf.h | 2 +- + arch/arm/mach-integrator/cpu.c | 1 - + arch/arm/mach-omap1/clock.c | 10 +- + arch/arm/mach-omap1/clock.h | 6 +- + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/mcbsp.c | 45 +- + arch/arm/mach-omap1/serial.c | 12 +- + arch/arm/mach-omap2/Kconfig | 22 +- + arch/arm/mach-omap2/Makefile | 12 +- + arch/arm/mach-omap2/board-ldp.c | 86 + + arch/arm/mach-omap2/board-omap3beagle.c | 244 ++ + arch/arm/mach-omap2/board-overo.c | 242 ++ + arch/arm/mach-omap2/clock.c | 64 +- + arch/arm/mach-omap2/clock.h | 2 + + arch/arm/mach-omap2/clock24xx.h | 238 ++- + arch/arm/mach-omap2/clock34xx.c | 31 +- + arch/arm/mach-omap2/clock34xx.h | 248 ++- + arch/arm/mach-omap2/clockdomain.c | 623 +++++ + arch/arm/mach-omap2/clockdomains.h | 305 +++ + arch/arm/mach-omap2/cm-regbits-24xx.h | 24 +- + arch/arm/mach-omap2/cm-regbits-34xx.h | 42 +- + arch/arm/mach-omap2/cm.h | 2 +- + arch/arm/mach-omap2/devices.c | 225 ++- + arch/arm/mach-omap2/gpmc.c | 88 +- + arch/arm/mach-omap2/id.c | 39 +- + arch/arm/mach-omap2/io.c | 152 +- + arch/arm/mach-omap2/irq.c | 81 +- + arch/arm/mach-omap2/mcbsp.c | 151 +- + arch/arm/mach-omap2/memory.c | 14 + + arch/arm/mach-omap2/memory.h | 7 + + arch/arm/mach-omap2/mux.c | 245 ++- + arch/arm/mach-omap2/powerdomain.c | 1113 ++++++++ + arch/arm/mach-omap2/powerdomains.h | 187 ++ + arch/arm/mach-omap2/powerdomains24xx.h | 200 ++ + arch/arm/mach-omap2/powerdomains34xx.h | 327 +++ + arch/arm/mach-omap2/prcm-common.h | 3 +- + arch/arm/mach-omap2/prm-regbits-24xx.h | 12 +- + arch/arm/mach-omap2/prm-regbits-34xx.h | 11 +- + arch/arm/mach-omap2/prm.h | 5 +- + arch/arm/mach-omap2/serial.c | 116 +- + arch/arm/mach-omap2/{sleep.S => sleep24xx.S} | 32 +- + arch/arm/mach-omap2/sram34xx.S | 179 ++ + arch/arm/mach-pxa/cm-x270.c | 2 +- + arch/arm/mach-pxa/cpufreq-pxa2xx.c | 3 - + arch/arm/mach-pxa/cpufreq-pxa3xx.c | 1 - + arch/arm/mach-pxa/viper.c | 54 +- + arch/arm/mach-s3c2410/bast-irq.c | 2 +- + arch/arm/mach-s3c2410/clock.c | 8 +- + arch/arm/mach-s3c2410/dma.c | 6 +- + arch/arm/mach-s3c2410/include/mach/debug-macro.S | 4 +- + arch/arm/mach-s3c2410/include/mach/map.h | 2 +- + arch/arm/mach-s3c2410/include/mach/spi.h | 1 + + arch/arm/mach-s3c2410/include/mach/uncompress.h | 2 +- + arch/arm/mach-s3c2410/irq.c | 4 +- + arch/arm/mach-s3c2410/mach-amlm5900.c | 6 +- + arch/arm/mach-s3c2410/mach-bast.c | 8 +- + arch/arm/mach-s3c2410/mach-h1940.c | 10 +- + arch/arm/mach-s3c2410/mach-n30.c | 10 +- + arch/arm/mach-s3c2410/mach-otom.c | 10 +- + arch/arm/mach-s3c2410/mach-qt2410.c | 10 +- + arch/arm/mach-s3c2410/mach-smdk2410.c | 8 +- + arch/arm/mach-s3c2410/mach-tct_hammer.c | 6 +- + arch/arm/mach-s3c2410/mach-vr1000.c | 8 +- + arch/arm/mach-s3c2410/pm.c | 4 +- + arch/arm/mach-s3c2410/s3c2410.c | 10 +- + arch/arm/mach-s3c2410/sleep.S | 2 +- + arch/arm/mach-s3c2410/usb-simtec.c | 2 +- + arch/arm/mach-s3c2412/clock.c | 8 +- + arch/arm/mach-s3c2412/dma.c | 6 +- + arch/arm/mach-s3c2412/irq.c | 6 +- + arch/arm/mach-s3c2412/mach-jive.c | 10 +- + arch/arm/mach-s3c2412/mach-smdk2413.c | 14 +- + arch/arm/mach-s3c2412/mach-vstms.c | 12 +- + arch/arm/mach-s3c2412/pm.c | 6 +- + arch/arm/mach-s3c2412/s3c2412.c | 12 +- + arch/arm/mach-s3c2440/clock.c | 4 +- + arch/arm/mach-s3c2440/dma.c | 6 +- + arch/arm/mach-s3c2440/dsc.c | 4 +- + arch/arm/mach-s3c2440/irq.c | 6 +- + arch/arm/mach-s3c2440/mach-anubis.c | 8 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 8 +- + arch/arm/mach-s3c2440/mach-nexcoder.c | 12 +- + arch/arm/mach-s3c2440/mach-osiris.c | 8 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 10 +- + arch/arm/mach-s3c2440/mach-smdk2440.c | 14 +- + arch/arm/mach-s3c2440/s3c2440.c | 6 +- + arch/arm/mach-s3c2442/clock.c | 4 +- + arch/arm/mach-s3c2442/s3c2442.c | 4 +- + arch/arm/mach-s3c2443/clock.c | 6 +- + arch/arm/mach-s3c2443/dma.c | 6 +- + arch/arm/mach-s3c2443/irq.c | 6 +- + arch/arm/mach-s3c2443/mach-smdk2443.c | 14 +- + arch/arm/mach-s3c2443/s3c2443.c | 6 +- + arch/arm/mach-sa1100/cpu-sa1100.c | 1 - + arch/arm/mm/Kconfig | 2 +- + arch/arm/plat-omap/Kconfig | 33 +- + arch/arm/plat-omap/Makefile | 2 +- + arch/arm/plat-omap/common.c | 40 +- + arch/arm/plat-omap/devices.c | 22 +- + arch/arm/plat-omap/dma.c | 8 +- + arch/arm/plat-omap/dmtimer.c | 2 +- + arch/arm/plat-omap/gpio.c | 70 +- + arch/arm/plat-omap/include/mach/board-2430sdp.h | 6 +- + arch/arm/plat-omap/include/mach/board-apollon.h | 6 + + arch/arm/plat-omap/include/mach/board-h4.h | 5 +- + arch/arm/plat-omap/include/mach/board-ldp.h | 36 + + .../arm/plat-omap/include/mach/board-omap3beagle.h | 33 + + arch/arm/plat-omap/include/mach/board-overo.h | 26 + + arch/arm/plat-omap/include/mach/board.h | 2 + + arch/arm/plat-omap/include/mach/clock.h | 3 + + arch/arm/plat-omap/include/mach/clockdomain.h | 106 + + arch/arm/plat-omap/include/mach/common.h | 3 + + arch/arm/plat-omap/include/mach/control.h | 23 +- + arch/arm/plat-omap/include/mach/cpu.h | 5 + + arch/arm/plat-omap/include/mach/debug-macro.S | 12 + + arch/arm/plat-omap/include/mach/entry-macro.S | 12 +- + arch/arm/plat-omap/include/mach/fpga.h | 12 +- + arch/arm/plat-omap/include/mach/gpio.h | 4 +- + arch/arm/plat-omap/include/mach/gpmc.h | 12 + + arch/arm/plat-omap/include/mach/hardware.h | 12 +- + arch/arm/plat-omap/include/mach/io.h | 59 +- + arch/arm/plat-omap/include/mach/irqs.h | 59 + + arch/arm/plat-omap/include/mach/mcbsp.h | 44 +- + arch/arm/plat-omap/include/mach/memory.h | 2 +- + arch/arm/plat-omap/include/mach/mux.h | 180 ++- + arch/arm/plat-omap/include/mach/omap1510.h | 2 + + arch/arm/plat-omap/include/mach/omap16xx.h | 7 +- + arch/arm/plat-omap/include/mach/omap24xx.h | 2 +- + arch/arm/plat-omap/include/mach/omapfb.h | 3 + + arch/arm/plat-omap/include/mach/pm.h | 7 +- + arch/arm/plat-omap/include/mach/powerdomain.h | 166 ++ + arch/arm/plat-omap/include/mach/sdrc.h | 8 +- + arch/arm/plat-omap/include/mach/serial.h | 18 +- + arch/arm/plat-omap/include/mach/sram.h | 10 + + arch/arm/plat-omap/include/mach/system.h | 2 +- + arch/arm/plat-omap/io.c | 107 + + arch/arm/plat-omap/mcbsp.c | 431 ++-- + arch/arm/plat-omap/sram.c | 53 +- + arch/arm/plat-s3c/Makefile | 3 + + .../arm/plat-s3c/include/plat}/debug-macro.S | 2 +- + .../arm/plat-s3c/include/plat}/map.h | 0 + .../arm/plat-s3c/include/plat}/regs-adc.h | 0 + .../arm/plat-s3c/include/plat}/regs-serial.h | 0 + .../arm/plat-s3c/include/plat}/regs-timer.h | 0 + .../arm/plat-s3c/include/plat}/uncompress.h | 2 +- + arch/arm/plat-s3c24xx/clock.c | 4 +- + arch/arm/plat-s3c24xx/common-smdk.c | 6 +- + arch/arm/plat-s3c24xx/cpu.c | 20 +- + arch/arm/plat-s3c24xx/devs.c | 6 +- + arch/arm/plat-s3c24xx/dma.c | 2 +- + .../arm/plat-s3c24xx/include/plat}/clock.h | 0 + .../arm/plat-s3c24xx/include/plat}/common-smdk.h | 0 + .../arm/plat-s3c24xx/include/plat}/cpu.h | 0 + .../arm/plat-s3c24xx/include/plat}/devs.h | 0 + .../arm/plat-s3c24xx/include/plat}/dma.h | 0 + .../arm/plat-s3c24xx/include/plat}/irq.h | 0 + .../arm/plat-s3c24xx/include/plat}/pm.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2400.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2410.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2412.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2440.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2442.h | 0 + .../arm/plat-s3c24xx/include/plat}/s3c2443.h | 0 + arch/arm/plat-s3c24xx/irq.c | 6 +- + arch/arm/plat-s3c24xx/pm-simtec.c | 2 +- + arch/arm/plat-s3c24xx/pm.c | 4 +- + arch/arm/plat-s3c24xx/pwm-clock.c | 6 +- + arch/arm/plat-s3c24xx/pwm.c | 4 +- + arch/arm/plat-s3c24xx/s3c244x-clock.c | 4 +- + arch/arm/plat-s3c24xx/s3c244x-irq.c | 6 +- + arch/arm/plat-s3c24xx/s3c244x.c | 14 +- + arch/arm/plat-s3c24xx/sleep.S | 2 +- + arch/arm/plat-s3c24xx/time.c | 6 +- + arch/avr32/include/asm/elf.h | 2 +- + arch/avr32/mach-at32ap/cpufreq.c | 1 - + arch/blackfin/configs/BF526-EZBRD_defconfig | 2 +- + arch/blackfin/configs/BF527-EZKIT_defconfig | 2 +- + arch/blackfin/configs/BF533-EZKIT_defconfig | 4 +- + arch/blackfin/configs/BF533-STAMP_defconfig | 2 +- + arch/blackfin/configs/BF537-STAMP_defconfig | 4 +- + arch/blackfin/configs/BF548-EZKIT_defconfig | 4 +- + arch/blackfin/configs/BF561-EZKIT_defconfig | 4 +- + arch/blackfin/configs/CM-BF527_defconfig | 2 +- + arch/blackfin/configs/CM-BF533_defconfig | 2 +- + arch/blackfin/configs/CM-BF537E_defconfig | 2 +- + arch/blackfin/configs/CM-BF537U_defconfig | 2 +- + arch/blackfin/configs/CM-BF548_defconfig | 4 +- + arch/blackfin/configs/CM-BF561_defconfig | 2 +- + arch/blackfin/include/asm/cacheflush.h | 27 +- + arch/blackfin/include/asm/cplbinit.h | 17 - + arch/blackfin/include/asm/elf.h | 2 +- + arch/blackfin/include/asm/io.h | 30 + + arch/blackfin/include/asm/timex.h | 2 +- + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 5 +- + arch/blackfin/kernel/cplb-nompu/cplbinit.c | 1 + + arch/blackfin/mach-bf527/head.S | 2 +- + arch/blackfin/mach-bf533/head.S | 2 +- + .../mach-bf533/include/mach/bfin_serial_5xx.h | 2 +- + arch/blackfin/mach-bf537/boards/stamp.c | 25 +- + arch/blackfin/mach-bf537/head.S | 2 +- + arch/blackfin/mach-bf548/head.S | 2 +- + arch/blackfin/mach-bf561/head.S | 2 +- + .../mach-bf561/include/mach/bfin_serial_5xx.h | 2 +- + arch/blackfin/mach-common/cache.S | 173 +- + arch/blackfin/mach-common/cpufreq.c | 2 - + arch/blackfin/mach-common/head.S | 54 + + arch/cris/arch-v32/mach-a3/cpufreq.c | 1 - + arch/cris/arch-v32/mach-fs/cpufreq.c | 1 - + arch/frv/kernel/pm.c | 6 +- + arch/h8300/Kconfig | 4 + + arch/h8300/Kconfig.cpu | 115 +- + arch/h8300/include/asm/bug.h | 4 + + arch/h8300/include/asm/elf.h | 2 +- + arch/h8300/include/asm/io.h | 34 + + arch/h8300/include/asm/md.h | 2 +- + arch/h8300/include/asm/system.h | 2 + + arch/h8300/kernel/Makefile | 2 +- + arch/h8300/kernel/module.c | 3 +- + arch/h8300/kernel/time.c | 29 +- + arch/h8300/kernel/timer/Makefile | 6 + + arch/h8300/kernel/timer/itu.c | 83 + + arch/h8300/kernel/timer/timer16.c | 78 + + arch/h8300/kernel/timer/timer8.c | 103 + + arch/h8300/kernel/timer/tpu.c | 102 + + arch/h8300/kernel/traps.c | 17 +- + arch/h8300/mm/fault.c | 5 +- + arch/h8300/platform/h8300h/aki3068net/Makefile | 1 - + arch/h8300/platform/h8300h/aki3068net/timer.c | 51 - + arch/h8300/platform/h8300h/generic/Makefile | 1 - + arch/h8300/platform/h8300h/generic/timer.c | 95 - + arch/h8300/platform/h8300h/h8max/Makefile | 1 - + arch/h8300/platform/h8300h/h8max/timer.c | 52 - + arch/h8300/platform/h8s/edosk2674/Makefile | 1 - + arch/h8300/platform/h8s/edosk2674/timer.c | 54 - + arch/h8300/platform/h8s/generic/Makefile | 1 - + arch/h8300/platform/h8s/generic/timer.c | 53 - + arch/ia64/Kconfig | 8 - + arch/ia64/ia32/binfmt_elf32.c | 2 +- + arch/ia64/ia32/ia32_entry.S | 4 +- + arch/ia64/ia32/ia32priv.h | 4 +- + arch/ia64/ia32/sys_ia32.c | 91 - + arch/ia64/include/asm/elf.h | 2 +- + arch/m32r/kernel/process.c | 2 +- + arch/m68knommu/include/asm/elf.h | 2 +- + arch/mips/include/asm/elf.h | 10 +- + arch/mips/kernel/linux32.c | 101 - + arch/mips/kernel/rtlx.c | 4 +- + arch/mips/kernel/scall64-n32.S | 4 +- + arch/mips/kernel/scall64-o32.S | 4 +- + arch/mips/lasat/sysctl.c | 17 +- + arch/mips/sibyte/common/sb_tbprof.c | 3 +- + arch/parisc/kernel/binfmt_elf32.c | 2 +- + arch/parisc/kernel/sys_parisc32.c | 105 - + arch/parisc/kernel/syscall_table.S | 4 +- + arch/powerpc/include/asm/elf.h | 4 +- + arch/powerpc/kernel/iommu.c | 23 +- + arch/powerpc/kernel/sys_ppc32.c | 99 - + arch/s390/include/asm/elf.h | 8 +- + arch/s390/kernel/compat_linux.c | 102 - + arch/s390/kernel/compat_linux.h | 4 - + arch/s390/kernel/compat_wrapper.S | 12 +- + arch/s390/kernel/syscalls.S | 4 +- + arch/sh/include/asm/elf.h | 2 +- + arch/sparc/include/asm/elf_32.h | 2 +- + arch/sparc/include/asm/elf_64.h | 6 +- + arch/sparc64/kernel/iommu.c | 7 +- + arch/sparc64/kernel/iommu_common.h | 14 +- + arch/sparc64/kernel/pci_sun4v.c | 7 +- + arch/sparc64/kernel/sys_sparc32.c | 97 - + arch/sparc64/kernel/systbls.S | 4 +- + arch/sparc64/kernel/us3_cpufreq.c | 1 - + arch/um/kernel/exec.c | 12 - + arch/um/os-Linux/Makefile | 3 - + arch/um/os-Linux/tty_log.c | 217 -- + arch/x86/Kconfig | 23 +- + arch/x86/boot/video-vesa.c | 9 +- + arch/x86/ia32/ia32entry.S | 4 +- + arch/x86/ia32/sys_ia32.c | 99 - + arch/x86/kernel/amd_iommu.c | 9 +- + arch/x86/kernel/cpuid.c | 4 +- + arch/x86/kernel/dumpstack_32.c | 2 + + arch/x86/kernel/dumpstack_64.c | 2 + + arch/x86/kernel/msr.c | 4 +- + arch/x86/kernel/pci-calgary_64.c | 18 +- + arch/x86/kernel/pci-dma.c | 4 +- + arch/x86/kernel/pci-gart_64.c | 8 +- + arch/x86/kernel/smpboot.c | 14 +- + arch/x86/kvm/x86.c | 2 +- + block/bsg.c | 3 +- + drivers/base/Kconfig | 2 +- + drivers/base/bus.c | 54 +- + drivers/base/core.c | 30 +- + drivers/base/dd.c | 3 + + drivers/base/firmware_class.c | 24 +- + drivers/base/platform.c | 80 +- + drivers/base/power/main.c | 9 +- + drivers/block/aoe/aoechr.c | 6 +- + drivers/block/paride/pg.c | 5 +- + drivers/block/paride/pt.c | 10 +- + drivers/block/pktcdvd.c | 5 +- + drivers/char/Kconfig | 9 - + drivers/char/agp/amd-k7-agp.c | 38 +- + drivers/char/agp/intel-agp.c | 18 +- + drivers/char/agp/nvidia-agp.c | 22 +- + drivers/char/applicom.c | 2 +- + drivers/char/bsr.c | 5 +- + drivers/char/ds1286.c | 4 +- + drivers/char/dsp56k.c | 4 +- + drivers/char/hw_random/omap-rng.c | 33 +- + drivers/char/ip2/ip2main.c | 12 +- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/istallion.c | 5 +- + drivers/char/keyboard.c | 2 +- + drivers/char/lp.c | 4 +- + drivers/char/mem.c | 6 +- + drivers/char/misc.c | 4 +- + drivers/char/moxa.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 3 +- + drivers/char/ppdev.c | 5 +- + drivers/char/random.c | 2 +- + drivers/char/raw.c | 7 +- + drivers/char/rtc.c | 2 +- + drivers/char/snsc.c | 4 +- + drivers/char/stallion.c | 4 +- + drivers/char/sysrq.c | 31 + + drivers/char/tpm/tpm.c | 36 +- + drivers/char/tty_io.c | 2 +- + drivers/char/vc_screen.c | 12 +- + drivers/char/viotape.c | 8 +- + drivers/char/vt.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 3 +- + drivers/dca/dca-sysfs.c | 8 +- + drivers/edac/i5000_edac.c | 196 +- + drivers/edac/i82443bxgx_edac.c | 63 +- + drivers/edac/mpc85xx_edac.c | 33 +- + drivers/firmware/iscsi_ibft.c | 18 +- + drivers/gpio/gpiolib.c | 111 +- + drivers/gpio/max7301.c | 24 +- + drivers/gpio/max732x.c | 5 +- + drivers/gpio/mcp23s08.c | 5 +- + drivers/gpio/pca953x.c | 5 +- + drivers/gpio/pcf857x.c | 5 +- + drivers/gpu/drm/i915/i915_dma.c | 4 +- + drivers/hid/Kconfig | 122 +- + drivers/hid/hid-core.c | 2 + + drivers/hid/hid-ids.h | 2 + + drivers/hid/hidraw.c | 5 +- + drivers/hwmon/hwmon.c | 4 +- + drivers/i2c/busses/i2c-omap.c | 12 +- + drivers/i2c/i2c-dev.c | 6 +- + drivers/ide/Kconfig | 2 +- + drivers/ide/ide-probe.c | 4 +- + drivers/ide/ide-tape.c | 11 +- + drivers/ieee1394/dv1394.c | 8 +- + drivers/ieee1394/raw1394.c | 8 +- + drivers/ieee1394/video1394.c | 5 +- + drivers/infiniband/core/cm.c | 6 +- + drivers/infiniband/core/user_mad.c | 12 +- + drivers/infiniband/core/uverbs_main.c | 9 +- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- + drivers/input/gameport/gameport.c | 88 +- + drivers/input/joystick/a3d.c | 3 +- + drivers/input/joystick/adi.c | 3 +- + drivers/input/joystick/analog.c | 4 +- + drivers/input/joystick/cobra.c | 3 +- + drivers/input/joystick/gf2k.c | 3 +- + drivers/input/joystick/grip.c | 3 +- + drivers/input/joystick/grip_mp.c | 3 +- + drivers/input/joystick/guillemot.c | 3 +- + drivers/input/joystick/interact.c | 3 +- + drivers/input/joystick/joydump.c | 3 +- + drivers/input/joystick/sidewinder.c | 3 +- + drivers/input/joystick/tmdc.c | 3 +- + drivers/input/joystick/xpad.c | 4 +- + drivers/input/keyboard/atkbd.c | 30 +- + drivers/input/keyboard/bf54x-keys.c | 13 +- + drivers/input/keyboard/gpio_keys.c | 42 +- + drivers/input/keyboard/omap-keypad.c | 29 +- + drivers/input/misc/Kconfig | 13 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ati_remote2.c | 263 ++- + drivers/input/misc/cm109.c | 882 ++++++ + drivers/input/misc/wistron_btns.c | 19 + + drivers/input/misc/yealink.c | 2 +- + drivers/input/mouse/Kconfig | 10 + + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/alps.c | 1 + + drivers/input/mouse/appletouch.c | 299 ++- + drivers/input/mouse/hgpk.c | 477 ++++ + drivers/input/mouse/hgpk.h | 49 + + drivers/input/mouse/logips2pp.c | 4 +- + drivers/input/mouse/psmouse-base.c | 81 +- + drivers/input/mouse/psmouse.h | 14 +- + drivers/input/mouse/trackpoint.c | 8 +- + drivers/input/serio/i8042-x86ia64io.h | 7 + + drivers/input/serio/serio_raw.c | 6 + + drivers/input/tablet/aiptek.c | 53 +- + drivers/input/touchscreen/ads7846.c | 94 +- + drivers/input/touchscreen/atmel_tsadcc.c | 37 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 5 +- + drivers/input/touchscreen/wm9705.c | 5 +- + drivers/input/touchscreen/wm9712.c | 5 +- + drivers/input/touchscreen/wm9713.c | 5 +- + drivers/input/touchscreen/wm97xx-core.c | 5 +- + drivers/isdn/capi/capi.c | 3 +- + drivers/leds/led-class.c | 4 +- + drivers/macintosh/adb.c | 3 +- + drivers/md/faulty.c | 2 + + drivers/md/linear.c | 133 +- + drivers/md/md.c | 81 +- + drivers/md/multipath.c | 9 - + drivers/md/raid0.c | 5 - + drivers/md/raid1.c | 1 + + drivers/md/raid10.c | 6 +- + drivers/md/raid5.c | 42 +- + drivers/md/raid6.h | 9 - + drivers/media/dvb/dvb-core/dvbdev.c | 2 +- + drivers/media/video/cpia.c | 4 - + drivers/media/video/usbvision/usbvision-core.c | 4 - + drivers/media/video/usbvision/usbvision-video.c | 4 - + drivers/media/video/v4l1-compat.c | 4 - + drivers/media/video/v4l2-common.c | 4 - + drivers/media/video/vino.c | 5 +- + drivers/media/video/w9968cf.c | 4 +- + drivers/message/i2o/Makefile | 2 +- + drivers/message/i2o/device.c | 2 +- + drivers/message/i2o/exec-osm.c | 4 +- + drivers/message/i2o/i2o_config.c | 31 +- + drivers/message/i2o/iop.c | 2 +- + drivers/message/i2o/memory.c | 313 +++ + drivers/message/i2o/pci.c | 16 +- + drivers/misc/Kconfig | 3 +- + drivers/misc/hp-wmi.c | 2 +- + drivers/misc/phantom.c | 6 +- + drivers/misc/sgi-gru/gru.h | 4 +- + drivers/misc/sgi-gru/gru_instructions.h | 10 +- + drivers/misc/sgi-gru/grufault.c | 11 +- + drivers/misc/sgi-gru/grufile.c | 8 +- + drivers/misc/sgi-gru/gruhandles.h | 5 - + drivers/misc/sgi-gru/grukservices.c | 3 +- + drivers/misc/sgi-gru/grumain.c | 29 +- + drivers/mmc/host/omap.c | 11 +- + drivers/mtd/mtdchar.c | 10 +- + drivers/mtd/mtdpart.c | 2 - + drivers/mtd/nand/ams-delta.c | 4 +- + drivers/net/3c509.c | 2 +- + drivers/net/cs89x0.c | 13 +- + drivers/net/irda/sir_dongle.c | 2 - + drivers/net/phy/phy_device.c | 8 +- + drivers/net/ppp_generic.c | 14 +- + drivers/net/pppox.c | 9 +- + drivers/net/wan/cosa.c | 4 +- + drivers/net/wireless/ath9k/main.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 +- + drivers/net/wireless/libertas/cmd.c | 2 + + drivers/net/wireless/mac80211_hwsim.c | 6 +- + drivers/net/wireless/orinoco_cs.c | 5 +- + drivers/net/wireless/p54/p54common.c | 1 - + drivers/net/wireless/p54/p54usb.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 9 +- + drivers/net/wireless/rtl8187_dev.c | 3 + + drivers/net/wireless/spectrum_cs.c | 5 +- + drivers/net/xen-netfront.c | 2 +- + drivers/nubus/nubus.c | 2 +- + drivers/parport/ChangeLog | 2 +- + drivers/parport/ieee1284.c | 2 +- + drivers/parport/probe.c | 2 +- + drivers/parport/share.c | 2 +- + drivers/pci/probe.c | 50 +- + drivers/pcmcia/Makefile | 3 +- + drivers/pnp/base.h | 4 +- + drivers/pnp/core.c | 11 +- + drivers/pnp/driver.c | 1 + + drivers/pnp/interface.c | 37 +- + drivers/pnp/quirks.c | 2 +- + drivers/pnp/resource.c | 4 +- + drivers/power/olpc_battery.c | 20 +- + drivers/power/power_supply_core.c | 4 +- + drivers/rtc/Kconfig | 25 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-at91rm9200.c | 4 +- + drivers/rtc/rtc-dev.c | 12 +- + drivers/rtc/rtc-ds1286.c | 1 + + drivers/rtc/rtc-ds1307.c | 308 ++- + drivers/rtc/rtc-ds1374.c | 21 + + drivers/rtc/rtc-ds1511.c | 13 - + drivers/rtc/rtc-ds1553.c | 12 - + drivers/rtc/rtc-ds1672.c | 114 +- + drivers/rtc/rtc-ds3234.c | 290 ++ + drivers/rtc/rtc-m41t80.c | 43 +- + drivers/rtc/rtc-m48t35.c | 1 + + drivers/rtc/rtc-max6900.c | 223 +-- + drivers/rtc/rtc-pcf8563.c | 58 - + drivers/rtc/rtc-pl030.c | 11 - + drivers/rtc/rtc-pl031.c | 14 - + drivers/rtc/rtc-rs5c372.c | 228 +- + drivers/rtc/rtc-sh.c | 7 - + drivers/rtc/rtc-stk17ta8.c | 12 - + drivers/s390/char/raw3270.c | 14 +- + drivers/s390/char/tape_class.c | 6 +- + drivers/s390/char/vmlogrdr.c | 8 +- + drivers/s390/char/vmur.c | 5 +- + drivers/s390/net/ctcm_mpc.c | 2 +- + drivers/scsi/ch.c | 6 +- + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/osst.c | 3 +- + drivers/scsi/sg.c | 10 +- + drivers/scsi/st.c | 11 +- + drivers/serial/8250.c | 23 +- + drivers/serial/s3c2400.c | 2 +- + drivers/serial/s3c2410.c | 2 +- + drivers/serial/s3c2412.c | 2 +- + drivers/serial/s3c2440.c | 2 +- + drivers/serial/samsung.c | 2 +- + drivers/spi/mpc52xx_psc_spi.c | 55 - + drivers/spi/omap2_mcspi.c | 18 +- + drivers/spi/omap_uwire.c | 23 +- + drivers/spi/orion_spi.c | 5 + + drivers/spi/pxa2xx_spi.c | 54 +- + drivers/spi/spi.c | 24 +- + drivers/spi/spi_s3c24xx.c | 6 + + drivers/spi/spidev.c | 7 +- + drivers/telephony/ixj.c | 2 - + drivers/uio/Kconfig | 13 + + drivers/uio/Makefile | 1 + + drivers/uio/uio.c | 26 +- + drivers/uio/uio_pdrv.c | 2 +- + drivers/uio/uio_sercos3.c | 243 ++ + drivers/usb/core/devio.c | 6 +- + drivers/usb/core/file.c | 6 +- + drivers/usb/core/hcd.c | 5 +- + drivers/usb/gadget/Makefile | 23 +- + drivers/usb/gadget/cdc2.c | 25 +- + drivers/usb/gadget/ether.c | 28 +- + drivers/usb/gadget/f_ecm.c | 108 +- + drivers/usb/gadget/f_loopback.c | 34 +- + drivers/usb/gadget/f_subset.c | 44 +- + drivers/usb/gadget/file_storage.c | 12 + + drivers/usb/gadget/gmidi.c | 15 + + drivers/usb/gadget/printer.c | 18 +- + drivers/usb/gadget/rndis.c | 115 +- + drivers/usb/gadget/serial.c | 18 + + drivers/usb/gadget/u_ether.c | 4 +- + drivers/usb/gadget/zero.c | 17 + + drivers/usb/host/ohci-omap.c | 14 +- + drivers/usb/host/uhci-q.c | 24 +- + drivers/usb/misc/phidgetkit.c | 5 +- + drivers/usb/misc/phidgetmotorcontrol.c | 5 +- + drivers/usb/misc/phidgetservo.c | 5 +- + drivers/usb/mon/mon_bin.c | 6 +- + drivers/video/Kconfig | 109 +- + drivers/video/Makefile | 3 +- + drivers/video/atmel_lcdfb.c | 7 + + drivers/video/aty/radeon_accel.c | 313 ++- + drivers/video/aty/radeon_backlight.c | 2 +- + drivers/video/aty/radeon_base.c | 35 +- + drivers/video/aty/radeon_i2c.c | 4 - + drivers/video/aty/radeon_pm.c | 6 +- + drivers/video/aty/radeonfb.h | 53 +- + drivers/video/carminefb.c | 2 +- + drivers/video/cirrusfb.c | 581 ++--- + drivers/video/console/fbcon.c | 8 +- + drivers/video/console/vgacon.c | 39 +- + drivers/video/display/display-sysfs.c | 9 +- + drivers/video/efifb.c | 191 ++- + drivers/video/fbmem.c | 22 +- + drivers/video/fbmon.c | 8 +- + drivers/video/imacfb.c | 376 --- + drivers/video/intelfb/intelfb.h | 7 +- + drivers/video/intelfb/intelfb_i2c.c | 1 + + drivers/video/intelfb/intelfbdrv.c | 7 +- + drivers/video/intelfb/intelfbhw.c | 7 + + drivers/video/matrox/matroxfb_base.c | 9 + + drivers/video/neofb.c | 60 +- + drivers/video/omap/dispc.c | 21 +- + drivers/video/omap/dispc.h | 2 + + drivers/video/omap/lcd_h4.c | 4 +- + drivers/video/omap/lcd_inn1610.c | 22 +- + drivers/video/omap/lcd_osk.c | 10 +- + drivers/video/omap/lcd_sx1.c | 99 +- + drivers/video/omap/lcdc.c | 2 + + drivers/video/omap/lcdc.h | 2 + + drivers/video/omap/omapfb_main.c | 15 +- + drivers/video/omap/rfbi.c | 9 +- + drivers/video/omap/sossi.c | 8 +- + drivers/video/s1d13xxxfb.c | 23 +- + drivers/video/tdfxfb.c | 48 +- + drivers/video/tmiofb.c | 1050 +++++++ + drivers/video/uvesafb.c | 11 +- + drivers/video/vga16fb.c | 11 +- + drivers/video/via/Makefile | 7 + + drivers/video/via/accel.c | 279 ++ + drivers/video/via/accel.h | 169 ++ + drivers/video/via/chip.h | 190 ++ + drivers/video/via/debug.h | 41 + + drivers/video/via/dvi.c | 682 +++++ + drivers/video/via/dvi.h | 64 + + drivers/video/via/global.c | 60 + + drivers/video/via/global.h | 90 + + drivers/video/via/hw.c | 2865 ++++++++++++++++++++ + drivers/video/via/hw.h | 933 +++++++ + drivers/video/via/iface.c | 78 + + drivers/video/via/iface.h | 38 + + drivers/video/via/ioctl.c | 112 + + drivers/video/via/ioctl.h | 210 ++ + drivers/video/via/lcd.c | 1821 +++++++++++++ + drivers/video/via/lcd.h | 94 + + drivers/video/via/lcdtbl.h | 591 ++++ + drivers/video/via/share.h | 1105 ++++++++ + drivers/video/via/tbl1636.c | 71 + + drivers/video/via/tbl1636.h | 34 + + drivers/video/via/tblDPASetting.c | 109 + + drivers/video/via/tblDPASetting.h | 47 + + drivers/video/via/via_i2c.c | 177 ++ + drivers/video/via/via_i2c.h | 46 + + drivers/video/via/via_utility.c | 253 ++ + drivers/video/via/via_utility.h | 35 + + drivers/video/via/viafbdev.c | 2571 ++++++++++++++++++ + drivers/video/via/viafbdev.h | 112 + + drivers/video/via/viamode.c | 1086 ++++++++ + drivers/video/via/viamode.h | 177 ++ + drivers/video/via/vt1636.c | 306 +++ + drivers/video/via/vt1636.h | 44 + + drivers/w1/masters/ds1wm.c | 10 +- + drivers/w1/masters/ds2490.c | 346 ++- + drivers/w1/slaves/w1_ds2431.c | 312 +++ + drivers/w1/slaves/w1_therm.c | 72 +- + drivers/w1/w1.c | 423 ++-- + drivers/w1/w1.h | 34 +- + drivers/w1/w1_family.c | 13 +- + drivers/w1/w1_family.h | 3 +- + drivers/w1/w1_int.c | 88 +- + drivers/w1/w1_io.c | 85 +- + fs/Kconfig.binfmt | 2 +- + fs/Makefile | 3 +- + fs/afs/file.c | 4 +- + fs/afs/internal.h | 8 +- + fs/afs/write.c | 131 +- + fs/autofs4/Makefile | 2 +- + fs/autofs4/autofs_i.h | 44 +- + fs/autofs4/dev-ioctl.c | 863 ++++++ + fs/autofs4/expire.c | 18 +- + fs/autofs4/init.c | 11 +- + fs/autofs4/inode.c | 8 +- + fs/autofs4/waitq.c | 42 +- + fs/befs/befs_fs_types.h | 4 + + fs/befs/linuxvfs.c | 4 +- + fs/befs/super.c | 6 +- + fs/binfmt_elf.c | 6 +- + fs/binfmt_elf_fdpic.c | 85 +- + fs/binfmt_em86.c | 2 +- + fs/binfmt_flat.c | 6 +- + fs/binfmt_misc.c | 4 +- + fs/binfmt_script.c | 5 +- + fs/binfmt_som.c | 2 + + fs/char_dev.c | 3 - + fs/coda/psdev.c | 5 +- + fs/compat.c | 41 +- + fs/direct-io.c | 4 +- + fs/dquot.c | 2 - + fs/ecryptfs/Makefile | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 30 +- + fs/ecryptfs/file.c | 17 +- + fs/ecryptfs/keystore.c | 32 +- + fs/ecryptfs/main.c | 19 +- + fs/ecryptfs/messaging.c | 118 +- + fs/ecryptfs/mmap.c | 81 +- + fs/ecryptfs/netlink.c | 249 -- + fs/eventpoll.c | 9 +- + fs/exec.c | 15 +- + fs/ext2/balloc.c | 3 +- + fs/ext2/dir.c | 60 +- + fs/fs-writeback.c | 2 +- + fs/hfs/catalog.c | 4 + + fs/hfsplus/bitmap.c | 12 + + fs/hfsplus/catalog.c | 5 + + fs/hfsplus/super.c | 2 +- + fs/mpage.c | 2 +- + fs/nls/nls_base.c | 21 +- + fs/partitions/acorn.c | 10 - + fs/partitions/check.c | 17 +- + fs/proc/proc_misc.c | 26 - + fs/reiserfs/procfs.c | 3 - + fs/reiserfs/xattr.c | 2 +- + fs/sysfs/bin.c | 42 +- + fs/sysfs/dir.c | 24 +- + fs/sysfs/file.c | 46 +- + fs/sysfs/mount.c | 15 + + fs/sysfs/sysfs.h | 6 +- + include/acpi/acmacros.h | 6 +- + include/acpi/platform/acgcc.h | 2 +- + include/asm-cris/elf.h | 2 +- + include/asm-frv/elf.h | 2 +- + include/asm-generic/bug.h | 2 +- + include/asm-generic/gpio.h | 18 +- + include/asm-generic/vmlinux.lds.h | 10 +- + include/asm-h8300/timer.h | 25 + + include/asm-m32r/elf.h | 2 +- + include/asm-m68k/elf.h | 2 +- + include/asm-mn10300/elf.h | 2 +- + include/asm-parisc/elf.h | 2 +- + include/asm-um/elf-i386.h | 2 +- + include/asm-um/elf-ppc.h | 2 +- + include/asm-um/elf-x86_64.h | 2 +- + include/asm-x86/elf.h | 4 +- + include/asm-x86/es7000/apic.h | 2 +- + include/asm-x86/iommu.h | 2 +- + include/asm-x86/summit/apic.h | 2 +- + include/asm-xtensa/elf.h | 2 +- + include/linux/Kbuild | 1 + + include/linux/aio.h | 9 + + include/linux/auto_dev-ioctl.h | 157 ++ + include/linux/auto_fs4.h | 7 +- + include/linux/binfmts.h | 5 + + include/linux/cgroup.h | 3 +- + include/linux/clk.h | 4 + + include/linux/compat.h | 6 +- + include/linux/device.h | 18 +- + include/linux/dynamic_printk.h | 93 + + include/linux/ext2_fs.h | 2 +- + include/linux/ext3_fs.h | 4 +- + include/linux/ext3_jbd.h | 14 +- + include/linux/gameport.h | 7 +- + include/linux/gpio.h | 3 + + include/linux/i2o.h | 292 +-- + include/linux/icmpv6.h | 6 +- + include/linux/init.h | 4 - + include/linux/input.h | 15 +- + include/linux/iommu-helper.h | 3 + + include/linux/ioport.h | 7 +- + include/linux/jbd.h | 4 +- + include/linux/jbd2.h | 4 +- + include/linux/journal-head.h | 2 +- + include/linux/kallsyms.h | 8 +- + include/linux/kernel.h | 32 +- + include/linux/kmod.h | 3 + + .../input/misc => include/linux}/map_to_7segment.h | 4 +- + include/linux/mfd/tmio.h | 19 + + include/linux/mod_devicetable.h | 2 +- + include/linux/module.h | 1 - + include/linux/mount.h | 2 - + include/linux/netfilter/nfnetlink.h | 3 + + include/linux/parport.h | 2 - + include/linux/pci_ids.h | 1 + + include/linux/pid_namespace.h | 6 - + include/linux/platform_device.h | 2 + + include/linux/pm.h | 2 +- + include/linux/pnp.h | 6 +- + include/linux/profile.h | 8 +- + include/linux/quota.h | 2 - + include/linux/quotaops.h | 3 - + include/linux/raid/linear.h | 10 +- + include/linux/raid/md.h | 32 +- + include/linux/reiserfs_fs.h | 2 +- + include/linux/rtmutex.h | 2 +- + include/linux/spi/orion_spi.h | 1 + + include/linux/swiotlb.h | 83 + + include/linux/sysctl.h | 2 +- + include/linux/sysfs.h | 36 +- + include/linux/task_io_accounting.h | 2 +- + include/linux/telephony.h | 4 - + include/linux/time.h | 2 + + include/linux/wait.h | 9 - + include/media/saa7146.h | 2 +- + include/net/9p/9p.h | 4 +- + include/net/bluetooth/bluetooth.h | 4 +- + include/net/ieee80211.h | 2 +- + include/net/ip.h | 2 +- + include/net/ip_vs.h | 4 +- + include/net/irda/irda.h | 2 +- + include/net/mac80211.h | 3 +- + include/net/ndisc.h | 5 +- + include/net/netfilter/nf_nat_core.h | 8 + + include/net/sctp/sctp.h | 2 +- + include/video/cyblafb.h | 2 +- + include/video/neomagic.h | 1 - + include/video/radeon.h | 23 +- + include/video/s1d13xxxfb.h | 3 +- + init/Kconfig | 8 + + init/do_mounts_md.c | 1 + + init/do_mounts_rd.c | 2 +- + init/initramfs.c | 53 + + ipc/ipc_sysctl.c | 9 +- + ipc/sem.c | 2 +- + kernel/cgroup.c | 4 +- + kernel/compat.c | 58 + + kernel/dma.c | 2 +- + kernel/exit.c | 9 +- + kernel/kallsyms.c | 1 - + kernel/kmod.c | 67 +- + kernel/kprobes.c | 2 +- + kernel/ksysfs.c | 35 + + kernel/module.c | 45 +- + kernel/panic.c | 65 +- + kernel/power/disk.c | 11 + + kernel/power/main.c | 7 + + kernel/power/user.c | 10 +- + kernel/printk.c | 4 +- + kernel/profile.c | 41 +- + kernel/resource.c | 49 +- + kernel/softlockup.c | 2 +- + kernel/sys.c | 34 +- + kernel/sys_ni.c | 5 + + kernel/sysctl.c | 98 +- + kernel/time/Kconfig | 1 - + kernel/utsname_sysctl.c | 5 +- + kernel/wait.c | 14 +- + kernel/workqueue.c | 2 +- + lib/Kconfig | 4 +- + lib/Kconfig.debug | 55 + + lib/Makefile | 2 + + lib/dynamic_printk.c | 418 +++ + lib/iommu-helper.c | 9 + + lib/kobject.c | 35 +- + lib/vsprintf.c | 12 + + mm/Kconfig | 4 +- + mm/bootmem.c | 2 +- + mm/fadvise.c | 2 +- + mm/filemap.c | 3 +- + mm/hugetlb.c | 23 +- + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 2 +- + mm/pdflush.c | 2 +- + mm/readahead.c | 2 +- + mm/truncate.c | 2 +- + net/802/fc.c | 2 +- + net/bridge/netfilter/Kconfig | 1 + + net/core/net_namespace.c | 2 +- + net/decnet/dn_dev.c | 6 +- + net/decnet/sysctl_net_decnet.c | 4 +- + net/ipv4/devinet.c | 7 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 3 +- + net/ipv4/netfilter/nf_nat_core.c | 97 + + net/ipv4/route.c | 7 +- + net/ipv4/sysctl_net_ipv4.c | 18 +- + net/ipv6/addrconf.c | 1 - + net/ipv6/ndisc.c | 13 +- + net/ipv6/netfilter.c | 6 +- + net/mac80211/debugfs_netdev.c | 6 +- + net/mac80211/debugfs_sta.c | 11 + + net/mac80211/ieee80211_i.h | 6 +- + net/mac80211/mlme.c | 3 - + net/mac80211/scan.c | 3 +- + net/mac80211/sta_info.c | 7 +- + net/mac80211/sta_info.h | 1 + + net/mac80211/util.c | 8 +- + net/mac80211/wext.c | 2 +- + net/netfilter/nf_conntrack_acct.c | 2 +- + net/netfilter/nf_conntrack_core.c | 7 + + net/netfilter/nf_conntrack_netlink.c | 151 +- + net/netfilter/nf_conntrack_pptp.c | 2 +- + net/netfilter/nfnetlink.c | 12 +- + net/wireless/core.c | 5 +- + scripts/Makefile.lib | 11 +- + scripts/basic/Makefile | 2 +- + scripts/basic/hash.c | 64 + + scripts/checkpatch.pl | 388 ++- + sound/core/init.c | 6 +- + sound/core/sound.c | 5 +- + sound/oss/soundcard.c | 15 +- + sound/sound_core.c | 5 +- + 921 files changed, 42006 insertions(+), 9867 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-profiling + delete mode 100644 Documentation/DocBook/videobook.tmpl + create mode 100644 Documentation/development-process/1.Intro + create mode 100644 Documentation/development-process/2.Process + create mode 100644 Documentation/development-process/3.Early-stage + create mode 100644 Documentation/development-process/4.Coding + create mode 100644 Documentation/development-process/5.Posting + create mode 100644 Documentation/development-process/6.Followthrough + create mode 100644 Documentation/development-process/7.AdvancedTopics + create mode 100644 Documentation/development-process/8.Conclusion + create mode 100644 Documentation/fb/viafb.modes + create mode 100644 Documentation/fb/viafb.txt + create mode 100644 Documentation/filesystems/autofs4-mount-control.txt + create mode 100644 Documentation/w1/slaves/00-INDEX + create mode 100644 Documentation/w1/slaves/w1_therm + create mode 100644 arch/arm/configs/omap3_beagle_defconfig + create mode 100644 arch/arm/configs/omap_ldp_defconfig + create mode 100644 arch/arm/configs/overo_defconfig + create mode 100644 arch/arm/mach-omap2/board-ldp.c + create mode 100644 arch/arm/mach-omap2/board-omap3beagle.c + create mode 100644 arch/arm/mach-omap2/board-overo.c + create mode 100644 arch/arm/mach-omap2/clockdomain.c + create mode 100644 arch/arm/mach-omap2/clockdomains.h + create mode 100644 arch/arm/mach-omap2/powerdomain.c + create mode 100644 arch/arm/mach-omap2/powerdomains.h + create mode 100644 arch/arm/mach-omap2/powerdomains24xx.h + create mode 100644 arch/arm/mach-omap2/powerdomains34xx.h + rename arch/arm/mach-omap2/{sleep.S => sleep24xx.S} (85%) + create mode 100644 arch/arm/mach-omap2/sram34xx.S + create mode 100644 arch/arm/plat-omap/include/mach/board-ldp.h + create mode 100644 arch/arm/plat-omap/include/mach/board-omap3beagle.h + create mode 100644 arch/arm/plat-omap/include/mach/board-overo.h + create mode 100644 arch/arm/plat-omap/include/mach/clockdomain.h + create mode 100644 arch/arm/plat-omap/include/mach/powerdomain.h + create mode 100644 arch/arm/plat-omap/io.c + create mode 100644 arch/arm/plat-s3c/Makefile + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/debug-macro.S (97%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/map.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-adc.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-serial.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/regs-timer.h (100%) + rename {include/asm-arm/plat-s3c => arch/arm/plat-s3c/include/plat}/uncompress.h (98%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/clock.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/common-smdk.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/cpu.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/devs.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/dma.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/irq.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/pm.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2400.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2410.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2412.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2440.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2442.h (100%) + rename {include/asm-arm/plat-s3c24xx => arch/arm/plat-s3c24xx/include/plat}/s3c2443.h (100%) + create mode 100644 arch/h8300/kernel/timer/Makefile + create mode 100644 arch/h8300/kernel/timer/itu.c + create mode 100644 arch/h8300/kernel/timer/timer16.c + create mode 100644 arch/h8300/kernel/timer/timer8.c + create mode 100644 arch/h8300/kernel/timer/tpu.c + delete mode 100644 arch/h8300/platform/h8300h/aki3068net/timer.c + delete mode 100644 arch/h8300/platform/h8300h/generic/timer.c + delete mode 100644 arch/h8300/platform/h8300h/h8max/timer.c + delete mode 100644 arch/h8300/platform/h8s/edosk2674/timer.c + delete mode 100644 arch/h8300/platform/h8s/generic/timer.c + delete mode 100644 arch/um/os-Linux/tty_log.c + create mode 100644 drivers/input/misc/cm109.c + create mode 100644 drivers/input/mouse/hgpk.c + create mode 100644 drivers/input/mouse/hgpk.h + create mode 100644 drivers/message/i2o/memory.c + create mode 100644 drivers/rtc/rtc-ds3234.c + create mode 100644 drivers/uio/uio_sercos3.c + create mode 100644 drivers/video/tmiofb.c + create mode 100644 drivers/video/via/Makefile + create mode 100644 drivers/video/via/accel.c + create mode 100644 drivers/video/via/accel.h + create mode 100644 drivers/video/via/chip.h + create mode 100644 drivers/video/via/debug.h + create mode 100644 drivers/video/via/dvi.c + create mode 100644 drivers/video/via/dvi.h + create mode 100644 drivers/video/via/global.c + create mode 100644 drivers/video/via/global.h + create mode 100644 drivers/video/via/hw.c + create mode 100644 drivers/video/via/hw.h + create mode 100644 drivers/video/via/iface.c + create mode 100644 drivers/video/via/iface.h + create mode 100644 drivers/video/via/ioctl.c + create mode 100644 drivers/video/via/ioctl.h + create mode 100644 drivers/video/via/lcd.c + create mode 100644 drivers/video/via/lcd.h + create mode 100644 drivers/video/via/lcdtbl.h + create mode 100644 drivers/video/via/share.h + create mode 100644 drivers/video/via/tbl1636.c + create mode 100644 drivers/video/via/tbl1636.h + create mode 100644 drivers/video/via/tblDPASetting.c + create mode 100644 drivers/video/via/tblDPASetting.h + create mode 100644 drivers/video/via/via_i2c.c + create mode 100644 drivers/video/via/via_i2c.h + create mode 100644 drivers/video/via/via_utility.c + create mode 100644 drivers/video/via/via_utility.h + create mode 100644 drivers/video/via/viafbdev.c + create mode 100644 drivers/video/via/viafbdev.h + create mode 100644 drivers/video/via/viamode.c + create mode 100644 drivers/video/via/viamode.h + create mode 100644 drivers/video/via/vt1636.c + create mode 100644 drivers/video/via/vt1636.h + create mode 100644 drivers/w1/slaves/w1_ds2431.c + create mode 100644 fs/autofs4/dev-ioctl.c + delete mode 100644 fs/ecryptfs/netlink.c + create mode 100644 include/asm-h8300/timer.h + create mode 100644 include/linux/auto_dev-ioctl.h + create mode 100644 include/linux/dynamic_printk.h + rename {drivers/input/misc => include/linux}/map_to_7segment.h (98%) + create mode 100644 include/linux/swiotlb.h + create mode 100644 lib/dynamic_printk.c + create mode 100644 scripts/basic/hash.c +$ git cherry-pick c917a47312d1dcfadbb8d558fab121d4d6467d10 +Finished one cherry-pick. +Created commit 7dae844: mfd: Don't use NO_IRQ in WM8350 + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merged drivers/net/xen-netfront.c +Merge made by recursive. + drivers/net/Kconfig | 12 ++++++++++-- + drivers/net/ixgbe/ixgbe.h | 4 ++-- + drivers/net/ixgbe/ixgbe_main.c | 32 ++++++++++++++++---------------- + drivers/net/myri10ge/myri10ge.c | 26 +++++++++++++------------- + drivers/net/pcmcia/Kconfig | 2 +- + drivers/net/wan/lmc/lmc_main.c | 31 ++++++++++++++++++++++++------- + drivers/net/xen-netfront.c | 5 ++++- + 7 files changed, 70 insertions(+), 42 deletions(-) +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + sound/arm/pxa2xx-ac97-lib.c | 12 +++--- + sound/pci/hda/patch_realtek.c | 88 +++++++++++++++++++++++++++++++--------- + sound/pci/hda/patch_sigmatel.c | 2 +- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/tlv320aic23.c | 10 ++-- + sound/usb/usx2y/us122l.c | 13 +++--- + 6 files changed, 88 insertions(+), 39 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Auto-merged kernel/module.c +Merge made by recursive. +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + Documentation/ABI/stable/sysfs-driver-usb-usbtmc | 62 ++ + .../ABI/testing/sysfs-bus-usb-devices-usbsevseg | 43 + + Documentation/devices.txt | 3 + + Documentation/ioctl-number.txt | 2 + + Documentation/usb/misc_usbsevseg.txt | 46 + + drivers/usb/class/Kconfig | 10 + + drivers/usb/class/Makefile | 1 + + drivers/usb/class/usbtmc.c | 1087 ++++++++++++++++++++ + drivers/usb/misc/Kconfig | 9 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/usbsevseg.c | 394 +++++++ + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio.h | 5 + + drivers/usb/serial/option.c | 28 +- + include/linux/usb/Kbuild | 2 +- + include/linux/usb/tmc.h | 43 + + 16 files changed, 1714 insertions(+), 23 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-usb-usbtmc + create mode 100644 Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg + create mode 100644 Documentation/usb/misc_usbsevseg.txt + create mode 100644 drivers/usb/class/usbtmc.c + create mode 100644 drivers/usb/misc/usbsevseg.c + create mode 100644 include/linux/usb/tmc.h +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Merge made by recursive. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/Kconfig | 12 +- + arch/avr32/Makefile | 2 + + arch/avr32/boards/atngw100/Kconfig | 35 + + arch/avr32/boards/atngw100/Makefile | 3 +- + arch/avr32/boards/atngw100/evklcd10x.c | 155 +++ + arch/avr32/boards/atngw100/setup.c | 5 + + arch/avr32/boards/favr-32/Kconfig | 22 + + arch/avr32/boards/favr-32/Makefile | 1 + + arch/avr32/boards/favr-32/flash.c | 98 ++ + arch/avr32/boards/favr-32/setup.c | 352 +++++++ + arch/avr32/boards/mimc200/Makefile | 1 + + arch/avr32/boards/mimc200/flash.c | 143 +++ + arch/avr32/boards/mimc200/fram.c | 80 ++ + arch/avr32/boards/mimc200/setup.c | 237 +++++ + arch/avr32/configs/atngw100_evklcd100_defconfig | 1264 +++++++++++++++++++++++ + arch/avr32/configs/atngw100_evklcd101_defconfig | 1264 +++++++++++++++++++++++ + arch/avr32/configs/favr-32_defconfig | 1235 ++++++++++++++++++++++ + arch/avr32/configs/mimc200_defconfig | 1109 ++++++++++++++++++++ + arch/avr32/mach-at32ap/at32ap700x.c | 6 +- + 19 files changed, 6020 insertions(+), 4 deletions(-) + create mode 100644 arch/avr32/boards/atngw100/Kconfig + create mode 100644 arch/avr32/boards/atngw100/evklcd10x.c + create mode 100644 arch/avr32/boards/favr-32/Kconfig + create mode 100644 arch/avr32/boards/favr-32/Makefile + create mode 100644 arch/avr32/boards/favr-32/flash.c + create mode 100644 arch/avr32/boards/favr-32/setup.c + create mode 100644 arch/avr32/boards/mimc200/Makefile + create mode 100644 arch/avr32/boards/mimc200/flash.c + create mode 100644 arch/avr32/boards/mimc200/fram.c + create mode 100644 arch/avr32/boards/mimc200/setup.c + create mode 100644 arch/avr32/configs/atngw100_evklcd100_defconfig + create mode 100644 arch/avr32/configs/atngw100_evklcd101_defconfig + create mode 100644 arch/avr32/configs/favr-32_defconfig + create mode 100644 arch/avr32/configs/mimc200_defconfig +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/Makefile | 2 ++ + arch/cris/arch-v10/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v10/boot/rescue/Makefile | 2 +- + .../arch-v10/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/arch-v32/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v32/boot/rescue/Makefile | 2 +- + .../arch-v32/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/{ => configs}/artpec_3_defconfig | 0 + .../defconfig => configs/etrax-100lx_defconfig} | 0 + .../etrax-100lx_v2_defconfig} | 0 + arch/cris/{ => configs}/etraxfs_defconfig | 0 + 13 files changed, 6 insertions(+), 4 deletions(-) + rename arch/cris/arch-v10/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v10/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/arch-v32/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v32/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/{ => configs}/artpec_3_defconfig (100%) + rename arch/cris/{arch-v10/defconfig => configs/etrax-100lx_defconfig} (100%) + rename arch/cris/{defconfig => configs/etrax-100lx_v2_defconfig} (100%) + rename arch/cris/{ => configs}/etraxfs_defconfig (100%) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +Merge made by recursive. + drivers/char/amiserial.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/master +$ git merge parisc/master +CONFLICT (rename/delete): Renamed include/asm-parisc/a.out.h->arch/parisc/include/asm/a.out.h in parisc/master and deleted in HEAD +Auto-merged arch/parisc/Kconfig +Auto-merged arch/parisc/kernel/syscall_table.S +Auto-merged drivers/char/agp/parisc-agp.c +Auto-merged drivers/rtc/Kconfig +Auto-merged drivers/rtc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/parisc/include/asm/a.out.h +rm 'arch/parisc/include/asm/a.out.h' +$ git commit -v -a +Created commit f62f2c7: Merge commit 'parisc/master' +$ git diff -M --stat --summary HEAD^.. + arch/parisc/Kconfig | 2 + + .../asm-parisc => arch/parisc/include/asm}/Kbuild | 0 + .../asm-parisc => arch/parisc/include/asm}/agp.h | 0 + .../parisc/include/asm}/asmregs.h | 0 + .../parisc/include/asm}/assembly.h | 0 + .../parisc/include/asm}/atomic.h | 0 + .../parisc/include/asm}/auxvec.h | 0 + .../parisc/include/asm}/bitops.h | 0 + .../asm-parisc => arch/parisc/include/asm}/bug.h | 0 + .../asm-parisc => arch/parisc/include/asm}/bugs.h | 0 + .../parisc/include/asm}/byteorder.h | 0 + .../asm-parisc => arch/parisc/include/asm}/cache.h | 0 + .../parisc/include/asm}/cacheflush.h | 0 + .../parisc/include/asm}/checksum.h | 0 + .../parisc/include/asm}/compat.h | 0 + .../parisc/include/asm}/compat_rt_sigframe.h | 0 + .../parisc/include/asm}/compat_signal.h | 0 + .../parisc/include/asm}/compat_ucontext.h | 0 + .../parisc/include/asm}/cputime.h | 0 + .../parisc/include/asm}/current.h | 0 + .../asm-parisc => arch/parisc/include/asm}/delay.h | 0 + .../parisc/include/asm}/device.h | 0 + .../asm-parisc => arch/parisc/include/asm}/div64.h | 0 + .../parisc/include/asm}/dma-mapping.h | 0 + .../asm-parisc => arch/parisc/include/asm}/dma.h | 0 + .../parisc/include/asm}/eisa_bus.h | 0 + .../parisc/include/asm}/eisa_eeprom.h | 0 + .../asm-parisc => arch/parisc/include/asm}/elf.h | 0 + .../parisc/include/asm}/emergency-restart.h | 0 + .../asm-parisc => arch/parisc/include/asm}/errno.h | 0 + .../asm-parisc => arch/parisc/include/asm}/fb.h | 0 + .../asm-parisc => arch/parisc/include/asm}/fcntl.h | 0 + .../parisc/include/asm}/fixmap.h | 0 + .../parisc/include/asm}/floppy.h | 0 + .../asm-parisc => arch/parisc/include/asm}/futex.h | 0 + .../parisc/include/asm}/grfioctl.h | 0 + .../parisc/include/asm}/hardirq.h | 0 + .../parisc/include/asm}/hardware.h | 0 + .../parisc/include/asm}/hw_irq.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ide.h | 0 + .../asm-parisc => arch/parisc/include/asm}/io.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ioctl.h | 0 + .../parisc/include/asm}/ioctls.h | 0 + .../parisc/include/asm}/ipcbuf.h | 0 + .../asm-parisc => arch/parisc/include/asm}/irq.h | 0 + .../parisc/include/asm}/irq_regs.h | 0 + .../parisc/include/asm}/kdebug.h | 0 + .../parisc/include/asm}/kmap_types.h | 0 + .../asm-parisc => arch/parisc/include/asm}/led.h | 0 + .../parisc/include/asm}/linkage.h | 0 + .../asm-parisc => arch/parisc/include/asm}/local.h | 0 + .../parisc/include/asm}/machdep.h | 0 + .../parisc/include/asm}/mc146818rtc.h | 0 + .../parisc/include/asm}/mckinley.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mman.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mmu.h | 0 + .../parisc/include/asm}/mmu_context.h | 0 + .../parisc/include/asm}/mmzone.h | 0 + .../parisc/include/asm}/module.h | 0 + .../parisc/include/asm}/msgbuf.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mutex.h | 0 + .../asm-parisc => arch/parisc/include/asm}/page.h | 0 + .../asm-parisc => arch/parisc/include/asm}/param.h | 0 + .../parisc/include/asm}/parisc-device.h | 0 + .../parisc/include/asm}/parport.h | 0 + .../asm-parisc => arch/parisc/include/asm}/pci.h | 0 + .../asm-parisc => arch/parisc/include/asm}/pdc.h | 5 + + .../parisc/include/asm}/pdc_chassis.h | 0 + .../parisc/include/asm}/pdcpat.h | 0 + .../parisc/include/asm}/percpu.h | 0 + .../asm-parisc => arch/parisc/include/asm}/perf.h | 0 + .../parisc/include/asm}/pgalloc.h | 0 + .../parisc/include/asm}/pgtable.h | 0 + .../asm-parisc => arch/parisc/include/asm}/poll.h | 0 + .../parisc/include/asm}/posix_types.h | 0 + .../parisc/include/asm}/prefetch.h | 0 + .../parisc/include/asm}/processor.h | 0 + .../asm-parisc => arch/parisc/include/asm}/psw.h | 0 + .../parisc/include/asm}/ptrace.h | 0 + .../asm-parisc => arch/parisc/include/asm}/real.h | 0 + .../parisc/include/asm}/resource.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ropes.h | 2 +- + .../parisc/include/asm}/rt_sigframe.h | 0 + .../asm-parisc => arch/parisc/include/asm}/rtc.h | 0 + .../parisc/include/asm}/runway.h | 0 + .../parisc/include/asm}/scatterlist.h | 0 + .../parisc/include/asm}/sections.h | 0 + .../parisc/include/asm}/segment.h | 0 + .../parisc/include/asm}/sembuf.h | 0 + .../parisc/include/asm}/serial.h | 0 + .../asm-parisc => arch/parisc/include/asm}/setup.h | 0 + .../parisc/include/asm}/shmbuf.h | 0 + .../parisc/include/asm}/shmparam.h | 0 + .../parisc/include/asm}/sigcontext.h | 0 + .../parisc/include/asm}/siginfo.h | 0 + .../parisc/include/asm}/signal.h | 0 + .../asm-parisc => arch/parisc/include/asm}/smp.h | 0 + .../parisc/include/asm}/socket.h | 0 + .../parisc/include/asm}/sockios.h | 0 + .../parisc/include/asm}/spinlock.h | 0 + .../parisc/include/asm}/spinlock_types.h | 0 + .../asm-parisc => arch/parisc/include/asm}/stat.h | 0 + .../parisc/include/asm}/statfs.h | 0 + .../parisc/include/asm}/string.h | 0 + .../parisc/include/asm}/superio.h | 0 + .../parisc/include/asm}/system.h | 0 + .../parisc/include/asm}/termbits.h | 0 + .../parisc/include/asm}/termios.h | 0 + .../parisc/include/asm}/thread_info.h | 0 + .../asm-parisc => arch/parisc/include/asm}/timex.h | 0 + .../asm-parisc => arch/parisc/include/asm}/tlb.h | 0 + .../parisc/include/asm}/tlbflush.h | 0 + .../parisc/include/asm}/topology.h | 0 + .../asm-parisc => arch/parisc/include/asm}/traps.h | 0 + .../asm-parisc => arch/parisc/include/asm}/types.h | 0 + .../parisc/include/asm}/uaccess.h | 0 + .../parisc/include/asm}/ucontext.h | 0 + .../parisc/include/asm}/unaligned.h | 0 + .../parisc/include/asm}/unistd.h | 8 ++- + .../parisc/include/asm}/unwind.h | 2 + + .../asm-parisc => arch/parisc/include/asm}/user.h | 0 + .../asm-parisc => arch/parisc/include/asm}/vga.h | 0 + .../asm-parisc => arch/parisc/include/asm}/xor.h | 0 + arch/parisc/kernel/.gitignore | 1 + + arch/parisc/kernel/asm-offsets.c | 3 + + arch/parisc/kernel/firmware.c | 69 ++++++++---- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/real2.S | 12 ++ + arch/parisc/kernel/setup.c | 29 +++++- + arch/parisc/kernel/syscall_table.S | 6 + + arch/parisc/kernel/time.c | 20 ++++- + arch/parisc/kernel/unwind.c | 4 +- + drivers/char/agp/parisc-agp.c | 4 +- + drivers/parisc/ccio-dma.c | 43 +++----- + drivers/rtc/Kconfig | 8 ++ + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-parisc.c | 111 ++++++++++++++++++++ + 137 files changed, 273 insertions(+), 59 deletions(-) + rename {include/asm-parisc => arch/parisc/include/asm}/Kbuild (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/agp.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/asmregs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/assembly.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/atomic.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/auxvec.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bitops.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bug.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bugs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/byteorder.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cache.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cacheflush.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/checksum.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_rt_sigframe.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_signal.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_ucontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cputime.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/current.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/delay.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/device.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/div64.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/dma-mapping.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/dma.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/eisa_bus.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/eisa_eeprom.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/elf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/emergency-restart.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/errno.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fb.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fcntl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fixmap.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/floppy.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/futex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/grfioctl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hardirq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hardware.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hw_irq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ide.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/io.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ioctl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ioctls.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ipcbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/irq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/irq_regs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/kdebug.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/kmap_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/led.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/linkage.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/local.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/machdep.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mc146818rtc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mckinley.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mman.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmu.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmu_context.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmzone.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/module.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/msgbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mutex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/page.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/param.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/parisc-device.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/parport.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pci.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdc.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdc_chassis.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdcpat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/percpu.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/perf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pgalloc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pgtable.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/poll.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/posix_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/prefetch.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/processor.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/psw.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ptrace.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/real.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/resource.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ropes.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/rt_sigframe.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/rtc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/runway.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/scatterlist.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sections.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/segment.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sembuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/serial.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/setup.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/shmbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/shmparam.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sigcontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/siginfo.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/signal.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/smp.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/socket.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sockios.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/spinlock.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/spinlock_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/stat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/statfs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/string.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/superio.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/system.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/termbits.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/termios.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/thread_info.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/timex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/tlb.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/tlbflush.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/topology.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/traps.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/uaccess.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ucontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/unaligned.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/unistd.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/unwind.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/user.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/vga.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/xor.h (100%) + create mode 100644 arch/parisc/kernel/.gitignore + create mode 100644 drivers/rtc/rtc-parisc.c +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/mmu.h | 3 ++- + arch/s390/include/asm/mmu_context.h | 19 ++++++++++++++++--- + arch/s390/include/asm/pgtable.h | 8 ++++---- + arch/s390/kernel/smp.c | 24 +++++++++--------------- + arch/s390/mm/pgtable.c | 16 ++++++++-------- + drivers/s390/char/vmcp.c | 3 --- + drivers/s390/cio/qdio_debug.c | 19 ++++++------------- + drivers/s390/cio/qdio_main.c | 1 - + 8 files changed, 45 insertions(+), 48 deletions(-) +Merging sh/master +$ git merge sh/master +Auto-merged Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Auto-merged arch/sh/include/asm/elf.h +CONFLICT (content): Merge conflict in arch/sh/include/asm/elf.h +Removed arch/sh/kernel/dump_task.c +Auto-merged arch/sh/kernel/smp.c +Auto-merged drivers/net/sh_eth.c +Auto-merged drivers/rtc/rtc-sh.c +Recorded preimage for 'arch/sh/include/asm/elf.h' +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/sh/include/asm/elf.h'. +Created commit d84fc2d: Merge commit 'sh/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 12 +- + arch/sh/Kconfig | 16 +- + arch/sh/Kconfig.debug | 2 +- + arch/sh/Makefile | 2 + + arch/sh/boards/Kconfig | 7 + + arch/sh/boards/Makefile | 1 + + arch/sh/boards/board-ap325rxa.c | 35 +- + arch/sh/boards/board-edosk7760.c | 193 ++++ + arch/sh/boards/mach-migor/lcd_qvga.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + arch/sh/boot/.gitignore | 3 + + arch/sh/boot/Makefile | 6 + + arch/sh/boot/compressed/Makefile_32 | 5 + + arch/sh/boot/compressed/misc_32.c | 2 +- + arch/sh/configs/edosk7760_defconfig | 1050 ++++++++++++++++++++ + arch/sh/configs/rts7751r2dplus_qemu_defconfig | 909 +++++++++++++++++ + arch/sh/include/asm/bitops-llsc.h | 144 +++ + arch/sh/include/asm/bitops.h | 2 + + arch/sh/include/asm/clock.h | 1 + + arch/sh/include/asm/cmpxchg-llsc.h | 71 ++ + arch/sh/include/asm/elf.h | 14 +- + arch/sh/include/asm/fpu.h | 19 + + arch/sh/include/asm/ftrace.h | 8 + + arch/sh/include/asm/hw_irq.h | 92 +-- + arch/sh/include/asm/io.h | 300 +++---- + arch/sh/include/asm/io_generic.h | 7 - + arch/sh/include/asm/irq.h | 3 + + arch/sh/include/asm/kprobes.h | 58 ++ + arch/sh/include/asm/machvec.h | 7 - + arch/sh/include/asm/migor.h | 2 +- + arch/sh/include/asm/mmzone.h | 2 + + arch/sh/include/asm/page.h | 2 + + arch/sh/include/asm/pgtable.h | 1 + + arch/sh/include/asm/processor.h | 44 +- + arch/sh/include/asm/processor_32.h | 22 +- + arch/sh/include/asm/processor_64.h | 45 +- + arch/sh/include/asm/ptrace.h | 11 +- + arch/sh/include/asm/rtc.h | 1 + + arch/sh/include/asm/setup.h | 1 - + arch/sh/include/asm/sizes.h | 61 ++ + arch/sh/include/asm/smp.h | 26 +- + arch/sh/include/asm/syscall.h | 10 + + arch/sh/include/asm/syscall_32.h | 110 ++ + arch/sh/include/asm/syscall_64.h | 6 + + arch/sh/include/asm/syscalls.h | 25 + + arch/sh/include/asm/syscalls_32.h | 56 + + arch/sh/include/asm/syscalls_64.h | 34 + + arch/sh/include/asm/system.h | 8 +- + arch/sh/include/asm/system_32.h | 44 +- + arch/sh/include/asm/thread_info.h | 32 +- + arch/sh/include/asm/uaccess_64.h | 26 +- + arch/sh/kernel/Makefile_32 | 2 +- + arch/sh/kernel/Makefile_64 | 1 - + arch/sh/kernel/cpu/clock.c | 5 +- + arch/sh/kernel/cpu/irq/Makefile | 2 - + arch/sh/kernel/cpu/irq/ipr.c | 4 +- + arch/sh/kernel/cpu/sh4/fpu.c | 25 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 5 + + arch/sh/kernel/cpu/sh4/softfloat.c | 29 + + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 67 +- + arch/sh/kernel/cpu/sh5/Makefile | 5 + + arch/sh/kernel/cpu/sh5/clock-sh5.c | 79 ++ + arch/sh/kernel/dump_task.c | 32 - + arch/sh/kernel/entry-common.S | 44 + + arch/sh/kernel/io.c | 12 +- + arch/sh/kernel/io_generic.c | 67 +- + arch/sh/kernel/kprobes.c | 584 +++++++++++ + arch/sh/kernel/machvec.c | 4 +- + arch/sh/kernel/process_32.c | 36 +- + arch/sh/kernel/process_64.c | 11 +- + arch/sh/kernel/ptrace_32.c | 298 +++++- + arch/sh/kernel/ptrace_64.c | 1 + + arch/sh/kernel/setup.c | 48 +- + arch/sh/kernel/sh_ksyms_32.c | 4 + + arch/sh/kernel/signal_32.c | 69 +- + arch/sh/kernel/signal_64.c | 26 +- + arch/sh/kernel/smp.c | 43 +- + arch/sh/kernel/stacktrace.c | 23 +- + arch/sh/kernel/sys_sh.c | 9 +- + arch/sh/kernel/sys_sh32.c | 5 +- + arch/sh/kernel/time_32.c | 11 +- + arch/sh/kernel/time_64.c | 168 +--- + arch/sh/kernel/timers/Makefile | 1 + + arch/sh/kernel/timers/timer-broadcast.c | 57 ++ + arch/sh/kernel/timers/timer-cmt.c | 2 +- + arch/sh/kernel/timers/timer-tmu.c | 177 +++-- + arch/sh/kernel/traps_32.c | 95 +- + arch/sh/lib/div64-generic.c | 1 + + arch/sh/lib/io.c | 8 +- + arch/sh/mm/Kconfig | 6 +- + arch/sh/mm/cache-sh4.c | 2 +- + arch/sh/mm/consistent.c | 2 +- + arch/sh/mm/fault_32.c | 63 +- + arch/sh/mm/init.c | 74 ++- + arch/sh/mm/pg-nommu.c | 1 + + arch/sh/mm/tlb-nommu.c | 1 + + arch/sh/tools/mach-types | 1 + + drivers/net/sh_eth.c | 5 +- + drivers/rtc/rtc-sh.c | 21 +- + drivers/serial/sh-sci.c | 90 +- + drivers/serial/sh-sci.h | 14 +- + drivers/sh/Makefile | 2 +- + {arch/sh/kernel/cpu/irq => drivers/sh}/intc.c | 35 +- + drivers/video/sh_mobile_lcdcfb.c | 8 +- + include/linux/sh_intc.h | 91 ++ + .../include/asm => include/video}/sh_mobile_lcdc.h | 0 + 106 files changed, 4959 insertions(+), 1059 deletions(-) + create mode 100644 arch/sh/boards/board-edosk7760.c + create mode 100644 arch/sh/configs/edosk7760_defconfig + create mode 100644 arch/sh/configs/rts7751r2dplus_qemu_defconfig + create mode 100644 arch/sh/include/asm/bitops-llsc.h + create mode 100644 arch/sh/include/asm/cmpxchg-llsc.h + create mode 100644 arch/sh/include/asm/ftrace.h + create mode 100644 arch/sh/include/asm/kprobes.h + create mode 100644 arch/sh/include/asm/sizes.h + create mode 100644 arch/sh/include/asm/syscall.h + create mode 100644 arch/sh/include/asm/syscall_32.h + create mode 100644 arch/sh/include/asm/syscall_64.h + create mode 100644 arch/sh/include/asm/syscalls.h + create mode 100644 arch/sh/include/asm/syscalls_32.h + create mode 100644 arch/sh/include/asm/syscalls_64.h + create mode 100644 arch/sh/kernel/cpu/sh5/clock-sh5.c + delete mode 100644 arch/sh/kernel/dump_task.c + create mode 100644 arch/sh/kernel/kprobes.c + create mode 100644 arch/sh/kernel/timers/timer-broadcast.c + rename {arch/sh/kernel/cpu/irq => drivers/sh}/intc.c (96%) + create mode 100644 include/linux/sh_intc.h + rename {arch/sh/include/asm => include/video}/sh_mobile_lcdc.h (100%) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/Kconfig +Auto-merged include/linux/pci_ids.h +Merge made by recursive. + Documentation/kernel-parameters.txt | 11 +++ + arch/x86/Kconfig | 24 +++++ + arch/x86/mm/fault.c | 45 ++++------ + arch/x86/pci/common.c | 17 ++++ + drivers/acpi/pci_irq.c | 56 ++++++++++++ + drivers/pci/quirks.c | 170 ++++++++++++++++++++++++++++++----- + include/asm-x86/io_apic.h | 10 ++ + include/asm-x86/pci.h | 2 + + include/linux/pci.h | 6 ++ + include/linux/pci_ids.h | 5 + + 10 files changed, 297 insertions(+), 49 deletions(-) +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. + arch/xtensa/kernel/irq.c | 2 +- + arch/xtensa/platforms/iss/network.c | 2 +- + include/asm-xtensa/rwsem.h | 4 ++++ + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/base/bus.c +CONFLICT (content): Merge conflict in drivers/base/bus.c +Auto-merged drivers/base/platform.c +CONFLICT (content): Merge conflict in drivers/base/platform.c +Auto-merged drivers/base/power/main.c +Auto-merged drivers/char/tty_io.c +Auto-merged drivers/ieee1394/raw1394.c +CONFLICT (content): Merge conflict in drivers/ieee1394/raw1394.c +Auto-merged drivers/net/3c509.c +Auto-merged drivers/net/ppp_generic.c +Auto-merged drivers/net/xen-netfront.c +Auto-merged drivers/pnp/base.h +Auto-merged drivers/pnp/core.c +Auto-merged drivers/s390/char/raw3270.c +Auto-merged drivers/s390/char/vmlogrdr.c +Auto-merged drivers/s390/char/vmur.c +Auto-merged drivers/usb/gadget/rndis.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/rndis.c +Auto-merged drivers/video/console/fbcon.c +Auto-merged drivers/video/display/display-sysfs.c +CONFLICT (content): Merge conflict in drivers/video/display/display-sysfs.c +Auto-merged drivers/video/fbmem.c +Auto-merged include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Auto-merged include/linux/init.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/platform_device.h +Auto-merged include/linux/pm.h +Auto-merged kernel/module.c +Auto-merged lib/dynamic_printk.c +CONFLICT (add/add): Merge conflict in lib/dynamic_printk.c +Auto-merged lib/kobject.c +Recorded preimage for 'drivers/base/bus.c' +Recorded preimage for 'drivers/base/platform.c' +Recorded preimage for 'drivers/ieee1394/raw1394.c' +Recorded preimage for 'drivers/usb/gadget/rndis.c' +Recorded preimage for 'drivers/video/display/display-sysfs.c' +Recorded preimage for 'include/linux/device.h' +Recorded preimage for 'lib/dynamic_printk.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/base/bus.c'. +Recorded resolution for 'drivers/base/platform.c'. +Recorded resolution for 'drivers/ieee1394/raw1394.c'. +Recorded resolution for 'drivers/usb/gadget/rndis.c'. +Recorded resolution for 'drivers/video/display/display-sysfs.c'. +Recorded resolution for 'include/linux/device.h'. +Recorded resolution for 'lib/dynamic_printk.c'. +Created commit b71de75: Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/scan.c | 2 +- + drivers/base/platform.c | 115 ++++++++++++++------------- + drivers/base/power/main.c | 19 +++-- + drivers/block/xen-blkfront.c | 14 ++-- + drivers/eisa/pci_eisa.c | 2 +- + drivers/eisa/virtual_root.c | 2 +- + drivers/ide/legacy/ide_platform.c | 2 +- + drivers/input/xen-kbdfront.c | 8 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 22 +++--- + drivers/mfd/htc-pasic3.c | 8 +- + drivers/net/3c509.c | 42 +++++++--- + drivers/net/depca.c | 17 +++- + drivers/net/hp100.c | 4 +- + drivers/net/ne3210.c | 4 +- + drivers/net/tulip/de4x5.c | 7 +- + drivers/net/wireless/atmel_cs.c | 2 +- + drivers/net/wireless/ipw2100.c | 8 +- + drivers/net/wireless/ipw2200.c | 46 ++++++------ + drivers/net/wireless/iwlwifi/iwl3945-base.c | 22 +++--- + drivers/net/xen-netfront.c | 10 +- + drivers/pci/pci-driver.c | 46 ++++------- + drivers/pcmcia/ds.c | 8 +- + drivers/s390/block/dasd_devmap.c | 6 +- + drivers/s390/char/con3215.c | 16 ++-- + drivers/s390/char/raw3270.c | 16 ++-- + drivers/s390/char/tape_34xx.c | 4 +- + drivers/s390/char/tape_core.c | 20 +++--- + drivers/s390/char/vmlogrdr.c | 12 ++-- + drivers/s390/char/vmur.c | 10 +- + drivers/s390/net/claw.c | 40 +++++----- + drivers/s390/net/lcs.c | 23 +++--- + drivers/s390/net/netiucv.c | 47 ++++++------ + drivers/scsi/aha1740.c | 3 +- + drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- + drivers/scsi/libsrp.c | 2 +- + drivers/thermal/thermal_sys.c | 4 +- + drivers/usb/core/usb.c | 4 +- + drivers/video/xen-fbfront.c | 8 +- + include/linux/device.h | 8 +- + include/linux/eisa.h | 4 +- + include/linux/init.h | 1 + + include/linux/pci.h | 1 - + include/linux/platform_device.h | 1 - + include/linux/pm.h | 76 ++++++------------ + init/main.c | 9 ++ + lib/kobject.c | 50 ++++++++++++ + 46 files changed, 416 insertions(+), 361 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Auto-merged Documentation/kernel-parameters.txt +Auto-merged drivers/input/joystick/xpad.c +Auto-merged drivers/input/misc/yealink.c +Auto-merged drivers/input/tablet/aiptek.c +Removed drivers/usb/host/ehci-ppc-soc.c +Auto-merged drivers/usb/host/ohci-omap.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-bus-usb | 16 + + Documentation/DocBook/gadget.tmpl | 3 + + Documentation/ioctl-number.txt | 1 + + Documentation/kernel-parameters.txt | 19 + + Documentation/usb/anchors.txt | 17 + + Documentation/usb/power-management.txt | 8 +- + drivers/block/ub.c | 3 - + drivers/hid/usbhid/hid-core.c | 4 +- + drivers/input/joystick/iforce/iforce-ff.c | 36 +- + drivers/input/joystick/iforce/iforce-main.c | 14 +- + drivers/input/joystick/iforce/iforce-packets.c | 8 +- + drivers/input/joystick/iforce/iforce-usb.c | 2 +- + drivers/input/joystick/xpad.c | 2 +- + drivers/input/misc/ati_remote.c | 20 +- + drivers/input/misc/yealink.c | 3 +- + drivers/input/tablet/acecad.c | 3 +- + drivers/input/tablet/aiptek.c | 26 +- + drivers/input/tablet/gtco.c | 4 +- + drivers/input/tablet/kbtab.c | 3 +- + drivers/input/tablet/wacom_sys.c | 3 +- + drivers/media/radio/dsbr100.c | 13 +- + drivers/media/video/dabusb.c | 4 +- + drivers/media/video/ov511.c | 19 +- + drivers/media/video/usbvideo/konicawc.c | 8 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 14 +- + drivers/mtd/nand/alauda.c | 4 +- + drivers/net/irda/kingsun-sir.c | 3 +- + drivers/net/irda/ks959-sir.c | 3 +- + drivers/net/irda/ksdazzle-sir.c | 3 +- + drivers/net/irda/stir4200.c | 18 +- + drivers/net/usb/catc.c | 8 +- + drivers/net/usb/hso.c | 24 +- + drivers/net/usb/kaweth.c | 27 +- + drivers/net/usb/rtl8150.c | 31 +- + drivers/usb/Kconfig | 1 + + drivers/usb/atm/usbatm.c | 10 +- + drivers/usb/atm/usbatm.h | 10 +- + drivers/usb/atm/xusbatm.c | 2 +- + drivers/usb/class/cdc-acm.c | 26 +- + drivers/usb/class/cdc-wdm.c | 48 +- + drivers/usb/class/usblp.c | 25 +- + drivers/usb/core/Kconfig | 2 +- + drivers/usb/core/devio.c | 12 +- + drivers/usb/core/driver.c | 3 +- + drivers/usb/core/endpoint.c | 3 +- + drivers/usb/core/file.c | 5 +- + drivers/usb/core/hcd.c | 4 + + drivers/usb/core/hcd.h | 6 + + drivers/usb/core/hub.c | 102 +- + drivers/usb/core/inode.c | 18 +- + drivers/usb/core/message.c | 3 +- + drivers/usb/core/sysfs.c | 24 + + drivers/usb/core/urb.c | 169 ++- + drivers/usb/gadget/Kconfig | 315 ++- + drivers/usb/gadget/Makefile | 1 + + drivers/usb/gadget/cdc2.c | 1 - + drivers/usb/gadget/composite.c | 68 +- + drivers/usb/gadget/dummy_hcd.c | 33 +- + drivers/usb/gadget/ether.c | 2 - + drivers/usb/gadget/f_loopback.c | 1 - + drivers/usb/gadget/f_obex.c | 493 ++++ + drivers/usb/gadget/f_sourcesink.c | 1 - + drivers/usb/gadget/file_storage.c | 23 +- + drivers/usb/gadget/fsl_qe_udc.c | 2760 +++++++++++++++++++++ + drivers/usb/gadget/fsl_qe_udc.h | 437 ++++ + drivers/usb/gadget/fsl_usb2_udc.c | 176 +- + drivers/usb/gadget/fsl_usb2_udc.h | 21 +- + drivers/usb/gadget/gadget_chips.h | 9 + + drivers/usb/gadget/gmidi.c | 2 +- + drivers/usb/gadget/net2280.c | 40 +- + drivers/usb/gadget/net2280.h | 1 + + drivers/usb/gadget/omap_udc.c | 7 + + drivers/usb/gadget/printer.c | 6 +- + drivers/usb/gadget/pxa27x_udc.c | 1 - + drivers/usb/gadget/s3c2410_udc.c | 2 +- + drivers/usb/gadget/serial.c | 15 +- + drivers/usb/gadget/u_ether.c | 7 + + drivers/usb/gadget/u_serial.h | 1 + + drivers/usb/host/ehci-dbg.c | 56 +- + drivers/usb/host/ehci-hcd.c | 47 +- + drivers/usb/host/ehci-hub.c | 27 +- + drivers/usb/host/ehci-ppc-soc.c | 201 -- + drivers/usb/host/ehci.h | 23 +- + drivers/usb/host/isp116x-hcd.c | 13 +- + drivers/usb/host/isp1760-if.c | 7 +- + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/ohci-hcd.c | 31 +- + drivers/usb/host/ohci-hub.c | 87 +- + drivers/usb/host/ohci-omap.c | 4 +- + drivers/usb/host/ohci-pnx4008.c | 2 +- + drivers/usb/host/ohci-tmio.c | 376 +++ + drivers/usb/host/ohci.h | 8 - + drivers/usb/host/r8a66597-hcd.c | 101 +- + drivers/usb/host/sl811-hcd.c | 15 +- + drivers/usb/host/uhci-hcd.c | 10 +- + drivers/usb/host/uhci-q.c | 17 +- + drivers/usb/image/mdc800.c | 61 +- + drivers/usb/misc/Kconfig | 23 + + drivers/usb/misc/Makefile | 2 + + drivers/usb/misc/adutux.c | 22 +- + drivers/usb/misc/appledisplay.c | 26 +- + drivers/usb/misc/cypress_cy7c63.c | 6 +- + drivers/usb/misc/cytherm.c | 9 +- + drivers/usb/misc/emi26.c | 17 +- + drivers/usb/misc/emi62.c | 4 +- + drivers/usb/misc/ftdi-elan.c | 10 +- + drivers/usb/misc/gotemp.c | 301 +++ + drivers/usb/misc/idmouse.c | 5 +- + drivers/usb/misc/legousbtower.c | 23 +- + drivers/usb/misc/rio500.c | 11 +- + drivers/usb/misc/trancevibrator.c | 3 +- + drivers/usb/misc/usblcd.c | 13 +- + drivers/usb/misc/uss720.c | 19 +- + drivers/usb/misc/vstusb.c | 782 ++++++ + drivers/usb/mon/mon_main.c | 2 +- + drivers/usb/musb/Kconfig | 4 - + drivers/usb/musb/cppi_dma.h | 4 +- + drivers/usb/musb/davinci.c | 20 +- + drivers/usb/musb/musb_core.c | 41 +- + drivers/usb/musb/musb_gadget_ep0.c | 24 +- + drivers/usb/musb/musb_host.c | 19 +- + drivers/usb/musb/musb_io.h | 4 +- + drivers/usb/musb/musbhsdma.c | 306 ++-- + drivers/usb/serial/aircable.c | 8 +- + drivers/usb/serial/belkin_sa.c | 39 +- + drivers/usb/serial/cp2101.c | 3 +- + drivers/usb/serial/cyberjack.c | 28 +- + drivers/usb/serial/cypress_m8.c | 21 +- + drivers/usb/serial/digi_acceleport.c | 68 +- + drivers/usb/serial/empeg.c | 11 +- + drivers/usb/serial/ezusb.c | 3 +- + drivers/usb/serial/ftdi_sio.c | 81 +- + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/hp4x.c | 3 +- + drivers/usb/serial/io_edgeport.c | 19 +- + drivers/usb/serial/io_ti.c | 3 +- + drivers/usb/serial/ipaq.c | 30 +- + drivers/usb/serial/ipw.c | 3 +- + drivers/usb/serial/ir-usb.c | 3 +- + drivers/usb/serial/iuu_phoenix.c | 3 +- + drivers/usb/serial/keyspan.c | 3 +- + drivers/usb/serial/keyspan_pda.c | 17 +- + drivers/usb/serial/kl5kusb105.c | 69 +- + drivers/usb/serial/kobil_sct.c | 4 +- + drivers/usb/serial/mct_u232.c | 42 +- + drivers/usb/serial/mos7720.c | 22 +- + drivers/usb/serial/mos7840.c | 29 +- + drivers/usb/serial/omninet.c | 22 +- + drivers/usb/serial/option.c | 14 +- + drivers/usb/serial/pl2303.c | 2 +- + drivers/usb/serial/safe_serial.c | 28 +- + drivers/usb/serial/sierra.c | 72 +- + drivers/usb/serial/spcp8x5.c | 10 +- + drivers/usb/serial/ti_usb_3410_5052.c | 4 +- + drivers/usb/serial/usb-serial.c | 26 +- + drivers/usb/serial/visor.c | 17 +- + drivers/usb/serial/whiteheat.c | 121 +- + drivers/usb/storage/onetouch.c | 9 +- + drivers/usb/storage/transport.c | 2 +- + include/linux/usb.h | 11 +- + include/linux/usb/Kbuild | 1 + + include/linux/usb/cdc.h | 9 + + include/linux/usb/composite.h | 11 +- + include/linux/usb/serial.h | 2 +- + include/linux/usb/vstusb.h | 71 + + 165 files changed, 7479 insertions(+), 1526 deletions(-) + create mode 100644 drivers/usb/gadget/f_obex.c + create mode 100644 drivers/usb/gadget/fsl_qe_udc.c + create mode 100644 drivers/usb/gadget/fsl_qe_udc.h + delete mode 100644 drivers/usb/host/ehci-ppc-soc.c + create mode 100644 drivers/usb/host/ohci-tmio.c + create mode 100644 drivers/usb/misc/gotemp.c + create mode 100644 drivers/usb/misc/vstusb.c + create mode 100644 include/linux/usb/vstusb.h +$ git am ../patches/USB_unbreak_recursive_dependency +Applying USB: unbreak recursive dependancy +$ git revert 2ed5f27e20ee40d904e34e30745f8386f3611c88 +Finished one revert. +Created commit 65775d7: Revert "USB: remove info() macro from usb.h" + 1 files changed, 2 insertions(+), 0 deletions(-) +$ git revert b9313f21c7d595f8d163bee07c6d2b2c6943a93a +Finished one revert. +Created commit eafa5a9: Revert "USB: remove warn() macro from usb.h" + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged arch/powerpc/Kconfig +Auto-merged arch/powerpc/include/asm/page.h +Auto-merged arch/powerpc/include/asm/types.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/types.h +Auto-merged arch/powerpc/platforms/Kconfig.cputype +CONFLICT (content): Merge conflict in arch/powerpc/platforms/Kconfig.cputype +Auto-merged arch/powerpc/sysdev/ppc4xx_pci.c +Auto-merged arch/x86/Kconfig +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/ioport.h +Auto-merged include/linux/kernel.h +Auto-merged kernel/module.c +Auto-merged kernel/printk.c +Auto-merged kernel/resource.c +Auto-merged kernel/softlockup.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/Kconfig +Auto-merged mm/filemap.c +Resolved 'arch/powerpc/include/asm/types.h' using previous resolution. +Resolved 'arch/powerpc/platforms/Kconfig.cputype' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 060d878: Merge commit 'tip-core/auto-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/lockstat.txt | 1 + + arch/m32r/mm/discontig.c | 4 +- + arch/powerpc/Kconfig | 3 + + arch/powerpc/include/asm/page.h | 6 +- + arch/powerpc/include/asm/types.h | 7 - + arch/powerpc/platforms/Kconfig.cputype | 1 - + arch/powerpc/sysdev/ppc4xx_pci.c | 16 +- + arch/x86/Kconfig | 4 +- + arch/x86/kernel/e820.c | 4 +- + arch/x86/lib/usercopy_32.c | 8 +- + arch/x86/lib/usercopy_64.c | 4 +- + arch/x86/mm/ioremap.c | 6 + + drivers/firmware/dmi_scan.c | 22 ++- + drivers/pci/hotplug/ibmphp_ebda.c | 2 +- + drivers/pci/setup-bus.c | 9 +- + include/asm-generic/percpu.h | 11 +- + include/asm-generic/sections.h | 10 + + include/asm-generic/vmlinux.lds.h | 16 ++ + include/asm-um/system-generic.h | 32 ++-- + include/asm-x86/page_32.h | 2 - + include/asm-x86/page_64.h | 1 - + include/asm-x86/percpu.h | 83 +++++++++- + include/asm-x86/uaccess.h | 2 + + include/asm-x86/uaccess_32.h | 8 +- + include/asm-x86/uaccess_64.h | 6 + + include/asm-x86/xen/page.h | 4 +- + include/linux/debug_locks.h | 2 +- + include/linux/futex.h | 2 + + include/linux/interrupt.h | 2 + + include/linux/ioport.h | 1 + + include/linux/kernel.h | 14 ++ + include/linux/lockdep.h | 18 ++ + include/linux/percpu.h | 17 ++- + include/linux/pfn.h | 6 +- + include/linux/types.h | 8 +- + include/linux/uaccess.h | 2 +- + kernel/extable.c | 16 ++ + kernel/futex.c | 290 +++++++++++--------------------- + kernel/lockdep.c | 4 +- + kernel/lockdep_proc.c | 7 +- + kernel/module.c | 7 +- + kernel/notifier.c | 8 + + kernel/printk.c | 22 ++- + kernel/resource.c | 51 +++++- + kernel/sched.c | 2 +- + kernel/softirq.c | 13 ++- + kernel/softlockup.c | 2 +- + kernel/time/tick-sched.c | 2 +- + kernel/timer.c | 1 + + lib/Kconfig.debug | 10 + + mm/Kconfig | 3 + + mm/filemap.c | 15 +- + mm/memory.c | 15 ++ + 53 files changed, 509 insertions(+), 303 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/smp.c +Auto-merged arch/x86/xen/smp.c +Auto-merged include/asm-x86/smp.h +CONFLICT (content): Merge conflict in include/asm-x86/smp.h +Resolved 'include/asm-x86/smp.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit ff516d4: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 17 +++++++++++------ + arch/x86/kernel/smp.c | 6 +++--- + arch/x86/xen/smp.c | 6 +++--- + include/asm-x86/smp.h | 6 +++--- + kernel/smp.c | 12 +++++------- + 5 files changed, 25 insertions(+), 22 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged arch/x86/Kconfig +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/init.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/module.h +Auto-merged init/Kconfig +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged kernel/notifier.c +Auto-merged kernel/sched.c +Auto-merged scripts/bootgraph.pl +CONFLICT (add/add): Merge conflict in scripts/bootgraph.pl +Resolved 'init/main.c' using previous resolution. +Resolved 'kernel/module.c' using previous resolution. +Resolved 'scripts/bootgraph.pl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b79c824: Merge commit 'ftrace/auto-ftrace-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/markers.txt | 10 +- + Documentation/tracepoints.txt | 101 ++ + Documentation/tracers/mmiotrace.txt | 5 +- + arch/powerpc/platforms/cell/spufs/sputrace.c | 1 + + arch/x86/Kconfig | 1 + + arch/x86/kernel/cpu/perfctr-watchdog.c | 11 +- + arch/x86/kernel/entry_32.S | 14 - + arch/x86/kernel/entry_64.S | 26 - + arch/x86/kernel/ftrace.c | 124 +- + arch/x86/mm/mmio-mod.c | 87 +- + arch/x86/mm/pf_in.c | 121 +- + arch/x86/mm/testmmiotrace.c | 4 + + include/asm-generic/vmlinux.lds.h | 14 +- + include/asm-x86/ftrace.h | 10 + + include/linux/compiler.h | 2 + + include/linux/ftrace.h | 84 +- + include/linux/init.h | 2 +- + include/linux/kernel.h | 5 + + include/linux/kprobes.h | 5 +- + include/linux/linkage.h | 2 - + include/linux/marker.h | 7 + + include/linux/mmiotrace.h | 20 +- + include/linux/module.h | 17 + + include/linux/ring_buffer.h | 127 ++ + include/linux/tracepoint.h | 137 ++ + include/trace/sched.h | 56 + + init/Kconfig | 7 + + init/main.c | 34 +- + kernel/Makefile | 1 + + kernel/exit.c | 10 +- + kernel/fork.c | 3 + + kernel/kthread.c | 5 + + kernel/marker.c | 36 +- + kernel/module.c | 81 +- + kernel/notifier.c | 2 +- + kernel/sched.c | 17 +- + kernel/signal.c | 3 + + kernel/trace/Kconfig | 64 +- + kernel/trace/Makefile | 4 + + kernel/trace/ftrace.c | 275 +++- + kernel/trace/ring_buffer.c | 2014 ++++++++++++++++++++++++ + kernel/trace/trace.c | 1845 +++++++++++----------- + kernel/trace/trace.h | 211 ++- + kernel/trace/trace_boot.c | 126 ++ + kernel/trace/trace_functions.c | 2 +- + kernel/trace/trace_irqsoff.c | 19 +- + kernel/trace/trace_mmiotrace.c | 116 ++- + kernel/trace/trace_nop.c | 64 + + kernel/trace/trace_sched_switch.c | 137 +-- + kernel/trace/trace_sched_wakeup.c | 148 +-- + kernel/trace/trace_selftest.c | 83 +- + kernel/trace/trace_stack.c | 310 ++++ + kernel/trace/trace_sysprof.c | 2 +- + kernel/tracepoint.c | 477 ++++++ + samples/Kconfig | 6 + + samples/Makefile | 2 +- + samples/markers/probe-example.c | 1 + + samples/tracepoints/Makefile | 6 + + samples/tracepoints/tp-samples-trace.h | 13 + + samples/tracepoints/tracepoint-probe-sample.c | 55 + + samples/tracepoints/tracepoint-probe-sample2.c | 42 + + samples/tracepoints/tracepoint-sample.c | 53 + + scripts/Makefile.build | 7 + + scripts/bootgraph.pl | 24 +- + scripts/recordmcount.pl | 395 +++++ + 65 files changed, 6108 insertions(+), 1585 deletions(-) + create mode 100644 Documentation/tracepoints.txt + create mode 100644 include/linux/ring_buffer.h + create mode 100644 include/linux/tracepoint.h + create mode 100644 include/trace/sched.h + create mode 100644 kernel/trace/ring_buffer.c + create mode 100644 kernel/trace/trace_boot.c + create mode 100644 kernel/trace/trace_nop.c + create mode 100644 kernel/trace/trace_stack.c + create mode 100644 kernel/tracepoint.c + create mode 100644 samples/tracepoints/Makefile + create mode 100644 samples/tracepoints/tp-samples-trace.h + create mode 100644 samples/tracepoints/tracepoint-probe-sample.c + create mode 100644 samples/tracepoints/tracepoint-probe-sample2.c + create mode 100644 samples/tracepoints/tracepoint-sample.c + create mode 100755 scripts/recordmcount.pl +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Auto-merged include/linux/irq.h +Auto-merged kernel/irq/manage.c +Merge made by recursive. + include/linux/irq.h | 4 - + kernel/irq/chip.c | 17 +++--- + kernel/irq/handle.c | 2 - + kernel/irq/internals.h | 3 + + kernel/irq/manage.c | 43 ++++++++++----- + kernel/irq/spurious.c | 146 ++++++++++++++++++++++++++++++------------------ + 6 files changed, 132 insertions(+), 83 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Already uptodate! +Merge made by recursive. +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/mm/fault.c +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/panic.c +Auto-merged kernel/sched.c +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit a631b34: Merge commit 'stackprotector/auto-stackprotector-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/pda.h | 4 ++-- + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/asm-x86/system.h | 6 +++++- + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 133 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged fs/binfmt_elf.c +Auto-merged fs/compat.c +Auto-merged include/linux/sched.h +Auto-merged include/linux/time.h +Auto-merged kernel/compat.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/futex.c +Auto-merged kernel/sched.c +Auto-merged kernel/signal.c +Auto-merged kernel/sys.c +Auto-merged kernel/time/tick-sched.c +Auto-merged kernel/timer.c +Merge made by recursive. + arch/alpha/kernel/osf_sys.c | 13 +- + arch/ia64/kvm/kvm-ia64.c | 2 +- + arch/powerpc/oprofile/cell/spu_profiler.c | 2 +- + arch/x86/kvm/i8254.c | 6 +- + arch/x86/kvm/lapic.c | 6 +- + drivers/clocksource/acpi_pm.c | 7 +- + drivers/cpuidle/cpuidle.c | 7 + + drivers/s390/crypto/ap_bus.c | 6 +- + fs/binfmt_elf.c | 19 +- + fs/compat.c | 187 ++++------- + fs/proc/array.c | 8 +- + fs/select.c | 396 +++++++++++++---------- + fs/timerfd.c | 8 +- + include/linux/clocksource.h | 14 +- + include/linux/hrtimer.h | 104 ++++++- + include/linux/init_task.h | 1 + + include/linux/kernel_stat.h | 1 + + include/linux/poll.h | 8 +- + include/linux/posix-timers.h | 4 +- + include/linux/prctl.h | 7 + + include/linux/sched.h | 90 +++++- + include/linux/thread_info.h | 8 + + include/linux/time.h | 9 + + include/linux/timex.h | 11 +- + kernel/compat.c | 53 +--- + kernel/exit.c | 19 +- + kernel/fork.c | 94 +++--- + kernel/futex.c | 11 +- + kernel/hrtimer.c | 227 +++++++++++-- + kernel/itimer.c | 33 +-- + kernel/posix-cpu-timers.c | 512 +++++++++++++++-------------- + kernel/posix-timers.c | 163 ++++------ + kernel/rtmutex.c | 3 +- + kernel/sched.c | 26 +- + kernel/sched_fair.c | 1 + + kernel/sched_rt.c | 4 +- + kernel/sched_stats.h | 86 +++++ + kernel/signal.c | 8 +- + kernel/sys.c | 85 ++--- + kernel/time.c | 18 + + kernel/time/clocksource.c | 3 + + kernel/time/jiffies.c | 1 + + kernel/time/ntp.c | 96 +++--- + kernel/time/tick-sched.c | 21 +- + kernel/time/timekeeping.c | 122 +++++--- + kernel/time/timer_list.c | 8 +- + kernel/timer.c | 11 +- + net/sched/sch_cbq.c | 7 +- + security/selinux/hooks.c | 9 +- + sound/drivers/pcsp/pcsp_lib.c | 5 +- + 50 files changed, 1506 insertions(+), 1044 deletions(-) +$ git am -3 ../patches/0001-DECLARE_PER_CPU-needs-linux-percpu.h.patch +Applying DECLARE_PER_CPU needs linux/percpu.h +$ git reset HEAD^ +include/linux/hrtimer.h: needs update +$ git add . +$ git commit -v -a --amend +Created commit 8a71a0c: Merge commit 'timers/auto-timers-next' +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/powerpc/include/asm/pci.h +Auto-merged arch/powerpc/kernel/pci-common.c +Auto-merged arch/x86/pci/irq.c +Auto-merged drivers/i2c/busses/i2c-viapro.c +Auto-merged drivers/pci/hotplug/ibmphp_ebda.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged drivers/pci/pci-sysfs.c +Auto-merged drivers/pci/pcie/aspm.c +CONFLICT (content): Merge conflict in drivers/pci/pcie/aspm.c +Auto-merged drivers/pci/probe.c +Auto-merged drivers/pci/quirks.c +Auto-merged drivers/pci/setup-bus.c +Auto-merged drivers/scsi/ipr.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/pci_ids.h +Auto-merged init/Kconfig +Resolved 'drivers/pci/pcie/aspm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d5b0c41: Merge commit 'pci/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/MSI-HOWTO.txt | 6 +- + Documentation/PCI/pci.txt | 4 + + Documentation/kernel-parameters.txt | 25 ++-- + arch/powerpc/include/asm/pci-bridge.h | 7 + + arch/powerpc/include/asm/pci.h | 11 ++ + arch/powerpc/kernel/pci-common.c | 136 +++++++++++++++++++++- + arch/x86/pci/irq.c | 19 ++- + drivers/i2c/busses/i2c-amd756.c | 5 - + drivers/i2c/busses/i2c-viapro.c | 5 - + drivers/pci/bus.c | 7 + + drivers/pci/hotplug/ibmphp_ebda.c | 92 ++++----------- + drivers/pci/hotplug/pci_hotplug_core.c | 14 +- + drivers/pci/hotplug/pciehp.h | 16 +++- + drivers/pci/hotplug/pciehp_core.c | 78 ++++++++----- + drivers/pci/hotplug/pciehp_ctrl.c | 136 ++++++++++++---------- + drivers/pci/hotplug/pciehp_hpc.c | 202 ++++++++++++++++++-------------- + drivers/pci/hotplug/pciehp_pci.c | 26 +++-- + drivers/pci/hotplug/rpaphp.h | 4 +- + drivers/pci/hotplug/rpaphp_core.c | 4 +- + drivers/pci/hotplug/rpaphp_pci.c | 2 +- + drivers/pci/msi.c | 10 +- + drivers/pci/pci-driver.c | 21 +++- + drivers/pci/pci-sysfs.c | 148 ++++++++++++++---------- + drivers/pci/pci.c | 95 ++++++++++++--- + drivers/pci/pci.h | 20 +++ + drivers/pci/pcie/aspm.c | 6 +- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/pci/probe.c | 63 +++++++---- + drivers/pci/quirks.c | 176 ++++++++++++++-------------- + drivers/pci/remove.c | 11 +- + drivers/pci/setup-bus.c | 4 +- + drivers/pci/setup-res.c | 9 +- + drivers/pci/slot.c | 10 ++ + drivers/scsi/ipr.c | 1 - + drivers/scsi/qla2xxx/qla_def.h | 2 +- + include/linux/pci.h | 11 +- + include/linux/pci_ids.h | 6 +- + include/linux/pci_regs.h | 14 +++ + init/Kconfig | 8 ++ + 39 files changed, 888 insertions(+), 528 deletions(-) +$ git revert 913d3708831ec551ca8560ea2cc793f738df88d6 +Auto-merged arch/powerpc/include/asm/pci.h +Auto-merged arch/powerpc/kernel/pci-common.c +Finished one revert. +Created commit 6b6a0c4: Revert "powerpc/PCI: Add legacy PCI access via sysfs" + 3 files changed, 1 insertions(+), 153 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-crypt.c | 9 ++++++--- + drivers/md/dm-delay.c | 3 ++- + drivers/md/dm-exception-store.c | 1 - + drivers/md/dm-io.c | 2 +- + drivers/md/dm-kcopyd.c | 14 +++++++++++++- + drivers/md/dm-linear.c | 2 +- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-mpath.c | 3 ++- + drivers/md/dm-path-selector.c | 3 ++- + drivers/md/dm-raid1.c | 6 ++---- + drivers/md/dm-round-robin.c | 3 ++- + drivers/md/dm-snap.c | 11 +++-------- + drivers/md/dm-snap.h | 5 +---- + drivers/md/dm-stripe.c | 6 +++--- + drivers/md/dm-zero.c | 2 +- + drivers/md/dm.h | 9 --------- + include/linux/device-mapper.h | 3 +++ + 17 files changed, 43 insertions(+), 41 deletions(-) +Merging hid/mm +$ git merge hid/mm +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + Documentation/i2c/busses/i2c-i801 | 7 ++++--- + drivers/i2c/algos/i2c-algo-pcf.c | 4 ++-- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-elektor.c | 3 ++- + drivers/i2c/busses/i2c-i801.c | 3 +++ + include/linux/i2c-algo-pcf.h | 2 +- + 6 files changed, 13 insertions(+), 7 deletions(-) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merged drivers/hwmon/ams/ams.h +Merge made by recursive. + Documentation/hwmon/adt7470 | 76 +++ + Documentation/hwmon/it87 | 4 +- + Documentation/hwmon/lm85 | 10 - + Documentation/hwmon/lm87 | 9 +- + Documentation/hwmon/lm90 | 45 ++- + Documentation/hwmon/pc87360 | 7 +- + Documentation/hwmon/pc87427 | 2 +- + Documentation/hwmon/w83781d | 37 ++- + Documentation/hwmon/w83791d | 43 ++- + drivers/hwmon/Kconfig | 8 +- + drivers/hwmon/adm1026.c | 17 +- + drivers/hwmon/adm1029.c | 5 +- + drivers/hwmon/ams/ams-core.c | 82 ++-- + drivers/hwmon/ams/ams-i2c.c | 60 +-- + drivers/hwmon/ams/ams-input.c | 63 ++- + drivers/hwmon/ams/ams-pmu.c | 18 +- + drivers/hwmon/ams/ams.h | 4 +- + drivers/hwmon/ibmaem.c | 7 + + drivers/hwmon/ibmpex.c | 6 + + drivers/hwmon/it87.c | 11 +- + drivers/hwmon/lm78.c | 270 ++++++----- + drivers/hwmon/lm85.c | 352 +++++++------- + drivers/hwmon/lm87.c | 33 +- + drivers/hwmon/lm90.c | 444 ++++++++++++----- + drivers/hwmon/max1619.c | 17 +- + drivers/hwmon/w83781d.c | 976 ++++++++++++++++++++----------------- + drivers/hwmon/w83791d.c | 324 ++++++++++++- + drivers/i2c/busses/i2c-powermac.c | 29 ++ + 28 files changed, 1864 insertions(+), 1095 deletions(-) + create mode 100644 Documentation/hwmon/adt7470 +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merged Documentation/00-INDEX +Auto-merged include/linux/kernel.h +Merge made by recursive. + Documentation/00-INDEX | 2 -- + Documentation/early-userspace/00-INDEX | 8 ++++++++ + Documentation/{ => early-userspace}/initrd.txt | 6 +++--- + include/linux/kernel.h | 4 ++-- + scripts/kernel-doc | 6 +++--- + 5 files changed, 16 insertions(+), 10 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Removed arch/arm/mach-sa1100/include/mach/ide.h +Auto-merged drivers/ide/Kconfig +Auto-merged drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Removed drivers/ide/pci/hpt34x.c +Merge made by recursive. + arch/arm/mach-sa1100/include/mach/ide.h | 75 --- + arch/parisc/include/asm/ide.h | 4 - + drivers/ide/Kconfig | 94 ++--- + drivers/ide/Makefile | 19 +- + drivers/ide/ide-atapi.c | 2 +- + drivers/ide/ide-cd.c | 61 ++- + drivers/ide/ide-cd_ioctl.c | 8 +- + drivers/ide/ide-disk.c | 382 +++------------- + drivers/ide/ide-disk.h | 21 +- + drivers/ide/ide-disk_ioctl.c | 4 +- + drivers/ide/ide-disk_proc.c | 2 +- + drivers/ide/ide-dma-sff.c | 2 +- + drivers/ide/ide-floppy.c | 357 ++------------- + drivers/ide/ide-floppy.h | 41 +-- + drivers/ide/ide-floppy_ioctl.c | 23 +- + drivers/ide/ide-floppy_proc.c | 2 +- + drivers/ide/ide-gd.c | 398 ++++++++++++++++ + drivers/ide/ide-gd.h | 44 ++ + drivers/ide/ide-iops.c | 2 +- + drivers/ide/ide-probe.c | 1 + + drivers/ide/ide-proc.c | 6 +- + drivers/ide/ide-tape.c | 16 +- + drivers/ide/mips/Makefile | 1 + + drivers/ide/mips/tx4939ide.c | 775 +++++++++++++++++++++++++++++++ + drivers/ide/pci/Makefile | 1 - + drivers/ide/pci/delkin_cb.c | 63 +++- + drivers/ide/pci/hpt34x.c | 193 -------- + drivers/ide/pci/hpt366.c | 35 +- + drivers/ide/pci/scc_pata.c | 4 - + drivers/ide/pci/sgiioc4.c | 49 +-- + drivers/leds/Kconfig | 2 +- + drivers/scsi/ide-scsi.c | 26 +- + include/asm-frv/ide.h | 10 +- + include/asm-m68k/ide.h | 9 - + include/linux/ide.h | 36 +- + 35 files changed, 1597 insertions(+), 1171 deletions(-) + delete mode 100644 arch/arm/mach-sa1100/include/mach/ide.h + create mode 100644 drivers/ide/ide-gd.c + create mode 100644 drivers/ide/ide-gd.h + create mode 100644 drivers/ide/mips/tx4939ide.c + delete mode 100644 drivers/ide/pci/hpt34x.c +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merged fs/nfs/super.c +Auto-merged net/sunrpc/clnt.c +Auto-merged net/sunrpc/rpcb_clnt.c +Auto-merged net/sunrpc/xprtrdma/rpc_rdma.c +Merge made by recursive. + fs/nfs/client.c | 5 +- + fs/nfs/dir.c | 20 +- + fs/nfs/file.c | 18 +- + fs/nfs/inode.c | 183 ++++++---- + fs/nfs/internal.h | 25 ++- + fs/nfs/mount_clnt.c | 3 +- + fs/nfs/namespace.c | 7 +- + fs/nfs/nfs3acl.c | 2 + + fs/nfs/nfs3proc.c | 20 +- + fs/nfs/nfs4namespace.c | 105 +++--- + fs/nfs/proc.c | 10 +- + fs/nfs/super.c | 126 ++++--- + fs/nfs/unlink.c | 5 +- + fs/nfs/write.c | 3 +- + include/linux/nfs_fs.h | 19 +- + include/linux/nfs_fs_sb.h | 1 - + include/linux/nfs_mount.h | 4 + + include/linux/nfs_xdr.h | 11 +- + include/linux/sunrpc/xprtrdma.h | 4 +- + net/sunrpc/clnt.c | 4 +- + net/sunrpc/rpcb_clnt.c | 40 ++- + net/sunrpc/xprt.c | 12 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 29 ++- + net/sunrpc/xprtrdma/transport.c | 41 ++- + net/sunrpc/xprtrdma/verbs.c | 741 ++++++++++++++++++++++++++------------ + net/sunrpc/xprtrdma/xprt_rdma.h | 17 +- + 26 files changed, 955 insertions(+), 500 deletions(-) +Merging xfs/master +$ git merge xfs/master +Auto-merged fs/xfs/linux-2.6/xfs_super.c +Merge made by recursive. + fs/xfs/Makefile | 4 +- + fs/xfs/linux-2.6/xfs_stats.c | 4 + + fs/xfs/linux-2.6/xfs_stats.h | 65 + + fs/xfs/linux-2.6/xfs_super.c | 223 +-- + fs/xfs/linux-2.6/xfs_super.h | 3 - + fs/xfs/linux-2.6/xfs_sync.c | 609 +++++++ + fs/xfs/linux-2.6/xfs_sync.h | 63 + + fs/xfs/linux-2.6/xfs_vfs.h | 31 - + fs/xfs/quota/xfs_dquot.c | 18 +- + fs/xfs/quota/xfs_dquot.h | 4 +- + fs/xfs/quota/xfs_dquot_item.c | 37 +- + fs/xfs/quota/xfs_qm.c | 2 - + fs/xfs/quota/xfs_qm.h | 1 - + fs/xfs/quota/xfs_qm_syscalls.c | 127 +- + fs/xfs/support/debug.c | 2 +- + fs/xfs/xfs.h | 2 +- + fs/xfs/xfs_ag.h | 5 +- + fs/xfs/xfs_alloc.c | 195 ++- + fs/xfs/xfs_alloc.h | 27 +- + fs/xfs/xfs_alloc_btree.c | 2387 ++++----------------------- + fs/xfs/xfs_alloc_btree.h | 107 +- + fs/xfs/xfs_arch.h | 39 +- + fs/xfs/xfs_bit.h | 3 +- + fs/xfs/xfs_bmap.c | 296 ++-- + fs/xfs/xfs_bmap.h | 61 +- + fs/xfs/xfs_bmap_btree.c | 2614 ++++++------------------------ + fs/xfs/xfs_bmap_btree.h | 171 +-- + fs/xfs/xfs_btree.c | 3596 +++++++++++++++++++++++++++++++++++----- + fs/xfs/xfs_btree.h | 392 +++-- + fs/xfs/xfs_btree_trace.c | 249 +++ + fs/xfs/xfs_btree_trace.h | 116 ++ + fs/xfs/xfs_da_btree.h | 24 +- + fs/xfs/xfs_dinode.h | 5 +- + fs/xfs/xfs_fsops.c | 24 +- + fs/xfs/xfs_ialloc.c | 132 ++- + fs/xfs/xfs_ialloc.h | 21 +- + fs/xfs/xfs_ialloc_btree.c | 2193 +++---------------------- + fs/xfs/xfs_ialloc_btree.h | 111 +- + fs/xfs/xfs_iget.c | 66 +- + fs/xfs/xfs_imap.h | 2 - + fs/xfs/xfs_inode.c | 198 ++-- + fs/xfs/xfs_inode.h | 259 ++-- + fs/xfs/xfs_inode_item.h | 41 +- + fs/xfs/xfs_itable.c | 26 +- + fs/xfs/xfs_log_recover.c | 8 +- + fs/xfs/xfs_mount.c | 46 +- + fs/xfs/xfs_mount.h | 33 +- + fs/xfs/xfs_trans.h | 317 ++-- + fs/xfs/xfs_vfsops.c | 562 +------- + fs/xfs/xfs_vfsops.h | 1 - + fs/xfs/xfs_vnodeops.c | 42 +- + 51 files changed, 6846 insertions(+), 8718 deletions(-) + create mode 100644 fs/xfs/linux-2.6/xfs_sync.c + create mode 100644 fs/xfs/linux-2.6/xfs_sync.h + create mode 100644 fs/xfs/xfs_btree_trace.c + create mode 100644 fs/xfs/xfs_btree_trace.h +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/mad.c | 14 +++++--------- + drivers/infiniband/core/ucma.c | 4 ++-- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 + + drivers/infiniband/hw/ehca/ehca_qp.c | 6 ++++++ + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 +++---- + 5 files changed, 17 insertions(+), 15 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/acpi/boot.c +CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/boot.c +Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged drivers/acpi/Kconfig +CONFLICT (content): Merge conflict in drivers/acpi/Kconfig +Removed drivers/acpi/bay.c +Auto-merged drivers/acpi/scan.c +CONFLICT (content): Merge conflict in drivers/acpi/scan.c +Auto-merged drivers/acpi/toshiba_acpi.c +Auto-merged drivers/misc/Kconfig +Auto-merged drivers/pnp/Makefile +CONFLICT (content): Merge conflict in drivers/pnp/Makefile +Auto-merged drivers/pnp/base.h +Auto-merged drivers/pnp/core.c +Auto-merged drivers/pnp/driver.c +Auto-merged drivers/pnp/isapnp/core.c +Auto-merged drivers/pnp/pnpacpi/core.c +Auto-merged drivers/pnp/pnpbios/core.c +Auto-merged drivers/pnp/quirks.c +Auto-merged drivers/pnp/resource.c +Auto-merged include/acpi/acmacros.h +Auto-merged include/asm-x86/idle.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/pci_ids.h +Auto-merged include/linux/pnp.h +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/acpi/Kconfig' using previous resolution. +Resolved 'drivers/acpi/scan.c' using previous resolution. +Resolved 'drivers/pnp/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/acpi/boot.c'. +Created commit 9b2ce33: Merge commit 'acpi/test' + Documentation/kernel-parameters.txt | 59 ++- + Documentation/laptops/acer-wmi.txt | 28 +- + MAINTAINERS | 15 +- + arch/ia64/sn/kernel/io_acpi_init.c | 8 +- + arch/x86/Kconfig | 2 + + arch/x86/kernel/acpi/boot.c | 5 +- + arch/x86/kernel/acpi/sleep.c | 4 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 + + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 42 +- + arch/x86/kernel/process_64.c | 7 + + drivers/Makefile | 1 + + drivers/acpi/Kconfig | 11 +- + drivers/acpi/Makefile | 1 - + drivers/acpi/ac.c | 4 +- + drivers/acpi/acpi_memhotplug.c | 11 +- + drivers/acpi/asus_acpi.c | 4 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/bay.c | 411 --------------- + drivers/acpi/bus.c | 78 +++- + drivers/acpi/button.c | 6 +- + drivers/acpi/cm_sbs.c | 6 +- + drivers/acpi/container.c | 4 +- + drivers/acpi/dock.c | 388 +++++++++++---- + drivers/acpi/ec.c | 374 +++++++------- + drivers/acpi/executer/exconfig.c | 116 +++-- + drivers/acpi/fan.c | 6 +- + drivers/acpi/hardware/hwsleep.c | 44 +- + drivers/acpi/namespace/nsxfeval.c | 79 +++ + drivers/acpi/namespace/nsxfname.c | 5 + + drivers/acpi/numa.c | 2 +- + drivers/acpi/osl.c | 54 ++- + drivers/acpi/parser/psloop.c | 2 + + drivers/acpi/pci_link.c | 2 +- + drivers/acpi/pci_root.c | 4 +- + drivers/acpi/pci_slot.c | 10 +- + drivers/acpi/power.c | 74 ++- + drivers/acpi/processor_core.c | 6 +- + drivers/acpi/processor_perflib.c | 37 +- + drivers/acpi/processor_throttling.c | 19 +- + drivers/acpi/sbs.c | 2 +- + drivers/acpi/sbshc.c | 6 +- + drivers/acpi/scan.c | 91 ++-- + drivers/acpi/sleep/main.c | 61 +++- + drivers/acpi/system.c | 4 +- + drivers/acpi/tables/tbfadt.c | 32 +- + drivers/acpi/tables/tbinstal.c | 61 ++- + drivers/acpi/thermal.c | 49 ++- + drivers/acpi/toshiba_acpi.c | 2 +- + drivers/acpi/utilities/utglobal.c | 44 ++- + drivers/acpi/utilities/utobject.c | 8 +- + drivers/acpi/utilities/utxface.c | 7 +- + drivers/acpi/utils.c | 4 +- + drivers/acpi/video.c | 59 +-- + drivers/acpi/wmi.c | 49 ++- + drivers/ata/libata-acpi.c | 135 ++---- + drivers/dma/ioat_dma.c | 3 + + drivers/idle/Kconfig | 16 + + drivers/idle/Makefile | 2 + + drivers/idle/i7300_idle.c | 669 ++++++++++++++++++++++++ + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 1 + + drivers/misc/acer-wmi.c | 225 +++++--- + drivers/misc/asus-laptop.c | 14 +- + drivers/misc/eeepc-laptop.c | 232 ++++++++- + drivers/misc/fujitsu-laptop.c | 135 +++--- + drivers/misc/intel_menlow.c | 29 +- + drivers/misc/panasonic-laptop.c | 767 ++++++++++++++++++++++++++++ + drivers/misc/thinkpad_acpi.c | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 20 +- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/sgi_hotplug.c | 4 +- + drivers/pnp/Kconfig | 20 +- + drivers/pnp/Makefile | 4 - + drivers/pnp/base.h | 10 + + drivers/pnp/core.c | 29 +- + drivers/pnp/driver.c | 4 - + drivers/pnp/isapnp/Makefile | 4 - + drivers/pnp/isapnp/core.c | 12 +- + drivers/pnp/manager.c | 34 +- + drivers/pnp/pnpacpi/Makefile | 4 - + drivers/pnp/pnpacpi/core.c | 16 +- + drivers/pnp/pnpacpi/rsparser.c | 43 +- + drivers/pnp/pnpbios/Makefile | 4 - + drivers/pnp/pnpbios/core.c | 4 +- + drivers/pnp/pnpbios/rsparser.c | 18 +- + drivers/pnp/quirks.c | 6 +- + drivers/pnp/resource.c | 12 +- + drivers/pnp/support.c | 14 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acdisasm.h | 4 + + include/acpi/acmacros.h | 253 +++++----- + include/acpi/acpi_bus.h | 11 +- + include/acpi/acpi_drivers.h | 11 +- + include/acpi/acpiosxf.h | 3 + + include/acpi/actbl1.h | 51 ++- + include/acpi/actypes.h | 3 +- + include/acpi/acutils.h | 4 +- + include/acpi/platform/aclinux.h | 6 + + include/asm-x86/idle.h | 1 + + include/linux/acpi.h | 8 - + include/linux/kernel.h | 24 + + include/linux/pci_ids.h | 1 + + include/linux/pnp.h | 10 - + 103 files changed, 3686 insertions(+), 1625 deletions(-) + delete mode 100644 drivers/acpi/bay.c + create mode 100644 drivers/idle/Kconfig + create mode 100644 drivers/idle/Makefile + create mode 100644 drivers/idle/i7300_idle.c + create mode 100644 drivers/misc/panasonic-laptop.c +$ git am -3 ../patches/0001-acpi-acpi_os_hotplug_execute-needs-to-be-exported.patch +Applying acpi: acpi_os_hotplug_execute needs to be exported +$ git reset HEAD^ +drivers/acpi/osl.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit bb6ef59: Merge commit 'acpi/test' +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/ieee1394/dv1394.c +Auto-merged drivers/ieee1394/raw1394.c +Auto-merged drivers/ieee1394/video1394.c +Merge made by recursive. + drivers/firewire/fw-card.c | 56 ++------ + drivers/firewire/fw-cdev.c | 42 +++--- + drivers/firewire/fw-device.c | 40 ++---- + drivers/firewire/fw-device.h | 4 + + drivers/firewire/fw-ohci.c | 73 +++++----- + drivers/firewire/fw-sbp2.c | 119 ++++++---------- + drivers/firewire/fw-transaction.c | 48 ++++++- + drivers/firewire/fw-transaction.h | 11 +- + drivers/ieee1394/csr1212.c | 2 +- + drivers/ieee1394/dv1394.c | 2 +- + drivers/ieee1394/eth1394.c | 2 +- + drivers/ieee1394/nodemgr.c | 279 ++++++++++++++---------------------- + drivers/ieee1394/nodemgr.h | 2 +- + drivers/ieee1394/raw1394-private.h | 1 + + drivers/ieee1394/raw1394.c | 230 ++++++++++++++++------------- + drivers/ieee1394/sbp2.c | 218 ++++++++++++---------------- + drivers/ieee1394/sbp2.h | 33 ++--- + drivers/ieee1394/video1394.c | 8 +- + include/linux/firewire-cdev.h | 9 +- + 19 files changed, 530 insertions(+), 649 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/cdev.c | 6 +----- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/vtbl.c | 4 ++-- + 3 files changed, 4 insertions(+), 8 deletions(-) +Merging kvm/master +$ git merge kvm/master +Auto-merged MAINTAINERS +Auto-merged arch/ia64/kvm/kvm-ia64.c +Auto-merged arch/powerpc/kernel/asm-offsets.c +Auto-merged arch/x86/kvm/i8254.c +CONFLICT (content): Merge conflict in arch/x86/kvm/i8254.c +Auto-merged arch/x86/kvm/lapic.c +Auto-merged arch/x86/kvm/x86.c +Resolved 'arch/x86/kvm/i8254.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 0506b6f: Merge commit 'kvm/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 9 +- + arch/ia64/include/asm/kvm_host.h | 12 +- + arch/ia64/kvm/Kconfig | 2 + + arch/ia64/kvm/Makefile | 9 +- + arch/ia64/kvm/irq.h | 31 + + arch/ia64/kvm/kvm-ia64.c | 146 +++-- + arch/ia64/kvm/kvm_fw.c | 9 +- + arch/ia64/kvm/kvm_minstate.h | 23 +- + arch/ia64/kvm/optvfault.S | 181 ++++- + arch/ia64/kvm/process.c | 6 +- + arch/ia64/kvm/vcpu.h | 26 +- + arch/ia64/kvm/vmm_ivt.S | 39 +- + arch/ia64/kvm/vtlb.c | 23 +- + arch/powerpc/include/asm/kvm_host.h | 14 +- + arch/powerpc/include/asm/kvm_ppc.h | 12 + + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x_tlb.c | 53 +- + arch/powerpc/kvm/Kconfig | 11 + + arch/powerpc/kvm/Makefile | 6 +- + arch/powerpc/kvm/booke_guest.c | 17 + + arch/powerpc/kvm/booke_interrupts.S | 79 ++- + arch/powerpc/kvm/emulate.c | 8 +- + arch/powerpc/kvm/powerpc.c | 99 +++- + arch/s390/Kconfig | 7 +- + arch/s390/kvm/priv.c | 4 +- + arch/x86/kernel/cpu/mtrr/generic.c | 12 +- + arch/x86/kernel/cpu/mtrr/main.c | 4 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 18 +- + arch/x86/kernel/kvmclock.c | 30 + + arch/x86/kernel/pvclock.c | 12 + + arch/x86/kvm/Makefile | 5 +- + arch/x86/kvm/i8254.c | 103 ++- + arch/x86/kvm/i8254.h | 8 +- + arch/x86/kvm/i8259.c | 53 ++- + arch/x86/kvm/irq.c | 3 +- + arch/x86/kvm/irq.h | 7 +- + arch/x86/kvm/kvm_cache_regs.h | 32 + + arch/x86/kvm/lapic.c | 78 ++- + arch/x86/kvm/mmu.c | 794 ++++++++++++++++---- + arch/x86/kvm/paging_tmpl.h | 249 ++++-- + arch/x86/kvm/svm.c | 162 ++--- + arch/x86/kvm/vmx.c | 989 +++++++++++++++++------- + arch/x86/kvm/vmx.h | 10 +- + arch/x86/kvm/x86.c | 673 +++++++++++------ + arch/x86/kvm/x86.h | 22 + + arch/x86/kvm/x86_emulate.c | 178 +++-- + arch/x86/xen/time.c | 11 +- + drivers/pci/dmar.c | 4 +- + drivers/pci/intel-iommu.c | 116 +++- + drivers/pci/intr_remapping.c | 2 +- + drivers/pci/intr_remapping.h | 2 +- + drivers/pci/iova.c | 2 +- + include/asm-x86/kvm.h | 22 - + include/asm-x86/kvm_host.h | 96 ++- + include/asm-x86/kvm_x86_emulate.h | 10 +- + include/asm-x86/msr-index.h | 3 + + include/asm-x86/mtrr.h | 25 + + include/asm-x86/pvclock.h | 1 + + {drivers/pci => include/linux}/dma_remapping.h | 0 + {drivers/pci => include/linux}/intel-iommu.h | 24 +- + {drivers/pci => include/linux}/iova.h | 0 + include/linux/kvm.h | 83 ++- + include/linux/kvm_host.h | 87 +++ + virt/kvm/ioapic.c | 23 +- + virt/kvm/ioapic.h | 10 +- + virt/kvm/irq_comm.c | 96 +++ + virt/kvm/kvm_main.c | 386 ++++++++-- + virt/kvm/kvm_trace.c | 30 +- + virt/kvm/vtd.c | 191 +++++ + 69 files changed, 4085 insertions(+), 1411 deletions(-) + create mode 100644 arch/ia64/kvm/irq.h + create mode 100644 arch/x86/kvm/kvm_cache_regs.h + create mode 100644 arch/x86/kvm/x86.h + rename {drivers/pci => include/linux}/dma_remapping.h (100%) + rename {drivers/pci => include/linux}/intel-iommu.h (92%) + rename {drivers/pci => include/linux}/iova.h (100%) + create mode 100644 virt/kvm/irq_comm.c + create mode 100644 virt/kvm/vtd.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merged drivers/md/dm-mpath.c +Auto-merged drivers/md/multipath.c +Merge made by recursive. + block/blk-core.c | 11 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 3 +- + drivers/md/dm-mpath.c | 2 +- + drivers/md/multipath.c | 4 +- + drivers/s390/block/dasd_diag.c | 2 +- + drivers/s390/block/dasd_eckd.c | 2 +- + drivers/s390/block/dasd_fba.c | 2 +- + drivers/scsi/constants.c | 3 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 3 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 3 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 6 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 3 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 - + drivers/scsi/iscsi_tcp.c | 44 +- + drivers/scsi/libiscsi.c | 183 +++- + drivers/scsi/lpfc/lpfc.h | 96 ++- + drivers/scsi/lpfc/lpfc_attr.c | 1375 +++++++++++++++++++++- + drivers/scsi/lpfc/lpfc_crtn.h | 51 +- + drivers/scsi/lpfc/lpfc_ct.c | 20 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 400 ++++++-- + drivers/scsi/lpfc/lpfc_disc.h | 23 + + drivers/scsi/lpfc/lpfc_els.c | 1712 +++++++++++++++++++++++++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 241 ++++- + drivers/scsi/lpfc/lpfc_hw.h | 183 +++- + drivers/scsi/lpfc/lpfc_init.c | 924 +++++++++++---- + drivers/scsi/lpfc/lpfc_mbox.c | 624 ++++++++-- + drivers/scsi/lpfc/lpfc_mem.c | 116 ++- + drivers/scsi/lpfc/lpfc_nl.h | 163 +++ + drivers/scsi/lpfc/lpfc_nportdisc.c | 24 +- + drivers/scsi/lpfc/lpfc_scsi.c | 514 ++++++++- + drivers/scsi/lpfc/lpfc_scsi.h | 5 + + drivers/scsi/lpfc/lpfc_sli.c | 1715 ++++++++++++++++++++++++--- + drivers/scsi/lpfc/lpfc_sli.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 168 +++- + drivers/scsi/lpfc/lpfc_vport.h | 4 + + drivers/scsi/qla2xxx/qla_attr.c | 1 - + drivers/scsi/qla2xxx/qla_isr.c | 14 +- + drivers/scsi/qla2xxx/qla_os.c | 26 +- + drivers/scsi/qla4xxx/ql4_isr.c | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/scsi.c | 10 +- + drivers/scsi/scsi_error.c | 72 +- + drivers/scsi/scsi_lib.c | 106 ++- + drivers/scsi/scsi_priv.h | 1 + + drivers/scsi/scsi_scan.c | 1 + + drivers/scsi/scsi_transport_fc.c | 47 +- + drivers/scsi/scsi_transport_iscsi.c | 19 +- + drivers/scsi/scsi_transport_spi.c | 4 +- + drivers/scsi/sd.c | 17 +- + drivers/scsi/sd.h | 21 +- + drivers/scsi/sd_dif.c | 42 +- + include/linux/bio.h | 26 +- + include/linux/blkdev.h | 15 +- + include/scsi/iscsi_if.h | 2 + + include/scsi/libiscsi.h | 15 +- + include/scsi/scsi.h | 6 + + include/scsi/scsi_device.h | 10 + + include/scsi/scsi_transport_fc.h | 8 +- + include/scsi/scsi_transport_iscsi.h | 5 +- + 60 files changed, 8003 insertions(+), 1111 deletions(-) + create mode 100644 drivers/scsi/lpfc/lpfc_nl.h +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/mmap.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) +Merging ext4/next +$ git merge ext4/next +Auto-merged fs/Kconfig +Auto-merged fs/ext4/super.c +Auto-merged include/linux/jbd2.h +Merge made by recursive. +Merging async_tx/next +$ git merge async_tx/next +Auto-merged drivers/dma/ioat_dma.c +Merge made by recursive. + crypto/async_tx/async_tx.c | 34 +++--- + drivers/dma/Kconfig | 10 +- + drivers/dma/dmatest.c | 7 +- + drivers/dma/fsldma.c | 270 ++++++++++++++----------------------------- + drivers/dma/fsldma.h | 1 + + drivers/dma/ioat_dma.c | 2 - + 6 files changed, 116 insertions(+), 208 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Removed drivers/mtd/maps/ebony.c +Removed drivers/mtd/maps/ocotea.c +Removed drivers/mtd/maps/omap-toto-flash.c +Removed drivers/mtd/maps/walnut.c +Auto-merged drivers/mtd/mtdchar.c +Auto-merged drivers/mtd/mtdpart.c +Removed drivers/mtd/nand/toto.c +Auto-merged fs/Kconfig +Auto-merged include/linux/pci.h +Merge made by recursive. + Documentation/mtd/nand_ecc.txt | 714 +++++++++++++++++ + arch/arm/mach-pxa/include/mach/pxa3xx_nand.h | 44 +- + arch/arm/plat-mxc/include/mach/mxc_nand.h | 27 + + arch/arm/plat-omap/include/mach/onenand.h | 6 +- + drivers/mtd/Kconfig | 5 + + drivers/mtd/chips/Kconfig | 4 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 71 ++- + drivers/mtd/chips/cfi_probe.c | 58 +-- + drivers/mtd/chips/cfi_util.c | 66 ++- + drivers/mtd/chips/gen_probe.c | 2 +- + drivers/mtd/devices/Kconfig | 21 + + drivers/mtd/devices/m25p80.c | 140 +++-- + drivers/mtd/devices/mtd_dataflash.c | 214 +++++- + drivers/mtd/inftlcore.c | 5 +- + drivers/mtd/maps/Kconfig | 33 +- + drivers/mtd/maps/Makefile | 4 - + drivers/mtd/maps/ebony.c | 163 ---- + drivers/mtd/maps/ocotea.c | 154 ---- + drivers/mtd/maps/omap-toto-flash.c | 133 ---- + drivers/mtd/maps/pci.c | 18 +- + drivers/mtd/maps/physmap_of.c | 3 +- + drivers/mtd/maps/walnut.c | 122 --- + drivers/mtd/mtdchar.c | 4 +- + drivers/mtd/mtdconcat.c | 4 +- + drivers/mtd/mtdpart.c | 4 +- + drivers/mtd/nand/Kconfig | 36 +- + drivers/mtd/nand/Makefile | 3 +- + drivers/mtd/nand/atmel_nand.c | 58 +-- + drivers/mtd/nand/fsl_elbc_nand.c | 3 +- + drivers/mtd/nand/fsl_upm.c | 68 +- + drivers/mtd/nand/mxc_nand.c | 1077 ++++++++++++++++++++++++++ + drivers/mtd/nand/nand_base.c | 16 +- + drivers/mtd/nand/nand_ecc.c | 554 ++++++++++--- + drivers/mtd/nand/nandsim.c | 1 - + drivers/mtd/nand/pxa3xx_nand.c | 147 ++-- + drivers/mtd/nand/sh_flctl.c | 301 +++++++ + drivers/mtd/nand/toto.c | 206 ----- + drivers/mtd/ofpart.c | 1 - + drivers/mtd/onenand/Kconfig | 8 + + drivers/mtd/onenand/Makefile | 1 + + drivers/mtd/onenand/omap2.c | 802 +++++++++++++++++++ + drivers/mtd/onenand/onenand_base.c | 2 +- + drivers/mtd/ssfdc.c | 3 +- + drivers/pci/rom.c | 6 +- + fs/Kconfig | 190 +----- + fs/jffs2/Kconfig | 188 +++++ + fs/jffs2/dir.c | 2 +- + fs/jffs2/erase.c | 4 +- + fs/jffs2/fs.c | 6 +- + include/linux/mtd/cfi.h | 9 +- + include/linux/mtd/flashchip.h | 4 + + include/linux/mtd/mtd.h | 4 +- + include/linux/mtd/nand.h | 1 + + include/linux/mtd/onenand_regs.h | 2 + + include/linux/mtd/partitions.h | 1 - + include/linux/mtd/sh_flctl.h | 125 +++ + include/linux/pci.h | 2 + + 57 files changed, 4380 insertions(+), 1470 deletions(-) + create mode 100644 Documentation/mtd/nand_ecc.txt + create mode 100644 arch/arm/plat-mxc/include/mach/mxc_nand.h + delete mode 100644 drivers/mtd/maps/ebony.c + delete mode 100644 drivers/mtd/maps/ocotea.c + delete mode 100644 drivers/mtd/maps/omap-toto-flash.c + delete mode 100644 drivers/mtd/maps/walnut.c + create mode 100644 drivers/mtd/nand/mxc_nand.c + create mode 100644 drivers/mtd/nand/sh_flctl.c + delete mode 100644 drivers/mtd/nand/toto.c + create mode 100644 drivers/mtd/onenand/omap2.c + create mode 100644 fs/jffs2/Kconfig + create mode 100644 include/linux/mtd/sh_flctl.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + crypto/camellia.c | 84 +++++++++------------- + crypto/testmgr.c | 7 ++- + drivers/crypto/hifn_795x.c | 5 ++ + drivers/crypto/talitos.c | 169 ++++++++++++++++++++++++++++---------------- + drivers/crypto/talitos.h | 11 +++- + 5 files changed, 165 insertions(+), 111 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Auto-merged arch/alpha/kernel/osf_sys.c +Auto-merged arch/parisc/hpux/fs.c +Auto-merged drivers/md/dm-table.c +Auto-merged fs/block_dev.c +Auto-merged fs/char_dev.c +Auto-merged fs/compat.c +Auto-merged fs/dcache.c +Auto-merged fs/dquot.c +Auto-merged fs/ecryptfs/main.c +Auto-merged fs/ext2/dir.c +Auto-merged fs/ext2/ext2.h +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/namei.c +CONFLICT (content): Merge conflict in fs/ext4/namei.c +Auto-merged fs/ext4/super.c +Auto-merged fs/fat/inode.c +Auto-merged fs/fuse/inode.c +Auto-merged fs/gfs2/ops_inode.c +Auto-merged fs/jffs2/dir.c +Auto-merged fs/nfs/dir.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged fs/nfsd/nfsctl.c +Auto-merged fs/nfsd/vfs.c +Auto-merged include/linux/fs.h +Auto-merged init/main.c +Auto-merged net/unix/af_unix.c +Resolved 'fs/ext4/namei.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 6c4bd9d: Merge commit 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/osf_sys.c | 7 +- + arch/parisc/hpux/fs.c | 5 +- + arch/powerpc/platforms/cell/spufs/syscalls.c | 4 +- + drivers/md/dm-table.c | 21 +--- + fs/block_dev.c | 14 ++-- + fs/char_dev.c | 21 +++-- + fs/compat.c | 22 ++--- + fs/configfs/symlink.c | 16 ++-- + fs/dcache.c | 85 +++++++++--------- + fs/dquot.c | 10 +- + fs/ecryptfs/main.c | 23 ++--- + fs/efs/namei.c | 29 +----- + fs/exportfs/expfs.c | 16 ++-- + fs/ext2/dir.c | 14 ++-- + fs/ext2/ext2.h | 4 +- + fs/ext2/namei.c | 30 ++----- + fs/ext3/namei.c | 84 +++++++---------- + fs/ext3/super.c | 22 ++-- + fs/ext4/namei.c | 14 +--- + fs/ext4/super.c | 22 ++-- + fs/fat/inode.c | 52 ++++------- + fs/fuse/inode.c | 23 ++--- + fs/gfs2/ops_export.c | 33 ++----- + fs/gfs2/ops_inode.c | 2 +- + fs/hpfs/file.c | 2 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/inode.c | 29 ++++-- + fs/hpfs/namei.c | 2 +- + fs/isofs/export.c | 33 +------ + fs/jffs2/dir.c | 4 +- + fs/jffs2/super.c | 48 ++++++++++ + fs/jfs/namei.c | 15 +--- + fs/libfs.c | 26 +----- + fs/namei.c | 75 +++++++-------- + fs/namespace.c | 126 ++++++++++++------------- + fs/nfs/dir.c | 6 +- + fs/nfs/getroot.c | 6 +- + fs/nfsd/export.c | 125 ++++++++++++------------- + fs/nfsd/nfs4recover.c | 50 +++++----- + fs/nfsd/nfs4state.c | 8 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nfsd/vfs.c | 126 ++++++++++++++++++++++--- + fs/ntfs/namei.c | 22 +---- + fs/ocfs2/export.c | 30 +----- + fs/read_write.c | 58 ++++++++---- + fs/readdir.c | 22 ++--- + fs/reiserfs/inode.c | 13 +-- + fs/reiserfs/namei.c | 11 +-- + fs/reiserfs/super.c | 18 ++-- + fs/super.c | 15 +-- + fs/udf/namei.c | 17 +--- + fs/xfs/linux-2.6/xfs_export.c | 32 +------ + fs/xfs/linux-2.6/xfs_file.c | 128 -------------------------- + fs/xfs/linux-2.6/xfs_ioctl.c | 3 +- + include/linux/dcache.h | 2 +- + include/linux/fs.h | 1 - + include/linux/namei.h | 7 +- + init/main.c | 1 - + kernel/audit_tree.c | 48 +++++----- + net/unix/af_unix.c | 18 ++-- + 60 files changed, 724 insertions(+), 986 deletions(-) +$ git am -3 ../patches/0001-vfs-fix-up-merge-of-ext4.patch +Applying vfs: fix up merge of ext4 +$ git reset HEAD^ +fs/ext4/super.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit 1c2d355: Merge commit 'vfs/for-next' +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/core/jack.c | 3 ++ + sound/core/pcm_lib.c | 48 +++++++++++++++++++------------------- + sound/core/pcm_native.c | 24 ++++++------------- + sound/pci/hda/patch_nvhdmi.c | 1 + + sound/soc/at32/playpaq_wm8510.c | 12 ++------- + 5 files changed, 39 insertions(+), 49 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Auto-merged include/net/9p/9p.h +CONFLICT (content): Merge conflict in include/net/9p/9p.h +Removed net/9p/conv.c +Removed net/9p/fcprint.c +Recorded preimage for 'include/net/9p/9p.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/net/9p/9p.h'. +Created commit c8bdf8a: Merge commit 'v9fs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/9p/v9fs.c | 4 +- + fs/9p/v9fs_vfs.h | 6 +- + fs/9p/vfs_addr.c | 5 +- + fs/9p/vfs_dir.c | 60 ++- + fs/9p/vfs_file.c | 93 +++- + fs/9p/vfs_inode.c | 39 +- + fs/9p/vfs_super.c | 6 +- + include/net/9p/9p.h | 116 +--- + include/net/9p/client.h | 124 ++++- + include/net/9p/transport.h | 55 +-- + net/9p/Makefile | 3 +- + net/9p/client.c | 1467 +++++++++++++++++++++++++------------------- + net/9p/conv.c | 1054 ------------------------------- + net/9p/fcprint.c | 366 ----------- + net/9p/mod.c | 1 + + net/9p/protocol.c | 558 +++++++++++++++++ + net/9p/protocol.h | 34 + + net/9p/trans_fd.c | 1431 ++++++++++++++----------------------------- + net/9p/trans_virtio.c | 246 ++------- + net/9p/util.c | 4 + + 20 files changed, 2223 insertions(+), 3449 deletions(-) + delete mode 100644 net/9p/conv.c + delete mode 100644 net/9p/fcprint.c + create mode 100644 net/9p/protocol.c + create mode 100644 net/9p/protocol.h +Merging quilt/rr +$ git merge quilt/rr +Auto-merged drivers/md/md.c +CONFLICT (content): Merge conflict in drivers/md/md.c +Auto-merged drivers/mtd/mtdpart.c +Auto-merged drivers/net/ppp_generic.c +Auto-merged drivers/video/fbmem.c +Auto-merged fs/char_dev.c +Auto-merged fs/exec.c +Auto-merged include/linux/module.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Auto-merged kernel/kmod.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged kernel/panic.c +Auto-merged kernel/workqueue.c +Auto-merged net/decnet/dn_dev.c +Auto-merged net/ipv4/devinet.c +Auto-merged net/netfilter/nfnetlink.c +Resolved 'drivers/md/md.c' using previous resolution. +Resolved 'kernel/module.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 6aa121e: Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/lguest/lguest.c | 60 +-------- + arch/x86/lguest/i386_head.S | 15 -- + drivers/lguest/lg.h | 2 +- + drivers/lguest/lguest_user.c | 13 +- + drivers/lguest/page_tables.c | 61 +++++++++- + drivers/md/md.c | 2 + + drivers/net/virtio_net.c | 21 ++- + include/linux/module.h | 6 +- + include/linux/moduleparam.h | 25 ++++- + include/linux/workqueue.h | 18 ++- + init/Kconfig | 6 - + init/main.c | 12 +-- + kernel/module.c | 240 +++++++++++++++------------------- + kernel/panic.c | 17 +-- + kernel/params.c | 274 +++++++++++++++++++++------------------ + kernel/stop_machine.c | 111 ++++++---------- + kernel/workqueue.c | 7 +- + net/bluetooth/af_bluetooth.c | 8 +- + net/bridge/netfilter/ebtables.c | 15 +-- + net/can/af_can.c | 4 +- + net/core/dev.c | 2 - + net/core/rtnetlink.c | 4 +- + net/dccp/ccid.c | 2 +- + net/decnet/dn_dev.c | 2 - + net/ipv4/devinet.c | 2 - + net/ipv4/inet_diag.c | 2 - + net/ipv4/tcp_cong.c | 4 +- + net/netfilter/nfnetlink.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/sched/act_api.c | 2 +- + net/sched/cls_api.c | 2 +- + net/sched/ematch.c | 2 +- + net/sched/sch_api.c | 2 +- + net/socket.c | 2 +- + net/sunrpc/auth.c | 2 - + 35 files changed, 444 insertions(+), 507 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/README | 3 +++ + fs/cifs/connect.c | 53 ++++++++++++++++++++++++----------------------------- + 2 files changed, 27 insertions(+), 29 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Removed fs/gfs2/ops_dentry.h +Auto-merged fs/gfs2/ops_export.c +Removed fs/gfs2/ops_fstype.h +Auto-merged fs/gfs2/ops_inode.c +Removed fs/gfs2/ops_inode.h +Removed fs/gfs2/ops_super.h +Auto-merged include/linux/fs.h +Merge made by recursive. + fs/gfs2/inode.c | 1 - + fs/gfs2/inode.h | 11 +++++++++++ + fs/gfs2/main.c | 2 +- + fs/gfs2/ops_address.c | 16 +++++++--------- + fs/gfs2/ops_dentry.c | 2 +- + fs/gfs2/ops_dentry.h | 17 ----------------- + fs/gfs2/ops_export.c | 3 +-- + fs/gfs2/ops_file.c | 1 - + fs/gfs2/ops_fstype.c | 3 --- + fs/gfs2/ops_fstype.h | 19 ------------------- + fs/gfs2/ops_inode.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- + fs/gfs2/ops_inode.h | 25 ------------------------- + fs/gfs2/ops_super.c | 8 ++++---- + fs/gfs2/ops_super.h | 17 ----------------- + fs/gfs2/super.h | 8 ++++++++ + fs/ioctl.c | 44 ++++++++++++++++++++++++++++++++++---------- + include/linux/fs.h | 3 +++ + 17 files changed, 117 insertions(+), 112 deletions(-) + delete mode 100644 fs/gfs2/ops_dentry.h + delete mode 100644 fs/gfs2/ops_fstype.h + delete mode 100644 fs/gfs2/ops_inode.h + delete mode 100644 fs/gfs2/ops_super.h +Merging input/next +$ git merge input/next +Already up-to-date. +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged arch/arm/mach-lh7a40x/clocks.c +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged include/net/bluetooth/hci_core.h +Auto-merged net/9p/trans_virtio.c +CONFLICT (content): Merge conflict in net/9p/trans_virtio.c +Auto-merged net/bluetooth/hci_core.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Resolved 'net/9p/trans_virtio.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit c550442: Merge commit 'semaphore-removal/semaphore-removal' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- + drivers/net/bonding/bond_main.c | 21 +++++++++++---------- + drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- + drivers/net/ppp_async.c | 8 ++++---- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- + include/net/bluetooth/hci_core.h | 7 ++++--- + net/9p/trans_virtio.c | 21 +++++++++++---------- + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- + 11 files changed, 69 insertions(+), 63 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged drivers/uio/uio.c +Merge made by recursive. + drivers/uio/uio.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) +Merging trivial/next +$ git merge trivial/next +Auto-merged Documentation/edac.txt +CONFLICT (content): Merge conflict in Documentation/edac.txt +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/base/sys.c +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/net/spider_net.c +Auto-merged drivers/serial/mpc52xx_uart.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/ntfs/aops.c +Auto-merged fs/proc/nommu.c +Auto-merged include/linux/securebits.h +CONFLICT (content): Merge conflict in include/linux/securebits.h +Auto-merged mm/migrate.c +Auto-merged mm/slub.c +Auto-merged net/wireless/wext.c +Resolved 'Documentation/edac.txt' using previous resolution. +Resolved 'include/linux/securebits.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 83cfefc: Merge commit 'trivial/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/hfs.txt | 2 +- + Documentation/ja_JP/SubmittingPatches | 4 ++-- + Documentation/zh_CN/SubmittingPatches | 4 ++-- + arch/mips/kernel/vpe.c | 2 +- + arch/sh/lib64/c-checksum.c | 4 ++-- + drivers/base/sys.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/net/spider_net.c | 2 +- + drivers/serial/mpc52xx_uart.c | 4 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/proc/nommu.c | 2 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 19 files changed, 24 insertions(+), 24 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merged fs/ubifs/super.c +Merge made by recursive. + Documentation/filesystems/ubifs.txt | 9 + + fs/ubifs/budget.c | 26 ++-- + fs/ubifs/debug.c | 79 +++++++-- + fs/ubifs/debug.h | 6 + + fs/ubifs/file.c | 260 ++++++++++++++++++++++++++ + fs/ubifs/find.c | 4 +- + fs/ubifs/gc.c | 90 ++++++++-- + fs/ubifs/io.c | 12 +- + fs/ubifs/key.h | 22 ++- + fs/ubifs/lprops.c | 34 +---- + fs/ubifs/lpt.c | 3 +- + fs/ubifs/lpt_commit.c | 187 ++++++++++++++++++- + fs/ubifs/misc.h | 27 +++ + fs/ubifs/scan.c | 2 +- + fs/ubifs/super.c | 109 +++++++++-- + fs/ubifs/tnc.c | 345 ++++++++++++++++++++++++++++++++--- + fs/ubifs/tnc_misc.c | 4 +- + fs/ubifs/ubifs-media.h | 1 - + fs/ubifs/ubifs.h | 85 +++++++-- + fs/ubifs/xattr.c | 2 +- + 20 files changed, 1149 insertions(+), 158 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merged block/blk-core.c +Auto-merged fs/block_dev.c +Auto-merged fs/partitions/check.c +Auto-merged include/linux/bio.h +Auto-merged include/linux/interrupt.h +CONFLICT (content): Merge conflict in include/linux/interrupt.h +Auto-merged kernel/softirq.c +CONFLICT (content): Merge conflict in kernel/softirq.c +Auto-merged lib/Kconfig.debug +Resolved 'include/linux/interrupt.h' using previous resolution. +Resolved 'kernel/softirq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 2c86a67: Merge commit 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + block/blk-core.c | 25 +++++++- + block/blk-merge.c | 20 ++++++- + block/blk-settings.c | 2 - + block/elevator.c | 16 ++---- + block/genhd.c | 3 +- + drivers/s390/scsi/zfcp_def.h | 2 + + drivers/s390/scsi/zfcp_fsf.c | 34 +++++++++++ + drivers/s390/scsi/zfcp_fsf.h | 12 ++++ + drivers/s390/scsi/zfcp_qdio.c | 1 + + fs/block_dev.c | 2 +- + fs/partitions/check.c | 10 +++ + include/linux/bio.h | 7 ++ + include/linux/blktrace_api.h | 32 ++++++++++ + include/linux/interrupt.h | 24 +++++++- + include/linux/smp.h | 4 +- + kernel/softirq.c | 131 ++++++++++++++++++++++++++++++++++++++++- + lib/Kconfig.debug | 5 ++ + 17 files changed, 304 insertions(+), 26 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +Auto-merged drivers/media/dvb/ttpci/av7110.c +Removed drivers/media/dvb/ttpci/fdump.c +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Auto-merged drivers/scsi/qlogicpti.c +CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c +Removed drivers/scsi/qlogicpti_asm.c +Auto-merged firmware/Makefile +Auto-merged firmware/WHENCE +CONFLICT (content): Merge conflict in firmware/WHENCE +Auto-merged sound/isa/Kconfig +Auto-merged sound/isa/wavefront/wavefront_fx.c +Removed sound/isa/wavefront/yss225.c +Resolved 'drivers/scsi/qlogicpti.c' using previous resolution. +Resolved 'firmware/WHENCE' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 23e6d5d: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 ----------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 789 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +----- + drivers/scsi/ql1040_fw.h | 2130 ------- + drivers/scsi/ql12160_fw.h | 1811 ------ + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 20 + + firmware/WHENCE | 121 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 + + firmware/advansys/38C0800.bin.ihex | 336 + + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 +++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 ++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + firmware/yamaha/yss225_registers.bin.ihex | 998 +++ + sound/isa/Kconfig | 10 - + sound/isa/wavefront/wavefront_fx.c | 16 - + sound/isa/wavefront/yss225.c | 2739 --------- + 49 files changed, 20560 insertions(+), 22498 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex + create mode 100644 firmware/yamaha/yss225_registers.bin.ihex + delete mode 100644 sound/isa/wavefront/yss225.c +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Auto-merged drivers/power/Kconfig +Auto-merged drivers/power/Makefile +CONFLICT (content): Merge conflict in drivers/power/Makefile +Auto-merged drivers/power/power_supply_core.c +Resolved 'drivers/power/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 705efa7: Merge commit 'battery/master' +$ git diff -M --stat --summary HEAD^.. + drivers/power/Kconfig | 8 +- + drivers/power/Makefile | 3 +- + drivers/power/bq27x00_battery.c | 381 +++++++++++++++++++++++++++++++++++++ + drivers/power/pda_power.c | 11 +- + drivers/power/power_supply_core.c | 25 +++ + include/linux/power_supply.h | 6 + + 6 files changed, 428 insertions(+), 6 deletions(-) + create mode 100644 drivers/power/bq27x00_battery.c +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merged drivers/leds/Kconfig +Merge made by recursive. + drivers/leds/Kconfig | 16 ++++ + drivers/leds/Makefile | 2 + + drivers/leds/leds-da903x.c | 175 ++++++++++++++++++++++++++++++++++++++ + drivers/leds/ledtrig-backlight.c | 110 ++++++++++++++++++++++++ + include/linux/leds.h | 4 +- + 5 files changed, 305 insertions(+), 2 deletions(-) + create mode 100644 drivers/leds/leds-da903x.c + create mode 100644 drivers/leds/ledtrig-backlight.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Auto-merged drivers/leds/led-class.c +Merge made by recursive. + arch/arm/mach-pxa/include/mach/tosa.h | 3 + + arch/arm/mach-pxa/tosa.c | 21 +++- + drivers/leds/led-class.c | 5 +- + drivers/leds/leds-wrap.c | 5 +- + drivers/leds/ledtrig-timer.c | 8 +- + drivers/video/backlight/Kconfig | 25 +++ + drivers/video/backlight/Makefile | 4 + + drivers/video/backlight/da903x.c | 201 +++++++++++++++++++++++ + drivers/video/backlight/tosa_bl.c | 198 +++++++++++++++++++++++ + drivers/video/backlight/tosa_lcd.c | 280 +++++++++++++++++++++++++++++++++ + 10 files changed, 737 insertions(+), 13 deletions(-) + create mode 100644 drivers/video/backlight/da903x.c + create mode 100644 drivers/video/backlight/tosa_bl.c + create mode 100644 drivers/video/backlight/tosa_lcd.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + drivers/serial/serial_txx9.c | 113 ++++++++++++++++++++++++++++++++++-------- + 1 files changed, 92 insertions(+), 21 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged fs/dcache.c +Auto-merged fs/ext2/super.c +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/super.c +Auto-merged fs/proc/inode.c +Auto-merged fs/reiserfs/super.c +Auto-merged fs/xfs/linux-2.6/xfs_super.c +Auto-merged include/linux/fs.h +Auto-merged include/linux/mm.h +Auto-merged init/main.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/slob.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysctl/vm.txt | 12 + + Documentation/vm/kmemtrace.txt | 126 +++++++ + Documentation/vm/slabinfo.c | 95 +++++- + MAINTAINERS | 6 + + fs/buffer.c | 102 ++++++ + fs/dcache.c | 148 +++++++-- + fs/drop_caches.c | 2 +- + fs/ext2/super.c | 9 + + fs/ext3/super.c | 8 + + fs/ext4/super.c | 8 + + fs/inode.c | 123 +++++++ + fs/proc/inode.c | 8 + + fs/reiserfs/super.c | 8 + + fs/xfs/linux-2.6/xfs_super.c | 2 + + include/linux/fs.h | 6 + + include/linux/kmemtrace.h | 86 +++++ + include/linux/mm.h | 3 +- + include/linux/mmzone.h | 1 + + include/linux/page-flags.h | 2 + + include/linux/slab.h | 61 +++- + include/linux/slab_def.h | 68 +++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 69 ++++- + include/linux/swap.h | 3 + + init/main.c | 2 + + kernel/relay.c | 7 +- + kernel/sysctl.c | 20 + + lib/Kconfig.debug | 20 + + mm/Makefile | 2 +- + mm/kmemtrace.c | 333 +++++++++++++++++ + mm/slab.c | 79 ++++- + mm/slob.c | 37 ++- + mm/slub.c | 515 ++++++++++++++++++++++----- + mm/vmscan.c | 64 +++- + mm/vmstat.c | 4 +- + 37 files changed, 1943 insertions(+), 186 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/linux/kmemtrace.h + create mode 100644 mm/kmemtrace.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/slab.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/softirq.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Auto-merged mm/slab.c +CONFLICT (content): Merge conflict in mm/slab.c +Auto-merged mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'init/main.c' using previous resolution. +Resolved 'mm/Makefile' using previous resolution. +Resolved 'mm/slab.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 9366f0a: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 135 +++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 87 +++++ + arch/x86/Makefile | 5 + + arch/x86/kernel/cpu/common.c | 11 + + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps.c | 5 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/kmemcheck/Makefile | 1 + + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 + + arch/x86/mm/kmemcheck/kmemcheck.c | 756 +++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 90 +++++ + arch/x86/mm/kmemcheck/opcode.h | 10 + + arch/x86/mm/kmemcheck/pte.c | 22 ++ + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 + + include/asm-x86/dma-mapping.h | 2 + + include/asm-x86/kmemcheck.h | 42 ++ + include/asm-x86/pgtable.h | 4 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/pgtable_64.h | 6 + + include/asm-x86/string_32.h | 8 + + include/asm-x86/string_64.h | 8 + + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 86 +++++ + include/linux/mm_types.h | 4 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 26 +- + mm/Makefile | 1 + + mm/kmemcheck.c | 111 ++++++ + mm/slab.c | 101 +---- + mm/slub.c | 20 +- + 44 files changed, 2012 insertions(+), 109 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merged arch/arm/mach-pxa/include/mach/tosa.h +Auto-merged arch/arm/mach-pxa/tosa.c +Merge made by recursive. + arch/arm/mach-pxa/include/mach/tosa.h | 2 - + arch/arm/mach-pxa/tosa.c | 37 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/mfd/Kconfig | 16 + + drivers/mfd/Makefile | 2 + + drivers/mfd/da903x.c | 563 ++++++++++++++++ + drivers/mfd/htc-egpio.c | 2 +- + drivers/mfd/mfd-core.c | 15 +- + drivers/mfd/sm501.c | 6 +- + drivers/mfd/t7l66xb.c | 40 +- + drivers/mfd/tc6387xb.c | 47 +- + drivers/mfd/tc6393xb.c | 296 +++++++-- + drivers/mfd/twl4030-core.c | 1193 +++++++++++++++++++++++++++++++++ + include/linux/i2c/twl4030.h | 339 ++++++++++ + include/linux/mfd/da903x.h | 201 ++++++ + include/linux/mfd/t7l66xb.h | 2 - + include/linux/mfd/tc6387xb.h | 3 - + include/linux/mfd/tc6393xb.h | 17 +- + 18 files changed, 2686 insertions(+), 97 deletions(-) + create mode 100644 drivers/mfd/da903x.c + create mode 100644 drivers/mfd/twl4030-core.c + create mode 100644 include/linux/i2c/twl4030.h + create mode 100644 include/linux/mfd/da903x.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Auto-merged Documentation/DocBook/Makefile +CONFLICT (content): Merge conflict in Documentation/DocBook/Makefile +Removed Documentation/DocBook/wanbook.tmpl +Removed drivers/net/wan/syncppp.c +Removed include/net/syncppp.h +Recorded preimage for 'Documentation/DocBook/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/DocBook/Makefile'. +Created commit 214fdc6: Merge commit 'hdlc/hdlc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/networking.tmpl | 3 - + Documentation/DocBook/wanbook.tmpl | 99 -- + Documentation/networking/generic-hdlc.txt | 8 +- + drivers/net/wan/Makefile | 2 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/{hd6457x.c => hd64570.c} | 254 ++---- + drivers/net/wan/hd64572.c | 641 +++++++++++++ + drivers/net/wan/hdlc_ppp.c | 648 ++++++++++++- + drivers/net/wan/n2.c | 9 +- + drivers/net/wan/pc300too.c | 73 +- + drivers/net/wan/pci200syn.c | 77 +- + drivers/net/wan/syncppp.c | 1479 ----------------------------- + include/net/syncppp.h | 102 -- + 14 files changed, 1357 insertions(+), 2046 deletions(-) + delete mode 100644 Documentation/DocBook/wanbook.tmpl + rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) + create mode 100644 drivers/net/wan/hd64572.c + delete mode 100644 drivers/net/wan/syncppp.c + delete mode 100644 include/net/syncppp.h +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merged drivers/gpu/drm/i915/i915_dma.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c +Auto-merged mm/shmem.c +Recorded preimage for 'drivers/gpu/drm/i915/i915_dma.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/i915_dma.c'. +Created commit 236b5c7: Merge commit 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/mm/highmem_32.c | 1 + + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/drm_agpsupport.c | 52 +- + drivers/gpu/drm/drm_cache.c | 69 + + drivers/gpu/drm/drm_drv.c | 6 + + drivers/gpu/drm/drm_fops.c | 8 +- + drivers/gpu/drm/drm_gem.c | 421 ++++++ + drivers/gpu/drm/drm_irq.c | 464 +++++- + drivers/gpu/drm/drm_memory.c | 2 + + drivers/gpu/drm/drm_mm.c | 5 +- + drivers/gpu/drm/drm_proc.c | 135 ++- + drivers/gpu/drm/drm_stub.c | 11 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/i915_dma.c | 330 +++-- + drivers/gpu/drm/i915/i915_drv.c | 476 +------ + drivers/gpu/drm/i915/i915_drv.h | 1180 +++++----------- + drivers/gpu/drm/i915/i915_gem.c | 2558 ++++++++++++++++++++++++++++++++ + drivers/gpu/drm/i915/i915_gem_debug.c | 201 +++ + drivers/gpu/drm/i915/i915_gem_proc.c | 292 ++++ + drivers/gpu/drm/i915/i915_gem_tiling.c | 257 ++++ + drivers/gpu/drm/i915/i915_irq.c | 514 +++++-- + drivers/gpu/drm/i915/i915_opregion.c | 371 +++++ + drivers/gpu/drm/i915/i915_reg.h | 1417 ++++++++++++++++++ + drivers/gpu/drm/i915/i915_suspend.c | 509 +++++++ + drivers/gpu/drm/mga/mga_drv.c | 29 +- + drivers/gpu/drm/mga/mga_drv.h | 6 +- + drivers/gpu/drm/mga/mga_irq.c | 74 +- + drivers/gpu/drm/mga/mga_state.c | 2 +- + drivers/gpu/drm/r128/r128_drv.c | 29 +- + drivers/gpu/drm/r128/r128_drv.h | 11 +- + drivers/gpu/drm/r128/r128_irq.c | 55 +- + drivers/gpu/drm/r128/r128_state.c | 2 +- + drivers/gpu/drm/radeon/radeon_cp.c | 7 +- + drivers/gpu/drm/radeon/radeon_drv.c | 32 +- + drivers/gpu/drm/radeon/radeon_drv.h | 27 +- + drivers/gpu/drm/radeon/radeon_irq.c | 268 +++-- + drivers/gpu/drm/radeon/radeon_state.c | 2 +- + drivers/gpu/drm/sis/sis_mm.c | 10 +- + drivers/gpu/drm/via/via_drv.c | 26 +- + drivers/gpu/drm/via/via_drv.h | 16 +- + drivers/gpu/drm/via/via_irq.c | 105 +- + drivers/gpu/drm/via/via_mm.c | 3 +- + include/drm/drm.h | 63 +- + include/drm/drmP.h | 249 +++- + include/drm/i915_drm.h | 333 +++++ + mm/shmem.c | 1 + + 48 files changed, 8719 insertions(+), 1925 deletions(-) + create mode 100644 drivers/gpu/drm/drm_cache.c + create mode 100644 drivers/gpu/drm/drm_gem.c + create mode 100644 drivers/gpu/drm/i915/i915_gem.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_debug.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_proc.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_tiling.c + create mode 100644 drivers/gpu/drm/i915/i915_opregion.c + create mode 100644 drivers/gpu/drm/i915/i915_reg.h + create mode 100644 drivers/gpu/drm/i915/i915_suspend.c +Merging voltage/for-linus +$ git merge voltage/for-linus +Merge made by recursive. + drivers/Kconfig | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged drivers/char/tty_io.c +Auto-merged drivers/char/vt.c +Auto-merged drivers/serial/8250.c +Auto-merged include/linux/pci_ids.h +Merge made by recursive. + drivers/char/pty.c | 54 +++++++++- + drivers/char/tty_io.c | 31 ++---- + drivers/char/vt.c | 14 +-- + drivers/parport/parport_pc.c | 20 ++++- + drivers/serial/8250_pci.c | 211 +++++++++++++++++++++++++++++++++++++ + drivers/serial/bfin_5xx.c | 239 ++++++++++++++++++++++-------------------- + include/linux/pci_ids.h | 8 ++ + include/linux/tty.h | 3 +- + include/linux/tty_driver.h | 6 +- + 9 files changed, 437 insertions(+), 149 deletions(-) +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging creds/next-creds-subsys +$ git merge creds/next-creds-subsys +Auto-merged arch/ia64/ia32/sys_ia32.c +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/powerpc/platforms/cell/spufs/inode.c +Auto-merged arch/s390/kernel/compat_linux.c +Auto-merged arch/x86/mm/fault.c +Auto-merged drivers/gpu/drm/drm_fops.c +Auto-merged drivers/usb/core/devio.c +Auto-merged drivers/usb/core/inode.c +Auto-merged fs/9p/vfs_inode.c +Auto-merged fs/9p/vfs_super.c +Auto-merged fs/autofs4/inode.c +Auto-merged fs/autofs4/waitq.c +Auto-merged fs/binfmt_elf.c +Auto-merged fs/binfmt_elf_fdpic.c +CONFLICT (content): Merge conflict in fs/binfmt_elf_fdpic.c +Auto-merged fs/binfmt_flat.c +Auto-merged fs/binfmt_som.c +Auto-merged fs/cifs/connect.c +Auto-merged fs/compat.c +Auto-merged fs/dquot.c +Auto-merged fs/ecryptfs/ecryptfs_kernel.h +Auto-merged fs/ecryptfs/main.c +Auto-merged fs/ecryptfs/messaging.c +Auto-merged fs/exec.c +Auto-merged fs/exportfs/expfs.c +Auto-merged fs/ext2/balloc.c +Auto-merged fs/fat/inode.c +Auto-merged fs/gfs2/inode.c +Auto-merged fs/hpfs/namei.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/namei.c +Auto-merged fs/namespace.c +CONFLICT (content): Merge conflict in fs/namespace.c +Auto-merged fs/nfsd/nfs4recover.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c +Auto-merged fs/nfsd/nfsfh.c +Auto-merged fs/nfsd/vfs.c +Auto-merged fs/ocfs2/namei.c +Auto-merged fs/proc/array.c +Auto-merged fs/reiserfs/namei.c +Auto-merged fs/ubifs/budget.c +Auto-merged fs/udf/namei.c +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/xfs_inode.h +Auto-merged include/linux/binfmts.h +CONFLICT (content): Merge conflict in include/linux/binfmts.h +Auto-merged include/linux/fs.h +Auto-merged include/linux/init_task.h +Removed include/linux/key-ui.h +Auto-merged include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/Makefile +Auto-merged kernel/cgroup.c +Auto-merged kernel/exit.c +CONFLICT (content): Merge conflict in kernel/exit.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/futex.c +Auto-merged kernel/kmod.c +Auto-merged kernel/sched.c +Auto-merged kernel/signal.c +CONFLICT (content): Merge conflict in kernel/signal.c +Auto-merged kernel/sys.c +Auto-merged kernel/sysctl.c +Auto-merged kernel/timer.c +Auto-merged kernel/trace/trace.c +Auto-merged kernel/workqueue.c +Auto-merged lib/Makefile +Auto-merged mm/migrate.c +Auto-merged mm/shmem.c +Auto-merged net/9p/client.c +CONFLICT (content): Merge conflict in net/9p/client.c +Auto-merged net/core/dev.c +Auto-merged net/socket.c +Auto-merged net/sunrpc/auth.c +Auto-merged net/unix/af_unix.c +Auto-merged security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Recorded preimage for 'fs/binfmt_elf_fdpic.c' +Recorded preimage for 'include/linux/binfmts.h' +Resolved 'fs/namespace.c' using previous resolution. +Resolved 'fs/nfsd/nfs4recover.c' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Resolved 'kernel/exit.c' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Resolved 'kernel/signal.c' using previous resolution. +Resolved 'net/9p/client.c' using previous resolution. +Resolved 'security/selinux/hooks.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/binfmt_elf_fdpic.c'. +Recorded resolution for 'include/linux/binfmts.h'. +Created commit ec89089: Merge commit 'creds/next-creds-subsys' +$ git diff -M --stat --summary HEAD^.. + Documentation/credentials.txt | 582 +++++++++++++ + arch/alpha/kernel/asm-offsets.c | 11 +- + arch/alpha/kernel/entry.S | 10 +- + arch/ia64/ia32/sys_ia32.c | 7 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/perfmon.c | 43 +- + arch/ia64/kernel/signal.c | 4 +- + arch/mips/kernel/kspd.c | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 5 +- + arch/mips/kernel/vpe.c | 4 +- + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 8 +- + arch/s390/hypfs/inode.c | 4 +- + arch/s390/kernel/compat_linux.c | 28 +- + arch/um/drivers/mconsole_kern.c | 3 +- + arch/x86/ia32/ia32_aout.c | 2 +- + arch/x86/mm/fault.c | 2 +- + drivers/block/loop.c | 6 +- + drivers/char/tty_audit.c | 6 +- + drivers/connector/cn_proc.c | 16 +- + drivers/isdn/capi/capifs.c | 4 +- + drivers/isdn/hysdn/hysdn_procconf.c | 6 +- + drivers/net/tun.c | 8 +- + drivers/usb/core/devio.c | 10 +- + drivers/usb/core/inode.c | 4 +- + fs/9p/fid.c | 2 +- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_super.c | 4 +- + fs/affs/inode.c | 4 +- + fs/affs/super.c | 4 +- + fs/anon_inodes.c | 4 +- + fs/attr.c | 4 +- + fs/autofs/inode.c | 4 +- + fs/autofs4/inode.c | 4 +- + fs/autofs4/waitq.c | 4 +- + fs/bfs/dir.c | 4 +- + fs/binfmt_aout.c | 2 +- + fs/binfmt_elf.c | 20 +- + fs/binfmt_elf_fdpic.c | 19 +- + fs/binfmt_flat.c | 2 +- + fs/binfmt_som.c | 2 +- + fs/cifs/cifs_fs_sb.h | 2 +- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 4 +- + fs/cifs/dir.c | 12 +- + fs/cifs/inode.c | 8 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/misc.c | 4 +- + fs/coda/cache.c | 6 +- + fs/coda/file.c | 2 +- + fs/coda/upcall.c | 2 +- + fs/compat.c | 42 +- + fs/devpts/inode.c | 4 +- + fs/dquot.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 3 +- + fs/ecryptfs/kthread.c | 9 +- + fs/ecryptfs/main.c | 3 +- + fs/ecryptfs/messaging.c | 18 +- + fs/ecryptfs/miscdev.c | 20 +- + fs/exec.c | 183 +++-- + fs/exportfs/expfs.c | 4 +- + fs/ext2/balloc.c | 2 +- + fs/ext2/ialloc.c | 4 +- + fs/ext3/balloc.c | 2 +- + fs/ext3/ialloc.c | 4 +- + fs/ext4/balloc.c | 5 +- + fs/ext4/ialloc.c | 4 +- + fs/fat/file.c | 2 +- + fs/fat/inode.c | 4 +- + fs/fcntl.c | 18 +- + fs/file_table.c | 10 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 25 +- + fs/gfs2/inode.c | 10 +- + fs/hfs/inode.c | 4 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/inode.c | 4 +- + fs/hfsplus/options.c | 4 +- + fs/hpfs/namei.c | 24 +- + fs/hpfs/super.c | 4 +- + fs/hppfs/hppfs.c | 6 +- + fs/hugetlbfs/inode.c | 21 +- + fs/inotify_user.c | 2 +- + fs/internal.h | 6 + + fs/ioprio.c | 18 +- + fs/jfs/jfs_inode.c | 4 +- + fs/locks.c | 2 +- + fs/minix/bitmap.c | 4 +- + fs/namei.c | 10 +- + fs/namespace.c | 2 +- + fs/ncpfs/ioctl.c | 91 +-- + fs/nfsctl.c | 3 +- + fs/nfsd/auth.c | 95 ++- + fs/nfsd/nfs4recover.c | 71 +- + fs/nfsd/nfsfh.c | 11 +- + fs/nfsd/vfs.c | 9 +- + fs/ocfs2/dlm/dlmfs.c | 8 +- + fs/ocfs2/namei.c | 4 +- + fs/omfs/inode.c | 8 +- + fs/open.c | 59 +- + fs/pipe.c | 4 +- + fs/posix_acl.c | 4 +- + fs/proc/array.c | 32 +- + fs/proc/base.c | 32 +- + fs/quota.c | 4 +- + fs/ramfs/inode.c | 4 +- + fs/reiserfs/namei.c | 4 +- + fs/smbfs/dir.c | 3 +- + fs/smbfs/inode.c | 2 +- + fs/smbfs/proc.c | 2 +- + fs/sysv/ialloc.c | 4 +- + fs/ubifs/budget.c | 2 +- + fs/ubifs/dir.c | 4 +- + fs/udf/ialloc.c | 4 +- + fs/udf/namei.c | 2 +- + fs/ufs/ialloc.c | 4 +- + fs/xfs/linux-2.6/xfs_cred.h | 6 +- + fs/xfs/linux-2.6/xfs_globals.h | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 5 +- + fs/xfs/xfs_acl.c | 6 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_vnodeops.h | 10 +- + include/keys/keyring-type.h | 31 + + include/linux/binfmts.h | 16 +- + include/linux/capability.h | 2 - + include/linux/cred.h | 340 +++++++- + include/linux/fs.h | 8 +- + include/linux/init_task.h | 13 +- + include/linux/key-ui.h | 66 -- + include/linux/key.h | 32 +- + include/linux/keyctl.h | 4 +- + include/linux/sched.h | 64 +-- + include/linux/securebits.h | 2 +- + include/linux/security.h | 326 ++++---- + include/net/scm.h | 4 +- + init/main.c | 1 + + ipc/mqueue.c | 19 +- + ipc/shm.c | 9 +- + ipc/util.c | 18 +- + kernel/Makefile | 2 +- + kernel/acct.c | 7 +- + kernel/auditsc.c | 57 +- + kernel/capability.c | 268 +------ + kernel/cgroup.c | 17 +- + kernel/cred-internals.h | 21 + + kernel/cred.c | 577 +++++++++++++ + kernel/exit.c | 23 +- + kernel/fork.c | 47 +- + kernel/futex.c | 20 +- + kernel/futex_compat.c | 7 +- + kernel/kmod.c | 30 +- + kernel/ptrace.c | 29 +- + kernel/sched.c | 26 +- + kernel/signal.c | 60 +- + kernel/sys.c | 579 ++++++++------ + kernel/sysctl.c | 2 +- + kernel/timer.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/tsacct.c | 6 +- + kernel/uid16.c | 31 +- + kernel/user.c | 37 +- + kernel/user_namespace.c | 14 +- + kernel/workqueue.c | 8 +- + lib/Makefile | 2 +- + lib/is_single_threaded.c | 45 + + mm/mempolicy.c | 9 +- + mm/migrate.c | 9 +- + mm/oom_kill.c | 6 +- + mm/shmem.c | 8 +- + net/9p/client.c | 2 +- + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 2 +- + net/core/dev.c | 8 +- + net/core/scm.c | 10 +- + net/ipv4/netfilter/ipt_LOG.c | 4 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/netfilter/ip6t_LOG.c | 4 +- + net/netfilter/nfnetlink_log.c | 5 +- + net/netfilter/xt_owner.c | 16 +- + net/netrom/af_netrom.c | 4 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/ar-key.c | 6 +- + net/sched/cls_flow.c | 4 +- + net/socket.c | 4 +- + net/sunrpc/auth.c | 14 +- + net/unix/af_unix.c | 11 +- + security/capability.c | 56 +- + security/commoncap.c | 699 ++++++++++------ + security/keys/internal.h | 47 +- + security/keys/key.c | 25 +- + security/keys/keyctl.c | 210 +++-- + security/keys/keyring.c | 15 +- + security/keys/permission.c | 29 +- + security/keys/proc.c | 8 +- + security/keys/process_keys.c | 469 +++++------ + security/keys/request_key.c | 133 ++-- + security/keys/request_key_auth.c | 46 +- + security/root_plug.c | 13 +- + security/security.c | 96 +-- + security/selinux/exports.c | 8 +- + security/selinux/hooks.c | 1151 ++++++++++++++------------ + security/selinux/include/av_perm_to_string.h | 2 + + security/selinux/include/av_permissions.h | 2 + + security/selinux/include/class_to_string.h | 5 + + security/selinux/include/flask.h | 1 + + security/selinux/include/objsec.h | 11 - + security/selinux/selinuxfs.c | 13 +- + security/selinux/xfrm.c | 6 +- + security/smack/smack_access.c | 4 +- + security/smack/smack_lsm.c | 173 +++-- + security/smack/smackfs.c | 6 +- + 212 files changed, 5061 insertions(+), 3099 deletions(-) + create mode 100644 Documentation/credentials.txt + create mode 100644 include/keys/keyring-type.h + delete mode 100644 include/linux/key-ui.h + create mode 100644 kernel/cred-internals.h + create mode 100644 kernel/cred.c + create mode 100644 lib/is_single_threaded.c +$ git am -3 ../patches/0001-creds-autofs4-needs-updating-for-dentry_open-change.patch +Applying creds: autofs4 needs updating for dentry_open change +$ git reset HEAD^ +fs/autofs4/dev-ioctl.c: needs update +$ git add . +$ git commit -v -a --amend +Created commit e97ef43: Merge commit 'creds/next-creds-subsys' +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Already uptodate! +Merge made by recursive. +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Auto-merged drivers/acpi/battery.c +Auto-merged drivers/acpi/button.c +Auto-merged drivers/acpi/thermal.c +Auto-merged drivers/md/Kconfig +CONFLICT (content): Merge conflict in drivers/md/Kconfig +Auto-merged drivers/pci/pci.c +Auto-merged drivers/usb/host/ehci-hcd.c +Auto-merged drivers/usb/host/ohci-hcd.c +Auto-merged drivers/usb/host/uhci-hcd.c +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/init.h +CONFLICT (content): Merge conflict in include/linux/init.h +Auto-merged init/Kconfig +Auto-merged init/do_mounts.c +Auto-merged init/initramfs.c +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged scripts/bootgraph.pl +CONFLICT (add/add): Merge conflict in scripts/bootgraph.pl +Resolved 'drivers/md/Kconfig' using previous resolution. +Resolved 'include/linux/init.h' using previous resolution. +Resolved 'init/main.c' using previous resolution. +Resolved 'scripts/bootgraph.pl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 7fb3f8ce4: Merge commit 'fastboot/auto-fastboot-next' +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/battery.c | 2 +- + drivers/acpi/button.c | 2 +- + drivers/acpi/thermal.c | 2 +- + drivers/pci/pci.c | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/uhci-hcd.c | 2 +- + include/asm-generic/vmlinux.lds.h | 6 ++- + include/linux/init.h | 8 ++++ + init/Kconfig | 11 +++++ + init/do_mounts.c | 2 + + init/initramfs.c | 73 ++++++++++++++++++++++++++++------- + init/main.c | 77 +++++++++++++++++++++++++++++++++++- + 13 files changed, 165 insertions(+), 26 deletions(-) +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Already up-to-date. +Merging iommu/auto-iommu-next +$ git merge iommu/auto-iommu-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merged Documentation/ABI/testing/sysfs-bus-usb +CONFLICT (content): Merge conflict in Documentation/ABI/testing/sysfs-bus-usb +Auto-merged MAINTAINERS +Auto-merged arch/arm/Kconfig +Auto-merged arch/h8300/Kconfig +Auto-merged drivers/Kconfig +Auto-merged drivers/Makefile +Auto-merged drivers/usb/Kconfig +Auto-merged drivers/usb/host/Kconfig +Resolved 'Documentation/ABI/testing/sysfs-bus-usb' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 94fd581: Merge commit 'uwb/for-upstream' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 11 + + Documentation/ABI/testing/sysfs-bus-umc | 28 + + Documentation/ABI/testing/sysfs-bus-usb | 43 + + Documentation/ABI/testing/sysfs-class-usb_host | 25 + + Documentation/ABI/testing/sysfs-class-uwb_rc | 144 ++ + Documentation/ABI/testing/sysfs-wusb_cbaf | 100 ++ + Documentation/usb/WUSB-Design-overview.txt | 448 ++++++ + Documentation/usb/wusb-cbaf | 139 ++ + MAINTAINERS | 17 + + arch/arm/Kconfig | 2 + + arch/cris/Kconfig | 2 + + arch/h8300/Kconfig | 2 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 3 + + drivers/usb/host/Kconfig | 28 + + drivers/usb/host/Makefile | 3 + + drivers/usb/host/hwa-hc.c | 925 +++++++++++ + drivers/usb/host/whci/Kbuild | 11 + + drivers/usb/host/whci/asl.c | 367 +++++ + drivers/usb/host/whci/hcd.c | 339 ++++ + drivers/usb/host/whci/hw.c | 87 ++ + drivers/usb/host/whci/init.c | 188 +++ + drivers/usb/host/whci/int.c | 95 ++ + drivers/usb/host/whci/pzl.c | 398 +++++ + drivers/usb/host/whci/qset.c | 567 +++++++ + drivers/usb/host/whci/whcd.h | 197 +++ + drivers/usb/host/whci/whci-hc.h | 416 +++++ + drivers/usb/host/whci/wusb.c | 241 +++ + drivers/usb/wusbcore/Kconfig | 41 + + drivers/usb/wusbcore/Makefile | 26 + + drivers/usb/wusbcore/cbaf.c | 673 ++++++++ + drivers/usb/wusbcore/crypto.c | 538 +++++++ + drivers/usb/wusbcore/dev-sysfs.c | 143 ++ + drivers/usb/wusbcore/devconnect.c | 1297 ++++++++++++++++ + drivers/usb/wusbcore/mmc.c | 321 ++++ + drivers/usb/wusbcore/pal.c | 42 + + drivers/usb/wusbcore/reservation.c | 115 ++ + drivers/usb/wusbcore/rh.c | 477 ++++++ + drivers/usb/wusbcore/security.c | 642 ++++++++ + drivers/usb/wusbcore/wa-hc.c | 95 ++ + drivers/usb/wusbcore/wa-hc.h | 417 +++++ + drivers/usb/wusbcore/wa-nep.c | 310 ++++ + drivers/usb/wusbcore/wa-rpipe.c | 562 +++++++ + drivers/usb/wusbcore/wa-xfer.c | 1709 +++++++++++++++++++++ + drivers/usb/wusbcore/wusbhc.c | 418 +++++ + drivers/usb/wusbcore/wusbhc.h | 495 ++++++ + drivers/uwb/Kconfig | 90 ++ + drivers/uwb/Makefile | 29 + + drivers/uwb/address.c | 374 +++++ + drivers/uwb/beacon.c | 642 ++++++++ + drivers/uwb/driver.c | 144 ++ + drivers/uwb/drp-avail.c | 288 ++++ + drivers/uwb/drp-ie.c | 232 +++ + drivers/uwb/drp.c | 461 ++++++ + drivers/uwb/est.c | 477 ++++++ + drivers/uwb/hwa-rc.c | 926 +++++++++++ + drivers/uwb/i1480/Makefile | 2 + + drivers/uwb/i1480/dfu/Makefile | 9 + + drivers/uwb/i1480/dfu/dfu.c | 217 +++ + drivers/uwb/i1480/dfu/i1480-dfu.h | 260 ++++ + drivers/uwb/i1480/dfu/mac.c | 527 +++++++ + drivers/uwb/i1480/dfu/phy.c | 203 +++ + drivers/uwb/i1480/dfu/usb.c | 500 ++++++ + drivers/uwb/i1480/i1480-est.c | 99 ++ + drivers/uwb/i1480/i1480-wlp.h | 200 +++ + drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 284 ++++ + drivers/uwb/i1480/i1480u-wlp/lc.c | 421 +++++ + drivers/uwb/i1480/i1480u-wlp/netdev.c | 368 +++++ + drivers/uwb/i1480/i1480u-wlp/rx.c | 486 ++++++ + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 408 +++++ + drivers/uwb/i1480/i1480u-wlp/tx.c | 632 ++++++++ + drivers/uwb/ie.c | 541 +++++++ + drivers/uwb/lc-dev.c | 492 ++++++ + drivers/uwb/lc-rc.c | 495 ++++++ + drivers/uwb/neh.c | 616 ++++++++ + drivers/uwb/pal.c | 91 ++ + drivers/uwb/reset.c | 362 +++++ + drivers/uwb/rsv.c | 680 +++++++++ + drivers/uwb/scan.c | 133 ++ + drivers/uwb/umc-bus.c | 218 +++ + drivers/uwb/umc-dev.c | 104 ++ + drivers/uwb/umc-drv.c | 31 + + drivers/uwb/uwb-debug.c | 367 +++++ + drivers/uwb/uwb-internal.h | 305 ++++ + drivers/uwb/uwbd.c | 410 +++++ + drivers/uwb/whc-rc.c | 520 +++++++ + drivers/uwb/whci.c | 269 ++++ + drivers/uwb/wlp/Makefile | 10 + + drivers/uwb/wlp/driver.c | 43 + + drivers/uwb/wlp/eda.c | 449 ++++++ + drivers/uwb/wlp/messages.c | 1946 ++++++++++++++++++++++++ + drivers/uwb/wlp/sysfs.c | 709 +++++++++ + drivers/uwb/wlp/txrx.c | 374 +++++ + drivers/uwb/wlp/wlp-internal.h | 228 +++ + drivers/uwb/wlp/wlp-lc.c | 585 +++++++ + drivers/uwb/wlp/wss-lc.c | 1055 +++++++++++++ + include/linux/bitmap.h | 1 + + include/linux/usb/wusb-wa.h | 271 ++++ + include/linux/usb/wusb.h | 376 +++++ + include/linux/uwb.h | 765 ++++++++++ + include/linux/uwb/debug-cmd.h | 57 + + include/linux/uwb/debug.h | 82 + + include/linux/uwb/spec.h | 727 +++++++++ + include/linux/uwb/umc.h | 194 +++ + include/linux/uwb/whci.h | 117 ++ + include/linux/wlp.h | 735 +++++++++ + lib/bitmap.c | 22 + + 110 files changed, 35819 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-umc + create mode 100644 Documentation/ABI/testing/sysfs-class-usb_host + create mode 100644 Documentation/ABI/testing/sysfs-class-uwb_rc + create mode 100644 Documentation/ABI/testing/sysfs-wusb_cbaf + create mode 100644 Documentation/usb/WUSB-Design-overview.txt + create mode 100644 Documentation/usb/wusb-cbaf + create mode 100644 drivers/usb/host/hwa-hc.c + create mode 100644 drivers/usb/host/whci/Kbuild + create mode 100644 drivers/usb/host/whci/asl.c + create mode 100644 drivers/usb/host/whci/hcd.c + create mode 100644 drivers/usb/host/whci/hw.c + create mode 100644 drivers/usb/host/whci/init.c + create mode 100644 drivers/usb/host/whci/int.c + create mode 100644 drivers/usb/host/whci/pzl.c + create mode 100644 drivers/usb/host/whci/qset.c + create mode 100644 drivers/usb/host/whci/whcd.h + create mode 100644 drivers/usb/host/whci/whci-hc.h + create mode 100644 drivers/usb/host/whci/wusb.c + create mode 100644 drivers/usb/wusbcore/Kconfig + create mode 100644 drivers/usb/wusbcore/Makefile + create mode 100644 drivers/usb/wusbcore/cbaf.c + create mode 100644 drivers/usb/wusbcore/crypto.c + create mode 100644 drivers/usb/wusbcore/dev-sysfs.c + create mode 100644 drivers/usb/wusbcore/devconnect.c + create mode 100644 drivers/usb/wusbcore/mmc.c + create mode 100644 drivers/usb/wusbcore/pal.c + create mode 100644 drivers/usb/wusbcore/reservation.c + create mode 100644 drivers/usb/wusbcore/rh.c + create mode 100644 drivers/usb/wusbcore/security.c + create mode 100644 drivers/usb/wusbcore/wa-hc.c + create mode 100644 drivers/usb/wusbcore/wa-hc.h + create mode 100644 drivers/usb/wusbcore/wa-nep.c + create mode 100644 drivers/usb/wusbcore/wa-rpipe.c + create mode 100644 drivers/usb/wusbcore/wa-xfer.c + create mode 100644 drivers/usb/wusbcore/wusbhc.c + create mode 100644 drivers/usb/wusbcore/wusbhc.h + create mode 100644 drivers/uwb/Kconfig + create mode 100644 drivers/uwb/Makefile + create mode 100644 drivers/uwb/address.c + create mode 100644 drivers/uwb/beacon.c + create mode 100644 drivers/uwb/driver.c + create mode 100644 drivers/uwb/drp-avail.c + create mode 100644 drivers/uwb/drp-ie.c + create mode 100644 drivers/uwb/drp.c + create mode 100644 drivers/uwb/est.c + create mode 100644 drivers/uwb/hwa-rc.c + create mode 100644 drivers/uwb/i1480/Makefile + create mode 100644 drivers/uwb/i1480/dfu/Makefile + create mode 100644 drivers/uwb/i1480/dfu/dfu.c + create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h + create mode 100644 drivers/uwb/i1480/dfu/mac.c + create mode 100644 drivers/uwb/i1480/dfu/phy.c + create mode 100644 drivers/uwb/i1480/dfu/usb.c + create mode 100644 drivers/uwb/i1480/i1480-est.c + create mode 100644 drivers/uwb/i1480/i1480-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile + create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c + create mode 100644 drivers/uwb/ie.c + create mode 100644 drivers/uwb/lc-dev.c + create mode 100644 drivers/uwb/lc-rc.c + create mode 100644 drivers/uwb/neh.c + create mode 100644 drivers/uwb/pal.c + create mode 100644 drivers/uwb/reset.c + create mode 100644 drivers/uwb/rsv.c + create mode 100644 drivers/uwb/scan.c + create mode 100644 drivers/uwb/umc-bus.c + create mode 100644 drivers/uwb/umc-dev.c + create mode 100644 drivers/uwb/umc-drv.c + create mode 100644 drivers/uwb/uwb-debug.c + create mode 100644 drivers/uwb/uwb-internal.h + create mode 100644 drivers/uwb/uwbd.c + create mode 100644 drivers/uwb/whc-rc.c + create mode 100644 drivers/uwb/whci.c + create mode 100644 drivers/uwb/wlp/Makefile + create mode 100644 drivers/uwb/wlp/driver.c + create mode 100644 drivers/uwb/wlp/eda.c + create mode 100644 drivers/uwb/wlp/messages.c + create mode 100644 drivers/uwb/wlp/sysfs.c + create mode 100644 drivers/uwb/wlp/txrx.c + create mode 100644 drivers/uwb/wlp/wlp-internal.h + create mode 100644 drivers/uwb/wlp/wlp-lc.c + create mode 100644 drivers/uwb/wlp/wss-lc.c + create mode 100644 include/linux/usb/wusb-wa.h + create mode 100644 include/linux/usb/wusb.h + create mode 100644 include/linux/uwb.h + create mode 100644 include/linux/uwb/debug-cmd.h + create mode 100644 include/linux/uwb/debug.h + create mode 100644 include/linux/uwb/spec.h + create mode 100644 include/linux/uwb/umc.h + create mode 100644 include/linux/uwb/whci.h + create mode 100644 include/linux/wlp.h +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/ib700wdt.c | 49 ++++++++++++++++-------------------------- + 1 files changed, 19 insertions(+), 30 deletions(-) +Merging proc/proc +$ git merge proc/proc +Merge made by recursive. + fs/proc/task_mmu.c | 25 ++++++++++++++++--------- + 1 files changed, 16 insertions(+), 9 deletions(-) +Merging scsi-post-merge/master +$ git am -3 ../patches/0001-sparc-qlogicpti-fallout-from-sbus-removal.patch +Applying sparc: qlogicpti fallout from sbus removal +$ git am -3 ../patches/0001-tpm-don-t-export-static-functions.patch +Applying tpm: don't export static functions +$ git am -3 ../patches/0001-mfd-wm8350-don-t-export-static-functions.patch +Applying mfd/wm8350: don't export static functions +$ git am -3 ../patches/ibm_newemac__Fix_new_MAL_feature_handling +Applying ibm_newemac: Fix new MAL feature handling +Applying usb: vmalloc needs include of vmalloc.h diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..9af4729c4ba9 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,97 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Importing m68k based on 278429cff8809958d25415ba0ed32b59866ab1a8 +$ git checkout quilt/m68k +Switched to branch "quilt/m68k" +$ git reset --hard 278429cff8809958d25415ba0ed32b59866ab1a8 +HEAD is now at 278429c Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 +$ git quiltimport --author Geert Uytterhoeven <geert@linux-m68k.org> --patches ../quilt/m68k +amiga-amiserial-no-serial-console-if-modular.diff +Unchanged quilt series driver-core +Unchanged quilt series usb +Importing device-mapper based on v2.6.27-3976-g7591103 +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard 7591103c08abade60aeddb432ed0686ddd0de1c6 +HEAD is now at 7591103 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-kcopyd-avoid-queue-shuffle.patch +dm-snapshot-fix-primary_pe-race.patch +dm-snapshot-drop-unused-last_percent.patch +dm-publish-array_too_big.patch +dm-remove-dm-header-from-targets.patch +dm-crypt-tidy-sector.patch +Unchanged quilt series i2c +Unchanged quilt series jdelvare-hwmon +Unchanged quilt series kernel-doc +Importing ide based on 278429cff8809958d25415ba0ed32b59866ab1a8 +$ git checkout quilt/ide +Switched to branch "quilt/ide" +$ git reset --hard 278429cff8809958d25415ba0ed32b59866ab1a8 +HEAD is now at 278429c Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +ide-add-tx4939ide-driver-v3.patch +ide-disk-fix-ide_dflag_lba48-handling-on-resume.patch +ide-disk-lock-media-before-checking-for-media-change.patch +ide-floppy-use-alloc_disk_node.patch +ide-disk-use-to_ide_drv-and-ide_drv_g.patch +ide-disk-move-ide_dflag_doorlocking-flag-handling-to-idedisk_set_doorlock.patch +ide-disk-floppy-set-ide_dflag_attach-in-_setup.patch +ide-floppy-drop-floppy-argument-from-idefloppy_setup.patch +ide-floppy-use-drive-capacity64-for-caching-current-capacity.patch +ide-ide_aflag_media_changed-to-ide_dflag_media_changed.patch +ide-ide_aflag_wp-to-ide_dflag_wp.patch +ide-ide_aflag_format_in_progress-to-ide_dflag_format_in_progress.patch +ide-remove-ide_aflag_no_doorlocking.patch +ide-disk-factor-out-generic-disk-handling-code-to-ide-gd-c.patch +ide-disk-use-ide_dflag_media_changed.patch +ide-floppy-factor-out-generic-disk-handling-code-to-ide-gd-floppy-c.patch +ide-prepare-for-merging-ide-gd-floppy-c-with-ide-gd-c.patch +ide-allow-device-drivers-to-specify-per-device-type-proc-settings.patch +ide-add-generic-ata-atapi-disk-driver.patch +ide-cd-debug-log-enhancements.patch +ide-cd-small-drive-type-print-fix.patch +ide-cd-remove-stale-comment.patch +ide-fix-support-for-ide-pci-controllers-using-mmio-on-frv.patch +ide-remove-dead-asm-arm-arch-sa1100-ide-h.patch +ide-remove-m68k_ide_swapw-define-from-asm-m68k-ide-h.patch +ide-remove-unused-macros-from-asm-parisc-ide-h.patch +hpt366-fix-compile-warning.patch +ide-mask-interrupt-in-ide_config_drive_speed.patch +hpt366-cleanup-maskproc-method.patch +sgiioc4-remove-maskproc-method.patch +ide-floppy-remove-idefloppy_floppy_t-typedef.patch +ide-remove-broken-hpt34x-driver.patch +delkin_cb-add-pm-support.patch +sgiioc4-kill-useless-address-checks.patch +sgiioc4-kill-duplicate-ioremap.patch +scc_pata-kill-unused-variables.patch +ide-re-add-trm290-fix-lost-during-ide_build_dmatable-cleanup.patch +Importing rr based on v2.6.27-4431-g04ab591 +$ git checkout quilt/rr +Switched to branch "quilt/rr" +$ git reset --hard 04ab591808565f968d4406f6435090ad671ebdab +HEAD is now at 04ab591 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +module:remove_config_kmod_from_drivers.patch +module:remove_config_kmod_from_fs.patch +module:remove_config_kmod_from_net.patch +module:remove-kmod.c-CONFIG_KMOD-comment.patch +module:remove_config_kmod.patch +module:simplify-load_module.patch +module:remove_stop_machine_during_load_v2.patch +module:compile-time-prefix-length-check.patch +module_param:fix-duplicate-prefixes.patch +module:core_param.patch +misc:make-initcall_debug-a-module_param.patch +misc:make-panic-options-core_params.patch +virtio:net_recycle_some_more_rx_buffer_pages.patch +misc:call_init_workqueues_before_pre_smp_initcalls.patch +misc:workqueue_introduce_create_rt_workqueue.patch +stop_machine:use_workqueues_instead_of_kernel_threads.patch +lguest:move_the_initial_guest_page_table_creation_code_to_the_host.patch +lguest:physical_address_extension_support.patch +Context reduced to (1/1) to apply fragment at 851 +error: patch failed: drivers/lguest/page_tables.c:645 +error: drivers/lguest/page_tables.c: patch does not apply +Unchanged quilt series ttydev diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..b39ab3f58b1d --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20081017 |