diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-03-05 18:02:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-03-05 18:02:54 +1100 |
| commit | 69ff18d75960cd419aacc99b84cb44830da5e497 (patch) | |
| tree | fe6fa5a0b3df8c6a646440fbfe371aac741bcc51 | |
| parent | 25bf476fc0d2bf92460ab9a66c5878398b0bd3be (diff) | |
Add linux-next specific files for 20120305next-20120305
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 187 | ||||
| -rw-r--r-- | Next/Trees | 189 | ||||
| -rw-r--r-- | Next/merge.log | 10454 | ||||
| -rw-r--r-- | Next/quilt-import.log | 45 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 10876 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c5882bf83672 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,187 @@ +Name SHA1 +---- ---- +origin 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d +fixes 88ebdda6159ffc15699f204c33feb3e431bf9bdc +kbuild-current 42f1c01b79d54a00012c553b95fc7fe266d82394 +arm-current 7e55d0527e4925a49464a5b26fdabae1f7a91a77 +m68k-current 2a3535069e33d8b416f406c159ce924427315303 +powerpc-merge c2ea3776cda864506a298592d4b259b659adccc0 +52xx-and-virtex-current c49f8789f532ae39019135ca038e9bc0d15aaa4a +sparc e51e07e0ac7e3ff847d640f41b7527db04d4a4e7 +scsi-rc-fixes 41f8ad76362e7aefe3a03949c43e23102dae6e0b +net c0638c247f559e1a16ee79e54df14bca2cb679ea +sound-current 019ae33410581e09f429fba5cbbf0daa96d6659a +pci-current a97f4f5e524bcd09a85ef0b8821a14d35e69335f +wireless 00f157b49780e194c38dafdf9df8e10b8a6a9626 +driver-core.current 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d +tty.current f21c6d4a49179f91fd70a41382382f08c780d425 +usb.current 71919403dc86b40fafd9400738668f96679c551b +staging.current 6b21d18ed50c7d145220b0724ea7f2613abf0f95 +char-misc.current b01543dfe67bb1d191998e90d20534dc354de059 +cpufreq-current 88ebdda6159ffc15699f204c33feb3e431bf9bdc +input-current f3761c0779b62276b5bf84532a81d5dc49bd721f +md-current db91ff55bdf06736b849afc1b1fce5763bbb8d5d +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current f8f54e190ddb4ed697036b60f5e2ae6dd45b801c +ide 0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +devicetree-current 2261cc627f5453004042b4f694612edae27e492e +spi-current c88db233251b026fda775428f0250c760553e216 +gpio-current 7e3a70fb7bccada029c188c89bfbf3c0a63c1500 +arm 5742ee4dabc5c611741f9e100b517da060cf762c +arm-perf cdd2a5b530a008f64d86631c40e38c6dc9419b91 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p 734b5bb7375083fd24a50c02d123bbbcd4d26d91 +tegra 6f70c983bb416862ff936157d81d43c4ccd83d70 +xilinx b85a3ef4ac65169b65fd2fe9bec7912bbf475ba4 +blackfin e651fe5202da3dd618a72133f3040cc125f64681 +c6x 6b21d18ed50c7d145220b0724ea7f2613abf0f95 +cris ea78f5b898555ddfbab494c7755130362fe3cf46 +hexagon 110b3723837f231b7dda418df975bcc09e780825 +ia64 15839b4774c618117122074c630a49983f515318 +m68k 2a3535069e33d8b416f406c159ce924427315303 +m68knommu b4cb9062989d162e0df7a491ceb658006f2c8ba5 +microblaze 8597559a78e1cde158b999212bc9543682638eb1 +mips 2fea3778a54e5407527677bc326afd4e34985b62 +openrisc 754d5c2bf65847f7ff4e0047a830154abe666112 +parisc c60dc74eb95cb10f8d3269cab1cc2e20532cda9a +powerpc 6c15d7afbb2f9e2d3114b513306dae736b56f535 +4xx ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4 +52xx-and-virtex c1395f4cf4a1944236f0f28cdf718c4aacc88f2d +galak ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4 +s390 e11eae98ede4cb580c781a161df36d78ae2e3b3a +sparc-next e9b57cca3dbdc7a0b90514af8bf613baf97105a5 +tile 0c90547b4a3fcee184db4d54ffc1a4fb17fd54d6 +unicore32 099469502f62fbe0d7e4f0b83a2f22538367f734 +ceph 83eb26af0db71f2dfe551405c55d982288fa6178 +cifs 5bccda0ebc7c0331b81ac47d39e4b920b198b2cd +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 6cfd4b42f29db32426499c9dca8885ea04b04839 +ext3 a0391a3ae91d301c0e59368531a4de5f0b122bcf +ext4 9ee4930259abf3641ae85c19498eabe97cf6abad +fuse 03c9693db0ea5605e23b8f4bbd4f7212a6fad982 +gfs2 a08fd280b58836c910a4af10eee2066e358d16db +logfs 203738e548cefc3fc3c2f73a9063176c9f3583d5 +nfs 3ea8618342695d32d5c0bc1ffa4268a9bd2f5982 +nfsd 03cfb42025a16dc45195dbdd6d368daaa8367429 +ocfs2 939255798a468e1a92f03546de6e87be7b491e57 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 3d4a1c80c4eb97187b3a61b3bfa8c804327f7a45 +v9fs 208f3c28aab706fca2bc1bae7091da8a99c5e322 +ubifs c43be1085f8480ab36d5c8c76a08e67bdf6d2e18 +xfs 4b217ed9e30f94b6e8e5e262020ef0ceab6113af +vfs 9161999dacf6bb06076412a63888c4c8f8cbea7d +pci 63ab387ca0d1576edef35ef68e4b8ea5e0757b7a +hid bda02ea5d138f7e89b7393fec0bcecb28fafba51 +i2c c3632e0590532f1cc50f6851d896c6511687e6bd +bjdooks-i2c fc84fe19ffb9eee7e6b3301bc6cd45b22f187bd7 +i2c-embedded 7e87f54ce75ad19568a617b2c9609ffbdbdc84b1 +jdelvare-hwmon 064628b905490c5f5836e1154a89ddf3e86317ec +hwmon-staging 8caee5631b76342a92a8eec634a58f6f5dc3d02d +kernel-doc 7e7b32ac24949774b0c19cafa353390a0eead92b +docs 5c24d8b2bf99ee93049a6f8154ef9cd7897a6e36 +v4l-dvb df0877b1c16b237b101d6871fd4df6af994fcdce +kbuild 17c0999269a1cac8a85cf41353a61850da0e6268 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +libata 3f1581f583a972fe360e4113769ca72fb0982f38 +infiniband 01b5e3a074d99e05d4635c036cda27305eb5e4ab +acpi 71ad90e386d2a8d0e722564f13ba0b5d7f2659f2 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +ieee1394 02c68b739bc9d65a697cb11d1276b3c475d3ff2a +ubi a29852be492d61001d86c6ebf5fff9b93d7b4be9 +dlm 60f98d1839376d30e13f3e452dce2433fad3060e +scsi cd8df932d894f3128c884e3ae1b2b484540513db +target-updates c0974f89385970455a60a999ae4fc0a783cf458d +target-merge c0974f89385970455a60a999ae4fc0a783cf458d +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 57872c25d27817494b58fc396f8fd4bf950c593a +slave-dma a1c46016794fdd83b7993303915ec7f4a06682b7 +dmaengine d07a74a546981a09ba490936645fbf0d1340b96c +net-next 2556cd8603cd1f39205aaf61f054a76133359ae6 +wireless-next c288ec614e264b46853c65d3db9ccf91d53c9484 +bluetooth 5f15903279143eb640f9ba1c0e72b52fe9e9e2a6 +mtd 3c3e51d5451036b1d697f0f3b73c567c5cbdc4c5 +l2-mtd 309756ebcb47c97f844d743fa9347002c36907c8 +crypto 894042648902d11d579af2a936a5a9a43cd5f1e4 +sound 12cf5befcd769caccc2444da6dc36e9d683ab2d4 +sound-asoc 5b1c33e999ab7a3899b7fc55d3d352432546e10e +cpufreq fd0ef7a0583b9af3efeb7b1f965ea80b5ff70cdf +rr 2a22b634997e16f378097816944229cbafac556c +input fa3e44f391149dd49fd053aef55c42479753d45a +input-mt 7491f3dffd99fadf1239011c0ab5346925618dae +block b3021da8f53746bc90d76694ded195e890ac9220 +device-mapper 347f18ff092d5950bc53a46e713983cb4ef30e59 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +battery 913272b3864d6da89c70d9fc2c30ccb57794b369 +mmc e75c4ceb48529022e7a905c68c828ceb4b69fae1 +kgdb 0e997a455b913d0b7c80ce8f5cd3a2003e9bbb5f +slab 96438bc4c9e16113d1a5af1744f548d1e437c2e6 +uclinux 5e442a493fc59fa536c76db1fff5b49ca36a88c5 +md 2a78e32b5feb1d0c445688b429ea0990323760d2 +mfd 2fcf1640f7fd2d337b5dcb8de3c607e8519f1636 +drm 81ffbbedc37c6043e5f5b123da926aa7dd8ad60a +fbdev 0d04c58aa41652f2adc369926bd944cbeb7ba5a2 +viafb 91dc1be8f698eb016343d534159a919678e3889c +omap_dss2 9a9016832d2601a290db4dce6dd55552bdae5b1a +regulator 564c98426842f67fdde220eea9ef9d5e469c4ce3 +security df91e49477a9be15921cb2854e1d12a3bdb5e425 +selinux a9ab18a8d687276dd0647443c3f9ed52e2816209 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 1f033c1a6ec1a6815e9c4507d83eb20161163c37 +dwmw2-iommu c3b92c8787367a8bb53d57d9789b558f1295cc96 +iommu 84799396358a81ede4955b3027174300bb84e144 +osd 0aa436b78b6c7f3bfc814b78ea752369af311c3a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial c3363c912ba743e6f981ba58c744e413fc41f943 +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +pm ed819e3b964bba8bfae8e65d4d55a3f345f8da16 +apm b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +edac 4d096ca7e65584dd5845e64c6400f920e694f672 +edac-amd 305f1c3cfd7eef63bef2128b6934a9054d902976 +devicetree 0f22dd395fc473cee252b9af50249b8e0f32fde7 +spi 14af60b6fb3b76634278364b697dae2f9f360abf +gpio daefd89efc279b142bbb054577c2d706da211723 +tip 93379d9d02475b5845363d5a01454b772ffded06 +rcu 1cc85961e214773cb7d7f2ccbe3bc644dd466df0 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes f0b42ab749bb9ab4314e9e0149c315f79a8ea2c0 +cgroup 3ce3230a0cff484e5130153f244d4fb8a56b3a8b +kmemleak d65b4e98d7ea3038b767b70fe8be959b2913f16d +kvm 4b99f72c2a9c622ad8b346bd1593b19b789d5638 +oprofile b9e7f8e9382a93e41305caa914f160d15c464b19 +xen 59e9a6b1ee9fa3992860eb6c48a37b163e97d205 +xen-two eb7644292f71fbef305da45849644014532b8c57 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu adb795062f89b8d67d295ee25e04034bccce6779 +workqueues 6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e75732035d7e97e001bdf6e3149d3967c0221de +regmap ed492c20b1f8239e3185a1f678e8180a19fdad74 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +driver-core f6e8a1d7b4c4087e13913da43deb45b3e3413f29 +tty 6623d64021469b0094bb070d3eb7d0e3f5e928af +usb 5f0b3f9998ceca8414dfb7d0dba69209f11b44af +staging 1ec41a31fb695682cab7fc7c1f6ced84d188b6f9 +char-misc b222258ac11cae3e0350fe5992ad164a7b128103 +tmem b05b561f1dd2b8f36120c92184057b50804611a0 +writeback 977b7e3a52a7421ad33a393a38ece59f3d41c2fa +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 1bbfa4d2195da49e6902c7fb7e773c80c5c59134 +moduleh 1901ea5f490f78bc5194954cba65094f8d0c3a88 +vhost 1e05b62ae4bd4c1209229de367b0989b39644f88 +kmap_atomic 019e9ad394b1ec0293210a651fa242e50f790188 +modem-shm 3cff1cc0d7703b289fc2e1dbf6cc7790ccac9d5e +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc e12bc14b88d44e5c1456dccb59ff58103f6c6edc +irqdomain 280ad7fda5f95211857fda38960f2b6fdf6edd3e +arm-soc 6469d9d7c6cfd9589f26e9ca72f3c8bcb3465b69 +kvmtool d8a493417e71dab26757a12ff10dea744a5ae863 +dma-mapping 6cc2bf1ab405a7085c92fefbad610b35ec60d3e0 +ktest be405f95f0a090d1dfc26a5bb4d781c00f34479c +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm 8da3246a3d286da8e4baeaf9b95bd234d5fee868 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a6afd024fb83 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,189 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arm-current git git://ftp.arm.linux.org.uk/~rmk/linux-next.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +52xx-and-virtex-current git git://git.secretlab.ca/git/linux-2.6#powerpc/merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +scsi-rc-fixes git git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +gpio-current git git://git.secretlab.ca/git/linux-2.6#gpio/merge +arm git git://ftp.arm.linux.org.uk/~rmk/linux-next.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +s5p git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git#for-next +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon quilt https://www.codeaurora.org/patches/quic/hlk/linux-next/ +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.infradead.org/users/jwboyer/powerpc-4xx.git#next +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#powerpc/next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://github.com/gxt/linux.git#unicore32 +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs.git#for-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +i2c-embedded git git://git.pengutronix.de/git/wsa/linux.git#i2c-embedded/for-next +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://www.xenotime.net/kernel-doc-patches/current/ +docs git git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs.git#docs-move +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://github.com/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +scsi git git://bedivere.hansenpartnership.com/git/scsi-misc-2.6.git#master +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git#linux-next +isci git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git#all +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://github.com/rydberg/linux.git#for-next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper quilt http://people.redhat.com/agk/patches/linux/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +battery git git://git.infradead.org/battery-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +fbdev git git://github.com/schandinat/linux-2.6.git#fbdev-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog.git#linux-next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +edac git git://git.infradead.org/users/mchehab/edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +cputime git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#cputime +uprobes git git://github.com/srikard/linux.git#for-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +kmemleak git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux.git#kmemleak +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +oprofile git git://amd64.org/linux/rric.git#for-next +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +tmem git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +moduleh git git://openlinux.windriver.com/people/paulg/linux-next#for-sfr +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +kmap_atomic git git://github.com/congwang/linux.git#kmap_atomic +modem-shm git git://github.com/sjurbren/modem-ipc.git#for-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +irqdomain git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +kvmtool git git://github.com/penberg/linux-kvm.git#master +dma-mapping git git://git.infradead.org/users/kmpark/linux-samsung#dma-mapping-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm mmotm http://userweb.kernel.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..2ceaafdfb0b4 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10454 @@ +$ date +Mon Mar 5 10:44:43 EST 2012 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 88ebdda Merge tag 'for-3.3' of git://openrisc.net/jonas/linux +Merging origin/master (192cfd5 Linux 3.3-rc6) +$ git merge origin/master +Updating 88ebdda..192cfd5 +Fast-forward + MAINTAINERS | 2 +- + Makefile | 2 +- + arch/arm/mach-lpc32xx/include/mach/irqs.h | 2 +- + arch/arm/mach-lpc32xx/irq.c | 25 ++++++-- + arch/arm/mach-lpc32xx/serial.c | 20 +++++- + arch/arm/mach-mmp/aspenite.c | 1 - + arch/arm/mach-mmp/pxa168.c | 1 - + arch/arm/mach-mmp/tavorevb.c | 1 - + arch/arm/mach-omap1/board-innovator.c | 4 +- + arch/arm/mach-omap2/Kconfig | 4 +- + arch/arm/mach-omap2/board-n8x0.c | 4 + + arch/arm/mach-omap2/board-omap3evm.c | 2 +- + arch/arm/mach-omap2/common.h | 1 + + arch/arm/mach-omap2/cpuidle44xx.c | 5 +- + arch/arm/mach-omap2/gpmc-smsc911x.c | 52 ++++++++++++++ + arch/arm/mach-omap2/hsmmc.c | 6 ++ + arch/arm/mach-omap2/io.c | 1 + + arch/arm/mach-omap2/mailbox.c | 10 +++- + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/omap4-common.c | 25 +++++--- + arch/arm/mach-omap2/pm.c | 3 + + arch/arm/mach-omap2/usb-host.c | 6 +- + arch/arm/mach-pxa/hx4700.c | 25 +++++++ + arch/arm/mach-pxa/pxa25x.c | 1 - + arch/arm/mach-pxa/pxa27x.c | 1 - + arch/arm/mach-pxa/saarb.c | 1 - + arch/arm/mach-pxa/sharpsl_pm.c | 3 +- + arch/arm/mach-pxa/spitz_pm.c | 5 +- + arch/arm/plat-omap/common.c | 1 + + arch/arm/plat-omap/include/plat/omap-secure.h | 6 ++ + arch/parisc/Makefile | 4 + + arch/s390/Kconfig | 3 + + arch/s390/kernel/crash_dump.c | 1 - + arch/s390/mm/init.c | 30 +++++++- + arch/x86/include/asm/perf_event.h | 8 ++ + arch/x86/kernel/cpu/perf_event.h | 8 ++- + arch/x86/kernel/cpu/perf_event_amd.c | 37 ++++++++++- + arch/x86/kvm/svm.c | 5 ++ + drivers/crypto/mv_cesa.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_connector.c | 16 +++-- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 27 ++++---- + drivers/gpu/drm/i915/intel_display.c | 15 ++++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 14 +---- + drivers/gpu/drm/radeon/r600_cs.c | 1 + + drivers/gpu/drm/radeon/radeon_connectors.c | 25 +++++-- + drivers/gpu/drm/radeon/radeon_gart.c | 2 +- + drivers/hwmon/f75375s.c | 89 +++++++++++++++++++++---- + drivers/i2c/busses/i2c-mxs.c | 13 +++- + drivers/parisc/iommu-helpers.h | 2 + + drivers/pcmcia/pxa2xx_base.c | 12 +--- + drivers/regulator/88pm8607.c | 6 +- + drivers/scsi/osd/osd_uld.c | 4 +- + drivers/video/omap2/displays/Kconfig | 2 +- + drivers/video/omap2/dss/apply.c | 6 ++ + drivers/video/omap2/dss/hdmi.c | 24 +++++++- + drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 9 +-- + drivers/video/via/hw.c | 4 + + drivers/virtio/virtio_balloon.c | 33 ++++++--- + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/booke_wdt.c | 6 ++- + drivers/watchdog/hpwdt.c | 5 +- + drivers/watchdog/pnx4008_wdt.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 57 +++++++++------- + fs/binfmt_elf.c | 2 +- + fs/dcache.c | 13 ++-- + fs/namei.c | 66 ++++++++++++------ + include/asm-generic/iomap.h | 2 +- + include/asm-generic/pci_iomap.h | 2 +- + include/drm/Kbuild | 1 + + include/drm/exynos_drm.h | 22 +++++- + include/linux/dcache.h | 21 ++---- + include/linux/regset.h | 10 ++- + kernel/events/hw_breakpoint.c | 4 +- + kernel/sched/core.c | 4 +- + mm/memblock.c | 6 +- + sound/pci/azt3328.c | 3 +- + sound/pci/hda/hda_codec.c | 12 ++- + sound/pci/hda/hda_codec.h | 3 + + sound/pci/hda/patch_cirrus.c | 4 +- + sound/pci/hda/patch_conexant.c | 24 ++++++- + sound/pci/hda/patch_realtek.c | 8 +- + sound/pci/hda/patch_sigmatel.c | 2 +- + sound/soc/imx/imx-ssi.c | 2 +- + sound/soc/soc-dapm.c | 12 +++- + tools/perf/util/event.c | 1 + + tools/perf/util/evlist.c | 4 + + tools/perf/util/probe-event.c | 6 ++ + tools/perf/util/probe-finder.c | 12 +++- + 89 files changed, 690 insertions(+), 255 deletions(-) +Merging fixes/master (88ebdda Merge tag 'for-3.3' of git://openrisc.net/jonas/linux) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (42f1c01 coccicheck: change handling of C={1,2} when M= is set) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/fixes (7e55d05 ARM: 7339/1: amba/serial.h: Include types.h for resolving dependency of type bool) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + include/linux/amba/serial.h | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging m68k-current/for-linus (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge (c2ea377 Merge remote-tracking branch 'origin/master' into merge) +$ git merge powerpc-merge/merge +Removing arch/powerpc/platforms/pseries/phyp_dump.c +Auto-merging arch/powerpc/perf/ppc970-pmu.c +Auto-merging arch/powerpc/perf/power6-pmu.c +Auto-merging arch/powerpc/perf/callchain.c +Removing arch/powerpc/include/asm/phyp_dump.h +Removing Documentation/powerpc/phyp-assisted-dump.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/powerpc/fsl/mpic.txt | 22 +- + Documentation/powerpc/firmware-assisted-dump.txt | 270 ++++ + Documentation/powerpc/phyp-assisted-dump.txt | 127 -- + arch/powerpc/Kconfig | 17 +- + arch/powerpc/Makefile | 1 + + arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi | 3 + + arch/powerpc/include/asm/fadump.h | 218 ++++ + arch/powerpc/include/asm/mpic.h | 9 +- + arch/powerpc/include/asm/phyp_dump.h | 47 - + arch/powerpc/kernel/Makefile | 10 +- + arch/powerpc/kernel/fadump.c | 1315 ++++++++++++++++++++ + arch/powerpc/kernel/iommu.c | 8 +- + arch/powerpc/kernel/prom.c | 98 +-- + arch/powerpc/kernel/setup-common.c | 14 + + arch/powerpc/kernel/traps.c | 3 + + arch/powerpc/mm/hash_utils_64.c | 11 + + arch/powerpc/perf/Makefile | 14 + + .../{kernel/perf_callchain.c => perf/callchain.c} | 2 +- + .../{kernel/perf_event.c => perf/core-book3s.c} | 0 + .../perf_event_fsl_emb.c => perf/core-fsl-emb.c} | 0 + arch/powerpc/{kernel => perf}/e500-pmu.c | 0 + arch/powerpc/{kernel => perf}/mpc7450-pmu.c | 0 + arch/powerpc/{kernel => perf}/power4-pmu.c | 0 + arch/powerpc/{kernel => perf}/power5+-pmu.c | 0 + arch/powerpc/{kernel => perf}/power5-pmu.c | 0 + arch/powerpc/{kernel => perf}/power6-pmu.c | 2 +- + arch/powerpc/{kernel => perf}/power7-pmu.c | 0 + arch/powerpc/{kernel => perf}/ppc970-pmu.c | 2 +- + arch/powerpc/platforms/44x/currituck.c | 2 +- + arch/powerpc/platforms/44x/iss4xx.c | 3 +- + arch/powerpc/platforms/85xx/corenet_ds.c | 4 +- + arch/powerpc/platforms/85xx/ksi8560.c | 3 +- + arch/powerpc/platforms/85xx/mpc8536_ds.c | 4 +- + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 3 +- + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 3 +- + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 6 +- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 5 +- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 7 +- + arch/powerpc/platforms/85xx/p1010rdb.c | 5 +- + arch/powerpc/platforms/85xx/p1022_ds.c | 4 +- + arch/powerpc/platforms/85xx/p1023_rds.c | 5 +- + arch/powerpc/platforms/85xx/sbc8548.c | 3 +- + arch/powerpc/platforms/85xx/sbc8560.c | 3 +- + arch/powerpc/platforms/85xx/socrates.c | 3 +- + arch/powerpc/platforms/85xx/stx_gp3.c | 3 +- + arch/powerpc/platforms/85xx/tqm85xx.c | 2 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 4 +- + arch/powerpc/platforms/86xx/pic.c | 5 +- + arch/powerpc/platforms/cell/setup.c | 3 +- + arch/powerpc/platforms/chrp/setup.c | 3 +- + arch/powerpc/platforms/embedded6xx/holly.c | 6 +- + arch/powerpc/platforms/embedded6xx/linkstation.c | 3 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 6 +- + arch/powerpc/platforms/embedded6xx/storcenter.c | 3 +- + arch/powerpc/platforms/maple/setup.c | 2 +- + arch/powerpc/platforms/pasemi/setup.c | 2 +- + arch/powerpc/platforms/powermac/pic.c | 1 - + arch/powerpc/platforms/pseries/Makefile | 1 - + arch/powerpc/platforms/pseries/phyp_dump.c | 513 -------- + arch/powerpc/platforms/pseries/setup.c | 5 +- + arch/powerpc/sysdev/mpic.c | 103 +- + arch/powerpc/sysdev/mpic_msi.c | 4 +- + fs/proc/vmcore.c | 23 + + 63 files changed, 2024 insertions(+), 924 deletions(-) + create mode 100644 Documentation/powerpc/firmware-assisted-dump.txt + delete mode 100644 Documentation/powerpc/phyp-assisted-dump.txt + create mode 100644 arch/powerpc/include/asm/fadump.h + delete mode 100644 arch/powerpc/include/asm/phyp_dump.h + create mode 100644 arch/powerpc/kernel/fadump.c + create mode 100644 arch/powerpc/perf/Makefile + rename arch/powerpc/{kernel/perf_callchain.c => perf/callchain.c} (99%) + rename arch/powerpc/{kernel/perf_event.c => perf/core-book3s.c} (100%) + rename arch/powerpc/{kernel/perf_event_fsl_emb.c => perf/core-fsl-emb.c} (100%) + rename arch/powerpc/{kernel => perf}/e500-pmu.c (100%) + rename arch/powerpc/{kernel => perf}/mpc7450-pmu.c (100%) + rename arch/powerpc/{kernel => perf}/power4-pmu.c (100%) + rename arch/powerpc/{kernel => perf}/power5+-pmu.c (100%) + rename arch/powerpc/{kernel => perf}/power5-pmu.c (100%) + rename arch/powerpc/{kernel => perf}/power6-pmu.c (99%) + rename arch/powerpc/{kernel => perf}/power7-pmu.c (100%) + rename arch/powerpc/{kernel => perf}/ppc970-pmu.c (99%) + delete mode 100644 arch/powerpc/platforms/pseries/phyp_dump.c +Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries) +$ git merge 52xx-and-virtex-current/powerpc/merge +Already up-to-date. +Merging sparc/master (e51e07e sparc32: forced setting of mode of sun4m per-cpu timers) +$ git merge sparc/master +Already up-to-date. +Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576) +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net/master (c0638c2 tcp: don't fragment SACKed skbs in tcp_mark_head_lost()) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/broadcom/tg3.c | 45 ++++++++++---------- + drivers/net/ethernet/cisco/enic/enic.h | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 15 ++++--- + drivers/net/ethernet/packetengines/Kconfig | 1 + + drivers/net/ethernet/realtek/r8169.c | 8 ++++ + drivers/net/vmxnet3/vmxnet3_drv.c | 7 +--- + drivers/net/vmxnet3/vmxnet3_int.h | 4 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 25 +---------- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 19 ++++++++ + drivers/net/wireless/ath/ath9k/hw.h | 1 - + drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 12 ++---- + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 10 ++++- + drivers/net/wireless/rt2x00/rt2x00dev.c | 3 +- + include/linux/tcp.h | 3 +- + include/net/tcp.h | 5 +- + net/bridge/netfilter/ebtables.c | 10 +---- + net/ipv4/tcp_input.c | 19 +++++---- + net/mac80211/iface.c | 3 + + net/mac80211/rate.c | 2 +- + 20 files changed, 102 insertions(+), 94 deletions(-) +Merging sound-current/for-linus (019ae33 Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/soc/samsung/neo1973_wm8753.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (a97f4f5 x86/PCI: do not tie MSI MS-7253 use_crs quirk to BIOS version) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + arch/x86/pci/acpi.c | 22 +++++++++++++++++----- + 1 files changed, 17 insertions(+), 5 deletions(-) +Merging wireless/master (00f157b mwifiex: reset encryption mode flag before association) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/carl9170/tx.c | 9 ++++++--- + drivers/net/wireless/mwifiex/cfg80211.c | 1 + + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging driver-core.current/driver-core-linus (192cfd5 Linux 3.3-rc6) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (f21c6d4 tty/powerpc: early udbg consoles can't be modules) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/Kconfig | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging usb.current/usb-linus (7191940 Revert "powerpc/usb: fix issue of CPU halt when missing USB PHY clock") +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/host/ehci-fsl.c | 11 ++--------- + drivers/usb/host/ehci-fsl.h | 1 - + 2 files changed, 2 insertions(+), 10 deletions(-) +Merging staging.current/staging-linus (6b21d18 Linux 3.3-rc5) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (b01543d Linux 3.3-rc4) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging cpufreq-current/fixes (88ebdda Merge tag 'for-3.3' of git://openrisc.net/jonas/linux) +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus (f3761c0 Input: twl4030-vibra - use proper guard for PM methods) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + Documentation/input/alps.txt | 3 ++- + drivers/input/evdev.c | 2 +- + drivers/input/misc/twl4030-vibra.c | 6 ++---- + drivers/input/mouse/alps.c | 7 +++++-- + drivers/input/tablet/Kconfig | 2 ++ + 5 files changed, 12 insertions(+), 8 deletions(-) +Merging md-current/for-linus (db91ff5 md: two small fixes to handling interrupt resync.) +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (f8f54e1 crypto: mv_cesa - fix final callback not ignoring input data) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (2261cc6 dt: add empty of_find_compatible_node function) +$ git merge devicetree-current/devicetree/merge +Merge made by the 'recursive' strategy. + arch/arm/boot/.gitignore | 1 + + include/linux/of.h | 8 ++++++++ + 2 files changed, 9 insertions(+), 0 deletions(-) +Merging spi-current/spi/merge (c88db23 spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver) +$ git merge spi-current/spi/merge +Already up-to-date. +Merging gpio-current/gpio/merge (7e3a70f gpio: Add missing spin_lock_init in gpio-ml-ioh driver) +$ git merge gpio-current/gpio/merge +Already up-to-date. +Merging arm/for-next (5742ee4 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Auto-merging drivers/pcmcia/sa1111_neponset.c +Auto-merging drivers/pcmcia/sa1111_lubbock.c +Auto-merging drivers/pcmcia/sa1111_jornada720.c +Auto-merging drivers/pcmcia/sa1111_badge4.c +Auto-merging drivers/pcmcia/pxa2xx_base.c +Auto-merging arch/powerpc/Kconfig +Removing arch/arm/plat-spear/include/plat/system.h +Removing arch/arm/plat-omap/include/plat/system.h +Removing arch/arm/plat-mxc/include/mach/system.h +Removing arch/arm/plat-mxc/include/mach/entry-macro.S +Removing arch/arm/mach-zynq/include/mach/system.h +Removing arch/arm/mach-zynq/include/mach/entry-macro.S +Removing arch/arm/mach-w90x900/include/mach/system.h +Removing arch/arm/mach-vexpress/include/mach/system.h +Removing arch/arm/mach-vexpress/include/mach/entry-macro.S +Removing arch/arm/mach-versatile/include/mach/system.h +Removing arch/arm/mach-versatile/include/mach/entry-macro.S +Removing arch/arm/mach-ux500/include/mach/system.h +Removing arch/arm/mach-ux500/include/mach/entry-macro.S +Removing arch/arm/mach-u300/mmc.h +Removing arch/arm/mach-u300/mmc.c +Removing arch/arm/mach-u300/include/mach/system.h +Removing arch/arm/mach-u300/include/mach/entry-macro.S +Removing arch/arm/mach-tegra/include/mach/system.h +Removing arch/arm/mach-tegra/include/mach/entry-macro.S +Removing arch/arm/mach-spear6xx/include/mach/system.h +Removing arch/arm/mach-spear6xx/include/mach/entry-macro.S +Removing arch/arm/mach-spear3xx/include/mach/system.h +Removing arch/arm/mach-spear3xx/include/mach/entry-macro.S +Auto-merging arch/arm/mach-shmobile/intc-sh73a0.c +Removing arch/arm/mach-shmobile/include/mach/entry-macro.S +Auto-merging arch/arm/mach-shmobile/board-mackerel.c +Auto-merging arch/arm/mach-shmobile/board-kota2.c +Auto-merging arch/arm/mach-shmobile/board-ag5evm.c +Removing arch/arm/mach-shark/include/mach/system.h +Removing arch/arm/mach-sa1100/include/mach/system.h +Removing arch/arm/mach-sa1100/include/mach/dma.h +Removing arch/arm/mach-sa1100/dma.c +Removing arch/arm/mach-s5pv210/include/mach/system.h +Removing arch/arm/mach-s5pv210/include/mach/entry-macro.S +Removing arch/arm/mach-s5pc100/include/mach/system.h +Removing arch/arm/mach-s5p64x0/include/mach/system.h +Removing arch/arm/mach-s5p64x0/include/mach/entry-macro.S +Removing arch/arm/mach-s3c64xx/include/mach/system.h +Removing arch/arm/mach-s3c64xx/include/mach/entry-macro.S +Removing arch/arm/mach-s3c2410/include/mach/system.h +Removing arch/arm/mach-rpc/include/mach/system.h +Removing arch/arm/mach-realview/include/mach/system.h +Removing arch/arm/mach-realview/include/mach/entry-macro.S +Removing arch/arm/mach-pxa/include/mach/system.h +Removing arch/arm/mach-pxa/include/mach/entry-macro.S +Removing arch/arm/mach-prima2/include/mach/system.h +Removing arch/arm/mach-pnx4008/include/mach/system.h +Removing arch/arm/mach-picoxcell/include/mach/system.h +Removing arch/arm/mach-picoxcell/include/mach/irqs.h +Removing arch/arm/mach-picoxcell/include/mach/entry-macro.S +Removing arch/arm/mach-orion5x/include/mach/system.h +Auto-merging arch/arm/mach-omap2/pm24xx.c +Removing arch/arm/mach-omap2/include/mach/system.h +Removing arch/arm/mach-omap2/include/mach/entry-macro.S +Removing arch/arm/mach-omap1/include/mach/system.h +Removing arch/arm/mach-nomadik/include/mach/system.h +Removing arch/arm/mach-nomadik/include/mach/entry-macro.S +Removing arch/arm/mach-netx/include/mach/system.h +Removing arch/arm/mach-netx/include/mach/entry-macro.S +Removing arch/arm/mach-mxs/include/mach/system.h +Removing arch/arm/mach-mv78xx0/include/mach/system.h +Removing arch/arm/mach-msm/idle.S +Auto-merging arch/arm/mach-mmp/tavorevb.c +Removing arch/arm/mach-mmp/include/mach/system.h +Auto-merging arch/arm/mach-mmp/aspenite.c +Removing arch/arm/mach-lpc32xx/include/mach/system.h +Removing arch/arm/mach-ks8695/include/mach/system.h +Removing arch/arm/mach-kirkwood/include/mach/system.h +Removing arch/arm/mach-ixp4xx/include/mach/system.h +Removing arch/arm/mach-ixp23xx/include/mach/system.h +Removing arch/arm/mach-ixp2000/include/mach/system.h +Removing arch/arm/mach-iop33x/include/mach/system.h +Removing arch/arm/mach-iop32x/include/mach/system.h +Removing arch/arm/mach-iop13xx/include/mach/system.h +Removing arch/arm/mach-integrator/include/mach/system.h +Removing arch/arm/mach-highbank/include/mach/system.h +Removing arch/arm/mach-highbank/include/mach/irqs.h +Removing arch/arm/mach-highbank/include/mach/entry-macro.S +Removing arch/arm/mach-h720x/include/mach/system.h +Removing arch/arm/mach-footbridge/include/mach/system.h +Removing arch/arm/mach-exynos/include/mach/system.h +Removing arch/arm/mach-exynos/include/mach/entry-macro.S +Removing arch/arm/mach-ep93xx/include/mach/system.h +Removing arch/arm/mach-ep93xx/include/mach/entry-macro.S +Removing arch/arm/mach-ebsa110/include/mach/system.h +Removing arch/arm/mach-dove/include/mach/system.h +Removing arch/arm/mach-davinci/include/mach/system.h +Removing arch/arm/mach-cns3xxx/include/mach/system.h +Removing arch/arm/mach-cns3xxx/include/mach/entry-macro.S +Removing arch/arm/mach-clps711x/include/mach/system.h +Removing arch/arm/mach-bcmring/include/mach/system.h +Removing arch/arm/mach-at91/include/mach/system.h +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 27 +- + arch/arm/Kconfig.debug | 156 ++-- + arch/arm/boot/compressed/.gitignore | 2 + + arch/arm/boot/compressed/Makefile | 15 +- + arch/arm/boot/compressed/decompress.c | 6 + + arch/arm/boot/compressed/piggy.xzkern.S | 6 + + arch/arm/common/gic.c | 13 +- + arch/arm/common/sa1111.c | 281 ++++-- + arch/arm/configs/integrator_defconfig | 8 + + arch/arm/include/asm/cp15.h | 87 ++ + arch/arm/include/asm/elf.h | 4 - + arch/arm/include/asm/hardware/cache-l2x0.h | 6 +- + arch/arm/include/asm/hardware/entry-macro-iomd.S | 8 - + arch/arm/include/asm/hardware/it8152.h | 3 + + arch/arm/include/asm/hardware/sa1111.h | 156 +--- + arch/arm/include/asm/irq.h | 8 +- + arch/arm/include/asm/mc146818rtc.h | 4 +- + arch/arm/include/asm/mmu_context.h | 29 +- + arch/arm/include/asm/opcodes.h | 59 + + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/perf_event.h | 1 + + arch/arm/include/asm/prom.h | 2 - + arch/arm/include/asm/system.h | 78 +-- + arch/arm/include/asm/tlbflush.h | 136 +-- + arch/arm/include/asm/traps.h | 2 +- + arch/arm/kernel/Makefile | 13 +- + arch/arm/kernel/ecard.c | 6 +- + arch/arm/kernel/entry-armv.S | 3 +- + arch/arm/kernel/entry-common.S | 8 +- + arch/arm/kernel/fiq.c | 2 +- + arch/arm/kernel/ftrace.c | 90 +-- + arch/arm/kernel/head-nommu.S | 2 +- + arch/arm/kernel/head.S | 2 +- + arch/arm/kernel/insn.c | 61 ++ + arch/arm/kernel/insn.h | 19 + + arch/arm/kernel/irq.c | 5 +- + arch/arm/kernel/kprobes.c | 86 +-- + arch/arm/kernel/machine_kexec.c | 25 + + arch/arm/kernel/patch.c | 75 ++ + arch/arm/kernel/patch.h | 7 + + arch/arm/kernel/perf_event.c | 3 + + arch/arm/kernel/perf_event_v7.c | 145 +++ + arch/arm/kernel/process.c | 65 +- + arch/arm/kernel/sched_clock.c | 18 + + arch/arm/kernel/setup.c | 3 +- + arch/arm/kernel/smp.c | 17 +- + arch/arm/kernel/time.c | 4 - + arch/arm/kernel/traps.c | 19 +- + arch/arm/mach-at91/at91cap9.c | 8 + + arch/arm/mach-at91/at91rm9200.c | 10 + + arch/arm/mach-at91/at91sam9260.c | 8 + + arch/arm/mach-at91/at91sam9261.c | 8 + + arch/arm/mach-at91/at91sam9263.c | 8 + + arch/arm/mach-at91/at91sam9g45.c | 7 + + arch/arm/mach-at91/at91sam9rl.c | 8 + + arch/arm/mach-at91/at91x40.c | 12 + + arch/arm/mach-at91/include/mach/entry-macro.S | 6 - + arch/arm/mach-at91/include/mach/system.h | 50 - + arch/arm/mach-bcmring/core.c | 23 +- + arch/arm/mach-bcmring/include/mach/entry-macro.S | 6 - + arch/arm/mach-bcmring/include/mach/system.h | 28 - + arch/arm/mach-clps711x/common.c | 16 + + arch/arm/mach-clps711x/include/mach/entry-macro.S | 6 - + arch/arm/mach-clps711x/include/mach/system.h | 35 - + arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 15 - + arch/arm/mach-cns3xxx/include/mach/system.h | 25 - + arch/arm/mach-davinci/include/mach/entry-macro.S | 6 - + arch/arm/mach-davinci/include/mach/system.h | 21 - + arch/arm/mach-davinci/time.c | 28 +- + arch/arm/mach-dove/include/mach/entry-macro.S | 6 - + arch/arm/mach-dove/include/mach/system.h | 17 - + arch/arm/mach-ebsa110/core.c | 38 +- + arch/arm/mach-ebsa110/core.h | 41 + + arch/arm/mach-ebsa110/include/mach/entry-macro.S | 6 - + arch/arm/mach-ebsa110/include/mach/hardware.h | 39 - + arch/arm/mach-ebsa110/include/mach/system.h | 37 - + arch/arm/mach-ebsa110/io.c | 20 + + arch/arm/mach-ebsa110/leds.c | 2 + + arch/arm/mach-ep93xx/core.c | 46 +- + arch/arm/mach-ep93xx/include/mach/entry-macro.S | 17 - + arch/arm/mach-ep93xx/include/mach/system.h | 7 - + arch/arm/mach-exynos/common.c | 12 - + arch/arm/mach-exynos/dma.c | 38 +- + arch/arm/mach-exynos/hotplug.c | 1 + + arch/arm/mach-exynos/include/mach/entry-macro.S | 16 - + arch/arm/mach-exynos/include/mach/system.h | 20 - + .../arm/mach-footbridge/include/mach/entry-macro.S | 6 - + arch/arm/mach-footbridge/include/mach/system.h | 13 - + arch/arm/mach-gemini/Makefile | 2 +- + arch/arm/mach-gemini/idle.c | 29 + + arch/arm/mach-gemini/include/mach/entry-macro.S | 6 - + arch/arm/mach-gemini/include/mach/system.h | 14 - + arch/arm/mach-gemini/irq.c | 4 +- + arch/arm/mach-h720x/common.c | 18 + + arch/arm/mach-h720x/include/mach/entry-macro.S | 6 - + arch/arm/mach-h720x/include/mach/system.h | 27 - + arch/arm/mach-highbank/highbank.c | 1 - + arch/arm/mach-highbank/include/mach/entry-macro.S | 5 - + arch/arm/mach-highbank/include/mach/irqs.h | 6 - + arch/arm/mach-highbank/include/mach/system.h | 24 - + arch/arm/mach-imx/mm-imx3.c | 52 +- + arch/arm/mach-imx/mm-imx5.c | 28 +- + arch/arm/mach-imx/pm-imx27.c | 3 +- + arch/arm/mach-integrator/core.c | 70 +- + arch/arm/mach-integrator/impd1.c | 9 +- + .../arm/mach-integrator/include/mach/entry-macro.S | 6 - + arch/arm/mach-integrator/include/mach/system.h | 33 - + arch/arm/mach-integrator/integrator_ap.c | 7 + + arch/arm/mach-integrator/integrator_cp.c | 49 +- + arch/arm/mach-iop13xx/include/mach/entry-macro.S | 3 - + arch/arm/mach-iop13xx/include/mach/system.h | 13 - + arch/arm/mach-iop32x/include/mach/entry-macro.S | 3 - + arch/arm/mach-iop32x/include/mach/system.h | 13 - + arch/arm/mach-iop33x/include/mach/entry-macro.S | 3 - + arch/arm/mach-iop33x/include/mach/system.h | 13 - + arch/arm/mach-ixp2000/include/mach/entry-macro.S | 6 - + arch/arm/mach-ixp2000/include/mach/system.h | 14 - + arch/arm/mach-ixp23xx/core.c | 3 + + arch/arm/mach-ixp23xx/include/mach/entry-macro.S | 6 - + arch/arm/mach-ixp23xx/include/mach/system.h | 16 - + arch/arm/mach-ixp4xx/common.c | 6 + + arch/arm/mach-ixp4xx/include/mach/entry-macro.S | 6 - + arch/arm/mach-ixp4xx/include/mach/system.h | 19 - + arch/arm/mach-kirkwood/include/mach/entry-macro.S | 6 - + arch/arm/mach-kirkwood/include/mach/system.h | 17 - + arch/arm/mach-ks8695/include/mach/entry-macro.S | 6 - + arch/arm/mach-ks8695/include/mach/system.h | 27 - + arch/arm/mach-lpc32xx/include/mach/entry-macro.S | 6 - + arch/arm/mach-lpc32xx/include/mach/system.h | 27 - + arch/arm/mach-lpc32xx/phy3250.c | 32 +- + arch/arm/mach-mmp/aspenite.c | 5 +- + arch/arm/mach-mmp/avengers_lite.c | 1 + + arch/arm/mach-mmp/brownstone.c | 4 +- + arch/arm/mach-mmp/flint.c | 3 +- + arch/arm/mach-mmp/gplugd.c | 2 +- + arch/arm/mach-mmp/include/mach/entry-macro.S | 6 - + arch/arm/mach-mmp/include/mach/irqs.h | 3 +- + arch/arm/mach-mmp/include/mach/system.h | 16 - + arch/arm/mach-mmp/irq-mmp2.c | 1 + + arch/arm/mach-mmp/jasper.c | 5 +- + arch/arm/mach-mmp/tavorevb.c | 1 + + arch/arm/mach-mmp/teton_bga.c | 3 +- + arch/arm/mach-mmp/ttc_dkb.c | 4 +- + arch/arm/mach-msm/idle.S | 36 - + arch/arm/mach-msm/idle.c | 49 + + arch/arm/mach-msm/include/mach/entry-macro.S | 6 - + arch/arm/mach-msm/include/mach/system.h | 1 - + arch/arm/mach-mv78xx0/include/mach/entry-macro.S | 6 - + arch/arm/mach-mv78xx0/include/mach/system.h | 17 - + arch/arm/mach-mxs/devices.c | 8 +- + arch/arm/mach-mxs/devices/amba-duart.c | 2 +- + arch/arm/mach-mxs/include/mach/entry-macro.S | 6 - + arch/arm/mach-mxs/include/mach/system.h | 25 - + arch/arm/mach-mxs/pm.c | 3 +- + arch/arm/mach-netx/fb.c | 13 +- + arch/arm/mach-netx/include/mach/entry-macro.S | 26 - + arch/arm/mach-netx/include/mach/system.h | 28 - + arch/arm/mach-nomadik/board-nhk8815.c | 17 +- + arch/arm/mach-nomadik/cpu-8815.c | 9 +- + arch/arm/mach-nomadik/include/mach/entry-macro.S | 13 - + arch/arm/mach-nomadik/include/mach/system.h | 32 - + arch/arm/mach-omap1/include/mach/entry-macro.S | 6 - + arch/arm/mach-omap1/include/mach/system.h | 5 - + arch/arm/mach-omap1/pm.c | 19 +- + arch/arm/mach-omap2/emu.c | 26 +- + arch/arm/mach-omap2/include/mach/entry-macro.S | 18 - + arch/arm/mach-omap2/include/mach/system.h | 5 - + arch/arm/mach-omap2/pm24xx.c | 4 +- + arch/arm/mach-omap2/pm34xx.c | 6 +- + arch/arm/mach-omap2/pm44xx.c | 8 +- + arch/arm/mach-omap2/prm_common.c | 1 - + arch/arm/mach-orion5x/include/mach/entry-macro.S | 6 - + arch/arm/mach-orion5x/include/mach/system.h | 19 - + arch/arm/mach-picoxcell/include/mach/entry-macro.S | 16 - + arch/arm/mach-picoxcell/include/mach/irqs.h | 20 - + arch/arm/mach-picoxcell/include/mach/system.h | 26 - + arch/arm/mach-pnx4008/include/mach/entry-macro.S | 6 - + arch/arm/mach-pnx4008/include/mach/system.h | 29 - + arch/arm/mach-prima2/include/mach/entry-macro.S | 7 - + arch/arm/mach-prima2/include/mach/system.h | 17 - + arch/arm/mach-prima2/timer.c | 21 +- + arch/arm/mach-pxa/capc7117.c | 1 + + arch/arm/mach-pxa/cm-x300.c | 1 + + arch/arm/mach-pxa/colibri-pxa270.c | 2 + + arch/arm/mach-pxa/colibri-pxa300.c | 1 + + arch/arm/mach-pxa/colibri-pxa320.c | 1 + + arch/arm/mach-pxa/corgi.c | 3 + + arch/arm/mach-pxa/csb726.c | 1 + + arch/arm/mach-pxa/devices.c | 1 + + arch/arm/mach-pxa/em-x270.c | 2 + + arch/arm/mach-pxa/gumstix.c | 1 + + arch/arm/mach-pxa/h5000.c | 1 + + arch/arm/mach-pxa/himalaya.c | 1 + + arch/arm/mach-pxa/icontrol.c | 1 + + arch/arm/mach-pxa/idp.c | 1 + + arch/arm/mach-pxa/include/mach/balloon3.h | 1 - + arch/arm/mach-pxa/include/mach/entry-macro.S | 15 - + arch/arm/mach-pxa/include/mach/irqs.h | 2 +- + arch/arm/mach-pxa/include/mach/mainstone.h | 2 + + arch/arm/mach-pxa/include/mach/system.h | 15 - + arch/arm/mach-pxa/lubbock.c | 1 + + arch/arm/mach-pxa/mioa701.c | 1 + + arch/arm/mach-pxa/mp900.c | 1 + + arch/arm/mach-pxa/palmld.c | 1 + + arch/arm/mach-pxa/palmt5.c | 1 + + arch/arm/mach-pxa/palmtc.c | 1 + + arch/arm/mach-pxa/palmte2.c | 1 + + arch/arm/mach-pxa/palmtreo.c | 2 + + arch/arm/mach-pxa/palmtx.c | 1 + + arch/arm/mach-pxa/palmz72.c | 1 + + arch/arm/mach-pxa/pxa3xx.c | 1 + + arch/arm/mach-pxa/raumfeld.c | 3 + + arch/arm/mach-pxa/saar.c | 1 + + arch/arm/mach-pxa/spitz.c | 3 + + arch/arm/mach-pxa/stargate2.c | 1 + + arch/arm/mach-pxa/tavorevb.c | 1 + + arch/arm/mach-pxa/time.c | 1 + + arch/arm/mach-pxa/trizeps4.c | 2 + + arch/arm/mach-pxa/viper.c | 1 + + arch/arm/mach-pxa/vpac270.c | 1 + + arch/arm/mach-pxa/xcep.c | 1 + + arch/arm/mach-pxa/z2.c | 1 + + arch/arm/mach-realview/core.h | 20 +- + arch/arm/mach-realview/hotplug.c | 1 + + arch/arm/mach-realview/include/mach/entry-macro.S | 16 - + arch/arm/mach-realview/include/mach/irqs-eb.h | 23 +- + arch/arm/mach-realview/include/mach/irqs-pb1176.h | 2 +- + arch/arm/mach-realview/include/mach/system.h | 33 - + arch/arm/mach-realview/realview_eb.c | 78 +- + arch/arm/mach-realview/realview_pb1176.c | 78 +- + arch/arm/mach-realview/realview_pb11mp.c | 78 +- + arch/arm/mach-realview/realview_pba8.c | 78 +- + arch/arm/mach-realview/realview_pbx.c | 78 +- + arch/arm/mach-rpc/Makefile | 2 +- + arch/arm/mach-rpc/fiq.S | 16 + + arch/arm/mach-rpc/include/mach/entry-macro.S | 4 - + arch/arm/mach-rpc/include/mach/system.h | 13 - + arch/arm/mach-rpc/irq.c | 6 + + arch/arm/mach-s3c2410/include/mach/entry-macro.S | 8 - + arch/arm/mach-s3c2410/include/mach/system.h | 54 - + arch/arm/mach-s3c2412/s3c2412.c | 4 +- + arch/arm/mach-s3c2416/s3c2416.c | 3 - + arch/arm/mach-s3c64xx/include/mach/entry-macro.S | 19 - + arch/arm/mach-s3c64xx/include/mach/system.h | 19 - + arch/arm/mach-s5p64x0/common.c | 15 +- + arch/arm/mach-s5p64x0/dma.c | 22 +- + arch/arm/mach-s5p64x0/include/mach/entry-macro.S | 17 - + arch/arm/mach-s5p64x0/include/mach/system.h | 21 - + arch/arm/mach-s5pc100/common.c | 12 - + arch/arm/mach-s5pc100/dma.c | 38 +- + arch/arm/mach-s5pc100/include/mach/entry-macro.S | 6 - + arch/arm/mach-s5pc100/include/mach/system.h | 19 - + arch/arm/mach-s5pv210/common.c | 12 - + arch/arm/mach-s5pv210/dma.c | 38 +- + arch/arm/mach-s5pv210/include/mach/entry-macro.S | 17 - + arch/arm/mach-s5pv210/include/mach/system.h | 21 - + arch/arm/mach-sa1100/Makefile | 2 +- + arch/arm/mach-sa1100/assabet.c | 194 +++- + arch/arm/mach-sa1100/badge4.c | 42 +- + arch/arm/mach-sa1100/cerf.c | 17 +- + arch/arm/mach-sa1100/collie.c | 55 +- + arch/arm/mach-sa1100/dma.c | 348 ------ + arch/arm/mach-sa1100/generic.c | 151 ++-- + arch/arm/mach-sa1100/generic.h | 7 +- + arch/arm/mach-sa1100/h3100.c | 25 +- + arch/arm/mach-sa1100/h3600.c | 34 +- + arch/arm/mach-sa1100/h3xxx.c | 13 +- + arch/arm/mach-sa1100/hackkit.c | 13 +- + arch/arm/mach-sa1100/include/mach/SA-1100.h | 229 +---- + arch/arm/mach-sa1100/include/mach/assabet.h | 15 +- + arch/arm/mach-sa1100/include/mach/cerf.h | 15 +- + arch/arm/mach-sa1100/include/mach/dma.h | 117 -- + arch/arm/mach-sa1100/include/mach/entry-macro.S | 6 - + arch/arm/mach-sa1100/include/mach/irqs.h | 27 +- + arch/arm/mach-sa1100/include/mach/mcp.h | 2 +- + arch/arm/mach-sa1100/include/mach/nanoengine.h | 12 +- + arch/arm/mach-sa1100/include/mach/neponset.h | 52 +- + arch/arm/mach-sa1100/include/mach/shannon.h | 14 +- + arch/arm/mach-sa1100/include/mach/simpad.h | 6 +- + arch/arm/mach-sa1100/include/mach/system.h | 9 - + arch/arm/mach-sa1100/irq.c | 8 +- + arch/arm/mach-sa1100/jornada720.c | 46 +- + arch/arm/mach-sa1100/lart.c | 82 ++ + arch/arm/mach-sa1100/nanoengine.c | 13 +- + arch/arm/mach-sa1100/neponset.c | 549 ++++++---- + arch/arm/mach-sa1100/pci-nanoengine.c | 8 +- + arch/arm/mach-sa1100/pleb.c | 25 +- + arch/arm/mach-sa1100/shannon.c | 27 +- + arch/arm/mach-sa1100/simpad.c | 24 +- + arch/arm/mach-sa1100/sleep.S | 37 +- + arch/arm/mach-sa1100/ssp.c | 2 +- + arch/arm/mach-sa1100/time.c | 1 + + arch/arm/mach-shark/core.c | 6 + + arch/arm/mach-shark/include/mach/entry-macro.S | 6 - + arch/arm/mach-shark/include/mach/system.h | 13 - + arch/arm/mach-shmobile/Kconfig | 4 + + arch/arm/mach-shmobile/board-ag5evm.c | 1 + + arch/arm/mach-shmobile/board-bonito.c | 1 + + arch/arm/mach-shmobile/board-g3evm.c | 1 + + arch/arm/mach-shmobile/board-g4evm.c | 1 + + arch/arm/mach-shmobile/board-kota2.c | 1 + + arch/arm/mach-shmobile/board-mackerel.c | 1 + + arch/arm/mach-shmobile/board-marzen.c | 1 + + arch/arm/mach-shmobile/include/mach/entry-macro.S | 22 - + arch/arm/mach-shmobile/include/mach/irqs.h | 6 +- + arch/arm/mach-shmobile/include/mach/system.h | 5 - + arch/arm/mach-shmobile/intc-r8a7740.c | 1 + + arch/arm/mach-shmobile/intc-sh7367.c | 1 + + arch/arm/mach-shmobile/intc-sh7372.c | 1 + + arch/arm/mach-shmobile/intc-sh7377.c | 1 + + arch/arm/mach-shmobile/intc-sh73a0.c | 1 + + arch/arm/mach-shmobile/setup-r8a7740.c | 1 + + arch/arm/mach-shmobile/setup-r8a7779.c | 1 + + arch/arm/mach-shmobile/setup-sh7367.c | 1 + + arch/arm/mach-shmobile/setup-sh7372.c | 1 + + arch/arm/mach-shmobile/setup-sh7377.c | 1 + + arch/arm/mach-shmobile/setup-sh73a0.c | 1 + + arch/arm/mach-spear3xx/include/mach/entry-macro.S | 18 - + arch/arm/mach-spear3xx/include/mach/system.h | 19 - + arch/arm/mach-spear3xx/spear300.c | 14 +- + arch/arm/mach-spear3xx/spear3xx.c | 27 +- + arch/arm/mach-spear6xx/include/mach/entry-macro.S | 18 - + arch/arm/mach-spear6xx/include/mach/system.h | 19 - + arch/arm/mach-spear6xx/spear6xx.c | 10 +- + arch/arm/mach-tegra/common.c | 3 +- + arch/arm/mach-tegra/hotplug.c | 1 + + arch/arm/mach-tegra/include/mach/entry-macro.S | 20 - + arch/arm/mach-tegra/include/mach/system.h | 28 - + arch/arm/mach-u300/Makefile | 1 - + arch/arm/mach-u300/core.c | 113 +-- + arch/arm/mach-u300/include/mach/entry-macro.S | 16 - + arch/arm/mach-u300/include/mach/system.h | 14 - + arch/arm/mach-u300/mmc.c | 52 - + arch/arm/mach-u300/mmc.h | 18 - + arch/arm/mach-ux500/board-mop500-sdi.c | 21 +- + arch/arm/mach-ux500/devices-common.c | 13 +- + arch/arm/mach-ux500/include/mach/entry-macro.S | 18 - + arch/arm/mach-ux500/include/mach/system.h | 20 - + arch/arm/mach-versatile/core.c | 70 +- + arch/arm/mach-versatile/core.h | 20 +- + arch/arm/mach-versatile/include/mach/entry-macro.S | 15 - + arch/arm/mach-versatile/include/mach/system.h | 33 - + arch/arm/mach-versatile/versatile_pb.c | 18 +- + arch/arm/mach-vexpress/core.h | 17 - + arch/arm/mach-vexpress/ct-ca9x4.c | 8 +- + arch/arm/mach-vexpress/hotplug.c | 2 +- + arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 2 +- + arch/arm/mach-vexpress/include/mach/entry-macro.S | 5 - + arch/arm/mach-vexpress/include/mach/io.h | 1 - + arch/arm/mach-vexpress/include/mach/system.h | 33 - + arch/arm/mach-vexpress/v2m.c | 20 +- + arch/arm/mach-vt8500/include/mach/entry-macro.S | 6 - + arch/arm/mach-vt8500/include/mach/system.h | 5 - + arch/arm/mach-w90x900/dev.c | 1 + + arch/arm/mach-w90x900/include/mach/entry-macro.S | 8 - + arch/arm/mach-w90x900/include/mach/system.h | 19 - + arch/arm/mach-zynq/include/mach/entry-macro.S | 27 - + arch/arm/mach-zynq/include/mach/system.h | 23 - + arch/arm/mm/alignment.c | 2 +- + arch/arm/mm/cache-feroceon-l2.c | 1 + + arch/arm/mm/cache-l2x0.c | 22 +- + arch/arm/mm/cache-tauros2.c | 1 + + arch/arm/mm/cache-xsc3l2.c | 2 +- + arch/arm/mm/copypage-v4mc.c | 9 +- + arch/arm/mm/copypage-v6.c | 20 +- + arch/arm/mm/copypage-xscale.c | 9 +- + arch/arm/mm/dma-mapping.c | 20 +- + arch/arm/mm/fault.c | 3 +- + arch/arm/mm/flush.c | 14 +- + arch/arm/mm/highmem.c | 21 +- + arch/arm/mm/init.c | 4 + + arch/arm/mm/ioremap.c | 1 + + arch/arm/mm/mm.h | 26 +- + arch/arm/mm/mmu.c | 8 +- + arch/arm/mm/pgd.c | 1 + + arch/arm/mm/vmregion.c | 76 ++- + arch/arm/mm/vmregion.h | 5 +- + arch/arm/plat-mxc/include/mach/entry-macro.S | 16 - + arch/arm/plat-mxc/include/mach/system.h | 25 - + arch/arm/plat-nomadik/Kconfig | 1 - + arch/arm/plat-omap/include/plat/system.h | 15 - + arch/arm/plat-s3c24xx/cpu.c | 27 + + arch/arm/plat-spear/include/plat/system.h | 26 - + arch/arm/plat-versatile/Kconfig | 3 +- + arch/arm/vfp/vfpmodule.c | 1 + + arch/c6x/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/sh/Kconfig | 2 +- + arch/sh/include/asm/irq.h | 11 - + arch/x86/Kconfig | 1 - + drivers/amba/bus.c | 105 ++- + drivers/dma/Kconfig | 9 + + drivers/dma/Makefile | 1 + + drivers/dma/sa11x0-dma.c | 1117 ++++++++++++++++++++ + drivers/gpio/gpio-pxa.c | 2 + + drivers/gpio/gpio-sa1100.c | 1 + + drivers/input/keyboard/jornada720_kbd.c | 1 + + drivers/input/serio/sa1111ps2.c | 59 +- + drivers/input/touchscreen/jornada720_ts.c | 1 + + drivers/mfd/Kconfig | 5 +- + drivers/mfd/mcp-core.c | 49 +- + drivers/mfd/mcp-sa11x0.c | 198 +++-- + drivers/mfd/ucb1x00-assabet.c | 46 +- + drivers/mfd/ucb1x00-core.c | 433 ++++---- + drivers/mfd/ucb1x00-ts.c | 39 +- + drivers/mmc/host/mmci.c | 168 +++- + drivers/mmc/host/mmci.h | 15 +- + drivers/mtd/maps/sa1100-flash.c | 112 -- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/irda/Kconfig | 2 +- + drivers/net/irda/sa1100_ir.c | 957 ++++++++++-------- + drivers/of/platform.c | 6 +- + drivers/pcmcia/Kconfig | 8 +- + drivers/pcmcia/Makefile | 14 +- + drivers/pcmcia/pxa2xx_balloon3.c | 22 +- + drivers/pcmcia/pxa2xx_base.c | 5 +- + drivers/pcmcia/pxa2xx_cm_x255.c | 39 +- + drivers/pcmcia/pxa2xx_cm_x270.c | 23 +- + drivers/pcmcia/pxa2xx_colibri.c | 21 +- + drivers/pcmcia/pxa2xx_e740.c | 71 +- + drivers/pcmcia/pxa2xx_mainstone.c | 31 +- + drivers/pcmcia/pxa2xx_palmld.c | 8 +- + drivers/pcmcia/pxa2xx_palmtc.c | 8 +- + drivers/pcmcia/pxa2xx_palmtx.c | 8 +- + drivers/pcmcia/pxa2xx_sharpsl.c | 30 +- + drivers/pcmcia/pxa2xx_stargate2.c | 34 +- + drivers/pcmcia/pxa2xx_trizeps4.c | 62 +- + drivers/pcmcia/pxa2xx_viper.c | 39 +- + drivers/pcmcia/pxa2xx_vpac270.c | 54 +- + drivers/pcmcia/sa1100_assabet.c | 65 +- + drivers/pcmcia/sa1100_cerf.c | 52 +- + drivers/pcmcia/sa1100_h3600.c | 94 +-- + drivers/pcmcia/sa1100_nanoengine.c | 132 +-- + drivers/pcmcia/sa1100_shannon.c | 56 +- + drivers/pcmcia/sa1100_simpad.c | 27 +- + .../pcmcia/{sa1100_badge4.c => sa1111_badge4.c} | 3 +- + drivers/pcmcia/sa1111_generic.c | 111 ++- + drivers/pcmcia/sa1111_generic.h | 1 - + .../{sa1100_jornada720.c => sa1111_jornada720.c} | 8 +- + .../pcmcia/{pxa2xx_lubbock.c => sa1111_lubbock.c} | 1 - + .../{sa1100_neponset.c => sa1111_neponset.c} | 18 +- + drivers/pcmcia/sa11xx_base.c | 5 +- + drivers/pcmcia/soc_common.c | 193 +++-- + drivers/pcmcia/soc_common.h | 23 +- + drivers/rtc/rtc-sa1100.c | 2 +- + drivers/scsi/arm/arxescsi.c | 2 +- + drivers/scsi/arm/fas216.c | 4 +- + drivers/scsi/arm/fas216.h | 4 - + drivers/sh/intc/balancing.c | 2 +- + drivers/sh/intc/core.c | 2 +- + drivers/sh/intc/handle.c | 2 +- + drivers/sh/intc/virq.c | 2 +- + drivers/tty/serial/sa1100.c | 1 + + drivers/usb/host/ohci-sa1111.c | 297 +++--- + drivers/video/sa1100fb.c | 493 +++------ + drivers/video/sa1100fb.h | 76 +-- + include/linux/amba/bus.h | 36 + + include/linux/amba/mmci.h | 22 +- + include/linux/mfd/mcp.h | 14 +- + include/linux/mfd/ucb1x00.h | 38 +- + include/linux/sa11x0-dma.h | 24 + + include/linux/sh_intc.h | 17 + + include/video/sa1100fb.h | 63 ++ + kernel/irq/Kconfig | 5 +- + sound/arm/pxa2xx-ac97-lib.c | 2 +- + 465 files changed, 6255 insertions(+), 7632 deletions(-) + create mode 100644 arch/arm/boot/compressed/piggy.xzkern.S + create mode 100644 arch/arm/include/asm/cp15.h + create mode 100644 arch/arm/kernel/insn.c + create mode 100644 arch/arm/kernel/insn.h + create mode 100644 arch/arm/kernel/patch.c + create mode 100644 arch/arm/kernel/patch.h + delete mode 100644 arch/arm/mach-at91/include/mach/system.h + delete mode 100644 arch/arm/mach-bcmring/include/mach/system.h + delete mode 100644 arch/arm/mach-clps711x/include/mach/system.h + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/system.h + delete mode 100644 arch/arm/mach-davinci/include/mach/system.h + delete mode 100644 arch/arm/mach-dove/include/mach/system.h + create mode 100644 arch/arm/mach-ebsa110/core.h + delete mode 100644 arch/arm/mach-ebsa110/include/mach/system.h + delete mode 100644 arch/arm/mach-ep93xx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-ep93xx/include/mach/system.h + delete mode 100644 arch/arm/mach-exynos/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-exynos/include/mach/system.h + delete mode 100644 arch/arm/mach-footbridge/include/mach/system.h + create mode 100644 arch/arm/mach-gemini/idle.c + delete mode 100644 arch/arm/mach-h720x/include/mach/system.h + delete mode 100644 arch/arm/mach-highbank/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-highbank/include/mach/irqs.h + delete mode 100644 arch/arm/mach-highbank/include/mach/system.h + delete mode 100644 arch/arm/mach-integrator/include/mach/system.h + delete mode 100644 arch/arm/mach-iop13xx/include/mach/system.h + delete mode 100644 arch/arm/mach-iop32x/include/mach/system.h + delete mode 100644 arch/arm/mach-iop33x/include/mach/system.h + delete mode 100644 arch/arm/mach-ixp2000/include/mach/system.h + delete mode 100644 arch/arm/mach-ixp23xx/include/mach/system.h + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/system.h + delete mode 100644 arch/arm/mach-kirkwood/include/mach/system.h + delete mode 100644 arch/arm/mach-ks8695/include/mach/system.h + delete mode 100644 arch/arm/mach-lpc32xx/include/mach/system.h + delete mode 100644 arch/arm/mach-mmp/include/mach/system.h + delete mode 100644 arch/arm/mach-msm/idle.S + create mode 100644 arch/arm/mach-msm/idle.c + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/system.h + delete mode 100644 arch/arm/mach-mxs/include/mach/system.h + delete mode 100644 arch/arm/mach-netx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-netx/include/mach/system.h + delete mode 100644 arch/arm/mach-nomadik/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-nomadik/include/mach/system.h + delete mode 100644 arch/arm/mach-omap1/include/mach/system.h + delete mode 100644 arch/arm/mach-omap2/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-omap2/include/mach/system.h + delete mode 100644 arch/arm/mach-orion5x/include/mach/system.h + delete mode 100644 arch/arm/mach-picoxcell/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-picoxcell/include/mach/irqs.h + delete mode 100644 arch/arm/mach-picoxcell/include/mach/system.h + delete mode 100644 arch/arm/mach-pnx4008/include/mach/system.h + delete mode 100644 arch/arm/mach-prima2/include/mach/system.h + delete mode 100644 arch/arm/mach-pxa/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-pxa/include/mach/system.h + delete mode 100644 arch/arm/mach-realview/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-realview/include/mach/system.h + create mode 100644 arch/arm/mach-rpc/fiq.S + delete mode 100644 arch/arm/mach-rpc/include/mach/system.h + delete mode 100644 arch/arm/mach-s3c2410/include/mach/system.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/system.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/system.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/system.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-s5pv210/include/mach/system.h + delete mode 100644 arch/arm/mach-sa1100/dma.c + delete mode 100644 arch/arm/mach-sa1100/include/mach/dma.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/system.h + delete mode 100644 arch/arm/mach-shark/include/mach/system.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-spear3xx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-spear3xx/include/mach/system.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-spear6xx/include/mach/system.h + delete mode 100644 arch/arm/mach-tegra/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-tegra/include/mach/system.h + delete mode 100644 arch/arm/mach-u300/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-u300/include/mach/system.h + delete mode 100644 arch/arm/mach-u300/mmc.c + delete mode 100644 arch/arm/mach-u300/mmc.h + delete mode 100644 arch/arm/mach-ux500/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-ux500/include/mach/system.h + delete mode 100644 arch/arm/mach-versatile/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-versatile/include/mach/system.h + delete mode 100644 arch/arm/mach-vexpress/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-vexpress/include/mach/system.h + delete mode 100644 arch/arm/mach-w90x900/include/mach/system.h + delete mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-zynq/include/mach/system.h + delete mode 100644 arch/arm/plat-mxc/include/mach/entry-macro.S + delete mode 100644 arch/arm/plat-mxc/include/mach/system.h + delete mode 100644 arch/arm/plat-omap/include/plat/system.h + delete mode 100644 arch/arm/plat-spear/include/plat/system.h + create mode 100644 drivers/dma/sa11x0-dma.c + rename drivers/pcmcia/{sa1100_badge4.c => sa1111_badge4.c} (98%) + rename drivers/pcmcia/{sa1100_jornada720.c => sa1111_jornada720.c} (94%) + rename drivers/pcmcia/{pxa2xx_lubbock.c => sa1111_lubbock.c} (99%) + rename drivers/pcmcia/{sa1100_neponset.c => sa1111_neponset.c} (90%) + create mode 100644 include/linux/sa11x0-dma.h + create mode 100644 include/video/sa1100fb.h +Merging arm-perf/for-next/perf (cdd2a5b Merge branches 'perf/updates' and 'perf/fixes' into for-next/perf) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +Already up-to-date. +Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next (734b5bb Merge branch 'next/soc-exynos5250-arch-wip' into for-next) +$ git merge s5p/for-next +Auto-merging include/linux/spi/s3c24xx.h +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/mmc/host/Kconfig +Removing arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c +Removing arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c +Removing arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c +Auto-merging arch/arm/mach-s3c24xx/s3c2443.c +Auto-merging arch/arm/mach-s3c24xx/s3c2416.c +Auto-merging arch/arm/mach-s3c24xx/mach-smdk2416.c +Auto-merging arch/arm/mach-s3c24xx/mach-rx1950.c +Auto-merging arch/arm/mach-s3c24xx/mach-h1940.c +Auto-merging arch/arm/mach-s3c24xx/mach-gta02.c +Auto-merging arch/arm/mach-s3c24xx/common.h +Auto-merging arch/arm/mach-s3c24xx/common-s3c2443.c +Auto-merging arch/arm/mach-s3c24xx/clock-s3c2416.c +Removing arch/arm/mach-s3c2443/Makefile +Removing arch/arm/mach-s3c2443/Kconfig +Removing arch/arm/mach-s3c2440/common.h +Removing arch/arm/mach-exynos/include/mach/exynos4-clock.h +Removing arch/arm/mach-exynos/dev-pd.c +Removing arch/arm/mach-exynos/clock.c +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/arm/exynos/power_domain.txt | 21 + + .../devicetree/bindings/mmc/samsung-sdhci.txt | 70 + + arch/arm/Kconfig | 26 +- + arch/arm/Makefile | 3 +- + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 26 + + arch/arm/boot/dts/exynos5250.dtsi | 413 ++++++ + arch/arm/configs/mini2440_defconfig | 2 +- + arch/arm/configs/s3c2410_defconfig | 57 +- + arch/arm/configs/tct_hammer_defconfig | 2 +- + arch/arm/mach-exynos/Kconfig | 50 +- + arch/arm/mach-exynos/Makefile | 12 +- + arch/arm/mach-exynos/clock-exynos4.c | 1564 ++++++++++++++++++++ + arch/arm/mach-exynos/clock-exynos4.h | 32 + + arch/arm/mach-exynos/clock-exynos4210.c | 48 +- + arch/arm/mach-exynos/clock-exynos4212.c | 32 +- + arch/arm/mach-exynos/clock-exynos5.c | 1247 ++++++++++++++++ + arch/arm/mach-exynos/clock.c | 1564 -------------------- + arch/arm/mach-exynos/common.c | 197 +++- + arch/arm/mach-exynos/common.h | 40 +- + arch/arm/mach-exynos/dev-pd.c | 139 -- + arch/arm/mach-exynos/dev-uart.c | 78 + + arch/arm/mach-exynos/dma.c | 16 +- + arch/arm/mach-exynos/include/mach/debug-macro.S | 9 +- + arch/arm/mach-exynos/include/mach/exynos4-clock.h | 43 - + arch/arm/mach-exynos/include/mach/irqs.h | 248 +++- + arch/arm/mach-exynos/include/mach/map.h | 44 +- + arch/arm/mach-exynos/include/mach/regs-clock.h | 426 +++--- + arch/arm/mach-exynos/include/mach/regs-pmu.h | 1 + + arch/arm/mach-exynos/include/mach/uncompress.h | 17 +- + arch/arm/mach-exynos/mach-armlex4210.c | 3 - + arch/arm/mach-exynos/mach-exynos5-dt.c | 78 + + arch/arm/mach-exynos/mach-nuri.c | 80 +- + arch/arm/mach-exynos/mach-origen.c | 54 +- + arch/arm/mach-exynos/mach-smdk4x12.c | 2 - + arch/arm/mach-exynos/mach-smdk5250.c | 92 ++ + arch/arm/mach-exynos/mach-smdkv310.c | 17 +- + arch/arm/mach-exynos/mach-universal_c210.c | 98 +- + arch/arm/mach-exynos/platsmp.c | 9 +- + arch/arm/mach-exynos/pm.c | 40 +- + arch/arm/mach-exynos/pm_domains.c | 195 +++ + arch/arm/mach-exynos/setup-i2c0.c | 9 +- + arch/arm/mach-s3c2410/Kconfig | 154 -- + arch/arm/mach-s3c2410/Makefile | 26 - + arch/arm/mach-s3c2412/Kconfig | 85 -- + arch/arm/mach-s3c2412/Makefile | 12 - + arch/arm/mach-s3c2416/Kconfig | 46 - + arch/arm/mach-s3c2416/Makefile | 10 - + arch/arm/mach-s3c2440/Kconfig | 165 -- + arch/arm/mach-s3c2440/Makefile | 26 +- + arch/arm/mach-s3c2440/common.h | 17 - + arch/arm/mach-s3c2443/Kconfig | 32 - + arch/arm/mach-s3c2443/Makefile | 20 - + arch/arm/mach-s3c24xx/Kconfig | 504 +++++++ + arch/arm/mach-s3c24xx/Makefile | 89 ++ + .../{mach-s3c2410 => mach-s3c24xx}/Makefile.boot | 0 + arch/arm/{mach-s3c2410 => mach-s3c24xx}/bast-ide.c | 0 + arch/arm/{mach-s3c2410 => mach-s3c24xx}/bast-irq.c | 0 + .../clock.c => mach-s3c24xx/clock-s3c2412.c} | 0 + .../clock.c => mach-s3c24xx/clock-s3c2416.c} | 7 - + .../clock.c => mach-s3c24xx/clock-s3c2440.c} | 0 + .../clock.c => mach-s3c24xx/clock-s3c2443.c} | 0 + .../clock-s3c244x.c} | 0 + .../common-s3c2443.c} | 20 +- + arch/arm/{mach-s3c2410 => mach-s3c24xx}/common.h | 6 + + .../dma.c => mach-s3c24xx/dma-s3c2410.c} | 0 + .../dma.c => mach-s3c24xx/dma-s3c2412.c} | 0 + .../dma.c => mach-s3c24xx/dma-s3c2440.c} | 0 + .../dma.c => mach-s3c24xx/dma-s3c2443.c} | 0 + .../h1940-bluetooth.c | 0 + .../include/mach/anubis-cpld.h | 0 + .../include/mach/anubis-irq.h | 0 + .../include/mach/anubis-map.h | 0 + .../include/mach/bast-cpld.h | 0 + .../include/mach/bast-irq.h | 0 + .../include/mach/bast-map.h | 0 + .../include/mach/bast-pmu.h | 0 + .../include/mach/debug-macro.S | 0 + .../include/mach/dma.h | 0 + .../include/mach/entry-macro.S | 0 + .../include/mach/fb.h | 0 + .../include/mach/gpio-fns.h | 0 + .../include/mach/gpio-nrs.h | 0 + .../include/mach/gpio-track.h | 0 + .../include/mach/gpio.h | 0 + .../include/mach/gta02.h | 0 + .../include/mach/h1940-latch.h | 0 + .../include/mach/h1940.h | 0 + .../include/mach/hardware.h | 0 + .../include/mach/idle.h | 0 + .../include/mach/io.h | 0 + .../include/mach/irqs.h | 0 + .../include/mach/leds-gpio.h | 0 + .../include/mach/map.h | 0 + .../include/mach/osiris-cpld.h | 0 + .../include/mach/osiris-map.h | 0 + .../include/mach/otom-map.h | 0 + .../include/mach/pm-core.h | 0 + .../include/mach/regs-clock.h | 0 + .../include/mach/regs-dsc.h | 0 + .../include/mach/regs-gpio.h | 0 + .../include/mach/regs-gpioj.h | 0 + .../include/mach/regs-irq.h | 0 + .../include/mach/regs-lcd.h | 0 + .../include/mach/regs-mem.h | 0 + .../include/mach/regs-power.h | 0 + .../include/mach/regs-s3c2412-mem.h | 0 + .../include/mach/regs-s3c2412.h | 0 + .../include/mach/regs-s3c2416-mem.h | 0 + .../include/mach/regs-s3c2416.h | 0 + .../include/mach/regs-s3c2443-clock.h | 0 + .../include/mach/regs-sdi.h | 0 + .../include/mach/tick.h | 0 + .../include/mach/timex.h | 0 + .../include/mach/uncompress.h | 0 + .../include/mach/vr1000-cpld.h | 0 + .../include/mach/vr1000-irq.h | 0 + .../include/mach/vr1000-map.h | 0 + .../irq.c => mach-s3c24xx/irq-s3c2412.c} | 0 + .../irq.c => mach-s3c24xx/irq-s3c2416.c} | 0 + .../irq.c => mach-s3c24xx/irq-s3c2440.c} | 0 + .../irq.c => mach-s3c24xx/irq-s3c2443.c} | 0 + .../s3c244x-irq.c => mach-s3c24xx/irq-s3c244x.c} | 0 + .../{mach-s3c2410 => mach-s3c24xx}/mach-amlm5900.c | 0 + .../{mach-s3c2440 => mach-s3c24xx}/mach-anubis.c | 0 + .../mach-at2440evb.c | 0 + .../arm/{mach-s3c2410 => mach-s3c24xx}/mach-bast.c | 0 + .../{mach-s3c2440 => mach-s3c24xx}/mach-gta02.c | 6 +- + .../{mach-s3c2410 => mach-s3c24xx}/mach-h1940.c | 12 +- + .../arm/{mach-s3c2412 => mach-s3c24xx}/mach-jive.c | 0 + .../{mach-s3c2440 => mach-s3c24xx}/mach-mini2440.c | 0 + arch/arm/{mach-s3c2410 => mach-s3c24xx}/mach-n30.c | 0 + .../{mach-s3c2440 => mach-s3c24xx}/mach-nexcoder.c | 0 + .../mach-osiris-dvs.c | 0 + .../{mach-s3c2440 => mach-s3c24xx}/mach-osiris.c | 0 + .../arm/{mach-s3c2410 => mach-s3c24xx}/mach-otom.c | 0 + .../{mach-s3c2410 => mach-s3c24xx}/mach-qt2410.c | 0 + .../{mach-s3c2440 => mach-s3c24xx}/mach-rx1950.c | 12 +- + .../{mach-s3c2440 => mach-s3c24xx}/mach-rx3715.c | 0 + .../{mach-s3c2410 => mach-s3c24xx}/mach-smdk2410.c | 0 + .../{mach-s3c2412 => mach-s3c24xx}/mach-smdk2413.c | 0 + .../{mach-s3c2416 => mach-s3c24xx}/mach-smdk2416.c | 8 +- + .../{mach-s3c2440 => mach-s3c24xx}/mach-smdk2440.c | 0 + .../{mach-s3c2443 => mach-s3c24xx}/mach-smdk2443.c | 0 + .../mach-tct_hammer.c | 0 + .../{mach-s3c2410 => mach-s3c24xx}/mach-vr1000.c | 0 + .../{mach-s3c2412 => mach-s3c24xx}/mach-vstms.c | 0 + .../{mach-s3c2410 => mach-s3c24xx}/nor-simtec.c | 0 + .../{mach-s3c2410 => mach-s3c24xx}/nor-simtec.h | 0 + arch/arm/{mach-s3c2410 => mach-s3c24xx}/pm-h1940.S | 0 + .../pm.c => mach-s3c24xx/pm-s3c2410.c} | 0 + .../pm.c => mach-s3c24xx/pm-s3c2412.c} | 0 + .../pm.c => mach-s3c24xx/pm-s3c2416.c} | 0 + arch/arm/{mach-s3c2410 => mach-s3c24xx}/s3c2410.c | 0 + arch/arm/{mach-s3c2412 => mach-s3c24xx}/s3c2412.c | 0 + arch/arm/{mach-s3c2416 => mach-s3c24xx}/s3c2416.c | 2 + + arch/arm/{mach-s3c2440 => mach-s3c24xx}/s3c2440.c | 0 + arch/arm/{mach-s3c2440 => mach-s3c24xx}/s3c2442.c | 0 + arch/arm/{mach-s3c2443 => mach-s3c24xx}/s3c2443.c | 2 + + arch/arm/{mach-s3c2440 => mach-s3c24xx}/s3c244x.c | 0 + .../setup-sdhci-gpio.c | 0 + .../sleep.S => mach-s3c24xx/sleep-s3c2410.S} | 0 + .../sleep.S => mach-s3c24xx/sleep-s3c2412.S} | 0 + .../{mach-s3c2410 => mach-s3c24xx}/usb-simtec.c | 0 + .../{mach-s3c2410 => mach-s3c24xx}/usb-simtec.h | 0 + arch/arm/mach-s3c64xx/Kconfig | 1 + + arch/arm/mach-s3c64xx/Makefile | 1 + + arch/arm/mach-s3c64xx/clock.c | 121 ++- + arch/arm/mach-s3c64xx/common.h | 2 - + arch/arm/mach-s3c64xx/cpuidle.c | 91 ++ + arch/arm/mach-s3c64xx/irq-pm.c | 2 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 27 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 67 +- + arch/arm/mach-s5p64x0/clock.c | 11 +- + arch/arm/mach-s5p64x0/dma.c | 12 +- + arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h | 7 - + arch/arm/mach-s5pc100/clock.c | 28 +- + arch/arm/mach-s5pc100/dma.c | 16 +- + arch/arm/mach-s5pv210/dma.c | 16 +- + arch/arm/mach-s5pv210/mach-aquila.c | 1 + + arch/arm/mach-s5pv210/mach-goni.c | 2 +- + arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +- + arch/arm/plat-s3c24xx/Kconfig | 34 +- + arch/arm/plat-s3c24xx/Makefile | 11 +- + arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 36 - + arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 38 - + arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 36 - + arch/arm/plat-s5p/Kconfig | 13 +- + arch/arm/plat-s5p/Makefile | 3 +- + arch/arm/plat-s5p/clock.c | 36 + + arch/arm/plat-s5p/irq-eint.c | 2 +- + arch/arm/plat-s5p/irq-gpioint.c | 2 +- + arch/arm/plat-samsung/Kconfig | 4 +- + arch/arm/plat-samsung/clock.c | 12 +- + arch/arm/plat-samsung/dev-backlight.c | 2 + + arch/arm/plat-samsung/devs.c | 45 +- + arch/arm/plat-samsung/dma-ops.c | 2 +- + arch/arm/plat-samsung/include/plat/clock.h | 21 + + arch/arm/plat-samsung/include/plat/cpu.h | 10 + + arch/arm/plat-samsung/include/plat/devs.h | 3 + + arch/arm/plat-samsung/include/plat/regs-rtc.h | 81 +- + arch/arm/plat-samsung/include/plat/rtc-core.h | 27 + + arch/arm/plat-samsung/include/plat/s3c2410.h | 2 - + arch/arm/plat-samsung/include/plat/s3c2443.h | 20 - + arch/arm/plat-samsung/include/plat/s5p-clock.h | 6 + + arch/arm/plat-samsung/include/plat/sdhci.h | 37 +- + arch/arm/plat-samsung/include/plat/uncompress.h | 2 + + arch/arm/plat-samsung/platformdata.c | 4 +- + drivers/base/power/domain.c | 32 + + drivers/cpufreq/exynos4210-cpufreq.c | 70 +- + drivers/devfreq/exynos4_bus.c | 224 ++-- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/leds/Kconfig | 2 +- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/sdhci-s3c.c | 238 +++- + drivers/mtd/nand/Kconfig | 2 +- + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-s3c.c | 71 +- + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-s3c24xx.c | 2 +- + drivers/usb/Kconfig | 2 +- + drivers/usb/gadget/Kconfig | 4 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/video/Kconfig | 2 +- + drivers/watchdog/Kconfig | 2 +- + include/linux/pm_domain.h | 12 + + .../mach/spi.h => include/linux/spi/s3c24xx.h | 20 +- + sound/soc/samsung/Kconfig | 12 +- + 228 files changed, 6624 insertions(+), 3344 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/exynos/power_domain.txt + create mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt + create mode 100644 arch/arm/boot/dts/exynos5250-smdk5250.dts + create mode 100644 arch/arm/boot/dts/exynos5250.dtsi + create mode 100644 arch/arm/mach-exynos/clock-exynos4.c + create mode 100644 arch/arm/mach-exynos/clock-exynos4.h + create mode 100644 arch/arm/mach-exynos/clock-exynos5.c + delete mode 100644 arch/arm/mach-exynos/clock.c + delete mode 100644 arch/arm/mach-exynos/dev-pd.c + create mode 100644 arch/arm/mach-exynos/dev-uart.c + delete mode 100644 arch/arm/mach-exynos/include/mach/exynos4-clock.h + create mode 100644 arch/arm/mach-exynos/mach-exynos5-dt.c + create mode 100644 arch/arm/mach-exynos/mach-smdk5250.c + create mode 100644 arch/arm/mach-exynos/pm_domains.c + delete mode 100644 arch/arm/mach-s3c2440/common.h + delete mode 100644 arch/arm/mach-s3c2443/Kconfig + delete mode 100644 arch/arm/mach-s3c2443/Makefile + create mode 100644 arch/arm/mach-s3c24xx/Kconfig + create mode 100644 arch/arm/mach-s3c24xx/Makefile + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/Makefile.boot (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/bast-ide.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/bast-irq.c (100%) + rename arch/arm/{mach-s3c2412/clock.c => mach-s3c24xx/clock-s3c2412.c} (100%) + rename arch/arm/{mach-s3c2416/clock.c => mach-s3c24xx/clock-s3c2416.c} (96%) + rename arch/arm/{mach-s3c2440/clock.c => mach-s3c24xx/clock-s3c2440.c} (100%) + rename arch/arm/{mach-s3c2443/clock.c => mach-s3c24xx/clock-s3c2443.c} (100%) + rename arch/arm/{mach-s3c2440/s3c244x-clock.c => mach-s3c24xx/clock-s3c244x.c} (100%) + rename arch/arm/{plat-s3c24xx/s3c2443-clock.c => mach-s3c24xx/common-s3c2443.c} (95%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/common.h (80%) + rename arch/arm/{mach-s3c2410/dma.c => mach-s3c24xx/dma-s3c2410.c} (100%) + rename arch/arm/{mach-s3c2412/dma.c => mach-s3c24xx/dma-s3c2412.c} (100%) + rename arch/arm/{mach-s3c2440/dma.c => mach-s3c24xx/dma-s3c2440.c} (100%) + rename arch/arm/{mach-s3c2443/dma.c => mach-s3c24xx/dma-s3c2443.c} (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/h1940-bluetooth.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/anubis-cpld.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/anubis-irq.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/anubis-map.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/bast-cpld.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/bast-irq.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/bast-map.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/bast-pmu.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/debug-macro.S (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/dma.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/entry-macro.S (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/fb.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/gpio-fns.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/gpio-nrs.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/gpio-track.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/gpio.h (100%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/include/mach/gta02.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/h1940-latch.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/h1940.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/hardware.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/idle.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/io.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/irqs.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/leds-gpio.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/map.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/osiris-cpld.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/osiris-map.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/otom-map.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/pm-core.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-clock.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-dsc.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-gpio.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-gpioj.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-irq.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-lcd.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-mem.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-power.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-s3c2412-mem.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-s3c2412.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-s3c2416-mem.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-s3c2416.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-s3c2443-clock.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/regs-sdi.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/tick.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/timex.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/uncompress.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/vr1000-cpld.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/vr1000-irq.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/include/mach/vr1000-map.h (100%) + rename arch/arm/{mach-s3c2412/irq.c => mach-s3c24xx/irq-s3c2412.c} (100%) + rename arch/arm/{mach-s3c2416/irq.c => mach-s3c24xx/irq-s3c2416.c} (100%) + rename arch/arm/{mach-s3c2440/irq.c => mach-s3c24xx/irq-s3c2440.c} (100%) + rename arch/arm/{mach-s3c2443/irq.c => mach-s3c24xx/irq-s3c2443.c} (100%) + rename arch/arm/{mach-s3c2440/s3c244x-irq.c => mach-s3c24xx/irq-s3c244x.c} (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/mach-amlm5900.c (100%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/mach-anubis.c (100%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/mach-at2440evb.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/mach-bast.c (100%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/mach-gta02.c (99%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/mach-h1940.c (98%) + rename arch/arm/{mach-s3c2412 => mach-s3c24xx}/mach-jive.c (100%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/mach-mini2440.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/mach-n30.c (100%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/mach-nexcoder.c (100%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/mach-osiris-dvs.c (100%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/mach-osiris.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/mach-otom.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/mach-qt2410.c (100%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/mach-rx1950.c (98%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/mach-rx3715.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/mach-smdk2410.c (100%) + rename arch/arm/{mach-s3c2412 => mach-s3c24xx}/mach-smdk2413.c (100%) + rename arch/arm/{mach-s3c2416 => mach-s3c24xx}/mach-smdk2416.c (96%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/mach-smdk2440.c (100%) + rename arch/arm/{mach-s3c2443 => mach-s3c24xx}/mach-smdk2443.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/mach-tct_hammer.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/mach-vr1000.c (100%) + rename arch/arm/{mach-s3c2412 => mach-s3c24xx}/mach-vstms.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/nor-simtec.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/nor-simtec.h (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/pm-h1940.S (100%) + rename arch/arm/{mach-s3c2410/pm.c => mach-s3c24xx/pm-s3c2410.c} (100%) + rename arch/arm/{mach-s3c2412/pm.c => mach-s3c24xx/pm-s3c2412.c} (100%) + rename arch/arm/{mach-s3c2416/pm.c => mach-s3c24xx/pm-s3c2416.c} (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/s3c2410.c (100%) + rename arch/arm/{mach-s3c2412 => mach-s3c24xx}/s3c2412.c (100%) + rename arch/arm/{mach-s3c2416 => mach-s3c24xx}/s3c2416.c (98%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/s3c2440.c (100%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/s3c2442.c (100%) + rename arch/arm/{mach-s3c2443 => mach-s3c24xx}/s3c2443.c (97%) + rename arch/arm/{mach-s3c2440 => mach-s3c24xx}/s3c244x.c (100%) + rename arch/arm/{mach-s3c2416 => mach-s3c24xx}/setup-sdhci-gpio.c (100%) + rename arch/arm/{mach-s3c2410/sleep.S => mach-s3c24xx/sleep-s3c2410.S} (100%) + rename arch/arm/{mach-s3c2412/sleep.S => mach-s3c24xx/sleep-s3c2412.S} (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/usb-simtec.c (100%) + rename arch/arm/{mach-s3c2410 => mach-s3c24xx}/usb-simtec.h (100%) + create mode 100644 arch/arm/mach-s3c64xx/cpuidle.c + delete mode 100644 arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c + delete mode 100644 arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c + delete mode 100644 arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c + create mode 100644 arch/arm/plat-samsung/include/plat/rtc-core.h + rename arch/arm/mach-s3c2410/include/mach/spi.h => include/linux/spi/s3c24xx.h (56%) +Merging tegra/for-next (6f70c98 Merge branch 'for-3.4/boards' into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/tegra/emc.txt | 100 + + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 19 + + .../devicetree/bindings/dma/tegra20-apbdma.txt | 30 + + .../devicetree/bindings/gpio/gpio_nvidia.txt | 36 +- + arch/arm/boot/dts/tegra-cardhu.dts | 34 + + arch/arm/boot/dts/tegra-harmony.dts | 45 +- + arch/arm/boot/dts/tegra-paz00.dts | 57 + + arch/arm/boot/dts/tegra-seaboard.dts | 78 + + arch/arm/boot/dts/tegra-trimslice.dts | 12 + + arch/arm/boot/dts/tegra-ventana.dts | 42 + + arch/arm/boot/dts/tegra20.dtsi | 49 +- + arch/arm/boot/dts/tegra30.dtsi | 61 +- + arch/arm/mach-tegra/Kconfig | 14 + + arch/arm/mach-tegra/Makefile | 11 +- + arch/arm/mach-tegra/apbio.c | 145 + + arch/arm/mach-tegra/apbio.h | 39 + + arch/arm/mach-tegra/board-dt-tegra20.c | 6 +- + arch/arm/mach-tegra/board-dt-tegra30.c | 26 +- + arch/arm/mach-tegra/board-harmony-power.c | 18 +- + arch/arm/mach-tegra/board-harmony.c | 2 +- + arch/arm/mach-tegra/board-seaboard.c | 5 +- + arch/arm/mach-tegra/clock.c | 22 + + arch/arm/mach-tegra/clock.h | 15 + + arch/arm/mach-tegra/common.c | 27 +- + arch/arm/mach-tegra/cpuidle.c | 107 + + arch/arm/mach-tegra/dma.c | 128 +- + arch/arm/mach-tegra/flowctrl.c | 62 + + arch/arm/mach-tegra/flowctrl.h | 42 + + arch/arm/mach-tegra/fuse.c | 111 +- + arch/arm/mach-tegra/fuse.h | 38 +- + arch/arm/mach-tegra/headsmp.S | 167 +- + arch/arm/mach-tegra/include/mach/clk.h | 10 + + arch/arm/mach-tegra/include/mach/debug-macro.S | 88 +- + arch/arm/mach-tegra/include/mach/gpio-tegra.h | 2 - + arch/arm/mach-tegra/include/mach/iomap.h | 6 + + arch/arm/mach-tegra/include/mach/irammap.h | 35 + + arch/arm/mach-tegra/include/mach/irqs.h | 7 +- + arch/arm/mach-tegra/include/mach/powergate.h | 15 +- + arch/arm/mach-tegra/include/mach/uncompress.h | 120 +- + arch/arm/mach-tegra/irq.c | 20 +- + arch/arm/mach-tegra/platsmp.c | 137 +- + arch/arm/mach-tegra/pmc.c | 76 + + arch/arm/mach-tegra/pmc.h | 23 + + arch/arm/mach-tegra/powergate.c | 53 +- + arch/arm/mach-tegra/reset.c | 84 + + arch/arm/mach-tegra/reset.h | 50 + + arch/arm/mach-tegra/sleep.S | 91 + + arch/arm/mach-tegra/tegra2_clocks.c | 32 +- + arch/arm/mach-tegra/tegra2_emc.c | 224 ++- + arch/arm/mach-tegra/tegra2_emc.h | 11 +- + arch/arm/mach-tegra/tegra30_clocks.c | 3099 ++++++++++++++++++++ + arch/arm/mach-tegra/usb_phy.c | 11 + + drivers/gpio/gpio-tegra.c | 59 +- + include/linux/platform_data/tegra_emc.h | 34 + + 54 files changed, 5563 insertions(+), 272 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/tegra/emc.txt + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt + create mode 100644 Documentation/devicetree/bindings/dma/tegra20-apbdma.txt + create mode 100644 arch/arm/mach-tegra/apbio.c + create mode 100644 arch/arm/mach-tegra/apbio.h + create mode 100644 arch/arm/mach-tegra/cpuidle.c + create mode 100644 arch/arm/mach-tegra/flowctrl.c + create mode 100644 arch/arm/mach-tegra/flowctrl.h + create mode 100644 arch/arm/mach-tegra/include/mach/irammap.h + create mode 100644 arch/arm/mach-tegra/pmc.c + create mode 100644 arch/arm/mach-tegra/pmc.h + create mode 100644 arch/arm/mach-tegra/reset.c + create mode 100644 arch/arm/mach-tegra/reset.h + create mode 100644 arch/arm/mach-tegra/sleep.S + create mode 100644 arch/arm/mach-tegra/tegra30_clocks.c + create mode 100644 include/linux/platform_data/tegra_emc.h +Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) +$ git merge xilinx/arm-next +Already up-to-date. +Merging blackfin/for-linus (e651fe5 Blackfin: wire up new process_vm syscalls) +$ git merge blackfin/for-linus +Merge made by the 'recursive' strategy. + arch/blackfin/configs/BF518F-EZBRD_defconfig | 25 ++-- + arch/blackfin/configs/BF526-EZBRD_defconfig | 26 ++-- + arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 26 ++-- + arch/blackfin/configs/BF527-EZKIT_defconfig | 27 ++-- + arch/blackfin/configs/BF533-EZKIT_defconfig | 23 +-- + arch/blackfin/configs/BF533-STAMP_defconfig | 22 +- + arch/blackfin/configs/BF537-STAMP_defconfig | 27 ++-- + arch/blackfin/configs/BF548-EZKIT_defconfig | 16 +- + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 35 ++-- + arch/blackfin/configs/BF561-EZKIT_defconfig | 23 +-- + arch/blackfin/include/asm/bfin5xx_spi.h | 1 - + arch/blackfin/include/asm/bfin_simple_timer.h | 10 +- + arch/blackfin/include/asm/bfin_sport.h | 3 + + arch/blackfin/include/asm/blackfin.h | 44 ++--- + arch/blackfin/include/asm/kgdb.h | 1 + + arch/blackfin/include/asm/mmu_context.h | 5 +- + arch/blackfin/include/asm/thread_info.h | 2 + + arch/blackfin/include/asm/unistd.h | 4 +- + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 2 + + arch/blackfin/mach-bf537/boards/stamp.c | 24 +++- + arch/blackfin/mach-bf548/boards/ezkit.c | 2 + + arch/blackfin/mach-bf561/atomic.S | 7 + + arch/blackfin/mach-bf561/include/mach/defBF561.h | 220 +++++++++++----------- + arch/blackfin/mach-common/entry.S | 2 + + 24 files changed, 309 insertions(+), 268 deletions(-) +Merging c6x/for-linux-next (6b21d18 Linux 3.3-rc5) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (ea78f5b CRIS: Update documentation) +$ git merge cris/for-next +Auto-merging drivers/net/cris/eth_v10.c +Auto-merging arch/cris/arch-v32/drivers/cryptocop.c +Merge made by the 'recursive' strategy. + Documentation/cris/README | 62 +++++++++++++++--------------- + arch/cris/arch-v32/drivers/cryptocop.c | 6 +-- + arch/cris/arch-v32/kernel/ptrace.c | 2 - + arch/cris/include/arch-v32/arch/cache.h | 2 +- + drivers/net/cris/eth_v10.c | 1 - + 5 files changed, 34 insertions(+), 39 deletions(-) +Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h) +$ git merge quilt/hexagon +Resolved 'arch/hexagon/Kconfig' using previous resolution. +Auto-merging arch/hexagon/Kconfig +CONFLICT (content): Merge conflict in arch/hexagon/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 59fa1d9] Merge branch 'quilt/hexagon' +$ git diff -M --stat --summary HEAD^.. + arch/hexagon/Kconfig | 23 ++++------------------- + arch/hexagon/Makefile | 4 ---- + arch/hexagon/include/asm/spinlock_types.h | 2 -- + arch/hexagon/kernel/dma.c | 1 + + arch/hexagon/kernel/ptrace.c | 1 + + arch/hexagon/kernel/time.c | 7 +++---- + arch/hexagon/kernel/vdso.c | 1 + + 7 files changed, 10 insertions(+), 29 deletions(-) +Merging ia64/next (15839b4 [IA64] Fix a couple of warnings for EXPORT_SYMBOL) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + arch/ia64/hp/sim/boot/fw-emu.c | 17 +++----------- + arch/ia64/hp/sim/hpsim_irq.c | 36 +++++++++++++++++++++++++----- + arch/ia64/hp/sim/hpsim_setup.c | 6 ----- + arch/ia64/hp/sim/simeth.c | 19 ++------------- + arch/ia64/hp/sim/simserial.c | 20 ++++------------- + arch/ia64/include/asm/hpsim.h | 2 +- + arch/ia64/kernel/machine_kexec.c | 2 +- + arch/ia64/kernel/mca.c | 2 + + arch/ia64/sn/kernel/huberror.c | 2 + + arch/ia64/sn/kernel/io_common.c | 1 + + arch/ia64/sn/kernel/irq.c | 2 + + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 1 + + arch/ia64/sn/kernel/tiocx.c | 7 +++++- + arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 + + arch/ia64/sn/pci/tioca_provider.c | 1 + + arch/ia64/sn/pci/tioce_provider.c | 1 + + drivers/tty/serial/sn_console.c | 1 + + 17 files changed, 62 insertions(+), 59 deletions(-) +Merging m68k/for-next (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (b4cb906 m68knommu: merge common ColdFire QSPI platform setup code) +$ git merge m68knommu/for-next +Removing arch/m68k/kernel/time_no.c +Removing arch/m68k/kernel/time_mm.c +Removing arch/m68k/kernel/ptrace_no.c +Removing arch/m68k/kernel/ptrace_mm.c +Removing arch/m68k/kernel/process_no.c +Removing arch/m68k/kernel/process_mm.c +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig | 7 +- + arch/m68k/include/asm/m5206sim.h | 10 +- + arch/m68k/include/asm/m520xsim.h | 33 +++- + arch/m68k/include/asm/m523xsim.h | 38 +++- + arch/m68k/include/asm/m5249sim.h | 18 ++- + arch/m68k/include/asm/m5272sim.h | 17 +- + arch/m68k/include/asm/m527xsim.h | 49 ++++- + arch/m68k/include/asm/m528xsim.h | 36 +++- + arch/m68k/include/asm/m5307sim.h | 10 +- + arch/m68k/include/asm/m532xsim.h | 35 +++- + arch/m68k/include/asm/m5407sim.h | 6 +- + arch/m68k/include/asm/m54xxsim.h | 16 +- + arch/m68k/include/asm/machdep.h | 5 +- + arch/m68k/include/asm/mcfqspi.h | 11 - + arch/m68k/include/asm/mcfuart.h | 5 +- + arch/m68k/kernel/process.c | 379 +++++++++++++++++++++++++++++- + arch/m68k/kernel/process_mm.c | 369 ----------------------------- + arch/m68k/kernel/process_no.c | 406 -------------------------------- + arch/m68k/kernel/ptrace.c | 306 ++++++++++++++++++++++++- + arch/m68k/kernel/ptrace_mm.c | 295 ----------------------- + arch/m68k/kernel/ptrace_no.c | 255 -------------------- + arch/m68k/kernel/setup_no.c | 3 + + arch/m68k/kernel/time.c | 116 +++++++++- + arch/m68k/kernel/time_mm.c | 114 --------- + arch/m68k/kernel/time_no.c | 90 ------- + arch/m68k/kernel/vmlinux-nommu.lds | 200 ++++------------ + arch/m68k/platform/5206/config.c | 61 +----- + arch/m68k/platform/520x/config.c | 247 ++------------------ + arch/m68k/platform/523x/config.c | 217 +----------------- + arch/m68k/platform/5249/config.c | 213 +---------------- + arch/m68k/platform/5272/config.c | 84 +------ + arch/m68k/platform/527x/config.c | 287 +---------------------- + arch/m68k/platform/528x/config.c | 212 +---------------- + arch/m68k/platform/5307/config.c | 61 +----- + arch/m68k/platform/532x/config.c | 196 +--------------- + arch/m68k/platform/5407/config.c | 61 +----- + arch/m68k/platform/54xx/config.c | 77 +------ + arch/m68k/platform/68328/config.c | 5 +- + arch/m68k/platform/68328/ints.c | 2 - + arch/m68k/platform/68328/timers.c | 18 +- + arch/m68k/platform/68360/config.c | 8 +- + arch/m68k/platform/68360/ints.c | 2 - + arch/m68k/platform/68EZ328/config.c | 5 +- + arch/m68k/platform/68VZ328/config.c | 5 +- + arch/m68k/platform/coldfire/Makefile | 2 +- + arch/m68k/platform/coldfire/device.c | 318 +++++++++++++++++++++++++ + arch/m68k/platform/coldfire/head.S | 4 + + arch/m68k/platform/coldfire/pit.c | 2 +- + arch/m68k/platform/coldfire/sltimers.c | 7 +- + arch/m68k/platform/coldfire/timers.c | 7 +- + arch/m68k/platform/coldfire/vectors.c | 2 - + 51 files changed, 1502 insertions(+), 3430 deletions(-) + delete mode 100644 arch/m68k/kernel/process_mm.c + delete mode 100644 arch/m68k/kernel/process_no.c + delete mode 100644 arch/m68k/kernel/ptrace_mm.c + delete mode 100644 arch/m68k/kernel/ptrace_no.c + delete mode 100644 arch/m68k/kernel/time_mm.c + delete mode 100644 arch/m68k/kernel/time_no.c + create mode 100644 arch/m68k/platform/coldfire/device.c +Merging microblaze/next (8597559 Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/alchemy/common/time.c | 2 +- + arch/mips/ath79/dev-wmac.c | 2 +- + arch/mips/configs/nlm_xlp_defconfig | 4 +- + arch/mips/configs/nlm_xlr_defconfig | 4 +- + arch/mips/configs/powertv_defconfig | 2 +- + arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 20 ++++++++++++- + arch/mips/include/asm/page.h | 3 -- + arch/mips/kernel/smp-bmips.c | 1 - + arch/mips/kernel/traps.c | 2 +- + arch/mips/kernel/vmlinux.lds.S | 1 - + arch/mips/mm/fault.c | 36 ++++++++++++++++++---- + arch/mips/pci/pci.c | 5 +-- + arch/mips/pmc-sierra/yosemite/ht-irq.c | 10 ------ + arch/mips/txx9/generic/7segled.c | 2 +- + 14 files changed, 58 insertions(+), 36 deletions(-) +Merging openrisc/for-upstream (754d5c2 openrisc: Set shortest clock event to 100 ticks) +$ git merge openrisc/for-upstream +Merge made by the 'recursive' strategy. + arch/openrisc/include/asm/uaccess.h | 1 - + arch/openrisc/kernel/head.S | 17 ++++++++++++- + arch/openrisc/kernel/setup.c | 18 +++++++------- + arch/openrisc/kernel/signal.c | 45 ++++++++++++++-------------------- + arch/openrisc/kernel/time.c | 13 ++++------ + arch/openrisc/mm/init.c | 3 +- + 6 files changed, 50 insertions(+), 47 deletions(-) +Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next) +$ git merge parisc/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/futex.h | 31 +++++++++++++++++++++++++++---- + arch/parisc/kernel/smp.c | 3 +-- + 2 files changed, 28 insertions(+), 6 deletions(-) +Merging powerpc/next (6c15d7a carma-fpga: fix race between data dumping and DMA callback) +$ git merge powerpc/next +Removing arch/powerpc/platforms/iseries/Kconfig +Removing arch/powerpc/configs/iseries_defconfig +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 2 +- + arch/powerpc/Kconfig.debug | 7 - + arch/powerpc/configs/iseries_defconfig | 236 -------------------------------- + arch/powerpc/kvm/book3s_hv.c | 1 - + arch/powerpc/platforms/Kconfig | 3 +- + arch/powerpc/platforms/iseries/Kconfig | 38 ----- + arch/powerpc/platforms/powernv/setup.c | 1 - + arch/powerpc/platforms/pseries/Kconfig | 2 +- + arch/powerpc/sysdev/mpic.c | 8 +- + drivers/macintosh/mediabay.c | 2 +- + drivers/misc/carma/carma-fpga.c | 114 ++++++++++------ + 11 files changed, 82 insertions(+), 332 deletions(-) + delete mode 100644 arch/powerpc/configs/iseries_defconfig + delete mode 100644 arch/powerpc/platforms/iseries/Kconfig +Merging 4xx/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c) +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries) +$ git merge 52xx-and-virtex/powerpc/next +Merge made by the 'recursive' strategy. +Merging galak/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c) +$ git merge galak/next +Already up-to-date. +Merging s390/features (e11eae9 [S390] Ensure that vmcore_info pointer is never accessed directly) +$ git merge s390/features +Removing drivers/s390/crypto/zcrypt_mono.c +Removing arch/s390/kernel/switch_cpu64.S +Removing arch/s390/kernel/switch_cpu.S +Removing arch/s390/include/asm/sigp.h +Merge made by the 'recursive' strategy. + arch/s390/include/asm/cputime.h | 9 +- + arch/s390/include/asm/debug.h | 3 +- + arch/s390/include/asm/hardirq.h | 1 + + arch/s390/include/asm/ipl.h | 1 + + arch/s390/include/asm/irq.h | 7 +- + arch/s390/include/asm/lowcore.h | 119 ++-- + arch/s390/include/asm/os_info.h | 50 ++ + arch/s390/include/asm/sigp.h | 132 ---- + arch/s390/include/asm/smp.h | 63 +-- + arch/s390/include/asm/system.h | 24 + + arch/s390/include/asm/timer.h | 4 +- + arch/s390/include/asm/vdso.h | 4 +- + arch/s390/kernel/Makefile | 4 +- + arch/s390/kernel/asm-offsets.c | 27 +- + arch/s390/kernel/compat_signal.c | 6 +- + arch/s390/kernel/crash_dump.c | 37 +- + arch/s390/kernel/debug.c | 54 ++- + arch/s390/kernel/early.c | 21 +- + arch/s390/kernel/entry.S | 159 +++--- + arch/s390/kernel/entry.h | 17 +- + arch/s390/kernel/entry64.S | 139 +++-- + arch/s390/kernel/ipl.c | 99 ++-- + arch/s390/kernel/irq.c | 14 +- + arch/s390/kernel/lgr.c | 211 +++++++ + arch/s390/kernel/machine_kexec.c | 49 +-- + arch/s390/kernel/nmi.c | 2 - + arch/s390/kernel/os_info.c | 169 +++++ + arch/s390/kernel/process.c | 7 +- + arch/s390/kernel/setup.c | 61 +- + arch/s390/kernel/signal.c | 6 +- + arch/s390/kernel/smp.c | 1146 ++++++++++++++++++----------------- + arch/s390/kernel/switch_cpu.S | 58 -- + arch/s390/kernel/switch_cpu64.S | 51 -- + arch/s390/kernel/swsusp_asm64.S | 19 +- + arch/s390/kernel/time.c | 4 +- + arch/s390/kernel/topology.c | 8 +- + arch/s390/kernel/traps.c | 6 +- + arch/s390/kernel/vdso.c | 28 +- + arch/s390/kernel/vtime.c | 168 ++---- + arch/s390/kvm/interrupt.c | 6 +- + arch/s390/lib/delay.c | 31 +- + arch/s390/lib/spinlock.c | 30 +- + arch/s390/mm/fault.c | 4 +- + arch/s390/oprofile/hwsampler.c | 6 +- + drivers/crypto/Kconfig | 9 - + drivers/s390/block/dasd.c | 4 + + drivers/s390/block/dasd_diag.c | 8 +- + drivers/s390/block/dasd_eckd.c | 8 + + drivers/s390/char/sclp.c | 4 +- + drivers/s390/char/sclp_quiesce.c | 1 - + drivers/s390/char/sclp_sdias.c | 101 +++- + drivers/s390/char/zcore.c | 1 - + drivers/s390/cio/cio.c | 2 - + drivers/s390/cio/qdio_main.c | 10 +- + drivers/s390/crypto/Makefile | 10 - + drivers/s390/crypto/ap_bus.c | 2 - + drivers/s390/crypto/zcrypt_api.c | 2 - + drivers/s390/crypto/zcrypt_cex2a.c | 4 - + drivers/s390/crypto/zcrypt_mono.c | 100 --- + drivers/s390/crypto/zcrypt_pcica.c | 4 - + drivers/s390/crypto/zcrypt_pcicc.c | 4 - + drivers/s390/crypto/zcrypt_pcixcc.c | 4 - + drivers/s390/kvm/kvm_virtio.c | 6 +- + net/iucv/iucv.c | 2 +- + 64 files changed, 1707 insertions(+), 1643 deletions(-) + create mode 100644 arch/s390/include/asm/os_info.h + delete mode 100644 arch/s390/include/asm/sigp.h + create mode 100644 arch/s390/kernel/lgr.c + create mode 100644 arch/s390/kernel/os_info.c + delete mode 100644 arch/s390/kernel/switch_cpu.S + delete mode 100644 arch/s390/kernel/switch_cpu64.S + delete mode 100644 drivers/s390/crypto/zcrypt_mono.c +Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address) +$ git merge sparc-next/master +Merge made by the 'recursive' strategy. + arch/sparc/kernel/ds.c | 2 +- + arch/sparc/kernel/unaligned_64.c | 1 - + arch/sparc/mm/srmmu.c | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) +Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two")) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging ceph/master (83eb26a ceph: ensure prealloc_blob is in place when removing xattr) +$ git merge ceph/master +Already up-to-date. +Merging cifs/master (5bccda0 cifs: fix dentry refcount leak when opening a FIFO on lookup) +$ git merge cifs/master +Merge made by the 'recursive' strategy. + fs/cifs/dir.c | 20 ++++++++++++++++++-- + fs/cifs/inode.c | 28 +++++++++++++++++++--------- + 2 files changed, 37 insertions(+), 11 deletions(-) +Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic()) +$ git merge ecryptfs/next +Resolved 'fs/ecryptfs/ecryptfs_kernel.h' using previous resolution. +Auto-merging fs/ecryptfs/mmap.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5de6771] Merge remote-tracking branch 'ecryptfs/next' +$ git diff -M --stat --summary HEAD^.. + fs/ecryptfs/mmap.c | 12 ++++++++++-- + 1 files changed, 10 insertions(+), 2 deletions(-) +Merging ext3/for_next (a0391a3 udf: Fix deadlock in udf_release_file()) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext3/balloc.c | 7 ++- + fs/ext3/inode.c | 9 ++- + fs/quota/dquot.c | 189 ++++++++++++++++++++++++++++++++---------------------- + fs/udf/balloc.c | 84 +++++++++++++----------- + fs/udf/file.c | 2 - + fs/udf/ialloc.c | 1 + + fs/udf/inode.c | 20 ++++-- + fs/udf/super.c | 5 +- + fs/udf/udf_i.h | 1 + + 9 files changed, 187 insertions(+), 131 deletions(-) +Merging ext4/dev (9ee4930 ext4: format flag in dx_probe()) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext4.txt | 8 - + fs/ext4/balloc.c | 63 ++++++--- + fs/ext4/dir.c | 8 +- + fs/ext4/ext4.h | 15 ++- + fs/ext4/ext4_jbd2.h | 128 ++++++++++++++---- + fs/ext4/ialloc.c | 235 +++++++++++++------------------- + fs/ext4/inode.c | 46 ++++--- + fs/ext4/mballoc.c | 265 ++++++++++++++---------------------- + fs/ext4/mballoc.h | 20 ++-- + fs/ext4/migrate.c | 2 +- + fs/ext4/namei.c | 2 +- + fs/ext4/page-io.c | 2 + + fs/ext4/resize.c | 14 +- + fs/ext4/super.c | 73 ++++------- + fs/ext4/xattr.c | 12 +- + fs/jbd2/checkpoint.c | 4 +- + fs/jbd2/commit.c | 2 +- + fs/jbd2/journal.c | 74 ++--------- + fs/jbd2/revoke.c | 12 +- + fs/jbd2/transaction.c | 38 +++++- + include/linux/jbd2.h | 5 + + include/trace/events/jbd2.h | 28 ++++ + 22 files changed, 525 insertions(+), 531 deletions(-) +Merging fuse/for-next (03c9693 cuse: implement memory mapping) +$ git merge fuse/for-next +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/fuse_i.h +Merge made by the 'recursive' strategy. + fs/fuse/cuse.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++- + fs/fuse/dev.c | 155 ++----------------- + fs/fuse/fuse_i.h | 35 ++++- + fs/fuse/inode.c | 167 +++++++++++++++++++- + include/linux/fuse.h | 25 +++ + 5 files changed, 656 insertions(+), 152 deletions(-) +Merging gfs2/master (a08fd28 GFS2: Unlock rindex mutex on glock error) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 2 + + fs/gfs2/glock.c | 210 +++++++++++++++++++++++++++++++++++++++++-- + fs/gfs2/incore.h | 49 +++++++++- + fs/gfs2/inode.c | 4 +- + fs/gfs2/lock_dlm.c | 123 ++++++++++++++++++++++++- + fs/gfs2/log.c | 117 ++++-------------------- + fs/gfs2/log.h | 5 +- + fs/gfs2/lops.c | 94 +++++++++++++++++++- + fs/gfs2/ops_fstype.c | 8 ++ + fs/gfs2/rgrp.c | 167 ++++++++++++++++++++++++++++------ + fs/gfs2/rgrp.h | 10 ++- + fs/gfs2/super.c | 2 +- + fs/gfs2/trace_gfs2.h | 60 ++++++++++++- + fs/gfs2/xattr.c | 4 +- + include/linux/gfs2_ondisk.h | 1 + + 15 files changed, 699 insertions(+), 157 deletions(-) +Merging logfs/master (203738e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge logfs/master +Already up-to-date. +Merging nfs/linux-next (71a9b12 NFSv4: Add a encode op helper) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/idmapper.txt | 20 +- + Documentation/kernel-parameters.txt | 17 + + fs/lockd/clnt4xdr.c | 2 +- + fs/lockd/clntlock.c | 3 +- + fs/lockd/clntxdr.c | 8 +- + fs/lockd/host.c | 42 ++- + fs/lockd/mon.c | 21 +- + fs/lockd/netns.h | 12 + + fs/lockd/svc.c | 117 ++++- + fs/nfs/Kconfig | 25 +- + fs/nfs/blocklayout/blocklayout.c | 152 +++++- + fs/nfs/blocklayout/blocklayout.h | 3 +- + fs/nfs/blocklayout/blocklayoutdev.c | 7 +- + fs/nfs/blocklayout/blocklayoutdm.c | 9 +- + fs/nfs/blocklayout/extents.c | 2 +- + fs/nfs/cache_lib.c | 61 ++- + fs/nfs/cache_lib.h | 10 +- + fs/nfs/callback.c | 15 +- + fs/nfs/callback.h | 3 +- + fs/nfs/callback_proc.c | 99 ++-- + fs/nfs/callback_xdr.c | 15 +- + fs/nfs/client.c | 237 ++++++---- + fs/nfs/delegation.c | 14 +- + fs/nfs/dir.c | 27 +- + fs/nfs/dns_resolve.c | 129 ++++- + fs/nfs/dns_resolve.h | 14 +- + fs/nfs/file.c | 2 + + fs/nfs/idmap.c | 726 +++++++++++++--------------- + fs/nfs/inode.c | 94 ++++- + fs/nfs/internal.h | 13 +- + fs/nfs/mount_clnt.c | 14 +- + fs/nfs/namespace.c | 5 +- + fs/nfs/netns.h | 20 + + fs/nfs/nfs2xdr.c | 2 +- + fs/nfs/nfs3xdr.c | 4 +- + fs/nfs/nfs4_fs.h | 50 +- + fs/nfs/nfs4filelayout.c | 31 +- + fs/nfs/nfs4filelayoutdev.c | 88 ++--- + fs/nfs/nfs4namespace.c | 10 +- + fs/nfs/nfs4proc.c | 391 ++++++++++----- + fs/nfs/nfs4state.c | 238 ++++----- + fs/nfs/nfs4xdr.c | 488 ++++++++++--------- + fs/nfs/objlayout/objio_osd.c | 6 +- + fs/nfs/objlayout/objlayout.c | 6 +- + fs/nfs/pagelist.c | 1 + + fs/nfs/pnfs.c | 43 +- + fs/nfs/pnfs.h | 3 - + fs/nfs/read.c | 2 +- + fs/nfs/super.c | 159 +++++-- + fs/nfs/sysctl.c | 2 - + fs/nfs/unlink.c | 4 +- + fs/nfs/write.c | 2 +- + fs/nfsd/nfs4callback.c | 8 +- + fs/nfsd/nfs4state.c | 2 +- + fs/nfsd/nfsctl.c | 6 +- + fs/nfsd/nfssvc.c | 4 +- + fs/nfsd/stats.c | 5 +- + include/linux/key.h | 2 + + include/linux/lockd/bind.h | 1 + + include/linux/lockd/lockd.h | 7 +- + include/linux/lockd/xdr4.h | 2 +- + include/linux/nfs.h | 2 +- + include/linux/nfs4.h | 7 +- + include/linux/nfs_fs.h | 14 + + include/linux/nfs_fs_i.h | 4 - + include/linux/nfs_fs_sb.h | 23 +- + include/linux/nfs_idmap.h | 25 - + include/linux/nfs_iostat.h | 2 +- + include/linux/nfs_xdr.h | 40 +- + include/linux/sunrpc/auth.h | 2 + + include/linux/sunrpc/cache.h | 8 +- + include/linux/sunrpc/clnt.h | 40 +- + include/linux/sunrpc/debug.h | 22 +- + include/linux/sunrpc/metrics.h | 6 +- + include/linux/sunrpc/rpc_pipe_fs.h | 46 ++- + include/linux/sunrpc/sched.h | 24 +- + include/linux/sunrpc/stats.h | 22 +- + include/linux/sunrpc/svc.h | 13 +- + include/linux/sunrpc/svc_xprt.h | 3 +- + include/linux/sunrpc/svcauth_gss.h | 2 + + include/linux/sunrpc/svcsock.h | 2 +- + include/linux/sunrpc/xprt.h | 11 +- + include/trace/events/sunrpc.h | 177 +++++++ + net/sunrpc/addr.c | 26 +- + net/sunrpc/auth_gss/auth_gss.c | 216 ++++++--- + net/sunrpc/auth_gss/svcauth_gss.c | 165 +++++-- + net/sunrpc/cache.c | 44 ++- + net/sunrpc/clnt.c | 548 +++++++++++++++++----- + net/sunrpc/netns.h | 14 + + net/sunrpc/rpc_pipe.c | 501 ++++++++++++-------- + net/sunrpc/rpcb_clnt.c | 161 ++++--- + net/sunrpc/sched.c | 58 ++- + net/sunrpc/stats.c | 35 +- + net/sunrpc/sunrpc.h | 2 + + net/sunrpc/sunrpc_syms.c | 20 +- + net/sunrpc/svc.c | 98 +++-- + net/sunrpc/svc_xprt.c | 51 ++- + net/sunrpc/svcauth_unix.c | 126 +++--- + net/sunrpc/svcsock.c | 3 +- + net/sunrpc/sysctl.c | 4 +- + net/sunrpc/xprt.c | 80 ++-- + net/sunrpc/xprtsock.c | 23 +- + security/keys/key.c | 20 + + security/keys/keyctl.c | 18 +- + 104 files changed, 3964 insertions(+), 2249 deletions(-) + create mode 100644 fs/lockd/netns.h + create mode 100644 fs/nfs/netns.h + create mode 100644 include/trace/events/sunrpc.h +$ git reset --hard HEAD^ +HEAD is now at 897a60f Merge remote-tracking branch 'gfs2/master' +Merging refs/next/20120302/nfs +$ git merge refs/next/20120302/nfs +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/idmapper.txt | 20 +- + Documentation/kernel-parameters.txt | 8 + + fs/lockd/clnt4xdr.c | 2 +- + fs/lockd/clntlock.c | 3 +- + fs/lockd/clntxdr.c | 8 +- + fs/lockd/host.c | 42 ++- + fs/lockd/mon.c | 21 +- + fs/lockd/netns.h | 12 + + fs/lockd/svc.c | 117 ++++++- + fs/nfs/Kconfig | 13 +- + fs/nfs/blocklayout/blocklayout.c | 152 +++++++-- + fs/nfs/blocklayout/blocklayout.h | 3 +- + fs/nfs/blocklayout/blocklayoutdev.c | 7 +- + fs/nfs/blocklayout/blocklayoutdm.c | 9 +- + fs/nfs/blocklayout/extents.c | 2 +- + fs/nfs/cache_lib.c | 61 +++- + fs/nfs/cache_lib.h | 10 +- + fs/nfs/callback.c | 12 +- + fs/nfs/callback.h | 3 +- + fs/nfs/callback_proc.c | 58 +++- + fs/nfs/callback_xdr.c | 15 +- + fs/nfs/client.c | 205 +++++++----- + fs/nfs/dir.c | 25 +- + fs/nfs/dns_resolve.c | 129 ++++++-- + fs/nfs/dns_resolve.h | 14 +- + fs/nfs/file.c | 2 + + fs/nfs/idmap.c | 374 +++++++++++++++------ + fs/nfs/inode.c | 49 +++- + fs/nfs/internal.h | 13 +- + fs/nfs/mount_clnt.c | 14 +- + fs/nfs/namespace.c | 5 +- + fs/nfs/netns.h | 20 ++ + fs/nfs/nfs2xdr.c | 2 +- + fs/nfs/nfs3xdr.c | 4 +- + fs/nfs/nfs4_fs.h | 35 +-- + fs/nfs/nfs4filelayout.c | 31 ++- + fs/nfs/nfs4filelayoutdev.c | 88 ++--- + fs/nfs/nfs4namespace.c | 10 +- + fs/nfs/nfs4proc.c | 275 ++++++++++------ + fs/nfs/nfs4state.c | 203 +++++------- + fs/nfs/nfs4xdr.c | 40 ++- + fs/nfs/objlayout/objio_osd.c | 6 +- + fs/nfs/objlayout/objlayout.c | 6 +- + fs/nfs/pagelist.c | 1 + + fs/nfs/pnfs.c | 16 +- + fs/nfs/pnfs.h | 3 - + fs/nfs/read.c | 2 +- + fs/nfs/super.c | 31 ++- + fs/nfs/sysctl.c | 2 - + fs/nfs/unlink.c | 4 +- + fs/nfs/write.c | 2 +- + fs/nfsd/nfs4callback.c | 8 +- + fs/nfsd/nfs4state.c | 2 +- + fs/nfsd/nfsctl.c | 6 +- + fs/nfsd/nfssvc.c | 4 +- + fs/nfsd/stats.c | 5 +- + include/linux/lockd/bind.h | 1 + + include/linux/lockd/lockd.h | 7 +- + include/linux/lockd/xdr4.h | 2 +- + include/linux/nfs.h | 2 +- + include/linux/nfs_fs_i.h | 4 - + include/linux/nfs_fs_sb.h | 18 +- + include/linux/nfs_idmap.h | 22 +- + include/linux/nfs_iostat.h | 2 +- + include/linux/nfs_xdr.h | 13 +- + include/linux/sunrpc/auth.h | 2 + + include/linux/sunrpc/cache.h | 8 +- + include/linux/sunrpc/clnt.h | 36 +- + include/linux/sunrpc/debug.h | 9 +- + include/linux/sunrpc/metrics.h | 6 +- + include/linux/sunrpc/rpc_pipe_fs.h | 46 ++- + include/linux/sunrpc/sched.h | 24 ++- + include/linux/sunrpc/stats.h | 22 +- + include/linux/sunrpc/svc.h | 13 +- + include/linux/sunrpc/svc_xprt.h | 3 +- + include/linux/sunrpc/svcauth_gss.h | 2 + + include/linux/sunrpc/svcsock.h | 2 +- + include/linux/sunrpc/xprt.h | 9 +- + include/trace/events/sunrpc.h | 177 ++++++++++ + net/sunrpc/addr.c | 26 +- + net/sunrpc/auth_gss/auth_gss.c | 216 +++++++++---- + net/sunrpc/auth_gss/svcauth_gss.c | 165 +++++++--- + net/sunrpc/cache.c | 44 ++- + net/sunrpc/clnt.c | 235 ++++++++++---- + net/sunrpc/netns.h | 14 + + net/sunrpc/rpc_pipe.c | 495 +++++++++++++++++----------- + net/sunrpc/rpcb_clnt.c | 144 +++++---- + net/sunrpc/sched.c | 58 +++- + net/sunrpc/stats.c | 29 +- + net/sunrpc/sunrpc.h | 2 + + net/sunrpc/sunrpc_syms.c | 20 +- + net/sunrpc/svc.c | 98 ++++--- + net/sunrpc/svc_xprt.c | 51 ++- + net/sunrpc/svcauth_unix.c | 126 ++++--- + net/sunrpc/svcsock.c | 3 +- + net/sunrpc/sysctl.c | 4 +- + net/sunrpc/xprt.c | 65 ++-- + net/sunrpc/xprtsock.c | 23 +- + 98 files changed, 2972 insertions(+), 1490 deletions(-) + create mode 100644 fs/lockd/netns.h + create mode 100644 fs/nfs/netns.h + create mode 100644 include/trace/events/sunrpc.h +Merging nfsd/nfsd-next (03cfb42 NFSD: Clean up the test_stateid function) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/svcsock.c +Auto-merging net/sunrpc/svcauth_unix.c +Auto-merging net/sunrpc/cache.c +Auto-merging fs/nfsd/nfssvc.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/lockd/svc.c +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 2 +- + fs/nfsd/current_stateid.h | 28 ++++++ + fs/nfsd/export.c | 2 +- + fs/nfsd/nfs4proc.c | 64 +++++++++++--- + fs/nfsd/nfs4state.c | 146 ++++++++++++++++++++++++++---- + fs/nfsd/nfs4xdr.c | 90 ++++++++----------- + fs/nfsd/nfssvc.c | 44 +++++---- + fs/nfsd/state.h | 8 +- + fs/nfsd/xdr4.h | 29 +++++- + include/linux/sunrpc/svc_rdma.h | 2 +- + net/sunrpc/cache.c | 2 + + net/sunrpc/svcauth_unix.c | 2 +- + net/sunrpc/svcsock.c | 2 - + net/sunrpc/xprtrdma/svc_rdma.c | 1 + + net/sunrpc/xprtrdma/svc_rdma_marshal.c | 66 ++++---------- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 20 +++-- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 26 +++--- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 10 +-- + net/sunrpc/xprtrdma/xprt_rdma.h | 7 ++ + 19 files changed, 354 insertions(+), 197 deletions(-) + create mode 100644 fs/nfsd/current_stateid.h +Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap) +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (3d4a1c8 Squashfs: fix i_blocks calculation with extended regular files) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (208f3c2 net/9p: handle flushed Tclunk/Tremove) +$ git merge v9fs/for-next +Merge made by the 'recursive' strategy. + net/9p/client.c | 26 +++++++++++++++++++++++--- + 1 files changed, 23 insertions(+), 3 deletions(-) +Merging ubifs/linux-next (c43be10 UBIFS: do not use inc_link when i_nlink is zero) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + fs/ubifs/debug.c | 410 +++++++++++++++++++++++++------------------------- + fs/ubifs/debug.h | 3 - + fs/ubifs/dir.c | 18 +- + fs/ubifs/recovery.c | 3 +- + 4 files changed, 216 insertions(+), 218 deletions(-) +Merging xfs/for-next (4b217ed quota: make Q_XQUOTASYNC a noop) +$ git merge xfs/for-next +Resolved 'fs/xfs/xfs_trans_dquot.c' using previous resolution. +Auto-merging fs/xfs/xfs_trans_dquot.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_trans_dquot.c +Auto-merging fs/xfs/xfs_trans.c +Auto-merging fs/xfs/xfs_trace.h +Auto-merging fs/xfs/xfs_qm_syscalls.c +Auto-merging fs/xfs/xfs_qm.c +Auto-merging fs/xfs/xfs_log_recover.c +Auto-merging fs/xfs/xfs_dquot.c +Auto-merging fs/quota/quota.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 14f8198] Merge remote-tracking branch 'xfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/quota/quota.c | 3 +- + fs/xfs/xfs_dquot.c | 48 +--- + fs/xfs/xfs_dquot.h | 33 ++- + fs/xfs/xfs_iget.c | 22 +- + fs/xfs/xfs_inode.h | 4 +- + fs/xfs/xfs_inode_item.c | 6 +- + fs/xfs/xfs_log.c | 612 ++++++++++++++++++++-------------------------- + fs/xfs/xfs_log.h | 16 +- + fs/xfs/xfs_log_priv.h | 28 +- + fs/xfs/xfs_log_recover.c | 6 +- + fs/xfs/xfs_mount.c | 8 +- + fs/xfs/xfs_mount.h | 2 +- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_qm_bhv.c | 24 +- + fs/xfs/xfs_qm_syscalls.c | 118 ++++------ + fs/xfs/xfs_quota.h | 2 + + fs/xfs/xfs_sb.h | 1 - + fs/xfs/xfs_super.c | 7 +- + fs/xfs/xfs_sync.c | 10 +- + fs/xfs/xfs_trace.h | 22 +- + fs/xfs/xfs_trans.c | 31 ++- + fs/xfs/xfs_trans_ail.c | 83 +------ + fs/xfs/xfs_trans_buf.c | 25 +-- + fs/xfs/xfs_trans_dquot.c | 17 +- + fs/xfs/xfs_trans_priv.h | 3 - + 25 files changed, 455 insertions(+), 678 deletions(-) +Merging vfs/for-next (9161999 fs: initial qnx6fs addition) +$ git merge vfs/for-next +Auto-merging net/sunrpc/rpc_pipe.c +Auto-merging include/linux/dcache.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/udf/super.c +Auto-merging fs/ntfs/super.c +Auto-merging fs/namei.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/ext4/super.c +Auto-merging fs/dcache.c +Auto-merging fs/autofs4/inode.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/porting | 6 + + Documentation/filesystems/qnx6.txt | 174 +++++++ + arch/powerpc/platforms/cell/spufs/inode.c | 15 +- + arch/s390/hypfs/inode.c | 6 +- + drivers/misc/ibmasm/ibmasmfs.c | 16 +- + drivers/oprofile/oprofilefs.c | 11 +- + drivers/usb/core/inode.c | 13 +- + drivers/usb/gadget/f_fs.c | 8 +- + drivers/usb/gadget/inode.c | 4 +- + fs/9p/vfs_super.c | 3 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/adfs/super.c | 3 +- + fs/affs/super.c | 7 +- + fs/afs/super.c | 7 +- + fs/autofs4/inode.c | 10 +- + fs/befs/linuxvfs.c | 3 +- + fs/bfs/inode.c | 3 +- + fs/btrfs/super.c | 8 +- + fs/ceph/super.c | 3 +- + fs/cifs/cifsfs.c | 7 +- + fs/coda/inode.c | 6 +- + fs/configfs/mount.c | 3 +- + fs/cramfs/inode.c | 6 +- + fs/dcache.c | 24 - + fs/devpts/inode.c | 3 +- + fs/ecryptfs/main.c | 3 +- + fs/ecryptfs/super.c | 1 - + fs/efs/super.c | 3 +- + fs/exofs/namei.c | 13 +- + fs/exofs/super.c | 4 +- + fs/ext2/namei.c | 13 +- + fs/ext2/super.c | 4 +- + fs/ext3/super.c | 3 +- + fs/ext4/super.c | 3 +- + fs/fat/inode.c | 8 +- + fs/file_table.c | 3 +- + fs/freevxfs/vxfs_super.c | 3 +- + fs/fuse/inode.c | 9 +- + fs/gfs2/ops_fstype.c | 3 +- + fs/hfs/super.c | 6 +- + fs/hfsplus/super.c | 17 +- + fs/hostfs/hostfs_kern.c | 4 +- + fs/hpfs/super.c | 6 +- + fs/hppfs/hppfs.c | 9 +- + fs/hugetlbfs/inode.c | 13 +- + fs/inode.c | 11 - + fs/isofs/inode.c | 3 +- + fs/jffs2/fs.c | 6 +- + fs/jfs/namei.c | 13 - + fs/jfs/super.c | 4 +- + fs/libfs.c | 6 +- + fs/logfs/dir.c | 3 - + fs/logfs/super.c | 7 +- + fs/minix/inode.c | 38 +- + fs/minix/minix.h | 1 - + fs/minix/namei.c | 14 +- + fs/namei.c | 13 + + fs/ncpfs/inode.c | 6 +- + fs/nfs/getroot.c | 6 +- + fs/nilfs2/namei.c | 11 - + fs/nilfs2/super.c | 4 +- + fs/ntfs/super.c | 7 +- + fs/ocfs2/dlmfs/dlmfs.c | 14 +- + fs/ocfs2/super.c | 11 +- + fs/omfs/inode.c | 6 +- + fs/openpromfs/inode.c | 3 +- + fs/proc/inode.c | 16 +- + fs/pstore/inode.c | 25 +- + fs/qnx4/inode.c | 33 +-- + fs/qnx4/namei.c | 4 - + fs/qnx6/Kconfig | 26 ++ + fs/qnx6/Makefile | 7 + + fs/qnx6/README | 8 + + fs/qnx6/dir.c | 291 ++++++++++++ + fs/qnx6/inode.c | 698 +++++++++++++++++++++++++++++ + fs/qnx6/namei.c | 42 ++ + fs/qnx6/qnx6.h | 135 ++++++ + fs/qnx6/super_mmi.c | 150 ++++++ + fs/ramfs/inode.c | 30 +- + fs/reiserfs/super.c | 6 +- + fs/romfs/super.c | 6 +- + fs/squashfs/super.c | 3 +- + fs/sysfs/mount.c | 3 +- + fs/sysv/namei.c | 12 +- + fs/sysv/super.c | 27 +- + fs/sysv/sysv.h | 1 - + fs/ubifs/super.c | 6 +- + fs/udf/namei.c | 13 - + fs/udf/super.c | 6 +- + fs/ufs/namei.c | 14 +- + fs/ufs/super.c | 7 +- + fs/xfs/xfs_rename.c | 11 - + fs/xfs/xfs_super.c | 7 +- + fs/xfs/xfs_utils.c | 2 - + fs/xfs/xfs_vnodeops.c | 16 - + include/linux/dcache.h | 1 - + include/linux/file.h | 1 - + include/linux/fs.h | 6 +- + include/linux/magic.h | 1 + + include/linux/qnx6_fs.h | 134 ++++++ + ipc/mqueue.c | 24 +- + kernel/cgroup.c | 8 +- + mm/shmem.c | 10 +- + net/sunrpc/rpc_pipe.c | 8 +- + 105 files changed, 1883 insertions(+), 581 deletions(-) + create mode 100644 Documentation/filesystems/qnx6.txt + create mode 100644 fs/qnx6/Kconfig + create mode 100644 fs/qnx6/Makefile + create mode 100644 fs/qnx6/README + create mode 100644 fs/qnx6/dir.c + create mode 100644 fs/qnx6/inode.c + create mode 100644 fs/qnx6/namei.c + create mode 100644 fs/qnx6/qnx6.h + create mode 100644 fs/qnx6/super_mmi.c + create mode 100644 include/linux/qnx6_fs.h +Merging pci/linux-next (63ab387 x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()') +$ git merge pci/linux-next +Resolved 'arch/mips/pci/pci.c' using previous resolution. +Auto-merging drivers/xen/xen-pciback/pci_stub.c +Auto-merging drivers/usb/host/pci-quirks.c +Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c +Auto-merging drivers/pci/xen-pcifront.c +Auto-merging arch/x86/pci/acpi.c +Auto-merging arch/sh/drivers/pci/pci.c +Auto-merging arch/powerpc/platforms/wsp/wsp_pci.c +Auto-merging arch/powerpc/platforms/pseries/setup.c +Auto-merging arch/powerpc/platforms/powernv/pci.c +Auto-merging arch/powerpc/include/asm/ppc-pci.h +Auto-merging arch/mips/pci/pci.c +CONFLICT (content): Merge conflict in arch/mips/pci/pci.c +Auto-merging arch/arm/mach-sa1100/pci-nanoengine.c +Auto-merging arch/arm/common/it8152.c +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1874a55] Merge remote-tracking branch 'pci/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 14 +- + arch/alpha/include/asm/pci.h | 7 +- + arch/alpha/kernel/pci.c | 86 +---- + arch/alpha/kernel/pci_impl.h | 3 - + arch/alpha/kernel/sys_marvel.c | 3 +- + arch/alpha/kernel/sys_titan.c | 3 +- + arch/arm/common/it8152.c | 4 +- + arch/arm/include/asm/pci.h | 8 - + arch/arm/kernel/bios32.c | 76 +--- + arch/arm/mach-cns3xxx/pcie.c | 4 +- + arch/arm/mach-dove/pcie.c | 4 +- + arch/arm/mach-footbridge/dc21285.c | 8 +- + arch/arm/mach-integrator/pci_v3.c | 7 +- + arch/arm/mach-iop13xx/pci.c | 4 +- + arch/arm/mach-ixp2000/ixdp2400.c | 4 +- + arch/arm/mach-ixp2000/ixdp2800.c | 4 +- + arch/arm/mach-ixp2000/ixdp2x00.c | 4 +- + arch/arm/mach-ixp2000/pci.c | 6 +- + arch/arm/mach-ixp23xx/pci.c | 6 +- + arch/arm/mach-ixp4xx/common-pci.c | 4 +- + arch/arm/mach-kirkwood/pcie.c | 4 +- + arch/arm/mach-ks8695/pci.c | 4 +- + arch/arm/mach-mv78xx0/pcie.c | 4 +- + arch/arm/mach-orion5x/pci.c | 14 +- + arch/arm/mach-sa1100/pci-nanoengine.c | 8 +- + arch/arm/mach-tegra/pcie.c | 6 +- + arch/arm/mach-versatile/pci.c | 6 +- + arch/arm/mm/iomap.c | 3 - + arch/arm/plat-iop/pci.c | 4 +- + arch/ia64/include/asm/pci.h | 6 - + arch/ia64/pci/pci.c | 55 +--- + arch/ia64/sn/kernel/io_init.c | 16 +- + arch/microblaze/include/asm/pci-bridge.h | 1 - + arch/microblaze/include/asm/pci.h | 8 - + arch/microblaze/pci/pci-common.c | 117 +----- + arch/mips/include/asm/pci.h | 9 +- + arch/mips/pci/fixup-cobalt.c | 61 --- + arch/mips/pci/pci-bcm1480.c | 2 +- + arch/mips/pci/pci-ip27.c | 2 +- + arch/mips/pci/pci-lantiq.c | 3 +- + arch/mips/pci/pci-sb1250.c | 2 +- + arch/mips/pci/pci-xlr.c | 2 +- + arch/mips/pci/pci.c | 86 +---- + arch/mn10300/include/asm/pci.h | 16 - + arch/mn10300/unit-asb2305/pci.c | 62 +--- + arch/parisc/include/asm/pci.h | 38 -- + arch/parisc/kernel/pci.c | 52 --- + arch/powerpc/include/asm/pci.h | 8 - + arch/powerpc/include/asm/ppc-pci.h | 2 - + arch/powerpc/kernel/pci-common.c | 82 +---- + arch/powerpc/kernel/pci_64.c | 5 - + arch/powerpc/kernel/rtas_pci.c | 10 +- + arch/powerpc/platforms/iseries/pci.c | 2 +- + arch/powerpc/platforms/maple/pci.c | 2 +- + arch/powerpc/platforms/pasemi/pci.c | 2 +- + arch/powerpc/platforms/powermac/pci.c | 3 - + arch/powerpc/platforms/powernv/pci-ioda.c | 5 +- + arch/powerpc/platforms/powernv/pci.c | 5 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 3 + + arch/powerpc/platforms/wsp/wsp_pci.c | 1 - + arch/sh/drivers/pci/pci.c | 75 +--- + arch/sh/include/asm/pci.h | 6 - + arch/sparc/include/asm/pci_32.h | 8 - + arch/sparc/include/asm/pci_64.h | 8 - + arch/sparc/kernel/leon_pci.c | 47 +-- + arch/sparc/kernel/pci.c | 46 +-- + arch/unicore32/kernel/pci.c | 6 +- + arch/x86/kernel/pci-dma.c | 5 +- + arch/x86/pci/acpi.c | 7 +- + arch/x86/pci/fixup.c | 12 +- + arch/x86/pci/i386.c | 85 ++++- + arch/x86/pci/mrst.c | 40 ++- + arch/xtensa/kernel/pci.c | 17 +- + drivers/message/fusion/mptbase.c | 2 +- + drivers/parisc/dino.c | 27 +- + drivers/parisc/lba_pci.c | 31 +- + drivers/pci/Kconfig | 13 + + drivers/pci/bus.c | 30 +- + drivers/pci/hotplug/acpiphp_glue.c | 33 +- + drivers/pci/hotplug/cpci_hotplug_pci.c | 2 +- + drivers/pci/hotplug/cpcihp_generic.c | 2 +- + drivers/pci/hotplug/cpqphp_pci.c | 2 +- + drivers/pci/hotplug/fakephp.c | 2 +- + drivers/pci/hotplug/ibmphp_core.c | 2 +- + drivers/pci/hotplug/ibmphp_ebda.c | 6 +- + drivers/pci/hotplug/pciehp_hpc.c | 133 +++++- + drivers/pci/hotplug/pciehp_pci.c | 2 +- + drivers/pci/hotplug/rpadlpar_core.c | 2 +- + drivers/pci/hotplug/sgi_hotplug.c | 2 +- + drivers/pci/hotplug/shpchp_pci.c | 2 +- + drivers/pci/iov.c | 12 +- + drivers/pci/pci-driver.c | 10 + + drivers/pci/pci-sysfs.c | 7 +- + drivers/pci/pci.c | 133 ++++++- + drivers/pci/pci.h | 10 +- + drivers/pci/pcie/Kconfig | 25 + + drivers/pci/pcie/aspm.c | 8 + + drivers/pci/pcie/portdrv.h | 12 + + drivers/pci/pcie/portdrv_core.c | 16 +- + drivers/pci/probe.c | 297 +++++++++---- + drivers/pci/quirks.c | 182 ++++---- + drivers/pci/remove.c | 27 +- + drivers/pci/setup-bus.c | 660 +++++++++++++++++++--------- + drivers/pci/setup-res.c | 94 ++--- + drivers/pci/xen-pcifront.c | 4 +- + drivers/pcmcia/cardbus.c | 2 +- + drivers/platform/x86/asus-wmi.c | 2 +- + drivers/platform/x86/eeepc-laptop.c | 2 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 2 +- + drivers/usb/host/pci-quirks.c | 3 +- + drivers/xen/xen-pciback/pci_stub.c | 41 ++- + drivers/xen/xen-pciback/pciback.h | 1 + + include/asm-generic/pci-bridge.h | 6 + + include/asm-generic/pci.h | 24 - + include/linux/ioport.h | 6 - + include/linux/pci.h | 106 +++-- + include/linux/pci_regs.h | 1 + + 118 files changed, 1672 insertions(+), 1658 deletions(-) +$ git am -3 ../patches/0001-powerpc-PCI-fix-up-for-mismatch-between-resource_siz.patch +Applying: powerpc/PCI: fix up for mismatch between resource_size_t and pointer size +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/kernel/pci-common.c +$ git add . +$ git commit -v -a --amend +[master 13db52f] Merge remote-tracking branch 'pci/linux-next' +Merging hid/for-next (bda02ea Merge branch 'wacom' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 77 +++----- + drivers/hid/Makefile | 13 +- + drivers/hid/hid-chicony.c | 7 + + drivers/hid/hid-core.c | 12 ++ + drivers/hid/hid-ids.h | 18 ++- + drivers/hid/hid-input.c | 9 +- + drivers/hid/hid-kye.c | 399 +++++++++++++++++++++++++++++++++++++-- + drivers/hid/hid-logitech-dj.c | 2 +- + drivers/hid/hid-magicmouse.c | 2 + + drivers/hid/hid-multitouch.c | 102 +++++++++- + drivers/hid/hid-saitek.c | 70 +++++++ + drivers/hid/hid-sjoy.c | 6 +- + drivers/hid/hid-tivo.c | 89 +++++++++ + drivers/hid/hid-wacom.c | 65 ++++++- + drivers/hid/hid-waltop.c | 192 +++++++++++++++++++ + drivers/hid/usbhid/hid-quirks.c | 3 + + 16 files changed, 967 insertions(+), 99 deletions(-) + create mode 100644 drivers/hid/hid-saitek.c + create mode 100644 drivers/hid/hid-tivo.c +Merging quilt/i2c (c3632e0 i2c-i801: Use usleep_range to wait for command completion) +$ git merge quilt/i2c +Merge made by the 'recursive' strategy. + Documentation/i2c/busses/i2c-i801 | 1 + + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-gpio.c | 3 +-- + drivers/i2c/busses/i2c-i801.c | 27 +++++++++++++++------------ + drivers/i2c/busses/i2c-isch.c | 10 +++++----- + drivers/i2c/i2c-core.c | 12 ++++++++---- + 6 files changed, 31 insertions(+), 23 deletions(-) +Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap) +$ git merge bjdooks-i2c/next-i2c +Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution. +Auto-merging drivers/i2c/busses/i2c-omap.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master eca15ae] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. +Merging i2c-embedded/i2c-embedded/for-next (7e87f54 Merge branch 'for-34/i2c/i2c-samsung' of git://git.fluff.org/bjdooks/linux into i2c-embedded/for-3.4) +$ git merge i2c-embedded/i2c-embedded/for-next +Auto-merging drivers/i2c/busses/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/sirf-i2c.txt | 19 + + drivers/i2c/busses/Kconfig | 44 ++- + drivers/i2c/busses/Makefile | 4 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- + drivers/i2c/busses/i2c-imx.c | 5 - + drivers/i2c/busses/i2c-mpc.c | 63 ++- + drivers/i2c/busses/i2c-s3c2410.c | 14 +- + drivers/i2c/busses/i2c-sirf.c | 459 ++++++++++++++++++++ + drivers/i2c/busses/i2c-tegra.c | 1 - + drivers/i2c/busses/i2c-versatile.c | 10 + + drivers/i2c/busses/i2c-xlr.c | 278 ++++++++++++ + include/linux/i2c/at24.h | 35 ++- + 12 files changed, 891 insertions(+), 43 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/sirf-i2c.txt + create mode 100644 drivers/i2c/busses/i2c-sirf.c + create mode 100644 drivers/i2c/busses/i2c-xlr.c +Merging quilt/jdelvare-hwmon (064628b hwmon: Add MCP3021 ADC driver) +$ git merge quilt/jdelvare-hwmon +Merge made by the 'recursive' strategy. + Documentation/hwmon/lm90 | 4 + + Documentation/hwmon/mc13783-adc | 50 +++- + Documentation/hwmon/mcp3021 | 22 ++ + drivers/hwmon/Kconfig | 28 ++- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/fam15h_power.c | 10 +- + drivers/hwmon/lm63.c | 586 ++++++++++++++++++++++----------------- + drivers/hwmon/lm90.c | 98 +++++--- + drivers/hwmon/mc13783-adc.c | 103 ++++++-- + drivers/hwmon/mcp3021.c | 171 ++++++++++++ + drivers/hwmon/w83795.c | 132 ++++++--- + 11 files changed, 826 insertions(+), 379 deletions(-) + create mode 100644 Documentation/hwmon/mcp3021 + create mode 100644 drivers/hwmon/mcp3021.c +Merging hwmon-staging/hwmon-next (8caee56 hwmon: (max34440) Add support for 'lowest' output voltage attribute) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/w83795.c +Auto-merging drivers/hwmon/lm90.c +Auto-merging drivers/hwmon/lm63.c +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + Documentation/hwmon/lm80 | 9 +- + Documentation/hwmon/max34440 | 1 + + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/abituguru.c | 584 ++++++++++++++--------- + drivers/hwmon/abituguru3.c | 267 +++++++---- + drivers/hwmon/ad7314.c | 12 +- + drivers/hwmon/ad7414.c | 21 +- + drivers/hwmon/ad7418.c | 25 +- + drivers/hwmon/adcxx.c | 13 +- + drivers/hwmon/adm1021.c | 97 +++-- + drivers/hwmon/adm1025.c | 76 ++-- + drivers/hwmon/adm1026.c | 504 +++++++++++++-------- + drivers/hwmon/adm1029.c | 47 +-- + drivers/hwmon/adm1031.c | 73 ++-- + drivers/hwmon/adm9240.c | 86 ++-- + drivers/hwmon/ads1015.c | 13 +- + drivers/hwmon/ads7828.c | 59 ++-- + drivers/hwmon/ads7871.c | 39 +- + drivers/hwmon/adt7411.c | 14 +- + drivers/hwmon/adt7462.c | 30 +- + drivers/hwmon/adt7470.c | 19 +- + drivers/hwmon/adt7475.c | 105 +++-- + drivers/hwmon/amc6821.c | 74 ++-- + drivers/hwmon/applesmc.c | 14 +- + drivers/hwmon/asb100.c | 200 +++++---- + drivers/hwmon/asc7621.c | 8 +- + drivers/hwmon/asus_atk0110.c | 18 +- + drivers/hwmon/atxp1.c | 173 ++++--- + drivers/hwmon/coretemp.c | 4 +- + drivers/hwmon/dme1737.c | 506 ++++++++++++--------- + drivers/hwmon/ds1621.c | 93 ++-- + drivers/hwmon/ds620.c | 13 +- + drivers/hwmon/emc1403.c | 25 +- + drivers/hwmon/emc2103.c | 63 ++-- + drivers/hwmon/emc6w201.c | 12 +- + drivers/hwmon/f71805f.c | 201 ++++++--- + drivers/hwmon/f71882fg.c | 63 ++- + drivers/hwmon/f75375s.c | 13 +- + drivers/hwmon/fschmd.c | 231 ++++++---- + drivers/hwmon/g760a.c | 48 +-- + drivers/hwmon/gl518sm.c | 115 +++-- + drivers/hwmon/gl520sm.c | 243 ++++++---- + drivers/hwmon/hwmon-vid.c | 159 +++---- + drivers/hwmon/hwmon.c | 25 +- + drivers/hwmon/i5k_amb.c | 18 +- + drivers/hwmon/ibmaem.c | 2 +- + drivers/hwmon/it87.c | 176 +++++--- + drivers/hwmon/jc42.c | 79 ++-- + drivers/hwmon/k10temp.c | 2 +- + drivers/hwmon/k8temp.c | 17 +- + drivers/hwmon/lineage-pem.c | 24 +- + drivers/hwmon/lm63.c | 13 +- + drivers/hwmon/lm70.c | 38 +- + drivers/hwmon/lm73.c | 15 +- + drivers/hwmon/lm75.c | 17 +- + drivers/hwmon/lm77.c | 172 ++++--- + drivers/hwmon/lm78.c | 206 ++++++--- + drivers/hwmon/lm80.c | 247 +++++++--- + drivers/hwmon/lm83.c | 30 +- + drivers/hwmon/lm85.c | 374 +++++++++------ + drivers/hwmon/lm87.c | 958 ++++++++++++++++++++------------------ + drivers/hwmon/lm90.c | 13 +- + drivers/hwmon/lm92.c | 111 +++-- + drivers/hwmon/lm93.c | 696 +++++++++++++++++----------- + drivers/hwmon/lm95241.c | 13 +- + drivers/hwmon/lm95245.c | 13 +- + drivers/hwmon/ltc4151.c | 16 +- + drivers/hwmon/ltc4215.c | 28 +- + drivers/hwmon/ltc4245.c | 22 +- + drivers/hwmon/ltc4261.c | 28 +- + drivers/hwmon/max1111.c | 15 +- + drivers/hwmon/max16065.c | 36 +-- + drivers/hwmon/max1619.c | 34 +- + drivers/hwmon/max1668.c | 51 +-- + drivers/hwmon/max6639.c | 13 +- + drivers/hwmon/max6642.c | 13 +- + drivers/hwmon/max6650.c | 177 ++++---- + drivers/hwmon/pc87360.c | 602 ++++++++++++++---------- + drivers/hwmon/pc87427.c | 72 ++-- + drivers/hwmon/pcf8591.c | 143 ++++--- + drivers/hwmon/pmbus/adm1275.c | 36 +-- + drivers/hwmon/pmbus/lm25066.c | 46 +-- + drivers/hwmon/pmbus/ltc2978.c | 50 +-- + drivers/hwmon/pmbus/max16064.c | 20 +- + drivers/hwmon/pmbus/max34440.c | 29 +- + drivers/hwmon/pmbus/max8688.c | 20 +- + drivers/hwmon/pmbus/pmbus.c | 37 +-- + drivers/hwmon/pmbus/pmbus.h | 2 +- + drivers/hwmon/pmbus/pmbus_core.c | 59 +-- + drivers/hwmon/pmbus/ucd9000.c | 47 +-- + drivers/hwmon/pmbus/ucd9200.c | 43 +-- + drivers/hwmon/pmbus/zl6100.c | 39 +-- + drivers/hwmon/sht15.c | 2 +- + drivers/hwmon/sht21.c | 23 +- + drivers/hwmon/sis5595.c | 307 ++++++++----- + drivers/hwmon/smm665.c | 34 +- + drivers/hwmon/smsc47b397.c | 64 ++-- + drivers/hwmon/smsc47m1.c | 291 ++++++++----- + drivers/hwmon/smsc47m192.c | 145 ++++--- + drivers/hwmon/thmc50.c | 84 ++-- + drivers/hwmon/tmp102.c | 12 +- + drivers/hwmon/tmp401.c | 13 +- + drivers/hwmon/tmp421.c | 13 +- + drivers/hwmon/ultra45_env.c | 34 +- + drivers/hwmon/via686a.c | 357 +++++++++------ + drivers/hwmon/vt1211.c | 389 ++++++++-------- + drivers/hwmon/vt8231.c | 285 +++++++----- + drivers/hwmon/w83627ehf.c | 189 +++++---- + drivers/hwmon/w83627hf.c | 272 +++++++---- + drivers/hwmon/w83781d.c | 475 +++++++++++-------- + drivers/hwmon/w83791d.c | 331 ++++++++------ + drivers/hwmon/w83792d.c | 397 +++++++++------- + drivers/hwmon/w83793.c | 453 ++++++++++-------- + drivers/hwmon/w83795.c | 13 +- + drivers/hwmon/w83l785ts.c | 30 +- + drivers/hwmon/w83l786ng.c | 190 +++++---- + drivers/hwmon/wm831x-hwmon.c | 8 +- + drivers/hwmon/wm8350-hwmon.c | 2 +- + 118 files changed, 7614 insertions(+), 6110 deletions(-) +Merging quilt/kernel-doc (7e7b32a Update quilt tree location for Documentation/ patches.) +$ git merge quilt/kernel-doc +Merge made by the 'recursive' strategy. +Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move) +$ git merge docs/docs-move +Already up-to-date. +Merging v4l-dvb/master (df0877b Merge /home/v4l/v4l/patchwork) +$ git merge v4l-dvb/master +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/media/v4l/compat.xml | 4 + + Documentation/DocBook/media/v4l/controls.xml | 59 ++ + Documentation/DocBook/media/v4l/v4l2.xml | 10 +- + .../DocBook/media/v4l/vidioc-decoder-cmd.xml | 256 +++++ + .../DocBook/media/v4l/vidioc-encoder-cmd.xml | 9 +- + .../DocBook/media/v4l/vidioc-querycap.xml | 36 +- + arch/arm/mach-imx/clock-imx27.c | 2 +- + arch/arm/mach-imx/devices-imx27.h | 2 + + arch/arm/plat-mxc/devices/platform-mx2-camera.c | 18 + + arch/arm/plat-mxc/include/mach/devices-common.h | 2 + + drivers/hid/hid-core.c | 10 + + drivers/hid/hid-ids.h | 1 + + drivers/media/common/tuners/max2165.c | 9 +- + drivers/media/common/tuners/mt2063.c | 4 +- + drivers/media/common/tuners/mt2063.h | 4 - + drivers/media/common/tuners/tuner-types.c | 4 + + drivers/media/common/tuners/xc5000.c | 47 +- + drivers/media/common/tuners/xc5000.h | 5 + + drivers/media/dvb/ddbridge/ddbridge-core.c | 1 + + drivers/media/dvb/ddbridge/ddbridge.h | 2 - + drivers/media/dvb/dvb-core/dvb_frontend.c | 2 + + drivers/media/dvb/dvb-usb/Kconfig | 18 + + drivers/media/dvb/dvb-usb/Makefile | 7 +- + drivers/media/dvb/dvb-usb/anysee.c | 38 +- + drivers/media/dvb/dvb-usb/az6007.c | 582 +++++++++++ + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 7 + + drivers/media/dvb/dvb-usb/it913x.c | 128 ++- + drivers/media/dvb/dvb-usb/lmedm04.c | 9 +- + drivers/media/dvb/dvb-usb/rtl28xxu.c | 978 +++++++++++++++++++ + drivers/media/dvb/dvb-usb/rtl28xxu.h | 264 +++++ + drivers/media/dvb/frontends/Kconfig | 7 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/drxk.h | 23 +- + drivers/media/dvb/frontends/drxk_hard.c | 47 +- + drivers/media/dvb/frontends/drxk_hard.h | 1 + + drivers/media/dvb/frontends/rtl2830.c | 562 +++++++++++ + drivers/media/dvb/frontends/rtl2830.h | 97 ++ + drivers/media/dvb/frontends/rtl2830_priv.h | 57 ++ + drivers/media/dvb/frontends/tda1004x.c | 4 +- + drivers/media/dvb/mantis/mantis_hif.c | 2 +- + drivers/media/dvb/ngene/ngene-cards.c | 1 + + drivers/media/radio/Kconfig | 123 +-- + drivers/media/radio/Makefile | 2 + + drivers/media/radio/radio-aimslab.c | 439 +++------- + drivers/media/radio/radio-aztech.c | 371 ++------ + drivers/media/radio/radio-gemtek.c | 493 ++-------- + drivers/media/radio/radio-isa.c | 339 +++++++ + drivers/media/radio/radio-isa.h | 105 ++ + drivers/media/radio/radio-keene.c | 427 +++++++++ + drivers/media/radio/radio-rtrack2.c | 332 ++------ + drivers/media/radio/radio-terratec.c | 364 ++------ + drivers/media/radio/radio-trust.c | 387 ++------ + drivers/media/radio/radio-typhoon.c | 365 ++------ + drivers/media/radio/radio-zoltrix.c | 441 +++------- + drivers/media/rc/fintek-cir.c | 26 +- + drivers/media/rc/fintek-cir.h | 4 +- + drivers/media/rc/keymaps/Makefile | 2 + + drivers/media/rc/keymaps/rc-it913x-v1.c | 95 ++ + drivers/media/rc/keymaps/rc-it913x-v2.c | 94 ++ + .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 52 + + drivers/media/video/Kconfig | 10 + + drivers/media/video/Makefile | 2 + + drivers/media/video/bt8xx/bttv-driver.c | 4 - + drivers/media/video/cx18/cx18-driver.h | 2 - + drivers/media/video/cx18/cx18-ioctl.c | 4 - + drivers/media/video/cx231xx/cx231xx-417.c | 1 - + drivers/media/video/davinci/isif.c | 1 + + drivers/media/video/davinci/vpif.h | 2 - + drivers/media/video/davinci/vpif_display.c | 2 - + drivers/media/video/ivtv/ivtv-controls.c | 62 ++ + drivers/media/video/ivtv/ivtv-controls.h | 2 + + drivers/media/video/ivtv/ivtv-driver.c | 37 +- + drivers/media/video/ivtv/ivtv-driver.h | 13 +- + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 193 ++-- + drivers/media/video/ivtv/ivtv-streams.c | 23 +- + drivers/media/video/mx2_emmaprp.c | 1008 ++++++++++++++++++++ + drivers/media/video/omap/omap_vout.c | 3 +- + drivers/media/video/ov6650.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 - + drivers/media/video/pwc/pwc-v4l.c | 10 +- + drivers/media/video/s5p-tv/Kconfig | 10 + + drivers/media/video/s5p-tv/Makefile | 2 + + drivers/media/video/s5p-tv/hdmi_drv.c | 120 ++- + drivers/media/video/s5p-tv/mixer_drv.c | 2 +- + drivers/media/video/s5p-tv/sdo_drv.c | 26 +- + drivers/media/video/s5p-tv/sii9234_drv.c | 432 +++++++++ + drivers/media/video/saa7164/saa7164-encoder.c | 6 - + drivers/media/video/saa7164/saa7164-vbi.c | 6 - + drivers/media/video/tm6000/tm6000-input.c | 3 +- + drivers/media/video/tuner-core.c | 15 + + drivers/media/video/tveeprom.c | 2 +- + drivers/media/video/uvc/uvc_video.c | 14 +- + drivers/media/video/v4l2-compat-ioctl32.c | 2 + + drivers/media/video/v4l2-ctrls.c | 55 ++ + drivers/media/video/v4l2-ioctl.c | 40 +- + drivers/media/video/v4l2-subdev.c | 12 +- + drivers/media/video/vivi.c | 26 +- + drivers/staging/media/easycap/easycap_main.c | 1 + + include/linux/ivtv.h | 6 +- + include/linux/videodev2.h | 95 ++- + include/media/davinci/vpif_types.h | 2 + + include/media/rc-map.h | 2 + + include/media/s5p_hdmi.h | 35 + + include/media/sii9234.h | 24 + + include/media/tuner.h | 1 + + include/media/v4l2-ctrls.h | 13 + + include/media/v4l2-ioctl.h | 4 + + 108 files changed, 7170 insertions(+), 2951 deletions(-) + create mode 100644 Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml + create mode 100644 drivers/media/dvb/dvb-usb/az6007.c + create mode 100644 drivers/media/dvb/dvb-usb/rtl28xxu.c + create mode 100644 drivers/media/dvb/dvb-usb/rtl28xxu.h + create mode 100644 drivers/media/dvb/frontends/rtl2830.c + create mode 100644 drivers/media/dvb/frontends/rtl2830.h + create mode 100644 drivers/media/dvb/frontends/rtl2830_priv.h + create mode 100644 drivers/media/radio/radio-isa.c + create mode 100644 drivers/media/radio/radio-isa.h + create mode 100644 drivers/media/radio/radio-keene.c + create mode 100644 drivers/media/rc/keymaps/rc-it913x-v1.c + create mode 100644 drivers/media/rc/keymaps/rc-it913x-v2.c + create mode 100644 drivers/media/video/mx2_emmaprp.c + create mode 100644 drivers/media/video/s5p-tv/sii9234_drv.c + create mode 100644 include/media/s5p_hdmi.h + create mode 100644 include/media/sii9234.h +Merging kbuild/for-next (17c0999 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 +- + scripts/Makefile.build | 2 + + scripts/coccinelle/free/clk_put.cocci | 67 +++++++++ + scripts/coccinelle/free/iounmap.cocci | 67 +++++++++ + scripts/coccinelle/misc/boolinit.cocci | 178 ++++++++++++++++++++++++ + scripts/coccinelle/misc/cstptr.cocci | 41 ++++++ + scripts/coccinelle/null/badzero.cocci | 237 ++++++++++++++++++++++++++++++++ + scripts/kconfig/confdata.c | 26 +--- + scripts/kconfig/symbol.c | 9 +- + scripts/package/builddeb | 20 ++- + 10 files changed, 621 insertions(+), 28 deletions(-) + create mode 100644 scripts/coccinelle/free/clk_put.cocci + create mode 100644 scripts/coccinelle/free/iounmap.cocci + create mode 100644 scripts/coccinelle/misc/boolinit.cocci + create mode 100644 scripts/coccinelle/misc/cstptr.cocci + create mode 100644 scripts/coccinelle/null/badzero.cocci +Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next) +$ git merge kconfig/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging libata/NEXT (3f1581f sata_fsl: add support for interrupt coalsecing feature) +$ git merge libata/NEXT +Merge made by the 'recursive' strategy. + drivers/ata/ahci.c | 8 +++ + drivers/ata/ata_piix.c | 8 +++ + drivers/ata/pata_arasan_cf.c | 12 ++--- + drivers/ata/pata_legacy.c | 3 +- + drivers/ata/sata_fsl.c | 111 ++++++++++++++++++++++++++++++++++++++++-- + 5 files changed, 128 insertions(+), 14 deletions(-) +Merging infiniband/for-next (01b5e3a Merge branches 'cxgb4', 'ehca', 'mad', 'nes', 'qib' and 'srpt' into for-next) +$ git merge infiniband/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/core/mad.c | 21 ++++++ + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/infiniband/hw/ehca/ehca_irq.c | 3 +- + drivers/infiniband/hw/nes/nes_cm.c | 39 ++++++----- + drivers/infiniband/hw/qib/qib.h | 10 +++- + drivers/infiniband/hw/qib/qib_iba7322.c | 107 ++++++++++++++++++++++--------- + drivers/infiniband/hw/qib/qib_mad.c | 4 +- + drivers/infiniband/hw/qib/qib_pcie.c | 21 ++++++- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + include/rdma/ib_mad.h | 9 +++ + 10 files changed, 161 insertions(+), 57 deletions(-) +Merging acpi/next (71ad90e ACPICA: Fix regression in FADT revision checks) +$ git merge acpi/next +Merge made by the 'recursive' strategy. + drivers/acpi/acpica/tbfadt.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Merge made by the 'recursive' strategy. + tools/power/cpupower/Makefile | 93 ++++++++++++-------- + tools/power/cpupower/bench/Makefile | 23 +++-- + tools/power/cpupower/debug/i386/Makefile | 40 ++++++--- + tools/power/cpupower/debug/x86_64/Makefile | 26 +++++- + tools/power/cpupower/man/cpupower-frequency-info.1 | 4 +- + tools/power/cpupower/man/cpupower-frequency-set.1 | 4 +- + tools/power/cpupower/man/cpupower-idle-info.1 | 90 +++++++++++++++++++ + tools/power/cpupower/man/cpupower-monitor.1 | 2 +- + tools/power/cpupower/utils/cpuidle-info.c | 12 +-- + tools/power/cpupower/utils/helpers/amd.c | 4 +- + tools/power/cpupower/utils/helpers/helpers.h | 11 ++- + tools/power/cpupower/utils/helpers/pci.c | 35 +++++--- + .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 25 +++--- + 13 files changed, 259 insertions(+), 110 deletions(-) + create mode 100644 tools/power/cpupower/man/cpupower-idle-info.1 +Merging ieee1394/for-next (02c68b7 Merge branch 'master' into for-next) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/core-card.c | 28 ++++- + drivers/firewire/core-cdev.c | 10 +- + drivers/firewire/core-device.c | 62 ++++++------ + drivers/firewire/core-topology.c | 18 ++-- + drivers/firewire/core-transaction.c | 44 +++----- + drivers/firewire/core.h | 19 ++++ + drivers/firewire/net.c | 43 ++++---- + drivers/firewire/nosy.c | 4 +- + drivers/firewire/ohci.c | 185 ++++++++++++++++++++--------------- + drivers/firewire/sbp2.c | 128 +++++++++++++++--------- + include/linux/firewire.h | 15 --- + sound/firewire/isight.c | 4 +- + sound/firewire/speakers.c | 4 - + 13 files changed, 313 insertions(+), 251 deletions(-) +Merging ubi/linux-next (a29852b UBI: fix error handling in ubi_scan()) +$ git merge ubi/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/scan.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) +Merging dlm/next (60f98d1 dlm: add recovery callbacks) +$ git merge dlm/next +Already up-to-date. +Merging scsi/master (cd8df93 [SCSI] qla4xxx: Update driver version to 5.02.00-k15) +$ git merge scsi/master +Auto-merging drivers/scsi/qla4xxx/ql4_nx.c +Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c +Merge made by the 'recursive' strategy. + Documentation/scsi/LICENSE.qla2xxx | 41 +- + Documentation/scsi/bfa.txt | 82 +++ + Documentation/scsi/libsas.txt | 15 - + drivers/ata/libata-core.c | 34 +- + drivers/ata/libata-eh.c | 1 + + drivers/ata/libata-scsi.c | 13 + + drivers/ata/libata.h | 2 +- + drivers/scsi/Kconfig | 8 + + drivers/scsi/Makefile | 1 + + drivers/scsi/aacraid/aachba.c | 4 + + drivers/scsi/aacraid/aacraid.h | 27 +- + drivers/scsi/aacraid/comminit.c | 21 +- + drivers/scsi/aacraid/commsup.c | 26 + + drivers/scsi/aacraid/linit.c | 28 +- + drivers/scsi/aacraid/rx.c | 1 + + drivers/scsi/aacraid/sa.c | 1 + + drivers/scsi/aacraid/src.c | 293 +++++++-- + drivers/scsi/aic94xx/aic94xx.h | 2 + + drivers/scsi/aic94xx/aic94xx_dev.c | 38 +- + drivers/scsi/aic94xx/aic94xx_init.c | 6 +- + drivers/scsi/aic94xx/aic94xx_tmf.c | 11 +- + drivers/scsi/bfa/bfad_bsg.c | 4 +- + drivers/scsi/bnx2fc/bnx2fc.h | 8 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 20 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 12 +- + drivers/scsi/bnx2i/bnx2i_init.c | 9 +- + drivers/scsi/cxgbi/libcxgbi.c | 13 +- + drivers/scsi/fcoe/fcoe.c | 167 +++-- + drivers/scsi/fcoe/fcoe.h | 3 - + drivers/scsi/fcoe/fcoe_transport.c | 4 +- + drivers/scsi/hpsa.c | 344 +++++----- + drivers/scsi/hpsa.h | 3 +- + drivers/scsi/hpsa_cmd.h | 9 +- + drivers/scsi/ipr.c | 14 +- + drivers/scsi/ipr.h | 4 +- + drivers/scsi/isci/host.c | 17 +- + drivers/scsi/isci/host.h | 19 +- + drivers/scsi/isci/init.c | 24 +- + drivers/scsi/isci/phy.c | 171 +++-- + drivers/scsi/isci/phy.h | 155 ++--- + drivers/scsi/isci/port.c | 263 ++++---- + drivers/scsi/isci/port.h | 114 ++-- + drivers/scsi/isci/registers.h | 27 +- + drivers/scsi/isci/remote_device.c | 82 +-- + drivers/scsi/isci/remote_device.h | 212 +++--- + drivers/scsi/isci/remote_node_context.c | 19 +- + drivers/scsi/isci/remote_node_context.h | 97 ++-- + drivers/scsi/isci/request.c | 370 +++++------ + drivers/scsi/isci/request.h | 228 +++---- + drivers/scsi/isci/scu_task_context.h | 55 +- + drivers/scsi/isci/task.c | 158 +---- + drivers/scsi/isci/task.h | 40 - + drivers/scsi/iscsi_tcp.c | 13 +- + drivers/scsi/libfc/fc_disc.c | 7 + + drivers/scsi/libfc/fc_elsct.c | 3 +- + drivers/scsi/libfc/fc_exch.c | 7 +- + drivers/scsi/libfc/fc_lport.c | 227 ++++++- + drivers/scsi/libiscsi.c | 28 +- + drivers/scsi/libiscsi_tcp.c | 18 + + drivers/scsi/libsas/sas_ata.c | 828 +++++++++++----------- + drivers/scsi/libsas/sas_discover.c | 246 +++++-- + drivers/scsi/libsas/sas_event.c | 96 +++- + drivers/scsi/libsas/sas_expander.c | 342 ++++++--- + drivers/scsi/libsas/sas_host_smp.c | 11 +- + drivers/scsi/libsas/sas_init.c | 214 +++++- + drivers/scsi/libsas/sas_internal.h | 97 ++- + drivers/scsi/libsas/sas_phy.c | 12 +- + drivers/scsi/libsas/sas_port.c | 32 +- + drivers/scsi/libsas/sas_scsi_host.c | 364 ++++------ + drivers/scsi/lpfc/lpfc.h | 13 +- + drivers/scsi/lpfc/lpfc_attr.c | 12 +- + drivers/scsi/lpfc/lpfc_bsg.c | 18 +- + drivers/scsi/lpfc/lpfc_crtn.h | 1 + + drivers/scsi/lpfc/lpfc_ct.c | 4 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 19 + + drivers/scsi/lpfc/lpfc_els.c | 5 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 12 +- + drivers/scsi/lpfc/lpfc_hw.h | 5 +- + drivers/scsi/lpfc/lpfc_hw4.h | 49 +- + drivers/scsi/lpfc/lpfc_init.c | 137 ++++- + drivers/scsi/lpfc/lpfc_nportdisc.c | 77 ++- + drivers/scsi/lpfc/lpfc_scsi.c | 1178 ++++++++++++++++++++++++++----- + drivers/scsi/lpfc/lpfc_sli.c | 240 ++++--- + drivers/scsi/lpfc/lpfc_sli.h | 1 + + drivers/scsi/lpfc/lpfc_sli4.h | 3 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 5 + + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 6 +- + drivers/scsi/mvsas/mv_init.c | 2 - + drivers/scsi/mvsas/mv_sas.c | 11 +- + drivers/scsi/pm8001/pm8001_chips.h | 4 +- + drivers/scsi/pm8001/pm8001_hwi.c | 434 +++++++++--- + drivers/scsi/pm8001/pm8001_hwi.h | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 - + drivers/scsi/pm8001/pm8001_sas.c | 127 +++- + drivers/scsi/pm8001/pm8001_sas.h | 6 + + drivers/scsi/qla2xxx/qla_attr.c | 177 +---- + drivers/scsi/qla2xxx/qla_bsg.c | 120 ++-- + drivers/scsi/qla2xxx/qla_dbg.c | 630 ++++++++++++++++- + drivers/scsi/qla2xxx/qla_dbg.h | 63 ++ + drivers/scsi/qla2xxx/qla_def.h | 117 ++-- + drivers/scsi/qla2xxx/qla_dfs.c | 2 +- + drivers/scsi/qla2xxx/qla_fw.h | 13 + + drivers/scsi/qla2xxx/qla_gbl.h | 22 +- + drivers/scsi/qla2xxx/qla_gs.c | 86 ++- + drivers/scsi/qla2xxx/qla_init.c | 540 ++++++--------- + drivers/scsi/qla2xxx/qla_inline.h | 51 ++- + drivers/scsi/qla2xxx/qla_iocb.c | 167 +++--- + drivers/scsi/qla2xxx/qla_isr.c | 445 +++++------- + drivers/scsi/qla2xxx/qla_mbx.c | 410 +++++++++--- + drivers/scsi/qla2xxx/qla_mid.c | 2 +- + drivers/scsi/qla2xxx/qla_nx.c | 90 +-- + drivers/scsi/qla2xxx/qla_nx.h | 3 +- + drivers/scsi/qla2xxx/qla_os.c | 435 ++++++++---- + drivers/scsi/qla2xxx/qla_sup.c | 148 ++++- + drivers/scsi/qla4xxx/ql4_def.h | 45 ++- + drivers/scsi/qla4xxx/ql4_fw.h | 24 + + drivers/scsi/qla4xxx/ql4_glbl.h | 9 + + drivers/scsi/qla4xxx/ql4_init.c | 5 + + drivers/scsi/qla4xxx/ql4_iocb.c | 92 +++ + drivers/scsi/qla4xxx/ql4_isr.c | 78 ++ + drivers/scsi/qla4xxx/ql4_mbx.c | 23 +- + drivers/scsi/qla4xxx/ql4_nx.c | 17 +- + drivers/scsi/qla4xxx/ql4_nx.h | 1 + + drivers/scsi/qla4xxx/ql4_os.c | 563 ++++++++++++++- + drivers/scsi/qla4xxx/ql4_version.h | 2 +- + drivers/scsi/scsi.c | 6 - + drivers/scsi/scsi_debug.c | 6 +- + drivers/scsi/scsi_error.c | 24 +- + drivers/scsi/scsi_lib.c | 5 +- + drivers/scsi/scsi_transport_fc.c | 30 +- + drivers/scsi/scsi_transport_iscsi.c | 268 +++++++- + drivers/scsi/scsi_transport_sas.c | 60 ++- + drivers/scsi/sd.c | 86 +++- + drivers/scsi/sd.h | 35 + + drivers/scsi/st.c | 11 + + drivers/scsi/virtio_scsi.c | 594 ++++++++++++++++ + include/linux/libata.h | 2 + + include/linux/virtio_ids.h | 1 + + include/linux/virtio_scsi.h | 114 +++ + include/scsi/fc/fc_ms.h | 213 ++++++ + include/scsi/fc_encode.h | 363 +++++++++- + include/scsi/iscsi_if.h | 79 ++ + include/scsi/libfc.h | 11 + + include/scsi/libiscsi.h | 3 +- + include/scsi/libiscsi_tcp.h | 2 +- + include/scsi/libsas.h | 71 ++- + include/scsi/sas.h | 4 +- + include/scsi/sas_ata.h | 44 +- + include/scsi/scsi_cmnd.h | 12 +- + include/scsi/scsi_driver.h | 1 + + include/scsi/scsi_transport_fc.h | 32 +- + include/scsi/scsi_transport_iscsi.h | 22 + + include/scsi/scsi_transport_sas.h | 12 +- + 154 files changed, 10314 insertions(+), 4417 deletions(-) + create mode 100644 Documentation/scsi/bfa.txt + create mode 100644 drivers/scsi/virtio_scsi.c + create mode 100644 include/linux/virtio_scsi.h + create mode 100644 include/scsi/fc/fc_ms.h +Merging target-updates/for-next (c0974f8 target: Allow target_submit_tmr interrupt context + pass ABORT_TASK tag) +$ git merge target-updates/for-next +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Merge made by the 'recursive' strategy. + Documentation/target/tcm_mod_builder.py | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 17 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 4 +- + drivers/scsi/libfc/fc_fcp.c | 5 +- + drivers/target/iscsi/iscsi_target.c | 24 +- + drivers/target/iscsi/iscsi_target_device.c | 19 -- + drivers/target/iscsi/iscsi_target_device.h | 2 - + drivers/target/iscsi/iscsi_target_erl1.c | 2 +- + drivers/target/iscsi/iscsi_target_tmr.c | 6 +- + drivers/target/iscsi/iscsi_target_tq.c | 6 - + drivers/target/iscsi/iscsi_target_util.c | 7 +- + drivers/target/loopback/tcm_loop.c | 329 ++++++++++++++-------------- + drivers/target/loopback/tcm_loop.h | 2 +- + drivers/target/target_core_alua.c | 7 +- + drivers/target/target_core_cdb.c | 172 ++++----------- + drivers/target/target_core_configfs.c | 10 +- + drivers/target/target_core_device.c | 81 ++++++-- + drivers/target/target_core_iblock.c | 78 +++---- + drivers/target/target_core_iblock.h | 7 +- + drivers/target/target_core_internal.h | 3 + + drivers/target/target_core_pr.c | 6 +- + drivers/target/target_core_pscsi.c | 18 +- + drivers/target/target_core_pscsi.h | 2 +- + drivers/target/target_core_tmr.c | 103 +++++++-- + drivers/target/target_core_transport.c | 273 ++++++++++++++--------- + drivers/target/tcm_fc/tcm_fc.h | 2 - + drivers/target/tcm_fc/tfc_cmd.c | 136 ++++-------- + include/scsi/fc/fc_fcp.h | 6 +- + include/scsi/scsi.h | 1 + + include/target/target_core_base.h | 75 +++---- + include/target/target_core_fabric.h | 7 +- + 31 files changed, 709 insertions(+), 703 deletions(-) +Merging target-merge/for-next-merge (c0974f8 target: Allow target_submit_tmr interrupt context + pass ABORT_TASK tag) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) +$ git merge ibft/linux-next +Already up-to-date. +Merging isci/all (57872c2 Merge branches 'devel' and 'fixes' into all) +$ git merge isci/all +Resolved 'drivers/scsi/isci/init.c' using previous resolution. +Resolved 'drivers/scsi/isci/registers.h' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_discover.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_expander.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_init.c' using previous resolution. +Resolved 'drivers/scsi/libsas/sas_scsi_host.c' using previous resolution. +Resolved 'include/scsi/libsas.h' using previous resolution. +Auto-merging include/scsi/libsas.h +CONFLICT (content): Merge conflict in include/scsi/libsas.h +Auto-merging drivers/scsi/pm8001/pm8001_sas.c +Auto-merging drivers/scsi/mvsas/mv_sas.c +Auto-merging drivers/scsi/libsas/sas_scsi_host.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c +Auto-merging drivers/scsi/libsas/sas_init.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_init.c +Auto-merging drivers/scsi/libsas/sas_expander.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_expander.c +Auto-merging drivers/scsi/libsas/sas_discover.c +CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_discover.c +Auto-merging drivers/scsi/isci/registers.h +CONFLICT (content): Merge conflict in drivers/scsi/isci/registers.h +Auto-merging drivers/scsi/isci/init.c +CONFLICT (content): Merge conflict in drivers/scsi/isci/init.c +Auto-merging drivers/scsi/isci/host.c +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 790abe2] Merge remote-tracking branch 'isci/all' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 6 +++ + drivers/scsi/isci/host.c | 1 - + drivers/scsi/isci/init.c | 3 ++ + drivers/scsi/libsas/sas_expander.c | 20 ++++++------ + drivers/scsi/libsas/sas_init.c | 29 +++++++++++++++-- + drivers/scsi/libsas/sas_scsi_host.c | 61 +++++++++++++++++++++++++--------- + drivers/scsi/mvsas/mv_sas.c | 20 ++++++------ + drivers/scsi/pm8001/pm8001_sas.c | 30 ++++++++-------- + include/scsi/libsas.h | 15 ++++++--- + 9 files changed, 125 insertions(+), 60 deletions(-) +Merging slave-dma/next (a1c4601 dmaengine/dw_dmac: Remove unused fields in struct dw_dma_slave) +$ git merge slave-dma/next +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/mmc/host/mmci.c +Auto-merging drivers/mmc/host/atmel-mci.c +Auto-merging drivers/dma/imx-sdma.c +Merge made by the 'recursive' strategy. + arch/avr32/mach-at32ap/at32ap700x.c | 13 -- + arch/avr32/mach-at32ap/include/mach/atmel-mci.h | 7 - + drivers/dma/amba-pl08x.c | 6 +- + drivers/dma/dw_dmac.c | 183 +++++++++++++++-------- + drivers/dma/dw_dmac_regs.h | 15 ++ + drivers/dma/imx-dma.c | 9 +- + drivers/dma/imx-sdma.c | 140 +++++++++--------- + drivers/dma/intel_mid_dma.c | 5 +- + drivers/dma/pl330.c | 17 ++- + drivers/mmc/host/atmel-mci.c | 24 ++- + drivers/mmc/host/mmci.c | 2 + + drivers/mmc/host/mxcmmc.c | 3 + + drivers/spi/spi-dw-mid.c | 3 + + drivers/spi/spi-pl022.c | 2 + + drivers/tty/serial/amba-pl011.c | 3 + + drivers/usb/musb/ux500_dma.c | 1 + + include/linux/amba/pl08x.h | 8 +- + include/linux/dmaengine.h | 5 + + include/linux/dw_dmac.h | 38 ----- + sound/atmel/abdac.c | 18 ++- + sound/atmel/ac97c.c | 41 ++++- + sound/soc/imx/imx-pcm-dma-mx2.c | 4 + + 22 files changed, 315 insertions(+), 232 deletions(-) +Merging dmaengine/next (d07a74a dmaengine: fix missing 'cnt' in ?: in dmatest) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (2556cd8 mdio.h: Include linux/types.h) +$ git merge net-next/master +Recorded preimage for 'drivers/net/vmxnet3/vmxnet3_drv.c' +Auto-merging net/batman-adv/bat_algo.h +Auto-merging drivers/net/wireless/mwifiex/cfg80211.c +Auto-merging drivers/net/wireless/ath/carl9170/tx.c +Auto-merging drivers/net/vmxnet3/vmxnet3_drv.c +CONFLICT (content): Merge conflict in drivers/net/vmxnet3/vmxnet3_drv.c +Auto-merging drivers/net/ethernet/smsc/smc91x.c +Removing drivers/net/ethernet/sfc/mac.h +Auto-merging drivers/net/ethernet/realtek/r8169.c +Auto-merging drivers/net/ethernet/intel/e1000e/mac.c +Auto-merging drivers/infiniband/hw/nes/nes_cm.c +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Auto-merging arch/ia64/hp/sim/simeth.c +Auto-merging arch/blackfin/mach-bf537/boards/stamp.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/vmxnet3/vmxnet3_drv.c'. +[master be6dad3] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-net-mesh | 7 + + Documentation/DocBook/80211.tmpl | 1 - + Documentation/magic-number.txt | 2 +- + Documentation/networking/LICENSE.qlge | 328 +- + Documentation/networking/netdev-features.txt | 13 + + Documentation/networking/phy.txt | 3 +- + Documentation/zh_CN/magic-number.txt | 2 +- + MAINTAINERS | 14 +- + arch/alpha/include/asm/socket.h | 4 + + arch/arm/include/asm/socket.h | 4 + + arch/avr32/include/asm/socket.h | 4 + + arch/blackfin/mach-bf518/boards/ezbrd.c | 3 +- + arch/blackfin/mach-bf518/boards/tcm-bf518.c | 5 +- + arch/blackfin/mach-bf527/boards/ad7160eval.c | 3 +- + arch/blackfin/mach-bf527/boards/cm_bf527.c | 5 +- + arch/blackfin/mach-bf527/boards/ezbrd.c | 3 +- + arch/blackfin/mach-bf527/boards/ezkit.c | 3 +- + arch/blackfin/mach-bf527/boards/tll6527m.c | 3 +- + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 5 +- + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 5 +- + arch/blackfin/mach-bf537/boards/dnp5370.c | 3 +- + arch/blackfin/mach-bf537/boards/pnav10.c | 5 +- + arch/blackfin/mach-bf537/boards/stamp.c | 3 +- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 5 +- + arch/cris/include/asm/socket.h | 4 + + arch/frv/include/asm/socket.h | 4 + + arch/h8300/include/asm/socket.h | 4 + + arch/ia64/hp/sim/simeth.c | 10 +- + arch/ia64/include/asm/socket.h | 4 + + arch/m32r/include/asm/socket.h | 4 + + arch/m68k/include/asm/socket.h | 4 + + arch/mips/include/asm/socket.h | 4 + + arch/mips/pci/pci-bcm47xx.c | 49 +- + arch/mn10300/include/asm/socket.h | 4 + + arch/parisc/include/asm/socket.h | 5 + + arch/powerpc/include/asm/socket.h | 4 + + arch/s390/include/asm/qeth.h | 7 + + arch/s390/include/asm/socket.h | 4 + + arch/sparc/include/asm/socket.h | 5 + + arch/um/drivers/net_kern.c | 11 +- + arch/xtensa/include/asm/socket.h | 4 + + crypto/crypto_user.c | 10 +- + drivers/atm/lanai.c | 2 +- + drivers/bcma/bcma_private.h | 8 +- + drivers/bcma/driver_pci.c | 168 +- + drivers/bcma/driver_pci_host.c | 578 +- + drivers/bcma/host_pci.c | 4 +- + drivers/bcma/main.c | 14 +- + drivers/bcma/scan.c | 24 +- + drivers/bcma/sprom.c | 187 +- + drivers/infiniband/core/addr.c | 14 +- + drivers/infiniband/core/netlink.c | 10 +- + drivers/infiniband/hw/cxgb4/cm.c | 10 +- + drivers/infiniband/hw/nes/nes_cm.c | 8 +- + drivers/isdn/act2000/act2000.h | 28 +- + drivers/isdn/act2000/act2000_isa.c | 394 +- + drivers/isdn/act2000/act2000_isa.h | 32 +- + drivers/isdn/act2000/capi.c | 998 +- + drivers/isdn/act2000/capi.h | 50 +- + drivers/isdn/act2000/module.c | 806 +- + drivers/isdn/capi/capi.c | 178 +- + drivers/isdn/capi/capidrv.c | 956 +- + drivers/isdn/capi/capidrv.h | 42 +- + drivers/isdn/capi/capilib.c | 16 +- + drivers/isdn/capi/capiutil.c | 628 +- + drivers/isdn/capi/kcapi.c | 116 +- + drivers/isdn/capi/kcapi.h | 11 +- + drivers/isdn/capi/kcapi_proc.c | 14 +- + drivers/isdn/divert/divert_init.c | 75 +- + drivers/isdn/divert/divert_procfs.c | 152 +- + drivers/isdn/divert/isdn_divert.c | 1475 +- + drivers/isdn/divert/isdn_divert.h | 116 +- + drivers/isdn/gigaset/asyncdata.c | 4 +- + drivers/isdn/gigaset/bas-gigaset.c | 42 +- + drivers/isdn/gigaset/capi.c | 228 +- + drivers/isdn/gigaset/common.c | 14 +- + drivers/isdn/gigaset/ev-layer.c | 328 +- + drivers/isdn/gigaset/gigaset.h | 30 +- + drivers/isdn/gigaset/i4l.c | 8 +- + drivers/isdn/gigaset/interface.c | 20 +- + drivers/isdn/gigaset/isocdata.c | 192 +- + drivers/isdn/gigaset/proc.c | 4 +- + drivers/isdn/gigaset/ser-gigaset.c | 6 +- + drivers/isdn/gigaset/usb-gigaset.c | 8 +- + drivers/isdn/hardware/avm/avm_cs.c | 134 +- + drivers/isdn/hardware/avm/avmcard.h | 286 +- + drivers/isdn/hardware/avm/b1.c | 192 +- + drivers/isdn/hardware/avm/b1dma.c | 178 +- + drivers/isdn/hardware/avm/b1isa.c | 18 +- + drivers/isdn/hardware/avm/b1pci.c | 44 +- + drivers/isdn/hardware/avm/b1pcmcia.c | 28 +- + drivers/isdn/hardware/avm/c4.c | 348 +- + drivers/isdn/hardware/avm/t1isa.c | 100 +- + drivers/isdn/hardware/avm/t1pci.c | 32 +- + drivers/isdn/hardware/eicon/capi20.h | 514 +- + drivers/isdn/hardware/eicon/capidtmf.c | 1094 +- + drivers/isdn/hardware/eicon/capidtmf.h | 78 +- + drivers/isdn/hardware/eicon/capifunc.c | 222 +- + drivers/isdn/hardware/eicon/capifunc.h | 4 +- + drivers/isdn/hardware/eicon/capimain.c | 10 +- + drivers/isdn/hardware/eicon/cardtype.h | 1476 +- + drivers/isdn/hardware/eicon/cp_vers.h | 32 +- + drivers/isdn/hardware/eicon/dadapter.c | 576 +- + drivers/isdn/hardware/eicon/dadapter.h | 36 +- + drivers/isdn/hardware/eicon/debug.c | 3519 ++-- + drivers/isdn/hardware/eicon/debug_if.h | 82 +- + drivers/isdn/hardware/eicon/debuglib.c | 176 +- + drivers/isdn/hardware/eicon/debuglib.h | 272 +- + drivers/isdn/hardware/eicon/dfifo.h | 56 +- + drivers/isdn/hardware/eicon/di.c | 1430 +- + drivers/isdn/hardware/eicon/di.h | 156 +- + drivers/isdn/hardware/eicon/di_dbg.h | 34 +- + drivers/isdn/hardware/eicon/di_defs.h | 144 +- + drivers/isdn/hardware/eicon/did_vers.h | 32 +- + drivers/isdn/hardware/eicon/diddfunc.c | 22 +- + drivers/isdn/hardware/eicon/diva.c | 160 +- + drivers/isdn/hardware/eicon/diva_didd.c | 16 +- + drivers/isdn/hardware/eicon/diva_dma.c | 116 +- + drivers/isdn/hardware/eicon/diva_dma.h | 62 +- + drivers/isdn/hardware/eicon/diva_pci.h | 6 +- + drivers/isdn/hardware/eicon/divacapi.h | 630 +- + drivers/isdn/hardware/eicon/divamnt.c | 15 +- + drivers/isdn/hardware/eicon/divasfunc.c | 34 +- + drivers/isdn/hardware/eicon/divasi.c | 56 +- + drivers/isdn/hardware/eicon/divasmain.c | 118 +- + drivers/isdn/hardware/eicon/divasproc.c | 58 +- + drivers/isdn/hardware/eicon/divasync.h | 562 +- + drivers/isdn/hardware/eicon/dqueue.c | 14 +- + drivers/isdn/hardware/eicon/dqueue.h | 14 +- + drivers/isdn/hardware/eicon/dsp_defs.h | 256 +- + drivers/isdn/hardware/eicon/dsp_tst.h | 8 +- + drivers/isdn/hardware/eicon/dspdids.h | 30 +- + drivers/isdn/hardware/eicon/dsrv4bri.h | 34 +- + drivers/isdn/hardware/eicon/dsrv_bri.h | 44 +- + drivers/isdn/hardware/eicon/dsrv_pri.h | 46 +- + drivers/isdn/hardware/eicon/entity.h | 14 +- + drivers/isdn/hardware/eicon/helpers.h | 68 +- + drivers/isdn/hardware/eicon/idifunc.c | 22 +- + drivers/isdn/hardware/eicon/io.c | 1414 +- + drivers/isdn/hardware/eicon/io.h | 514 +- + drivers/isdn/hardware/eicon/istream.c | 352 +- + drivers/isdn/hardware/eicon/kst_ifc.h | 227 +- + drivers/isdn/hardware/eicon/maintidi.c | 2277 +- + drivers/isdn/hardware/eicon/maintidi.h | 105 +- + drivers/isdn/hardware/eicon/man_defs.h | 36 +- + drivers/isdn/hardware/eicon/mdm_msg.h | 72 +- + drivers/isdn/hardware/eicon/message.c |28300 ++++++++++---------- + drivers/isdn/hardware/eicon/mi_pc.h | 86 +- + drivers/isdn/hardware/eicon/mntfunc.c | 186 +- + drivers/isdn/hardware/eicon/os_4bri.c | 352 +- + drivers/isdn/hardware/eicon/os_4bri.h | 2 +- + drivers/isdn/hardware/eicon/os_bri.c | 262 +- + drivers/isdn/hardware/eicon/os_bri.h | 2 +- + drivers/isdn/hardware/eicon/os_capi.h | 10 +- + drivers/isdn/hardware/eicon/os_pri.c | 390 +- + drivers/isdn/hardware/eicon/os_pri.h | 2 +- + drivers/isdn/hardware/eicon/pc.h | 268 +- + drivers/isdn/hardware/eicon/pc_init.h | 48 +- + drivers/isdn/hardware/eicon/pc_maint.h | 158 +- + drivers/isdn/hardware/eicon/pkmaint.h | 43 +- + drivers/isdn/hardware/eicon/platform.h | 156 +- + drivers/isdn/hardware/eicon/pr_pc.h | 116 +- + drivers/isdn/hardware/eicon/s_4bri.c | 488 +- + drivers/isdn/hardware/eicon/s_bri.c | 288 +- + drivers/isdn/hardware/eicon/s_pri.c | 314 +- + drivers/isdn/hardware/eicon/sdp_hdr.h | 130 +- + drivers/isdn/hardware/eicon/um_idi.c | 224 +- + drivers/isdn/hardware/eicon/um_idi.h | 2 +- + drivers/isdn/hardware/eicon/xdi_adapter.h | 12 +- + drivers/isdn/hardware/eicon/xdi_msg.h | 2 +- + drivers/isdn/hardware/eicon/xdi_vers.h | 32 +- + drivers/isdn/hardware/mISDN/avmfritz.c | 68 +- + drivers/isdn/hardware/mISDN/hfc_multi.h | 47 +- + drivers/isdn/hardware/mISDN/hfc_multi_8xx.h | 28 +- + drivers/isdn/hardware/mISDN/hfc_pci.h | 18 +- + drivers/isdn/hardware/mISDN/hfcmulti.c | 1364 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 356 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 415 +- + drivers/isdn/hardware/mISDN/hfcsusb.h | 120 +- + drivers/isdn/hardware/mISDN/iohelper.h | 136 +- + drivers/isdn/hardware/mISDN/isar.h | 2 +- + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 36 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 112 +- + drivers/isdn/hardware/mISDN/mISDNisar.c | 208 +- + drivers/isdn/hardware/mISDN/netjet.c | 98 +- + drivers/isdn/hardware/mISDN/netjet.h | 1 - + drivers/isdn/hardware/mISDN/speedfax.c | 22 +- + drivers/isdn/hardware/mISDN/w6692.c | 86 +- + drivers/isdn/hisax/amd7930_fn.c | 786 +- + drivers/isdn/hisax/arcofi.c | 88 +- + drivers/isdn/hisax/arcofi.h | 2 +- + drivers/isdn/hisax/asuscom.c | 110 +- + drivers/isdn/hisax/avm_a1.c | 42 +- + drivers/isdn/hisax/avm_a1p.c | 152 +- + drivers/isdn/hisax/avm_pci.c | 324 +- + drivers/isdn/hisax/avma1_cs.c | 124 +- + drivers/isdn/hisax/bkm_a4t.c | 92 +- + drivers/isdn/hisax/bkm_a8.c | 184 +- + drivers/isdn/hisax/bkm_ax.h | 78 +- + drivers/isdn/hisax/callc.c | 1074 +- + drivers/isdn/hisax/config.c | 126 +- + drivers/isdn/hisax/diva.c | 334 +- + drivers/isdn/hisax/elsa.c | 500 +- + drivers/isdn/hisax/elsa_cs.c | 164 +- + drivers/isdn/hisax/elsa_ser.c | 178 +- + drivers/isdn/hisax/enternow_pci.c | 200 +- + drivers/isdn/hisax/fsm.c | 38 +- + drivers/isdn/hisax/fsm.h | 4 +- + drivers/isdn/hisax/gazel.c | 518 +- + drivers/isdn/hisax/hfc4s8s_l1.c | 648 +- + drivers/isdn/hisax/hfc4s8s_l1.h | 8 +- + drivers/isdn/hisax/hfc_2bds0.c | 484 +- + drivers/isdn/hisax/hfc_2bds0.h | 28 +- + drivers/isdn/hisax/hfc_2bs0.c | 284 +- + drivers/isdn/hisax/hfc_2bs0.h | 6 +- + drivers/isdn/hisax/hfc_pci.c | 714 +- + drivers/isdn/hisax/hfc_pci.h | 96 +- + drivers/isdn/hisax/hfc_sx.c | 1126 +- + drivers/isdn/hisax/hfc_sx.h | 30 +- + drivers/isdn/hisax/hfc_usb.c | 586 +- + drivers/isdn/hisax/hfc_usb.h | 10 +- + drivers/isdn/hisax/hfcscard.c | 96 +- + drivers/isdn/hisax/hisax.h | 172 +- + drivers/isdn/hisax/hisax_cfg.h | 6 +- + drivers/isdn/hisax/hisax_debug.h | 42 +- + drivers/isdn/hisax/hisax_fcpcipnp.c | 92 +- + drivers/isdn/hisax/hisax_fcpcipnp.h | 3 +- + drivers/isdn/hisax/hisax_if.h | 4 +- + drivers/isdn/hisax/hisax_isac.c | 44 +- + drivers/isdn/hisax/hscx.c | 136 +- + drivers/isdn/hisax/hscx.h | 2 +- + drivers/isdn/hisax/hscx_irq.c | 18 +- + drivers/isdn/hisax/icc.c | 314 +- + drivers/isdn/hisax/icc.h | 6 +- + drivers/isdn/hisax/ipac.h | 2 +- + drivers/isdn/hisax/ipacx.c | 675 +- + drivers/isdn/hisax/isac.c | 320 +- + drivers/isdn/hisax/isac.h | 2 +- + drivers/isdn/hisax/isar.c | 1796 +- + drivers/isdn/hisax/isar.h | 14 +- + drivers/isdn/hisax/isdnl1.c | 262 +- + drivers/isdn/hisax/isdnl2.c | 342 +- + drivers/isdn/hisax/isdnl2.h | 1 - + drivers/isdn/hisax/isdnl3.c | 174 +- + drivers/isdn/hisax/isdnl3.h | 3 +- + drivers/isdn/hisax/isurf.c | 118 +- + drivers/isdn/hisax/ix1_micro.c | 100 +- + drivers/isdn/hisax/jade.c | 209 +- + drivers/isdn/hisax/jade.h | 156 +- + drivers/isdn/hisax/jade_irq.c | 48 +- + drivers/isdn/hisax/l3_1tr6.c | 196 +- + drivers/isdn/hisax/l3dss1.c | 1900 +- + drivers/isdn/hisax/l3dss1.h | 20 +- + drivers/isdn/hisax/l3ni1.c | 1838 +- + drivers/isdn/hisax/l3ni1.h | 28 +- + drivers/isdn/hisax/lmgr.c | 28 +- + drivers/isdn/hisax/mic.c | 64 +- + drivers/isdn/hisax/netjet.c | 623 +- + drivers/isdn/hisax/netjet.h | 5 +- + drivers/isdn/hisax/niccy.c | 78 +- + drivers/isdn/hisax/nj_s.c | 112 +- + drivers/isdn/hisax/nj_u.c | 100 +- + drivers/isdn/hisax/q931.c | 240 +- + drivers/isdn/hisax/s0box.c | 132 +- + drivers/isdn/hisax/saphir.c | 122 +- + drivers/isdn/hisax/sedlbauer.c | 328 +- + drivers/isdn/hisax/sedlbauer_cs.c | 176 +- + drivers/isdn/hisax/sportster.c | 126 +- + drivers/isdn/hisax/st5481.h | 98 +- + drivers/isdn/hisax/st5481_b.c | 124 +- + drivers/isdn/hisax/st5481_d.c | 194 +- + drivers/isdn/hisax/st5481_init.c | 64 +- + drivers/isdn/hisax/st5481_usb.c | 269 +- + drivers/isdn/hisax/tei.c | 76 +- + drivers/isdn/hisax/teleint.c | 126 +- + drivers/isdn/hisax/teles0.c | 126 +- + drivers/isdn/hisax/teles3.c | 156 +- + drivers/isdn/hisax/teles_cs.c | 134 +- + drivers/isdn/hisax/telespci.c | 80 +- + drivers/isdn/hisax/w6692.c | 412 +- + drivers/isdn/hisax/w6692.h | 10 +- + drivers/isdn/hysdn/boardergo.c | 28 +- + drivers/isdn/hysdn/boardergo.h | 30 +- + drivers/isdn/hysdn/hycapi.c | 374 +- + drivers/isdn/hysdn/hysdn_boot.c | 302 +- + drivers/isdn/hysdn/hysdn_defs.h | 30 +- + drivers/isdn/hysdn/hysdn_init.c | 4 +- + drivers/isdn/hysdn/hysdn_net.c | 20 +- + drivers/isdn/hysdn/hysdn_pof.h | 26 +- + drivers/isdn/hysdn/hysdn_procconf.c | 10 +- + drivers/isdn/hysdn/hysdn_proclog.c | 26 +- + drivers/isdn/hysdn/hysdn_sched.c | 54 +- + drivers/isdn/hysdn/ince1pc.h | 72 +- + drivers/isdn/i4l/isdn_audio.c | 126 +- + drivers/isdn/i4l/isdn_bsdcomp.c | 374 +- + drivers/isdn/i4l/isdn_common.c | 1502 +- + drivers/isdn/i4l/isdn_common.h | 18 +- + drivers/isdn/i4l/isdn_concap.c | 36 +- + drivers/isdn/i4l/isdn_concap.h | 4 +- + drivers/isdn/i4l/isdn_net.c | 1498 +- + drivers/isdn/i4l/isdn_net.h | 11 +- + drivers/isdn/i4l/isdn_ppp.c | 1446 +- + drivers/isdn/i4l/isdn_ppp.h | 2 - + drivers/isdn/i4l/isdn_tty.c | 2442 +- + drivers/isdn/i4l/isdn_tty.h | 10 +- + drivers/isdn/i4l/isdn_ttyfax.c | 1092 +- + drivers/isdn/i4l/isdn_ttyfax.h | 1 - + drivers/isdn/i4l/isdn_v110.c | 294 +- + drivers/isdn/i4l/isdn_v110.h | 8 +- + drivers/isdn/i4l/isdn_x25iface.c | 226 +- + drivers/isdn/i4l/isdn_x25iface.h | 16 +- + drivers/isdn/i4l/isdnhdlc.c | 54 +- + drivers/isdn/icn/icn.c | 806 +- + drivers/isdn/icn/icn.h | 32 +- + drivers/isdn/isdnloop/isdnloop.c | 958 +- + drivers/isdn/isdnloop/isdnloop.h | 6 +- + drivers/isdn/mISDN/clock.c | 25 +- + drivers/isdn/mISDN/core.c | 37 +- + drivers/isdn/mISDN/core.h | 8 +- + drivers/isdn/mISDN/dsp.h | 25 +- + drivers/isdn/mISDN/dsp_audio.c | 5 +- + drivers/isdn/mISDN/dsp_biquad.h | 6 +- + drivers/isdn/mISDN/dsp_blowfish.c | 112 +- + drivers/isdn/mISDN/dsp_cmx.c | 1040 +- + drivers/isdn/mISDN/dsp_core.c | 183 +- + drivers/isdn/mISDN/dsp_dtmf.c | 66 +- + drivers/isdn/mISDN/dsp_ecdis.h | 26 +- + drivers/isdn/mISDN/dsp_hwec.c | 11 +- + drivers/isdn/mISDN/dsp_hwec.h | 1 - + drivers/isdn/mISDN/dsp_pipeline.c | 56 +- + drivers/isdn/mISDN/dsp_tones.c | 165 +- + drivers/isdn/mISDN/fsm.c | 42 +- + drivers/isdn/mISDN/hwchannel.c | 22 +- + drivers/isdn/mISDN/l1oip.h | 21 +- + drivers/isdn/mISDN/l1oip_codec.c | 36 +- + drivers/isdn/mISDN/l1oip_core.c | 597 +- + drivers/isdn/mISDN/layer1.c | 16 +- + drivers/isdn/mISDN/layer1.h | 1 - + drivers/isdn/mISDN/layer2.c | 97 +- + drivers/isdn/mISDN/layer2.h | 12 +- + drivers/isdn/mISDN/socket.c | 89 +- + drivers/isdn/mISDN/stack.c | 124 +- + drivers/isdn/mISDN/tei.c | 114 +- + drivers/isdn/mISDN/timerdev.c | 12 +- + drivers/isdn/pcbit/callbacks.c | 303 +- + drivers/isdn/pcbit/callbacks.h | 28 +- + drivers/isdn/pcbit/capi.c | 585 +- + drivers/isdn/pcbit/capi.h | 46 +- + drivers/isdn/pcbit/drv.c | 248 +- + drivers/isdn/pcbit/edss1.c | 414 +- + drivers/isdn/pcbit/edss1.h | 13 +- + drivers/isdn/pcbit/layer2.c | 36 +- + drivers/isdn/pcbit/layer2.h | 265 +- + drivers/isdn/pcbit/module.c | 35 +- + drivers/isdn/pcbit/pcbit.h | 32 +- + drivers/isdn/sc/card.h | 2 +- + drivers/isdn/sc/command.c | 132 +- + drivers/isdn/sc/event.c | 24 +- + drivers/isdn/sc/hardware.h | 2 +- + drivers/isdn/sc/init.c | 122 +- + drivers/isdn/sc/interrupt.c | 144 +- + drivers/isdn/sc/ioctl.c | 220 +- + drivers/isdn/sc/message.c | 126 +- + drivers/isdn/sc/message.h | 18 +- + drivers/isdn/sc/packet.c | 129 +- + drivers/isdn/sc/scioc.h | 5 +- + drivers/isdn/sc/shmem.c | 52 +- + drivers/isdn/sc/timer.c | 25 +- + drivers/net/bonding/bond_3ad.c | 2 +- + drivers/net/bonding/bond_alb.c | 12 +- + drivers/net/caif/caif_hsi.c | 145 +- + drivers/net/can/Kconfig | 6 +- + drivers/net/can/bfin_can.c | 36 +- + drivers/net/can/dev.c | 33 +- + drivers/net/can/flexcan.c | 61 +- + drivers/net/can/mcp251x.c | 3 +- + drivers/net/can/mscan/mscan.c | 33 +- + drivers/net/can/pch_can.c | 2 +- + drivers/net/can/sja1000/Kconfig | 1 + + drivers/net/can/sja1000/plx_pci.c | 22 +- + drivers/net/can/sja1000/sja1000.c | 19 +- + drivers/net/can/slcan.c | 6 +- + drivers/net/can/ti_hecc.c | 32 +- + drivers/net/can/usb/ems_usb.c | 63 +- + drivers/net/can/usb/esd_usb2.c | 27 +- + drivers/net/dummy.c | 3 +- + drivers/net/ethernet/3com/3c501.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 2 +- + drivers/net/ethernet/3com/3c515.c | 10 +- + drivers/net/ethernet/3com/3c574_cs.c | 2 +- + drivers/net/ethernet/3com/3c589_cs.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 10 +- + drivers/net/ethernet/3com/Kconfig | 2 +- + drivers/net/ethernet/3com/typhoon.c | 19 +- + drivers/net/ethernet/8390/ax88796.c | 2 +- + drivers/net/ethernet/8390/axnet_cs.c | 4 +- + drivers/net/ethernet/8390/lib8390.c | 2 +- + drivers/net/ethernet/8390/pcnet_cs.c | 2 +- + drivers/net/ethernet/adaptec/starfire.c | 13 +- + drivers/net/ethernet/adi/bfin_mac.c | 27 +- + drivers/net/ethernet/adi/bfin_mac.h | 2 +- + drivers/net/ethernet/aeroflex/greth.c | 5 +- + drivers/net/ethernet/alteon/acenic.c | 5 +- + drivers/net/ethernet/amd/7990.c | 2 +- + drivers/net/ethernet/amd/Kconfig | 2 +- + drivers/net/ethernet/amd/a2065.c | 2 +- + drivers/net/ethernet/amd/am79c961a.c | 4 +- + drivers/net/ethernet/amd/am79c961a.h | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 7 +- + drivers/net/ethernet/amd/ariadne.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/amd/au1000_eth.c | 12 +- + drivers/net/ethernet/amd/declance.c | 4 +- + drivers/net/ethernet/amd/depca.c | 2 +- + drivers/net/ethernet/amd/hplance.c | 10 +- + drivers/net/ethernet/amd/ni65.c | 6 +- + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 16 +- + drivers/net/ethernet/amd/sun3lance.c | 2 +- + drivers/net/ethernet/amd/sunlance.c | 4 +- + drivers/net/ethernet/apple/bmac.c | 19 +- + drivers/net/ethernet/apple/mace.c | 9 +- + drivers/net/ethernet/apple/macmace.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 12 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 1 - + drivers/net/ethernet/atheros/atlx/atl1.c | 12 +- + drivers/net/ethernet/atheros/atlx/atlx.c | 1 + + drivers/net/ethernet/broadcom/b44.c | 1 - + drivers/net/ethernet/broadcom/bnx2.c | 108 +- + drivers/net/ethernet/broadcom/bnx2.h | 3 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 33 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 261 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 122 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | 2 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 100 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 2 +- + .../ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 59 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h | 55 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 324 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 365 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 21 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 7 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 342 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 154 +- + drivers/net/ethernet/broadcom/cnic.c | 42 +- + drivers/net/ethernet/broadcom/cnic_defs.h | 27 +- + drivers/net/ethernet/broadcom/cnic_if.h | 4 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 2 - + drivers/net/ethernet/broadcom/tg3.c | 1920 +- + drivers/net/ethernet/broadcom/tg3.h | 14 +- + drivers/net/ethernet/brocade/bna/bfa_cee.c | 8 +- + drivers/net/ethernet/brocade/bna/bfa_defs.h | 1 + + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 +- + drivers/net/ethernet/brocade/bna/bnad.c | 1 - + drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 21 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 42 + + drivers/net/ethernet/cadence/at91_ether.c | 2 +- + drivers/net/ethernet/cadence/macb.c | 8 +- + drivers/net/ethernet/calxeda/xgmac.c | 3 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/version.h | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 4 +- + drivers/net/ethernet/cirrus/cs89x0.c | 4 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 4 +- + drivers/net/ethernet/cirrus/mac89x0.c | 12 +- + drivers/net/ethernet/cisco/enic/enic.h | 4 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 50 +- + drivers/net/ethernet/cisco/enic/enic_pp.c | 4 +- + drivers/net/ethernet/cisco/enic/enic_res.c | 2 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 76 +- + drivers/net/ethernet/cisco/enic/vnic_dev.h | 3 +- + drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 11 +- + drivers/net/ethernet/cisco/enic/vnic_rq.c | 4 +- + drivers/net/ethernet/cisco/enic/vnic_wq.c | 4 +- + drivers/net/ethernet/davicom/dm9000.c | 8 +- + drivers/net/ethernet/dec/ewrk3.c | 4 +- + drivers/net/ethernet/dec/tulip/21142.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 6 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 10 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 20 +- + drivers/net/ethernet/dec/tulip/eeprom.c | 2 +- + drivers/net/ethernet/dec/tulip/interrupt.c | 10 +- + drivers/net/ethernet/dec/tulip/media.c | 2 +- + drivers/net/ethernet/dec/tulip/pnic.c | 2 +- + drivers/net/ethernet/dec/tulip/pnic2.c | 2 +- + drivers/net/ethernet/dec/tulip/timer.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip.h | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 9 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 21 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 6 +- + drivers/net/ethernet/dec/tulip/xircom_cb.c | 7 +- + drivers/net/ethernet/dlink/de600.c | 2 +- + drivers/net/ethernet/dlink/de620.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 11 +- + drivers/net/ethernet/dnet.c | 8 +- + drivers/net/ethernet/emulex/benet/be.h | 78 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 107 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 54 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 160 +- + drivers/net/ethernet/emulex/benet/be_main.c | 948 +- + drivers/net/ethernet/ethoc.c | 23 +- + drivers/net/ethernet/faraday/ftgmac100.c | 2 +- + drivers/net/ethernet/faraday/ftmac100.c | 2 +- + drivers/net/ethernet/fealnx.c | 8 +- + drivers/net/ethernet/freescale/fec.c | 21 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 4 +- + drivers/net/ethernet/freescale/fec_mpc52xx.h | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 12 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/gianfar.h | 2 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 2 +- + drivers/net/ethernet/freescale/gianfar_sysfs.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 7 +- + drivers/net/ethernet/fujitsu/at1700.c | 2 +- + drivers/net/ethernet/fujitsu/eth16i.c | 2 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 +- + drivers/net/ethernet/hp/hp100.c | 6 +- + drivers/net/ethernet/i825xx/3c505.c | 2 +- + drivers/net/ethernet/i825xx/3c507.c | 2 +- + drivers/net/ethernet/i825xx/3c523.c | 2 +- + drivers/net/ethernet/i825xx/3c527.c | 4 +- + drivers/net/ethernet/i825xx/82596.c | 8 +- + drivers/net/ethernet/i825xx/eepro.c | 2 +- + drivers/net/ethernet/i825xx/eexpress.c | 2 +- + drivers/net/ethernet/i825xx/ether1.c | 2 +- + drivers/net/ethernet/i825xx/lp486e.c | 4 +- + drivers/net/ethernet/i825xx/ni52.c | 2 +- + drivers/net/ethernet/i825xx/sun3_82586.c | 27 +- + drivers/net/ethernet/i825xx/znet.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea.h | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_hw.h | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 3 +- + drivers/net/ethernet/ibm/ehea/ehea_phyp.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_phyp.h | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_qmr.h | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 8 +- + drivers/net/ethernet/ibm/emac/core.h | 2 +- + drivers/net/ethernet/ibm/emac/debug.c | 2 +- + drivers/net/ethernet/ibm/emac/debug.h | 2 +- + drivers/net/ethernet/ibm/emac/emac.h | 2 +- + drivers/net/ethernet/ibm/emac/mal.c | 2 +- + drivers/net/ethernet/ibm/emac/mal.h | 2 +- + drivers/net/ethernet/ibm/emac/phy.c | 2 +- + drivers/net/ethernet/ibm/emac/phy.h | 2 +- + drivers/net/ethernet/ibm/emac/rgmii.c | 7 +- + drivers/net/ethernet/ibm/emac/rgmii.h | 2 +- + drivers/net/ethernet/ibm/emac/tah.c | 7 +- + drivers/net/ethernet/ibm/emac/tah.h | 2 +- + drivers/net/ethernet/ibm/emac/zmii.c | 7 +- + drivers/net/ethernet/ibm/emac/zmii.h | 2 +- + drivers/net/ethernet/ibm/iseries_veth.c | 4 +- + drivers/net/ethernet/icplus/ipg.c | 4 - + drivers/net/ethernet/intel/e100.c | 84 +- + drivers/net/ethernet/intel/e1000/e1000.h | 1 + + drivers/net/ethernet/intel/e1000/e1000_hw.c | 156 +- + drivers/net/ethernet/intel/e1000/e1000_hw.h | 10 + + drivers/net/ethernet/intel/e1000/e1000_main.c | 249 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.c | 99 +- + drivers/net/ethernet/intel/e1000e/82571.c | 147 +- + drivers/net/ethernet/intel/e1000e/Makefile | 5 +- + drivers/net/ethernet/intel/e1000e/defines.h | 11 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 52 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 207 +- + drivers/net/ethernet/intel/e1000e/hw.h | 13 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 433 +- + drivers/net/ethernet/intel/e1000e/{lib.c => mac.c} | 1132 +- + drivers/net/ethernet/intel/e1000e/manage.c | 367 + + drivers/net/ethernet/intel/e1000e/netdev.c | 722 +- + drivers/net/ethernet/intel/e1000e/nvm.c | 643 + + drivers/net/ethernet/intel/e1000e/param.c | 55 +- + drivers/net/ethernet/intel/e1000e/phy.c | 327 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 + + drivers/net/ethernet/intel/igbvf/ethtool.c | 19 +- + drivers/net/ethernet/intel/igbvf/igbvf.h | 27 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 143 +- + drivers/net/ethernet/intel/ixgb/ixgb_ee.c | 12 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 30 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 59 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 724 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 14 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 42 +- + drivers/net/ethernet/jme.c | 1 - + drivers/net/ethernet/korina.c | 6 +- + drivers/net/ethernet/lantiq_etop.c | 15 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 17 +- + drivers/net/ethernet/marvell/skge.c | 4 +- + drivers/net/ethernet/marvell/sky2.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 21 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 38 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 1 - + drivers/net/ethernet/mellanox/mlx4/port.c | 2 - + drivers/net/ethernet/micrel/ks8695net.c | 8 +- + drivers/net/ethernet/micrel/ks8842.c | 3 +- + drivers/net/ethernet/micrel/ks8851.c | 11 +- + drivers/net/ethernet/micrel/ks8851.h | 2 +- + drivers/net/ethernet/micrel/ks8851_mll.c | 11 +- + drivers/net/ethernet/micrel/ksz884x.c | 8 +- + drivers/net/ethernet/microchip/enc28j60.c | 9 +- + drivers/net/ethernet/mipsnet.c | 4 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 4 +- + drivers/net/ethernet/natsemi/ibmlana.c | 2 +- + drivers/net/ethernet/natsemi/macsonic.c | 2 +- + drivers/net/ethernet/natsemi/natsemi.c | 5 +- + drivers/net/ethernet/natsemi/sonic.c | 4 +- + drivers/net/ethernet/neterion/s2io.c | 9 +- + drivers/net/ethernet/netx-eth.c | 5 +- + drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +- + drivers/net/ethernet/nvidia/forcedeth.c | 11 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 13 +- + drivers/net/ethernet/packetengines/hamachi.c | 8 +- + drivers/net/ethernet/packetengines/yellowfin.c | 13 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 6 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 437 +- + .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 296 +- + .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 109 + + .../net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 1 + + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 629 +- + .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 17 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 134 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 1 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 14 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 10 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 19 +- + drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +- + drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 4 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 86 +- + drivers/net/ethernet/racal/ni5010.c | 2 +- + drivers/net/ethernet/rdc/r6040.c | 3 +- + drivers/net/ethernet/realtek/8139too.c | 63 +- + drivers/net/ethernet/realtek/Kconfig | 10 +- + drivers/net/ethernet/realtek/atp.c | 2 +- + drivers/net/ethernet/realtek/r8169.c | 616 +- + drivers/net/ethernet/renesas/sh_eth.c | 439 +- + drivers/net/ethernet/renesas/sh_eth.h | 15 +- + drivers/net/ethernet/s6gmac.c | 15 +- + drivers/net/ethernet/seeq/ether3.c | 2 +- + drivers/net/ethernet/seeq/seeq8005.c | 2 +- + drivers/net/ethernet/seeq/sgiseeq.c | 1 - + drivers/net/ethernet/sfc/Kconfig | 21 +- + drivers/net/ethernet/sfc/Makefile | 3 +- + drivers/net/ethernet/sfc/bitfield.h | 22 +- + drivers/net/ethernet/sfc/efx.c | 868 +- + drivers/net/ethernet/sfc/efx.h | 11 +- + drivers/net/ethernet/sfc/ethtool.c | 200 +- + drivers/net/ethernet/sfc/falcon.c | 54 +- + drivers/net/ethernet/sfc/falcon_boards.c | 12 +- + drivers/net/ethernet/sfc/falcon_xmac.c | 15 +- + drivers/net/ethernet/sfc/filter.c | 255 +- + drivers/net/ethernet/sfc/filter.h | 20 +- + drivers/net/ethernet/sfc/mac.h | 21 - + drivers/net/ethernet/sfc/mcdi.c | 149 +- + drivers/net/ethernet/sfc/mcdi.h | 36 +- + drivers/net/ethernet/sfc/mcdi_mac.c | 65 +- + drivers/net/ethernet/sfc/mcdi_mon.c | 415 + + drivers/net/ethernet/sfc/mcdi_pcol.h | 3542 ++- + drivers/net/ethernet/sfc/mcdi_phy.c | 36 +- + drivers/net/ethernet/sfc/mdio_10g.c | 2 +- + drivers/net/ethernet/sfc/mtd.c | 15 +- + drivers/net/ethernet/sfc/net_driver.h | 321 +- + drivers/net/ethernet/sfc/nic.c | 593 +- + drivers/net/ethernet/sfc/nic.h | 122 +- + drivers/net/ethernet/sfc/qt202x_phy.c | 6 +- + drivers/net/ethernet/sfc/regs.h | 20 +- + drivers/net/ethernet/sfc/rx.c | 126 +- + drivers/net/ethernet/sfc/selftest.c | 110 +- + drivers/net/ethernet/sfc/selftest.h | 1 - + drivers/net/ethernet/sfc/siena.c | 47 +- + drivers/net/ethernet/sfc/siena_sriov.c | 1643 ++ + drivers/net/ethernet/sfc/spi.h | 2 +- + drivers/net/ethernet/sfc/tenxpress.c | 2 +- + drivers/net/ethernet/sfc/tx.c | 8 +- + drivers/net/ethernet/sfc/txc43128_phy.c | 2 +- + drivers/net/ethernet/sfc/vfdi.h | 255 + + drivers/net/ethernet/sis/sis190.c | 2 - + drivers/net/ethernet/sis/sis900.c | 9 +- + drivers/net/ethernet/smsc/epic100.c | 11 +- + drivers/net/ethernet/smsc/smc911x.c | 3 +- + drivers/net/ethernet/smsc/smc9194.c | 2 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 2 +- + drivers/net/ethernet/smsc/smc91x.c | 3 +- + drivers/net/ethernet/smsc/smsc911x.c | 4 +- + drivers/net/ethernet/smsc/smsc9420.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 4 +- + drivers/net/ethernet/sun/niu.c | 6 +- + drivers/net/ethernet/sun/sunbmac.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 1 - + drivers/net/ethernet/sun/sunhme.c | 2 +- + drivers/net/ethernet/sun/sunqe.c | 12 +- + drivers/net/ethernet/sun/sunvnet.c | 13 +- + drivers/net/ethernet/tehuti/tehuti.c | 8 +- + drivers/net/ethernet/ti/cpmac.c | 5 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 2 +- + drivers/net/ethernet/ti/davinci_emac.c | 11 +- + drivers/net/ethernet/ti/davinci_mdio.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 1 - + drivers/net/ethernet/tile/tilepro.c | 9 +- + drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 5 +- + drivers/net/ethernet/toshiba/tc35815.c | 9 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 6 +- + drivers/net/ethernet/via/via-rhine.c | 5 +- + drivers/net/ethernet/via/via-velocity.c | 6 +- + drivers/net/ethernet/xilinx/Kconfig | 8 + + drivers/net/ethernet/xilinx/Makefile | 2 + + drivers/net/ethernet/xilinx/ll_temac_main.c | 9 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 508 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1669 ++ + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 238 + + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 6 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 3 +- + drivers/net/ethernet/xscale/ixp2000/ixpdev.c | 7 +- + drivers/net/hamradio/baycom_epp.c | 2 +- + drivers/net/hamradio/baycom_par.c | 2 +- + drivers/net/hamradio/yam.c | 1 - + drivers/net/hippi/rrunner.c | 8 +- + drivers/net/hyperv/netvsc_drv.c | 7 +- + drivers/net/hyperv/rndis_filter.c | 60 +- + drivers/net/ifb.c | 2 +- + drivers/net/irda/donauboe.c | 2 - + drivers/net/macvlan.c | 3 +- + drivers/net/mdio.c | 3 + + drivers/net/mii.c | 4 +- + drivers/net/netconsole.c | 8 +- + drivers/net/phy/broadcom.c | 6 +- + drivers/net/plip/plip.c | 4 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/ppp/pptp.c | 4 +- + drivers/net/rionet.c | 2 - + drivers/net/slip/slip.c | 4 +- + drivers/net/team/team.c | 3 +- + drivers/net/tokenring/3c359.c | 4 - + drivers/net/tokenring/madgemc.c | 1 - + drivers/net/tokenring/tms380tr.c | 179 +- + drivers/net/tun.c | 2 +- + drivers/net/usb/Kconfig | 22 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/cdc_ncm.c | 6 +- + drivers/net/usb/kaweth.c | 8 +- + drivers/net/usb/mcs7830.c | 2 +- + drivers/net/usb/pegasus.c | 4 +- + drivers/net/usb/qmi_wwan.c | 228 + + drivers/net/usb/rtl8150.c | 4 +- + drivers/net/usb/smsc75xx.c | 2 +- + drivers/net/usb/smsc95xx.c | 2 +- + drivers/net/usb/usbnet.c | 4 +- + drivers/net/veth.c | 4 +- + drivers/net/virtio_net.c | 9 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 44 +- + drivers/net/wan/c101.c | 4 +- + drivers/net/wan/dscc4.c | 8 +- + drivers/net/wan/hdlc_fr.c | 2 +- + drivers/net/wan/hdlc_raw_eth.c | 2 +- + drivers/net/wan/lmc/lmc_main.c | 1 - + drivers/net/wan/n2.c | 4 +- + drivers/net/wan/pc300too.c | 1 - + drivers/net/wan/pci200syn.c | 1 - + drivers/net/wan/wanxl.c | 1 - + drivers/net/wan/x25_asy.c | 4 +- + drivers/net/wireless/ath/ath5k/ani.c | 8 +- + drivers/net/wireless/ath/ath5k/base.c | 5 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 8 + + drivers/net/wireless/ath/ath6kl/Kconfig | 25 +- + drivers/net/wireless/ath/ath6kl/Makefile | 30 +- + drivers/net/wireless/ath/ath6kl/bmi.c | 10 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 606 +- + drivers/net/wireless/ath/ath6kl/cfg80211.h | 12 +- + drivers/net/wireless/ath/ath6kl/common.h | 3 - + drivers/net/wireless/ath/ath6kl/core.c | 316 + + drivers/net/wireless/ath/ath6kl/core.h | 107 +- + drivers/net/wireless/ath/ath6kl/debug.c | 114 +- + drivers/net/wireless/ath/ath6kl/debug.h | 28 +- + drivers/net/wireless/ath/ath6kl/hif.c | 15 +- + drivers/net/wireless/ath/ath6kl/htc.c | 11 +- + drivers/net/wireless/ath/ath6kl/init.c | 472 +- + drivers/net/wireless/ath/ath6kl/main.c | 182 +- + drivers/net/wireless/ath/ath6kl/sdio.c | 140 +- + drivers/net/wireless/ath/ath6kl/testmode.c | 102 +- + drivers/net/wireless/ath/ath6kl/testmode.h | 6 +- + drivers/net/wireless/ath/ath6kl/txrx.c | 534 +- + drivers/net/wireless/ath/ath6kl/usb.c | 431 + + drivers/net/wireless/ath/ath6kl/wmi.c | 148 +- + drivers/net/wireless/ath/ath6kl/wmi.h | 67 +- + drivers/net/wireless/ath/ath9k/ani.c | 6 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 156 +- + drivers/net/wireless/ath/ath9k/hif_usb.h | 3 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 15 + + drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +- + drivers/net/wireless/ath/ath9k/hw-ops.h | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 5 +- + drivers/net/wireless/ath/ath9k/main.c | 4 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 2 +- + drivers/net/wireless/ath/carl9170/fw.c | 33 - + drivers/net/wireless/ath/carl9170/mac.c | 35 + + drivers/net/wireless/ath/carl9170/main.c | 18 +- + drivers/net/wireless/ath/carl9170/phy.c | 36 +- + drivers/net/wireless/ath/carl9170/tx.c | 2 + + drivers/net/wireless/atmel.c | 5 +- + drivers/net/wireless/b43/b43.h | 12 + + drivers/net/wireless/b43/main.c | 67 +- + drivers/net/wireless/b43/phy_n.c | 532 +- + drivers/net/wireless/b43/phy_n.h | 1 + + drivers/net/wireless/b43/tables_nphy.c | 76 +- + drivers/net/wireless/b43/tables_nphy.h | 14 +- + drivers/net/wireless/brcm80211/Makefile | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 + + .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 3 + + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 2 + + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 17 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 20 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 10 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 232 +- + .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 2 + + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 36 +- + drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 4 +- + drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 2 +- + drivers/net/wireless/brcm80211/brcmsmac/dma.c | 8 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 24 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 2 +- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 198 +- + drivers/net/wireless/brcm80211/brcmsmac/main.h | 6 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 7 +- + drivers/net/wireless/brcm80211/brcmutil/utils.c | 26 +- + .../net/wireless/brcm80211/include/brcmu_utils.h | 15 +- + drivers/net/wireless/hostap/hostap_hw.c | 18 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 5 +- + drivers/net/wireless/ipw2x00/libipw_module.c | 5 +- + drivers/net/wireless/ipw2x00/libipw_rx.c | 2 +- + drivers/net/wireless/iwlegacy/3945-mac.c | 186 +- + drivers/net/wireless/iwlegacy/3945-rs.c | 7 +- + drivers/net/wireless/iwlegacy/3945.c | 111 +- + drivers/net/wireless/iwlegacy/3945.h | 6 +- + drivers/net/wireless/iwlegacy/4965-calib.c | 24 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 512 +- + drivers/net/wireless/iwlegacy/4965-rs.c | 48 +- + drivers/net/wireless/iwlegacy/4965.c | 328 +- + drivers/net/wireless/iwlegacy/4965.h | 22 +- + drivers/net/wireless/iwlegacy/common.c | 656 +- + drivers/net/wireless/iwlegacy/common.h | 234 +- + drivers/net/wireless/iwlegacy/debug.c | 43 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-2000.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 38 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 814 +- + drivers/net/wireless/iwlwifi/iwl-agn.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-bus.h | 68 +- + drivers/net/wireless/iwlwifi/iwl-cfg.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 130 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 10 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 18 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 113 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 69 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 195 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 62 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-mac80211.c | 38 +- + drivers/net/wireless/iwlwifi/iwl-pci.c | 233 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 23 +- + drivers/net/wireless/iwlwifi/iwl-shared.h | 10 +- + drivers/net/wireless/iwlwifi/iwl-testmode.c | 94 +- + drivers/net/wireless/iwlwifi/iwl-testmode.h | 32 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 105 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 61 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 665 +- + drivers/net/wireless/iwlwifi/iwl-trans.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-trans.h | 137 +- + drivers/net/wireless/iwlwifi/iwl-ucode.c | 742 +- + drivers/net/wireless/iwlwifi/iwl-ucode.h | 178 + + drivers/net/wireless/iwlwifi/iwl-wifi.h | 4 +- + drivers/net/wireless/iwmc3200wifi/trace.h | 2 +- + drivers/net/wireless/libertas/if_cs.c | 5 +- + drivers/net/wireless/libertas/if_usb.c | 4 +- + drivers/net/wireless/libertas_tf/if_usb.c | 4 +- + drivers/net/wireless/mwifiex/11n_aggr.c | 3 +- + drivers/net/wireless/mwifiex/cfg80211.c | 46 +- + drivers/net/wireless/mwifiex/cmdevt.c | 3 +- + drivers/net/wireless/mwifiex/decl.h | 6 +- + drivers/net/wireless/mwifiex/init.c | 6 +- + drivers/net/wireless/mwifiex/main.c | 25 +- + drivers/net/wireless/mwifiex/main.h | 4 +- + drivers/net/wireless/mwifiex/pcie.c | 4 +- + drivers/net/wireless/mwifiex/scan.c | 2 +- + drivers/net/wireless/mwifiex/sdio.c | 4 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 60 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 3 + + drivers/net/wireless/mwifiex/sta_rx.c | 6 +- + drivers/net/wireless/mwifiex/sta_tx.c | 3 +- + drivers/net/wireless/mwifiex/txrx.c | 6 +- + drivers/net/wireless/mwifiex/util.c | 3 +- + drivers/net/wireless/mwifiex/wmm.c | 5 +- + drivers/net/wireless/mwifiex/wmm.h | 4 +- + drivers/net/wireless/mwl8k.c | 45 +- + drivers/net/wireless/orinoco/main.c | 6 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 5 - + drivers/net/wireless/p54/main.c | 3 +- + drivers/net/wireless/prism54/islpci_mgt.c | 6 +- + drivers/net/wireless/rt2x00/rt2800.h | 49 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 182 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 3 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 5 +- + drivers/net/wireless/rt2x00/rt2x00.h | 15 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 18 + + drivers/net/wireless/rtlwifi/Kconfig | 5 + + drivers/net/wireless/rtlwifi/base.c | 67 +- + drivers/net/wireless/rtlwifi/base.h | 2 +- + drivers/net/wireless/rtlwifi/cam.c | 85 +- + drivers/net/wireless/rtlwifi/cam.h | 2 +- + drivers/net/wireless/rtlwifi/core.c | 170 +- + drivers/net/wireless/rtlwifi/core.h | 6 +- + drivers/net/wireless/rtlwifi/debug.c | 4 +- + drivers/net/wireless/rtlwifi/debug.h | 121 +- + drivers/net/wireless/rtlwifi/efuse.c | 65 +- + drivers/net/wireless/rtlwifi/efuse.h | 2 +- + drivers/net/wireless/rtlwifi/pci.c | 280 +- + drivers/net/wireless/rtlwifi/pci.h | 3 +- + drivers/net/wireless/rtlwifi/ps.c | 39 +- + drivers/net/wireless/rtlwifi/ps.h | 2 +- + drivers/net/wireless/rtlwifi/rc.c | 4 +- + drivers/net/wireless/rtlwifi/rc.h | 2 +- + drivers/net/wireless/rtlwifi/regd.c | 14 +- + drivers/net/wireless/rtlwifi/regd.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 195 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 99 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/main.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 221 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 26 +- + drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 288 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 18 +- + drivers/net/wireless/rtlwifi/rtl8192ce/led.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 113 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 87 +- + drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 37 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/table.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/table.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 25 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/def.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 26 +- + drivers/net/wireless/rtlwifi/rtl8192cu/dm.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 464 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/led.c | 17 +- + drivers/net/wireless/rtlwifi/rtl8192cu/led.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 133 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 126 +- + drivers/net/wireless/rtlwifi/rtl8192cu/phy.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/reg.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 75 +- + drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 34 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/table.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/table.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 44 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/def.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 243 +- + drivers/net/wireless/rtlwifi/rtl8192de/dm.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 137 +- + drivers/net/wireless/rtlwifi/rtl8192de/fw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 202 +- + drivers/net/wireless/rtlwifi/rtl8192de/hw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/led.c | 16 +- + drivers/net/wireless/rtlwifi/rtl8192de/led.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 695 +- + drivers/net/wireless/rtlwifi/rtl8192de/phy.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/reg.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/rf.c | 99 +- + drivers/net/wireless/rtlwifi/rtl8192de/rf.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 57 +- + drivers/net/wireless/rtlwifi/rtl8192de/sw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/table.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/table.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 28 +- + drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/def.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 32 +- + drivers/net/wireless/rtlwifi/rtl8192se/dm.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 76 +- + drivers/net/wireless/rtlwifi/rtl8192se/fw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 272 +- + drivers/net/wireless/rtlwifi/rtl8192se/hw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/led.c | 22 +- + drivers/net/wireless/rtlwifi/rtl8192se/led.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 221 +- + drivers/net/wireless/rtlwifi/rtl8192se/phy.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/reg.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/rf.c | 66 +- + drivers/net/wireless/rtlwifi/rtl8192se/rf.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 87 +- + drivers/net/wireless/rtlwifi/rtl8192se/sw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/table.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/table.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 20 +- + drivers/net/wireless/rtlwifi/rtl8192se/trx.h | 2 +- + drivers/net/wireless/rtlwifi/usb.c | 92 +- + drivers/net/wireless/rtlwifi/usb.h | 3 +- + drivers/net/wireless/rtlwifi/wifi.h | 8 +- + drivers/net/wireless/wl1251/main.c | 7 +- + drivers/net/wireless/wl12xx/main.c | 5 +- + drivers/net/xen-netback/netback.c | 4 +- + drivers/net/xen-netfront.c | 62 +- + drivers/nfc/nfcwilink.c | 305 +- + drivers/s390/net/qeth_core.h | 1 + + drivers/s390/net/qeth_core_main.c | 100 + + drivers/s390/net/qeth_core_mpc.h | 13 + + drivers/s390/net/qeth_l2_main.c | 3 + + drivers/s390/net/qeth_l3_main.c | 38 +- + drivers/scsi/bnx2fc/bnx2fc_constants.h | 2 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 12 +- + drivers/ssb/driver_chipcommon_pmu.c | 48 +- + drivers/ssb/driver_mipscore.c | 3 + + drivers/ssb/main.c | 3 + + drivers/ssb/pci.c | 40 +- + drivers/ssb/scan.c | 3 + + drivers/ssb/ssb_private.h | 4 + + drivers/staging/et131x/et131x.c | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 7 +- + drivers/staging/wlags49_h2/wl_cs.c | 7 +- + include/asm-generic/socket.h | 5 + + include/linux/Kbuild | 1 + + include/linux/bcma/bcma.h | 2 + + include/linux/bcma/bcma_driver_chipcommon.h | 16 + + include/linux/bcma/bcma_driver_pci.h | 125 +- + include/linux/bcma/bcma_regs.h | 27 + + include/linux/can/dev.h | 2 +- + include/linux/dccp.h | 8 +- + include/linux/etherdevice.h | 13 +- + include/linux/ethtool.h | 23 +- + include/linux/if.h | 2 + + include/linux/in.h | 1 + + include/linux/in6.h | 1 + + include/linux/ipv6.h | 8 +- + include/linux/mdio.h | 10 +- + include/linux/mlx4/qp.h | 5 +- + include/linux/net.h | 1 + + include/linux/netdev_features.h | 4 + + include/linux/netdevice.h | 8 +- + include/linux/netfilter/nfnetlink_conntrack.h | 1 + + include/linux/netlink.h | 30 +- + include/linux/nfc.h | 7 + + include/linux/nl80211.h | 8 + + include/linux/pkt_sched.h | 21 + + include/linux/sh_eth.h | 1 + + include/linux/skbuff.h | 33 +- + include/linux/snmp.h | 1 + + include/linux/ssb/ssb.h | 8 + + include/linux/ssb/ssb_regs.h | 34 + + include/linux/tcp.h | 5 +- + include/net/addrconf.h | 1 - + include/net/arp.h | 4 +- + include/net/caif/caif_hsi.h | 1 + + include/net/cfg80211.h | 64 +- + include/net/dcbnl.h | 4 +- + include/net/dn.h | 1 + + include/net/genetlink.h | 31 +- + include/net/inet_sock.h | 3 + + include/net/iucv/af_iucv.h | 2 + + include/net/mac80211.h | 79 +- + include/net/ndisc.h | 1 - + include/net/netlink.h | 35 - + include/net/nfc/nci.h | 53 +- + include/net/nfc/nci_core.h | 26 +- + include/net/nfc/nfc.h | 9 +- + include/net/sock.h | 29 + + include/net/tcp.h | 66 +- + include/net/xfrm.h | 5 - + net/atm/clip.c | 17 +- + net/batman-adv/Makefile | 2 +- + net/batman-adv/{bat_ogm.h => bat_algo.h} | 20 +- + net/batman-adv/bat_debugfs.c | 24 +- + net/batman-adv/bat_debugfs.h | 2 +- + net/batman-adv/bat_iv_ogm.c | 247 +- + net/batman-adv/bat_sysfs.c | 15 +- + net/batman-adv/bat_sysfs.h | 2 +- + net/batman-adv/bitarray.c | 10 +- + net/batman-adv/bitarray.h | 2 +- + net/batman-adv/gateway_client.c | 6 +- + net/batman-adv/gateway_client.h | 2 +- + net/batman-adv/gateway_common.c | 6 +- + net/batman-adv/gateway_common.h | 2 +- + net/batman-adv/hard-interface.c | 56 +- + net/batman-adv/hard-interface.h | 2 +- + net/batman-adv/hash.c | 2 +- + net/batman-adv/hash.h | 2 +- + net/batman-adv/icmp_socket.c | 8 +- + net/batman-adv/icmp_socket.h | 2 +- + net/batman-adv/main.c | 109 +- + net/batman-adv/main.h | 32 +- + net/batman-adv/originator.c | 19 +- + net/batman-adv/originator.h | 2 +- + net/batman-adv/packet.h | 40 +- + net/batman-adv/ring_buffer.c | 2 +- + net/batman-adv/ring_buffer.h | 2 +- + net/batman-adv/routing.c | 37 +- + net/batman-adv/routing.h | 2 +- + net/batman-adv/send.c | 9 +- + net/batman-adv/send.h | 2 +- + net/batman-adv/soft-interface.c | 29 +- + net/batman-adv/soft-interface.h | 2 +- + net/batman-adv/translation-table.c | 168 +- + net/batman-adv/translation-table.h | 2 +- + net/batman-adv/types.h | 23 +- + net/batman-adv/unicast.c | 18 +- + net/batman-adv/unicast.h | 2 +- + net/batman-adv/vis.c | 19 +- + net/batman-adv/vis.h | 5 +- + net/bridge/br_device.c | 5 +- + net/caif/caif_dev.c | 2 - + net/caif/caif_socket.c | 113 +- + net/caif/chnl_net.c | 15 +- + net/core/datagram.c | 26 +- + net/core/dev.c | 94 +- + net/core/ethtool.c | 2 + + net/core/neighbour.c | 90 +- + net/core/netpoll.c | 71 +- + net/core/rtnetlink.c | 11 +- + net/core/skbuff.c | 4 +- + net/core/sock.c | 21 + + net/dccp/ccids/ccid3.c | 3 +- + net/dccp/ipv4.c | 8 +- + net/dccp/ipv6.c | 8 +- + net/dccp/minisocks.c | 18 +- + net/dccp/output.c | 10 +- + net/decnet/dn_neigh.c | 24 +- + net/decnet/dn_route.c | 3 +- + net/ethernet/eth.c | 2 + + net/ieee802154/6lowpan.c | 16 +- + net/ipv4/af_inet.c | 1 + + net/ipv4/inet_diag.c | 18 +- + net/ipv4/ip_gre.c | 21 +- + net/ipv4/ip_sockglue.c | 37 + + net/ipv4/ipip.c | 3 +- + net/ipv4/ping.c | 3 +- + net/ipv4/proc.c | 1 + + net/ipv4/raw.c | 3 +- + net/ipv4/route.c | 7 +- + net/ipv4/tcp_ipv4.c | 297 +- + net/ipv4/tcp_minisocks.c | 12 +- + net/ipv4/tcp_output.c | 4 +- + net/ipv4/udp.c | 7 +- + net/ipv6/af_inet6.c | 1 + + net/ipv6/anycast.c | 29 - + net/ipv6/datagram.c | 2 +- + net/ipv6/icmp.c | 4 + + net/ipv6/ip6_fib.c | 19 +- + net/ipv6/ip6_output.c | 10 +- + net/ipv6/ipv6_sockglue.c | 38 + + net/ipv6/ndisc.c | 30 +- + net/ipv6/raw.c | 2 + + net/ipv6/reassembly.c | 7 +- + net/ipv6/route.c | 15 +- + net/ipv6/sit.c | 20 +- + net/ipv6/tcp_ipv6.c | 231 +- + net/ipv6/udp.c | 7 +- + net/ipv6/xfrm6_output.c | 2 +- + net/iucv/af_iucv.c | 202 +- + net/l2tp/l2tp_eth.c | 2 +- + net/mac80211/Makefile | 4 +- + net/mac80211/cfg.c | 52 +- + net/mac80211/chan.c | 28 +- + net/mac80211/debugfs.c | 6 +- + net/mac80211/debugfs_netdev.c | 35 + + net/mac80211/debugfs_sta.c | 5 +- + net/mac80211/driver-ops.h | 33 + + net/mac80211/driver-trace.h | 32 + + net/mac80211/ibss.c | 98 +- + net/mac80211/ieee80211_i.h | 82 +- + net/mac80211/iface.c | 20 +- + net/mac80211/key.c | 38 +- + net/mac80211/main.c | 19 +- + net/mac80211/mesh_hwmp.c | 2 +- + net/mac80211/mesh_pathtbl.c | 6 +- + net/mac80211/mesh_plink.c | 6 +- + net/mac80211/mlme.c | 1389 +- + net/mac80211/pm.c | 11 +- + net/mac80211/rate.c | 151 +- + net/mac80211/rate.h | 4 - + net/mac80211/rx.c | 33 +- + net/mac80211/sta_info.c | 328 +- + net/mac80211/sta_info.h | 55 +- + net/mac80211/status.c | 6 +- + net/mac80211/tx.c | 5 + + net/mac80211/util.c | 32 +- + net/mac80211/work.c | 814 - + net/netfilter/ipset/ip_set_core.c | 10 +- + net/netfilter/nf_conntrack_netlink.c | 53 +- + net/netfilter/nfnetlink_acct.c | 6 +- + net/netlink/af_netlink.c | 30 +- + net/netlink/genetlink.c | 40 +- + net/nfc/core.c | 5 - + net/nfc/nci/core.c | 118 +- + net/nfc/nci/data.c | 4 + + net/nfc/nci/ntf.c | 337 +- + net/nfc/nci/rsp.c | 28 +- + net/nfc/netlink.c | 6 + + net/nfc/rawsock.c | 12 - + net/openvswitch/vport-internal_dev.c | 3 +- + net/packet/af_packet.c | 32 +- + net/sched/Kconfig | 26 + + net/sched/Makefile | 1 + + net/sched/sch_plug.c | 233 + + net/tipc/bcast.c | 336 +- + net/tipc/bcast.h | 2 +- + net/tipc/bearer.c | 5 +- + net/tipc/config.c | 21 +- + net/tipc/core.c | 10 - + net/tipc/core.h | 42 - + net/tipc/discover.c | 79 +- + net/tipc/link.c | 299 +- + net/tipc/log.c | 2 +- + net/tipc/msg.c | 2 +- + net/tipc/msg.h | 15 +- + net/tipc/name_distr.c | 8 +- + net/tipc/name_table.c | 48 +- + net/tipc/name_table.h | 2 - + net/tipc/net.c | 11 +- + net/tipc/node.c | 84 +- + net/tipc/node.h | 37 +- + net/tipc/port.c | 72 +- + net/tipc/port.h | 42 +- + net/tipc/socket.c | 11 +- + net/tipc/subscr.c | 2 +- + net/unix/af_unix.c | 52 +- + net/unix/diag.c | 10 +- + net/wireless/core.h | 14 +- + net/wireless/mesh.c | 1 + + net/wireless/mlme.c | 322 +- + net/wireless/nl80211.c | 112 +- + net/wireless/reg.c | 19 +- + net/wireless/scan.c | 12 + + net/wireless/sme.c | 41 +- + net/xfrm/xfrm_user.c | 9 +- + 1296 files changed, 85510 insertions(+), 72219 deletions(-) + rename drivers/net/ethernet/intel/e1000e/{lib.c => mac.c} (62%) + create mode 100644 drivers/net/ethernet/intel/e1000e/manage.c + create mode 100644 drivers/net/ethernet/intel/e1000e/nvm.c + delete mode 100644 drivers/net/ethernet/sfc/mac.h + create mode 100644 drivers/net/ethernet/sfc/mcdi_mon.c + create mode 100644 drivers/net/ethernet/sfc/siena_sriov.c + create mode 100644 drivers/net/ethernet/sfc/vfdi.h + create mode 100644 drivers/net/ethernet/xilinx/xilinx_axienet.h + create mode 100644 drivers/net/ethernet/xilinx/xilinx_axienet_main.c + create mode 100644 drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c + create mode 100644 drivers/net/usb/qmi_wwan.c + create mode 100644 drivers/net/wireless/ath/ath6kl/core.c + create mode 100644 drivers/net/wireless/ath/ath6kl/usb.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-ucode.h + rename net/batman-adv/{bat_ogm.h => bat_algo.h} (51%) + create mode 100644 net/sched/sch_plug.c +Merging wireless-next/master (c288ec6 carl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly") +$ git merge wireless-next/master +Auto-merging drivers/net/wireless/rtlwifi/rtl8192se/sw.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8192se/phy.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8192de/phy.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +Removing drivers/net/wireless/iwlwifi/iwl-bus.h +Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c +Auto-merging drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c +Auto-merging drivers/net/wireless/brcm80211/brcmsmac/main.c +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Removing drivers/net/wireless/ath/ath9k/ar9462_1p0_initvals.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/net/wireless/ath/ath5k/ahb.c | 20 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 4 +- + drivers/net/wireless/ath/ath5k/reset.c | 10 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 82 +- + drivers/net/wireless/ath/ath9k/Kconfig | 16 +- + drivers/net/wireless/ath/ath9k/Makefile | 10 +- + drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 270 --- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 107 +- + drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 98 -- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 42 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 - + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 88 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 48 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.h | 3 +- + drivers/net/wireless/ath/ath9k/ar9003_mci.c | 1250 ++++++------- + drivers/net/wireless/ath/ath9k/ar9003_mci.h | 233 +++ + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 15 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 23 +- + .../net/wireless/ath/ath9k/ar9462_1p0_initvals.h | 1833 -------------------- + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 465 ----- + drivers/net/wireless/ath/ath9k/ath9k.h | 35 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 77 +- + drivers/net/wireless/ath/ath9k/btcoex.h | 4 +- + drivers/net/wireless/ath/ath9k/debug.c | 373 ++--- + drivers/net/wireless/ath/ath9k/gpio.c | 123 ++- + drivers/net/wireless/ath/ath9k/htc.h | 21 +- + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 73 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 32 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 15 +- + drivers/net/wireless/ath/ath9k/hw.c | 178 +-- + drivers/net/wireless/ath/ath9k/hw.h | 208 +-- + drivers/net/wireless/ath/ath9k/init.c | 67 +- + drivers/net/wireless/ath/ath9k/main.c | 36 +- + drivers/net/wireless/ath/ath9k/mci.c | 290 +--- + drivers/net/wireless/ath/ath9k/mci.h | 5 +- + drivers/net/wireless/ath/ath9k/rc.c | 6 +- + drivers/net/wireless/ath/ath9k/reg.h | 5 - + drivers/net/wireless/ath/ath9k/xmit.c | 19 +- + drivers/net/wireless/ath/carl9170/tx.c | 2 +- + drivers/net/wireless/brcm80211/Kconfig | 17 +- + drivers/net/wireless/brcm80211/brcmfmac/Makefile | 6 +- + .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 14 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 17 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 59 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 32 +- + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 1623 +++++++++++++++++ + drivers/net/wireless/brcm80211/brcmfmac/usb.h | 84 + + drivers/net/wireless/brcm80211/brcmfmac/usb_rdl.h | 75 + + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 13 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 +- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 1 - + .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 28 +- + drivers/net/wireless/brcm80211/brcmsmac/srom.c | 14 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 101 +- + drivers/net/wireless/iwlegacy/3945-debug.c | 6 + + drivers/net/wireless/iwlegacy/3945-mac.c | 108 +- + drivers/net/wireless/iwlegacy/3945.c | 133 +- + drivers/net/wireless/iwlegacy/3945.h | 8 +- + drivers/net/wireless/iwlegacy/4965-calib.c | 16 +- + drivers/net/wireless/iwlegacy/4965-debug.c | 6 + + drivers/net/wireless/iwlegacy/4965-mac.c | 592 +++++-- + drivers/net/wireless/iwlegacy/4965.c | 402 +---- + drivers/net/wireless/iwlegacy/4965.h | 21 +- + drivers/net/wireless/iwlegacy/Kconfig | 78 +- + drivers/net/wireless/iwlegacy/common.c | 548 ++----- + drivers/net/wireless/iwlegacy/common.h | 247 +-- + drivers/net/wireless/iwlegacy/debug.c | 260 ++-- + drivers/net/wireless/iwlwifi/Makefile | 3 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-2000.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 28 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 144 ++- + drivers/net/wireless/iwlwifi/iwl-agn.h | 29 +- + drivers/net/wireless/iwlwifi/iwl-bus.h | 145 -- + drivers/net/wireless/iwlwifi/iwl-cfg.h | 2 + + drivers/net/wireless/iwlwifi/iwl-core.c | 38 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-debug.c | 127 ++ + drivers/net/wireless/iwlwifi/iwl-debug.h | 84 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 33 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 65 + + drivers/net/wireless/iwlwifi/iwl-drv.c | 103 ++ + drivers/net/wireless/iwlwifi/iwl-drv.h | 123 ++ + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 156 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-mac80211.c | 83 +- + drivers/net/wireless/iwlwifi/iwl-op-mode.h | 198 +++ + drivers/net/wireless/iwlwifi/iwl-pci.c | 70 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-shared.h | 45 +- + drivers/net/wireless/iwlwifi/iwl-testmode.c | 432 +++-- + drivers/net/wireless/iwlwifi/iwl-testmode.h | 64 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 88 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 46 +- + drivers/net/wireless/iwlwifi/iwl-trans.h | 207 ++- + drivers/net/wireless/iwlwifi/iwl-ucode.c | 394 ++--- + drivers/net/wireless/iwlwifi/iwl-ucode.h | 46 +- + drivers/net/wireless/iwlwifi/iwl-wifi.h | 37 + + drivers/net/wireless/mac80211_hwsim.c | 10 +- + drivers/net/wireless/mwifiex/cfg80211.c | 8 +- + drivers/net/wireless/mwifiex/fw.h | 5 - + drivers/net/wireless/mwifiex/init.c | 2 +- + drivers/net/wireless/mwifiex/join.c | 5 +- + drivers/net/wireless/mwifiex/main.h | 2 +- + drivers/net/wireless/mwifiex/scan.c | 47 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 10 +- + drivers/net/wireless/p54/txrx.c | 2 +- + drivers/net/wireless/rt2x00/Kconfig | 2 +- + drivers/net/wireless/rt2x00/rt2800.h | 25 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 245 +++- + drivers/net/wireless/rt2x00/rt2800lib.h | 1 + + drivers/net/wireless/rt2x00/rt2800pci.c | 37 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 16 + + drivers/net/wireless/rt2x00/rt2x00.h | 13 + + drivers/net/wireless/rt2x00/rt2x00config.c | 3 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 4 + + drivers/net/wireless/rt2x00/rt2x00lib.h | 13 + + drivers/net/wireless/rt2x00/rt2x00link.c | 39 + + drivers/net/wireless/rtlwifi/Kconfig | 2 +- + drivers/net/wireless/rtlwifi/base.c | 6 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 156 +-- + drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 187 +-- + drivers/net/wireless/rtlwifi/rtl8192se/fw.h | 3 +- + drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 40 +- + drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 3 +- + drivers/net/wireless/wl1251/Makefile | 2 + + drivers/net/wireless/wl1251/boot.c | 2 - + drivers/net/wireless/wl1251/io.h | 9 +- + drivers/net/wireless/wl1251/wl1251.h | 2 +- + drivers/net/wireless/wl12xx/Makefile | 2 + + drivers/net/wireless/wl12xx/acx.c | 17 +- + drivers/net/wireless/wl12xx/acx.h | 149 +- + drivers/net/wireless/wl12xx/boot.c | 105 +- + drivers/net/wireless/wl12xx/boot.h | 10 - + drivers/net/wireless/wl12xx/cmd.c | 143 ++- + drivers/net/wireless/wl12xx/cmd.h | 148 +- + drivers/net/wireless/wl12xx/conf.h | 51 +- + drivers/net/wireless/wl12xx/debug.h | 1 + + drivers/net/wireless/wl12xx/debugfs.c | 241 +++- + drivers/net/wireless/wl12xx/event.c | 154 +-- + drivers/net/wireless/wl12xx/event.h | 20 +- + drivers/net/wireless/wl12xx/init.c | 55 +- + drivers/net/wireless/wl12xx/io.c | 59 + + drivers/net/wireless/wl12xx/io.h | 2 + + drivers/net/wireless/wl12xx/main.c | 674 +++++--- + drivers/net/wireless/wl12xx/ps.c | 34 +- + drivers/net/wireless/wl12xx/ps.h | 2 +- + drivers/net/wireless/wl12xx/reg.h | 27 + + drivers/net/wireless/wl12xx/rx.c | 2 +- + drivers/net/wireless/wl12xx/scan.c | 56 +- + drivers/net/wireless/wl12xx/scan.h | 2 +- + drivers/net/wireless/wl12xx/sdio.c | 29 +- + drivers/net/wireless/wl12xx/spi.c | 8 +- + drivers/net/wireless/wl12xx/testmode.c | 50 + + drivers/net/wireless/wl12xx/tx.c | 75 +- + drivers/net/wireless/wl12xx/tx.h | 5 +- + drivers/net/wireless/wl12xx/wl12xx.h | 46 +- + drivers/net/wireless/wl12xx/wl12xx_80211.h | 2 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 12 +- + include/linux/nl80211.h | 34 +- + include/net/cfg80211.h | 76 +- + include/net/mac80211.h | 17 +- + net/mac80211/cfg.c | 158 +- + net/mac80211/ibss.c | 1 - + net/mac80211/ieee80211_i.h | 15 +- + net/mac80211/iface.c | 2 + + net/mac80211/key.c | 1 + + net/mac80211/main.c | 6 +- + net/mac80211/mesh.h | 1 - + net/mac80211/mesh_hwmp.c | 1 + + net/mac80211/mlme.c | 189 ++- + net/mac80211/pm.c | 2 +- + net/mac80211/rx.c | 1 + + net/mac80211/sta_info.c | 8 +- + net/mac80211/status.c | 1 + + net/mac80211/tx.c | 32 +- + net/mac80211/util.c | 2 +- + net/wireless/mlme.c | 6 +- + net/wireless/nl80211.c | 255 ++-- + 191 files changed, 8723 insertions(+), 8821 deletions(-) + delete mode 100644 drivers/net/wireless/ath/ath9k/ar9462_1p0_initvals.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/usb.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/usb.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/usb_rdl.h + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-bus.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-debug.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-drv.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-drv.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-op-mode.h +Merging bluetooth/master (5f15903 Bluetooth: mgmt: Add new error code for invalid index) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 1 + + drivers/bluetooth/bfusb.c | 23 +- + drivers/bluetooth/bluecard_cs.c | 20 +- + drivers/bluetooth/bpa10x.c | 35 +- + drivers/bluetooth/bt3c_cs.c | 14 +- + drivers/bluetooth/btmrvl_debugfs.c | 27 +- + drivers/bluetooth/btmrvl_main.c | 17 +- + drivers/bluetooth/btsdio.c | 23 +- + drivers/bluetooth/btuart_cs.c | 14 +- + drivers/bluetooth/btusb.c | 47 +- + drivers/bluetooth/btwilink.c | 18 +- + drivers/bluetooth/dtl1_cs.c | 34 +- + drivers/bluetooth/hci_ath.c | 2 +- + drivers/bluetooth/hci_bcsp.c | 2 +- + drivers/bluetooth/hci_h4.c | 2 +- + drivers/bluetooth/hci_ldisc.c | 34 +- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_uart.h | 2 + + drivers/bluetooth/hci_vhci.c | 17 +- + include/net/bluetooth/bluetooth.h | 40 +- + include/net/bluetooth/hci.h | 72 +- + include/net/bluetooth/hci_core.h | 284 +++-- + include/net/bluetooth/hci_mon.h | 51 + + include/net/bluetooth/l2cap.h | 37 +- + include/net/bluetooth/mgmt.h | 231 +++-- + include/net/bluetooth/smp.h | 2 +- + net/bluetooth/Kconfig | 1 - + net/bluetooth/bnep/sock.c | 6 +- + net/bluetooth/cmtp/sock.c | 6 +- + net/bluetooth/hci_conn.c | 73 +- + net/bluetooth/hci_core.c | 627 +++++++-- + net/bluetooth/hci_event.c | 607 ++++++--- + net/bluetooth/hci_sock.c | 470 ++++++-- + net/bluetooth/hci_sysfs.c | 53 +- + net/bluetooth/hidp/sock.c | 6 +- + net/bluetooth/l2cap_core.c | 638 +++++---- + net/bluetooth/l2cap_sock.c | 53 +- + net/bluetooth/lib.c | 27 +- + net/bluetooth/mgmt.c | 2590 +++++++++++++++++++++++------------- + net/bluetooth/smp.c | 92 +- + 40 files changed, 4157 insertions(+), 2143 deletions(-) + create mode 100644 include/net/bluetooth/hci_mon.h +Merging mtd/master (3c3e51d Merge ../linux-2.6 to bring in 3.3-rc fixes already merged) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0002.c | 240 +++++++++++++++++++++++++++++++++++ + 1 files changed, 240 insertions(+), 0 deletions(-) +Merging l2-mtd/master (309756e mtd : change the location of the ONFI detected log) +$ git merge l2-mtd/master +Resolved 'drivers/mtd/chips/cfi_cmdset_0002.c' using previous resolution. +Removing include/linux/mtd/pmc551.h +Auto-merging drivers/net/ethernet/sfc/mtd.c +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/chips/cfi_cmdset_0002.c +CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 21e34f5] Merge remote-tracking branch 'l2-mtd/master' +$ git diff -M --stat --summary HEAD^.. + drivers/dma/mxs-dma.c | 34 +- + drivers/mmc/host/mxs-mmc.c | 12 +- + drivers/mtd/Kconfig | 3 - + drivers/mtd/chips/cfi_cmdset_0001.c | 68 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 47 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 33 +- + drivers/mtd/chips/cfi_util.c | 6 - + drivers/mtd/chips/chipreg.c | 5 +- + drivers/mtd/chips/fwh_lock.h | 4 +- + drivers/mtd/chips/map_absent.c | 10 +- + drivers/mtd/chips/map_ram.c | 14 +- + drivers/mtd/chips/map_rom.c | 13 +- + drivers/mtd/devices/Kconfig | 7 + + drivers/mtd/devices/Makefile | 1 + + drivers/mtd/devices/block2mtd.c | 28 +- + drivers/mtd/devices/doc2000.c | 24 +- + drivers/mtd/devices/doc2001.c | 21 +- + drivers/mtd/devices/doc2001plus.c | 21 +- + drivers/mtd/devices/docg3.c | 14 +- + drivers/mtd/devices/lart.c | 17 +- + drivers/mtd/devices/m25p80.c | 56 +- + drivers/mtd/devices/ms02-nv.c | 12 +- + drivers/mtd/devices/mtd_dataflash.c | 50 +- + drivers/mtd/devices/mtdram.c | 35 +- + drivers/mtd/devices/phram.c | 43 +- + drivers/mtd/devices/pmc551.c | 99 +- + drivers/mtd/devices/slram.c | 41 +- + drivers/mtd/devices/spear_smi.c | 1091 ++++++++++++++++ + drivers/mtd/devices/sst25l.c | 40 +- + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/lpddr/lpddr_cmds.c | 37 +- + drivers/mtd/maps/ixp4xx.c | 5 +- + drivers/mtd/maps/uclinux.c | 2 +- + drivers/mtd/maps/vmu-flash.c | 14 +- + drivers/mtd/mtd_blkdevs.c | 1 + + drivers/mtd/mtdblock.c | 8 +- + drivers/mtd/mtdchar.c | 4 +- + drivers/mtd/mtdconcat.c | 104 +-- + drivers/mtd/mtdcore.c | 270 ++++- + drivers/mtd/mtdoops.c | 9 +- + drivers/mtd/mtdpart.c | 141 +-- + drivers/mtd/nand/Kconfig | 21 +- + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/alauda.c | 8 +- + drivers/mtd/nand/docg4.c | 1378 ++++++++++++++++++++ + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 19 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 2 +- + drivers/mtd/nand/nand_base.c | 182 ++-- + drivers/mtd/nftlcore.c | 7 - + drivers/mtd/onenand/onenand_base.c | 65 +- + drivers/mtd/onenand/samsung.c | 4 +- + drivers/mtd/redboot.c | 6 +- + drivers/mtd/ubi/gluebi.c | 29 +- + drivers/net/ethernet/sfc/mtd.c | 10 +- + fs/jffs2/compr.c | 2 +- + fs/jffs2/compr_lzo.c | 1 - + fs/jffs2/compr_zlib.c | 6 +- + fs/jffs2/os-linux.h | 4 +- + fs/jffs2/scan.c | 22 +- + fs/jffs2/security.c | 4 +- + fs/romfs/storage.c | 2 +- + .../mach/dma.h => include/linux/fsl/mxs-dma.h | 0 + include/linux/mtd/bbm.h | 5 + + include/linux/mtd/blktrans.h | 1 + + include/linux/mtd/mtd.h | 301 ++---- + include/linux/mtd/nand.h | 5 +- + include/linux/mtd/pmc551.h | 78 -- + include/linux/mtd/spear_smi.h | 62 + + sound/soc/mxs/mxs-pcm.c | 2 +- + sound/soc/mxs/mxs-pcm.h | 2 +- + sound/soc/mxs/mxs-saif.c | 2 +- + 72 files changed, 3425 insertions(+), 1254 deletions(-) + create mode 100644 drivers/mtd/devices/spear_smi.c + create mode 100644 drivers/mtd/nand/docg4.c + rename arch/arm/mach-mxs/include/mach/dma.h => include/linux/fsl/mxs-dma.h (100%) + delete mode 100644 include/linux/mtd/pmc551.h + create mode 100644 include/linux/mtd/spear_smi.h +Merging crypto/master (8940426 crypto: twofish-x86_64/i586 - set alignmask to zero) +$ git merge crypto/master +Resolved 'arch/arm/mach-tegra/fuse.c' using previous resolution. +Auto-merging drivers/crypto/mv_cesa.c +Auto-merging drivers/crypto/Kconfig +Auto-merging crypto/crypto_user.c +Auto-merging arch/arm/mach-tegra/fuse.c +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/fuse.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7640f6d] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-tegra/fuse.c | 2 + + arch/x86/crypto/blowfish_glue.c | 191 +++--- + arch/x86/crypto/serpent-sse2-i586-asm_32.S | 29 +- + arch/x86/crypto/serpent-sse2-x86_64-asm_64.S | 29 +- + arch/x86/crypto/serpent_sse2_glue.c | 394 ++++------ + arch/x86/crypto/twofish_glue.c | 2 +- + arch/x86/crypto/twofish_glue_3way.c | 265 ++++--- + crypto/algapi.c | 35 + + crypto/crypto_user.c | 2 +- + drivers/char/hw_random/tx4939-rng.c | 5 +- + drivers/crypto/Kconfig | 11 + + drivers/crypto/Makefile | 1 + + drivers/crypto/caam/caamalg.c | 126 +++- + drivers/crypto/caam/ctrl.c | 2 +- + drivers/crypto/geode-aes.c | 6 +- + drivers/crypto/hifn_795x.c | 3 +- + drivers/crypto/ixp4xx_crypto.c | 4 +- + drivers/crypto/mv_cesa.c | 12 +- + drivers/crypto/n2_core.c | 7 +- + drivers/crypto/omap-aes.c | 8 +- + drivers/crypto/omap-sham.c | 4 + + drivers/crypto/picoxcell_crypto.c | 46 +- + drivers/crypto/s5p-sss.c | 6 +- + drivers/crypto/talitos.c | 1 + + drivers/crypto/tegra-aes.c | 1096 ++++++++++++++++++++++++++ + drivers/crypto/tegra-aes.h | 103 +++ + include/linux/crypto.h | 7 + + 27 files changed, 1841 insertions(+), 556 deletions(-) + create mode 100644 drivers/crypto/tegra-aes.c + create mode 100644 drivers/crypto/tegra-aes.h +Merging sound/for-next (12cf5be Merge branch 'for-linus' into for-next) +$ git merge sound/for-next +Removing sound/soc/omap/sdp4430.c +Removing sound/pci/hda/alc_quirks.c +Removing sound/pci/hda/alc882_quirks.c +Removing sound/pci/hda/alc880_quirks.c +Removing sound/pci/hda/alc260_quirks.c +Auto-merging drivers/base/regmap/regcache.c +Auto-merging arch/arm/mach-s3c64xx/mach-crag6410-module.c +Auto-merging arch/arm/mach-omap2/board-omap4panda.c +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/arm/mach-ep93xx/core.c +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 3 + + Documentation/sound/alsa/ALSA-Configuration.txt | 8 +- + Documentation/sound/alsa/HD-Audio-Models.txt | 79 +- + Documentation/sound/alsa/HD-Audio.txt | 7 +- + arch/arm/mach-ep93xx/core.c | 19 +- + arch/arm/mach-ep93xx/include/mach/platform.h | 2 +- + arch/arm/mach-omap2/board-4430sdp.c | 29 + + arch/arm/mach-omap2/board-omap4panda.c | 60 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 1 + + arch/mips/jz4740/board-qi_lb60.c | 6 + + drivers/base/regmap/internal.h | 3 + + drivers/base/regmap/regcache.c | 11 + + drivers/base/regmap/regmap.c | 58 + + drivers/regulator/core.c | 108 + + include/linux/platform_data/omap-abe-twl6040.h | 49 + + include/linux/regmap.h | 3 + + include/linux/regulator/consumer.h | 12 + + include/sound/jack.h | 3 + + include/sound/pcm.h | 4 + + include/sound/soc-dapm.h | 9 + + include/sound/soc.h | 2 + + include/sound/version.h | 2 +- + include/sound/wm2200.h | 41 + + include/sound/wm8962.h | 6 + + sound/aoa/codecs/onyx.c | 13 +- + sound/aoa/codecs/tas.c | 13 +- + sound/core/jack.c | 4 +- + sound/core/misc.c | 2 +- + sound/core/pcm.c | 99 +- + sound/pci/au88x0/au88x0.h | 13 +- + sound/pci/au88x0/au88x0_core.c | 18 +- + sound/pci/au88x0/au88x0_pcm.c | 127 +- + sound/pci/ctxfi/ctvmem.c | 2 +- + sound/pci/hda/alc260_quirks.c | 968 ------ + sound/pci/hda/alc880_quirks.c | 1707 ----------- + sound/pci/hda/alc882_quirks.c | 866 ------ + sound/pci/hda/alc_quirks.c | 480 --- + sound/pci/hda/hda_codec.c | 21 +- + sound/pci/hda/hda_codec.h | 1 + + sound/pci/hda/hda_intel.c | 38 +- + sound/pci/hda/hda_jack.c | 16 + + sound/pci/hda/hda_jack.h | 13 +- + sound/pci/hda/hda_local.h | 3 +- + sound/pci/hda/patch_analog.c | 66 +- + sound/pci/hda/patch_conexant.c | 82 +- + sound/pci/hda/patch_hdmi.c | 2 + + sound/pci/hda/patch_realtek.c | 1750 ++++++++---- + sound/pci/hda/patch_sigmatel.c | 65 +- + sound/pci/hda/patch_via.c | 48 +- + sound/soc/atmel/atmel-pcm.c | 4 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/adau1373.c | 3 +- + sound/soc/codecs/adau1701.c | 2 +- + sound/soc/codecs/alc5623.c | 4 +- + sound/soc/codecs/alc5632.c | 2 +- + sound/soc/codecs/cq93vc.c | 2 - + sound/soc/codecs/sgtl5000.c | 19 +- + sound/soc/codecs/sn95031.c | 3 +- + sound/soc/codecs/tlv320aic3x.c | 2 +- + sound/soc/codecs/tlv320dac33.c | 8 +- + sound/soc/codecs/twl4030.c | 9 +- + sound/soc/codecs/twl6040.c | 29 +- + sound/soc/codecs/twl6040.h | 1 + + sound/soc/codecs/wm2200.c | 2285 ++++++++++++++ + sound/soc/codecs/wm2200.h | 3674 +++++++++++++++++++++++ + sound/soc/codecs/wm5100.c | 613 ++--- + sound/soc/codecs/wm8731.c | 109 +- + sound/soc/codecs/wm8753.c | 186 +- + sound/soc/codecs/wm8770.c | 3 +- + sound/soc/codecs/wm8804.c | 148 +- + sound/soc/codecs/wm8904.c | 840 ++---- + sound/soc/codecs/wm8904.h | 11 + + sound/soc/codecs/wm8940.c | 14 +- + sound/soc/codecs/wm8955.c | 247 +- + sound/soc/codecs/wm8962.c | 1838 +++++------- + sound/soc/codecs/wm8971.c | 37 +- + sound/soc/codecs/wm8974.c | 45 +- + sound/soc/codecs/wm8978.c | 185 +- + sound/soc/codecs/wm8978.h | 2 + + sound/soc/codecs/wm8983.c | 5 - + sound/soc/codecs/wm8985.c | 315 ++- + sound/soc/codecs/wm8988.c | 29 +- + sound/soc/codecs/wm8993.c | 599 +++-- + sound/soc/codecs/wm8994.c | 10 +- + sound/soc/codecs/wm8995.c | 2 +- + sound/soc/codecs/wm8996.c | 46 +- + sound/soc/codecs/wm9090.c | 266 +- + sound/soc/davinci/davinci-pcm.c | 4 +- + sound/soc/ep93xx/edb93xx.c | 4 +- + sound/soc/ep93xx/ep93xx-pcm.c | 4 +- + sound/soc/ep93xx/snappercl15.c | 4 +- + sound/soc/fsl/fsl_dma.c | 10 +- + sound/soc/fsl/mpc5200_dma.c | 16 +- + sound/soc/imx/mx27vis-aic32x4.c | 104 + + sound/soc/jz4740/qi_lb60.c | 56 +- + sound/soc/kirkwood/kirkwood-dma.c | 4 +- + sound/soc/omap/Kconfig | 13 +- + sound/soc/omap/Makefile | 4 +- + sound/soc/omap/omap-abe-twl6040.c | 349 +++ + sound/soc/omap/omap-dmic.c | 7 +- + sound/soc/omap/omap-mcpdm.c | 2 + + sound/soc/omap/sdp4430.c | 279 -- + sound/soc/s6000/s6000-pcm.c | 5 +- + sound/soc/samsung/dma.c | 2 +- + sound/soc/soc-core.c | 33 +- + sound/soc/soc-dapm.c | 86 +- + sound/soc/soc-io.c | 1 + + sound/soc/soc-pcm.c | 38 + + sound/soc/soc-utils.c | 20 +- + sound/soc/tegra/tegra_pcm.c | 2 +- + sound/spi/at73c213.c | 12 +- + sound/usb/6fire/chip.c | 3 +- + sound/usb/6fire/chip.h | 1 - + sound/usb/6fire/comm.c | 1 - + sound/usb/6fire/comm.h | 1 - + sound/usb/6fire/common.h | 1 - + sound/usb/6fire/control.c | 341 ++- + sound/usb/6fire/control.h | 7 +- + sound/usb/6fire/firmware.c | 1 - + sound/usb/6fire/midi.c | 1 - + sound/usb/6fire/midi.h | 1 - + sound/usb/6fire/pcm.c | 1 - + sound/usb/6fire/pcm.h | 1 - + sound/usb/Kconfig | 1 + + sound/usb/usx2y/usbusx2yaudio.c | 4 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- + 127 files changed, 11609 insertions(+), 8362 deletions(-) + create mode 100644 include/linux/platform_data/omap-abe-twl6040.h + create mode 100644 include/sound/wm2200.h + delete mode 100644 sound/pci/hda/alc260_quirks.c + delete mode 100644 sound/pci/hda/alc880_quirks.c + delete mode 100644 sound/pci/hda/alc882_quirks.c + delete mode 100644 sound/pci/hda/alc_quirks.c + create mode 100644 sound/soc/codecs/wm2200.c + create mode 100644 sound/soc/codecs/wm2200.h + create mode 100644 sound/soc/omap/omap-abe-twl6040.c + delete mode 100644 sound/soc/omap/sdp4430.c +Merging sound-asoc/for-next (5b1c33e Merge branch 'for-3.4' into asoc-next) +$ git merge sound-asoc/for-next +Recorded preimage for 'sound/soc/imx/imx-pcm-dma-mx2.c' +Recorded preimage for 'sound/soc/mxs/mxs-pcm.h' +Resolved 'sound/soc/codecs/wm5100.c' using previous resolution. +Auto-merging sound/soc/mxs/mxs-saif.c +Auto-merging sound/soc/mxs/mxs-pcm.h +CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-pcm.h +Auto-merging sound/soc/mxs/mxs-pcm.c +Auto-merging sound/soc/imx/imx-pcm-dma-mx2.c +CONFLICT (content): Merge conflict in sound/soc/imx/imx-pcm-dma-mx2.c +Auto-merging sound/soc/codecs/wm5100.c +CONFLICT (content): Merge conflict in sound/soc/codecs/wm5100.c +Auto-merging sound/soc/codecs/twl6040.c +Auto-merging arch/sh/boards/mach-se/7724/setup.c +Auto-merging arch/sh/boards/mach-ecovec24/setup.c +Auto-merging arch/arm/mach-shmobile/board-mackerel.c +Auto-merging arch/arm/mach-shmobile/board-ap4evb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'sound/soc/imx/imx-pcm-dma-mx2.c'. +Recorded resolution for 'sound/soc/mxs/mxs-pcm.h'. +[master d569f0f] Merge remote-tracking branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/sound/alc5632.txt | 24 + + .../{soc/codecs/fsl-sgtl5000.txt => sgtl5000.txt} | 0 + .../bindings/sound/tegra-audio-alc5632.txt | 59 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/mach-kirkwood/openrd-setup.c | 6 + + arch/arm/mach-kirkwood/t5325-setup.c | 6 + + arch/arm/mach-shmobile/board-ap4evb.c | 30 +- + arch/arm/mach-shmobile/board-mackerel.c | 18 +- + arch/sh/boards/mach-ecovec24/setup.c | 4 +- + arch/sh/boards/mach-se/7724/setup.c | 4 +- + drivers/base/regmap/regmap.c | 15 + + include/linux/mfd/wm8994/pdata.h | 3 + + include/linux/regmap.h | 1 + + include/sound/control.h | 2 +- + include/sound/dmaengine_pcm.h | 49 ++ + include/sound/max9768.h | 24 + + include/sound/sh_fsi.h | 12 +- + include/sound/soc-dai.h | 11 +- + include/sound/soc-dapm.h | 24 +- + include/sound/soc.h | 42 +- + sound/soc/Kconfig | 3 + + sound/soc/Makefile | 3 + + sound/soc/atmel/snd-soc-afeb9260.c | 37 +- + sound/soc/blackfin/bf5xx-ad1836.c | 17 +- + sound/soc/blackfin/bf5xx-ad193x.c | 17 +- + sound/soc/blackfin/bf5xx-ad73311.c | 29 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 20 +- + sound/soc/blackfin/bfin-eval-adau1373.c | 13 +- + sound/soc/blackfin/bfin-eval-adau1701.c | 16 +- + sound/soc/blackfin/bfin-eval-adav80x.c | 13 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ad1836.c | 6 +- + sound/soc/codecs/ad1980.c | 2 +- + sound/soc/codecs/adau1373.c | 4 +- + sound/soc/codecs/ak4104.c | 174 ++--- + sound/soc/codecs/ak4535.c | 98 ++- + sound/soc/codecs/ak4535.h | 2 - + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/ak4671.c | 2 +- + sound/soc/codecs/alc5623.c | 8 +- + sound/soc/codecs/alc5632.c | 195 +++-- + sound/soc/codecs/alc5632.h | 1 + + sound/soc/codecs/cq93vc.c | 2 +- + sound/soc/codecs/cs4270.c | 4 +- + sound/soc/codecs/cs4271.c | 2 +- + sound/soc/codecs/lm4857.c | 2 +- + sound/soc/codecs/max9768.c | 247 ++++++ + sound/soc/codecs/max98088.c | 4 +- + sound/soc/codecs/max98095.c | 6 +- + sound/soc/codecs/max9877.c | 2 +- + sound/soc/codecs/sn95031.c | 2 +- + sound/soc/codecs/ssm2602.c | 2 +- + sound/soc/codecs/stac9766.c | 2 +- + sound/soc/codecs/tlv320aic23.c | 2 +- + sound/soc/codecs/tlv320aic26.c | 2 +- + sound/soc/codecs/tlv320aic32x4.c | 2 +- + sound/soc/codecs/tlv320aic3x.c | 64 +-- + sound/soc/codecs/tlv320aic3x.h | 9 - + sound/soc/codecs/tlv320dac33.c | 2 +- + sound/soc/codecs/tpa6130a2.c | 4 +- + sound/soc/codecs/twl4030.c | 33 +- + sound/soc/codecs/twl6040.c | 2 +- + sound/soc/codecs/uda134x.c | 6 +- + sound/soc/codecs/wl1273.c | 2 +- + sound/soc/codecs/wm2200.c | 3 +- + sound/soc/codecs/wm5100.c | 40 +- + sound/soc/codecs/wm8737.c | 2 +- + sound/soc/codecs/wm8753.c | 15 +- + sound/soc/codecs/wm8770.c | 2 +- + sound/soc/codecs/wm8776.c | 8 +- + sound/soc/codecs/wm8904.c | 16 +- + sound/soc/codecs/wm8940.c | 2 +- + sound/soc/codecs/wm8958-dsp2.c | 14 +- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8961.c | 2 +- + sound/soc/codecs/wm8962.c | 289 +++---- + sound/soc/codecs/wm8988.c | 142 +++- + sound/soc/codecs/wm8990.c | 2 +- + sound/soc/codecs/wm8991.c | 2 +- + sound/soc/codecs/wm8993.c | 54 +- + sound/soc/codecs/wm8993.h | 9 + + sound/soc/codecs/wm8994.c | 294 +++++-- + sound/soc/codecs/wm8994.h | 5 +- + sound/soc/codecs/wm8995.c | 2 +- + sound/soc/codecs/wm8996.c | 154 ++--- + sound/soc/codecs/wm9081.c | 80 +-- + sound/soc/codecs/wm9090.c | 8 +- + sound/soc/codecs/wm9705.c | 2 +- + sound/soc/codecs/wm9712.c | 16 +- + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm_hubs.c | 148 +++- + sound/soc/codecs/wm_hubs.h | 12 + + sound/soc/fsl/mpc5200_dma.c | 1 + + sound/soc/fsl/mpc8610_hpcd.c | 16 +- + sound/soc/fsl/p1022_ds.c | 4 +- + sound/soc/imx/Kconfig | 6 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 222 +---- + sound/soc/imx/imx-ssi.c | 30 +- + sound/soc/kirkwood/kirkwood-openrd.c | 46 +- + sound/soc/kirkwood/kirkwood-t5325.c | 47 +- + sound/soc/mid-x86/mfld_machine.c | 2 +- + sound/soc/mxs/Kconfig | 2 +- + sound/soc/mxs/mxs-pcm.c | 157 +--- + sound/soc/mxs/mxs-pcm.h | 16 - + sound/soc/mxs/mxs-saif.c | 51 +- + sound/soc/omap/ams-delta.c | 2 +- + sound/soc/omap/n810.c | 17 +- + sound/soc/omap/omap-mcbsp.c | 8 +- + sound/soc/omap/omap-mcbsp.h | 2 +- + sound/soc/omap/rx51.c | 25 +- + sound/soc/pxa/corgi.c | 14 +- + sound/soc/pxa/magician.c | 2 +- + sound/soc/pxa/poodle.c | 14 +- + sound/soc/pxa/pxa2xx-ac97.c | 10 +- + sound/soc/pxa/raumfeld.c | 2 +- + sound/soc/pxa/spitz.c | 14 +- + sound/soc/pxa/tosa.c | 2 +- + sound/soc/samsung/ac97.c | 4 +- + sound/soc/samsung/i2s.c | 14 +- + sound/soc/samsung/i2s.h | 2 +- + sound/soc/samsung/littlemill.c | 3 + + sound/soc/samsung/neo1973_wm8753.c | 4 +- + sound/soc/samsung/pcm.c | 4 +- + sound/soc/samsung/s3c24xx_simtec.c | 6 +- + sound/soc/samsung/smdk_wm8580.c | 4 +- + sound/soc/samsung/smdk_wm9713.c | 4 +- + sound/soc/sh/fsi.c | 912 +++++++++++++------- + sound/soc/soc-core.c | 346 ++++++-- + sound/soc/soc-dapm.c | 309 +++++--- + sound/soc/soc-dmaengine-pcm.c | 287 ++++++ + sound/soc/soc-io.c | 6 + + sound/soc/soc-pcm.c | 66 +- + sound/soc/tegra/tegra_alc5632.c | 130 +++- + 134 files changed, 3435 insertions(+), 2111 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/alc5632.txt + rename Documentation/devicetree/bindings/sound/{soc/codecs/fsl-sgtl5000.txt => sgtl5000.txt} (100%) + create mode 100644 Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt + create mode 100644 include/sound/dmaengine_pcm.h + create mode 100644 include/sound/max9768.h + create mode 100644 sound/soc/codecs/max9768.c + create mode 100644 sound/soc/soc-dmaengine-pcm.c +Merging cpufreq/next (fd0ef7a [CPUFREQ] CPUfreq ondemand: update sampling rate without waiting for next sampling) +$ git merge cpufreq/next +Merge made by the 'recursive' strategy. + drivers/cpufreq/Kconfig.arm | 23 ++ + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/cpufreq_ondemand.c | 58 ++++- + drivers/cpufreq/exynos-cpufreq.c | 2 + + drivers/cpufreq/s3c2416-cpufreq.c | 542 ++++++++++++++++++++++++++++++++++++ + drivers/cpufreq/s3c64xx-cpufreq.c | 7 - + 6 files changed, 625 insertions(+), 8 deletions(-) + create mode 100644 drivers/cpufreq/s3c2416-cpufreq.c +Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.) +$ git merge quilt/rr +Resolved 'arch/arm/kernel/kprobes.c' using previous resolution. +Auto-merging arch/mips/kernel/smp-bmips.c +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/kernel/kprobes.c +CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 24d8a6c] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/cgroups/cpusets.txt | 2 +- + Documentation/cpu-hotplug.txt | 22 +- + Documentation/kernel-parameters.txt | 2 + + Documentation/virtual/virtio-spec.txt | 1000 ++++++++++++++++++++++++++++++--- + arch/alpha/kernel/smp.c | 2 +- + arch/arm/kernel/kprobes.c | 2 +- + arch/arm/kernel/smp.c | 7 +- + arch/hexagon/kernel/smp.c | 8 +- + arch/ia64/kernel/acpi.c | 2 +- + arch/mips/cavium-octeon/smp.c | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 2 +- + arch/mips/kernel/proc.c | 2 +- + arch/mips/kernel/smp-bmips.c | 2 +- + arch/mips/kernel/smp.c | 27 +- + arch/mips/kernel/smtc.c | 2 +- + arch/mips/mm/c-octeon.c | 6 +- + arch/mips/netlogic/common/smp.c | 6 +- + arch/mips/pmc-sierra/yosemite/smp.c | 8 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/mips/sibyte/bcm1480/smp.c | 7 +- + arch/mips/sibyte/sb1250/smp.c | 7 +- + arch/powerpc/mm/hugetlbpage.c | 3 +- + arch/sparc/kernel/leon_kernel.c | 6 +- + arch/tile/kernel/setup.c | 8 +- + arch/um/kernel/skas/process.c | 2 +- + arch/um/kernel/smp.c | 9 +- + arch/x86/xen/enlighten.c | 2 +- + drivers/cpufreq/db8500-cpufreq.c | 2 +- + include/asm-generic/vmlinux.lds.h | 35 +- + include/linux/cpumask.h | 6 - + include/linux/module.h | 32 +- + include/linux/moduleparam.h | 58 ++- + init/Kconfig | 4 +- + init/main.c | 65 ++- + kernel/cpuset.c | 10 +- + kernel/module.c | 37 ++- + kernel/params.c | 39 +- + 37 files changed, 1178 insertions(+), 262 deletions(-) +Merging input/next (fa3e44f Input: atmel-wm97xx - convert to dev_pm_ops) +$ git merge input/next +Auto-merging kernel/time/timekeeping.c +Auto-merging drivers/input/touchscreen/usbtouchscreen.c +Auto-merging drivers/input/touchscreen/atmel-wm97xx.c +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/tablet/wacom_wac.c +Auto-merging drivers/input/tablet/wacom_sys.c +Auto-merging drivers/input/serio/at32psif.c +Auto-merging drivers/input/mouse/sentelic.c +Auto-merging drivers/input/mouse/psmouse-base.c +Auto-merging drivers/input/keyboard/samsung-keypad.c +Auto-merging drivers/input/keyboard/nomadik-ske-keypad.c +Auto-merging drivers/input/evdev.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + arch/arm/mach-tegra/include/mach/kbc.h | 13 +- + arch/arm/plat-spear/include/plat/keyboard.h | 66 ++- + arch/m68k/q40/config.c | 13 + + drivers/hid/hid-core.c | 10 + + drivers/hid/hid-ids.h | 11 + + drivers/input/evdev.c | 25 +- + drivers/input/keyboard/nomadik-ske-keypad.c | 17 +- + drivers/input/keyboard/samsung-keypad.c | 6 +- + drivers/input/keyboard/spear-keyboard.c | 16 +- + drivers/input/keyboard/tegra-kbc.c | 51 ++- + drivers/input/misc/Kconfig | 12 +- + drivers/input/misc/Makefile | 1 + + drivers/input/misc/da9052_onkey.c | 169 ++++++++ + drivers/input/mouse/Kconfig | 17 + + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/hgpk.c | 9 +- + drivers/input/mouse/psmouse-base.c | 15 +- + drivers/input/mouse/psmouse.h | 2 + + drivers/input/mouse/sentelic.c | 12 +- + drivers/input/mouse/synaptics_usb.c | 568 ++++++++++++++++++++++++ + drivers/input/serio/at32psif.c | 22 +- + drivers/input/serio/q40kbd.c | 139 ++++--- + drivers/input/tablet/wacom_sys.c | 6 +- + drivers/input/tablet/wacom_wac.c | 28 +- + drivers/input/tablet/wacom_wac.h | 2 + + drivers/input/touchscreen/Kconfig | 53 +++- + drivers/input/touchscreen/Makefile | 6 +- + drivers/input/touchscreen/atmel-wm97xx.c | 20 +- + drivers/input/touchscreen/cyttsp_core.c | 625 +++++++++++++++++++++++++++ + drivers/input/touchscreen/cyttsp_core.h | 149 +++++++ + drivers/input/touchscreen/cyttsp_i2c.c | 146 +++++++ + drivers/input/touchscreen/cyttsp_spi.c | 210 +++++++++ + drivers/input/touchscreen/ti_tscadc.c | 486 +++++++++++++++++++++ + drivers/input/touchscreen/usbtouchscreen.c | 63 +++ + include/linux/input.h | 2 + + include/linux/input/cyttsp.h | 58 +++ + include/linux/input/ti_tscadc.h | 17 + + kernel/time/timekeeping.c | 2 + + 39 files changed, 2901 insertions(+), 174 deletions(-) + create mode 100644 drivers/input/misc/da9052_onkey.c + create mode 100644 drivers/input/mouse/synaptics_usb.c + create mode 100644 drivers/input/touchscreen/cyttsp_core.c + create mode 100644 drivers/input/touchscreen/cyttsp_core.h + create mode 100644 drivers/input/touchscreen/cyttsp_i2c.c + create mode 100644 drivers/input/touchscreen/cyttsp_spi.c + create mode 100644 drivers/input/touchscreen/ti_tscadc.c + create mode 100644 include/linux/input/cyttsp.h + create mode 100644 include/linux/input/ti_tscadc.h +Merging input-mt/for-next (7491f3d bcm5974: Add pointer and buttonpad properties) +$ git merge input-mt/for-next +Auto-merging include/linux/input.h +Auto-merging drivers/input/evdev.c +Merge made by the 'recursive' strategy. + drivers/input/evdev.c | 27 ++++++++++++++++++++++++++- + drivers/input/input.c | 2 +- + drivers/input/mouse/bcm5974.c | 1 + + include/linux/input.h | 25 +++++++++++++++++++++++++ + include/linux/input/mt.h | 8 ++++++-- + 5 files changed, 59 insertions(+), 4 deletions(-) +Merging block/for-next (b3021da Merge branch 'for-3.3/core' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +Merging quilt/device-mapper (347f18f Commit unwritten data every second to prevent too much building up. In future we might make the commit interval tunable.) +$ git merge quilt/device-mapper +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-block-dm | 25 +++++++++ + drivers/md/dm-bufio.c | 1 - + drivers/md/dm-crypt.c | 16 +++--- + drivers/md/dm-delay.c | 9 ++-- + drivers/md/dm-flakey.c | 5 +- + drivers/md/dm-io.c | 23 ++++++--- + drivers/md/dm-ioctl.c | 7 ++- + drivers/md/dm-linear.c | 3 +- + drivers/md/dm-log.c | 3 +- + drivers/md/dm-mpath.c | 10 +++- + drivers/md/dm-queue-length.c | 3 +- + drivers/md/dm-raid.c | 70 +++++++++++++++++++++--- + drivers/md/dm-raid1.c | 12 +++-- + drivers/md/dm-round-robin.c | 3 +- + drivers/md/dm-service-time.c | 5 +- + drivers/md/dm-stripe.c | 3 +- + drivers/md/dm-table.c | 6 ++- + drivers/md/dm-thin-metadata.c | 25 +++++++-- + drivers/md/dm-thin.c | 28 +++++++++- + drivers/md/persistent-data/dm-btree-internal.h | 7 +-- + drivers/md/persistent-data/dm-btree-remove.c | 28 +++++----- + drivers/md/persistent-data/dm-btree.c | 27 +++++----- + 22 files changed, 231 insertions(+), 88 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-block-dm +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Recorded preimage for 'drivers/pcmcia/soc_common.c' +Auto-merging drivers/pcmcia/soc_common.c +CONFLICT (content): Merge conflict in drivers/pcmcia/soc_common.c +Auto-merging drivers/pcmcia/pxa2xx_viper.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/pcmcia/soc_common.c'. +[master dbe0ede] Merge remote-tracking branch 'pcmcia/master' +$ git diff -M --stat --summary HEAD^.. + drivers/pcmcia/at91_cf.c | 52 +++++++++++++++++++------------------- + drivers/pcmcia/bcm63xx_pcmcia.c | 2 +- + drivers/pcmcia/bfin_cf_pcmcia.c | 13 +--------- + drivers/pcmcia/db1xxx_ss.c | 17 ++---------- + drivers/pcmcia/electra_cf.c | 12 +-------- + drivers/pcmcia/i82092.c | 11 ++------ + drivers/pcmcia/m8xx_pcmcia.c | 13 +--------- + drivers/pcmcia/pd6729.c | 9 +----- + drivers/pcmcia/pxa2xx_viper.c | 13 +--------- + drivers/pcmcia/vrc4173_cardu.c | 7 +--- + drivers/pcmcia/xxs1500_ss.c | 13 +--------- + drivers/pcmcia/yenta_socket.c | 2 +- + 12 files changed, 43 insertions(+), 121 deletions(-) +Merging battery/master (913272b Merge git://git.infradead.org/users/cbou/battery-urgent) +$ git merge battery/master +Already up-to-date. +Merging mmc/mmc-next (e75c4ce mmc: sdhci-esdhc-imx: fix for mmc cards on i.MX5) +$ git merge mmc/mmc-next +Resolved 'drivers/mmc/host/atmel-mci.c' using previous resolution. +Auto-merging include/linux/mmc/dw_mmc.h +Auto-merging include/linux/mmc/card.h +Auto-merging drivers/mmc/host/mmci.c +Auto-merging drivers/mmc/host/dw_mmc.c +Auto-merging drivers/mmc/host/atmel-mci.c +CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/mmc/core/sdio.c +Auto-merging drivers/mmc/core/sd.c +Auto-merging drivers/mmc/core/mmc.c +Auto-merging drivers/mmc/core/core.c +Auto-merging drivers/mmc/card/block.c +Auto-merging arch/arm/mach-omap2/hsmmc.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2d8b2e6] Merge remote-tracking branch 'mmc/mmc-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + arch/arm/mach-omap2/hsmmc.c | 1 + + arch/arm/mach-omap2/hsmmc.h | 2 + + drivers/mmc/card/block.c | 21 ++- + drivers/mmc/core/core.c | 9 ++ + drivers/mmc/core/host.c | 4 +- + drivers/mmc/core/mmc.c | 17 +++ + drivers/mmc/core/sd.c | 8 +- + drivers/mmc/core/sdio.c | 8 + + drivers/mmc/host/Kconfig | 25 ++++ + drivers/mmc/host/Makefile | 2 + + drivers/mmc/host/atmel-mci.c | 18 +-- + drivers/mmc/host/dw_mmc-pci.c | 158 ++++++++++++++++++++ + drivers/mmc/host/dw_mmc-pltfm.c | 134 +++++++++++++++++ + drivers/mmc/host/dw_mmc.c | 280 +++++++++++++++++++---------------- + drivers/mmc/host/dw_mmc.h | 7 + + drivers/mmc/host/mmci.c | 7 +- + drivers/mmc/host/omap_hsmmc.c | 8 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 5 +- + drivers/mmc/host/sdhci-of-esdhc.c | 37 +++++- + drivers/mmc/host/sdhci-tegra.c | 100 +++++++++++-- + drivers/mmc/host/sdhci.c | 6 + + drivers/mmc/host/sdhci.h | 2 + + include/linux/mmc/card.h | 2 + + include/linux/mmc/dw_mmc.h | 8 +- + include/linux/mmc/mmc.h | 3 + + 26 files changed, 700 insertions(+), 176 deletions(-) + create mode 100644 drivers/mmc/host/dw_mmc-pci.c + create mode 100644 drivers/mmc/host/dw_mmc-pltfm.c +Merging kgdb/kgdb-next (0e997a4 KDB: Fix usability issues relating to the 'enter' key.) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_keyboard.c | 95 ++++++++++++++++++++++++++++++--------- + kernel/debug/kdb/kdb_main.c | 3 + + kernel/debug/kdb/kdb_private.h | 7 +++ + 3 files changed, 83 insertions(+), 22 deletions(-) +Merging slab/for-next (96438bc Merge branch 'slub/cleanups' into for-next) +$ git merge slab/for-next +Merge made by the 'recursive' strategy. + include/linux/slub_def.h | 7 +- + mm/slab.c | 5 +- + mm/slub.c | 192 ++++++++++++++++++++++++++-------------------- + 3 files changed, 116 insertions(+), 88 deletions(-) +Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (2a78e32 commit 56a2559bb654a (md/raid10: recognise replacements ...) changed 'run' to set ->replacement or ->rdev depending on the 'Replacement' status if the device, but it didn't remove the old unconditional setting of 'rdev'. So it was largely ineffective.) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/raid1.c | 2 +- + drivers/md/raid10.c | 42 ++++++++++++++++++++++++++++-------------- + drivers/md/raid5.c | 8 +++----- + 3 files changed, 32 insertions(+), 20 deletions(-) +Merging mfd/for-next (2fcf164 mfd: Fix a typo in MFD_MAX8997 Kconfig entry) +$ git merge mfd/for-next +Auto-merging sound/soc/codecs/twl6040.c +Auto-merging sound/soc/codecs/Kconfig +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/hwmon/mc13783-adc.c +Auto-merging drivers/cpufreq/db8500-cpufreq.c +Auto-merging arch/arm/mach-omap2/board-omap4panda.c +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Merge made by the 'recursive' strategy. + arch/arm/mach-omap2/board-4430sdp.c | 12 +- + arch/arm/mach-omap2/board-generic.c | 2 +- + arch/arm/mach-omap2/board-omap4panda.c | 4 +- + arch/arm/mach-omap2/twl-common.c | 37 +- + arch/arm/mach-omap2/twl-common.h | 10 +- + .../mach-ux500/include/mach/irqs-board-mop500.h | 2 +- + drivers/cpufreq/db8500-cpufreq.c | 13 +- + drivers/gpio/gpio-stmpe.c | 41 +- + drivers/hwmon/mc13783-adc.c | 2 +- + drivers/input/misc/88pm860x_onkey.c | 26 + + drivers/input/misc/Kconfig | 3 +- + drivers/input/misc/twl6040-vibra.c | 4 +- + drivers/input/touchscreen/mc13783_ts.c | 11 +- + drivers/leds/leds-88pm860x.c | 23 + + drivers/mfd/88pm860x-core.c | 108 ++- + drivers/mfd/88pm860x-i2c.c | 25 + + drivers/mfd/Kconfig | 31 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/ab5500-core.c | 1 - + drivers/mfd/ab8500-core.c | 301 +++++- + drivers/mfd/ab8500-i2c.c | 15 +- + drivers/mfd/asic3.c | 6 + + drivers/mfd/da9052-core.c | 3 - + drivers/mfd/da9052-i2c.c | 7 +- + drivers/mfd/da9052-spi.c | 9 +- + drivers/mfd/db8500-prcmu.c | 1041 ++++++++++++++++---- + drivers/mfd/dbx500-prcmu-regs.h | 130 ++- + drivers/mfd/mc13xxx-core.c | 11 +- + drivers/mfd/mfd-core.c | 4 +- + drivers/mfd/omap-usb-host.c | 7 +- + drivers/mfd/pcf50633-core.c | 8 +- + drivers/mfd/pcf50633-gpio.c | 27 +- + drivers/mfd/pcf50633-irq.c | 7 +- + drivers/mfd/s5m-core.c | 60 +- + drivers/mfd/s5m-irq.c | 14 +- + drivers/mfd/stmpe.c | 134 ++- + drivers/mfd/tps65217.c | 242 +++++ + drivers/mfd/tps65910-irq.c | 11 + + drivers/mfd/tps65910.c | 125 +-- + drivers/mfd/tps65912-core.c | 2 +- + drivers/mfd/twl-core.c | 66 +- + drivers/mfd/twl4030-irq.c | 26 +- + drivers/mfd/twl6030-irq.c | 15 +- + drivers/mfd/twl6040-core.c | 155 ++- + drivers/mfd/wm831x-spi.c | 2 +- + drivers/mfd/wm8350-irq.c | 1 - + drivers/mfd/wm8400-core.c | 3 +- + drivers/mfd/wm8994-core.c | 24 +- + drivers/mfd/wm8994-regmap.c | 2 + + drivers/rtc/rtc-88pm860x.c | 27 + + drivers/video/backlight/88pm860x_bl.c | 49 +- + include/linux/i2c/twl.h | 12 - + include/linux/mfd/88pm860x.h | 23 + + include/linux/mfd/abx500.h | 7 - + include/linux/mfd/abx500/ab8500-gpio.h | 4 +- + include/linux/mfd/abx500/ab8500-sysctrl.h | 43 + + include/linux/mfd/abx500/ab8500.h | 114 ++- + include/linux/mfd/da9052/da9052.h | 2 - + include/linux/mfd/db8500-prcmu.h | 148 ++- + include/linux/mfd/dbx500-prcmu.h | 407 +++++++- + include/linux/mfd/mc13xxx.h | 16 +- + include/linux/mfd/stmpe.h | 1 + + include/linux/mfd/tps65217.h | 283 ++++++ + include/linux/mfd/tps65910.h | 1 + + include/linux/mfd/twl6040.h | 29 + + include/linux/regulator/ab8500.h | 70 ++- + sound/soc/codecs/Kconfig | 3 +- + sound/soc/codecs/twl6040.c | 3 +- + 68 files changed, 3308 insertions(+), 748 deletions(-) + create mode 100644 drivers/mfd/tps65217.c + create mode 100644 include/linux/mfd/tps65217.h +Merging drm/drm-next (81ffbbe drm/radeon: fix deferred page-flip detection logic on Avivo-based ASICs) +$ git merge drm/drm-next +Recorded preimage for 'drivers/gpu/drm/i915/intel_ringbuffer.c' +Auto-merging drivers/gpu/drm/radeon/rv770.c +Auto-merging drivers/gpu/drm/radeon/rv515.c +Auto-merging drivers/gpu/drm/radeon/rs690.c +Auto-merging drivers/gpu/drm/radeon/rs600.c +Auto-merging drivers/gpu/drm/radeon/rs400.c +Auto-merging drivers/gpu/drm/radeon/radeon_ring.c +Auto-merging drivers/gpu/drm/radeon/radeon_cs.c +Auto-merging drivers/gpu/drm/radeon/r600_cs.c +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/radeon/r520.c +Auto-merging drivers/gpu/drm/radeon/r420.c +Auto-merging drivers/gpu/drm/radeon/r300.c +Auto-merging drivers/gpu/drm/radeon/r100.c +Auto-merging drivers/gpu/drm/radeon/ni.c +Auto-merging drivers/gpu/drm/radeon/evergreen.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Removing drivers/gpu/drm/i915/i915_mem.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_fbdev.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/intel_ringbuffer.c'. +[master db82b92] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/char/agp/intel-agp.c | 1 + + drivers/char/agp/intel-gtt.c | 10 +- + drivers/gpu/drm/drm_crtc.c | 201 ++-- + drivers/gpu/drm/drm_crtc_helper.c | 12 +- + drivers/gpu/drm/drm_drv.c | 12 +- + drivers/gpu/drm/drm_edid.c | 7 +- + drivers/gpu/drm/drm_fb_helper.c | 88 +-- + drivers/gpu/drm/drm_ioctl.c | 8 + + drivers/gpu/drm/drm_irq.c | 4 +- + drivers/gpu/drm/drm_memory.c | 19 - + drivers/gpu/drm/drm_modes.c | 2 - + drivers/gpu/drm/drm_pci.c | 2 - + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 28 +- + drivers/gpu/drm/gma500/framebuffer.c | 11 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 + + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 28 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 5 +- + drivers/gpu/drm/i810/i810_dma.c | 2 + + drivers/gpu/drm/i915/Makefile | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 324 ++++--- + drivers/gpu/drm/i915/i915_dma.c | 66 +- + drivers/gpu/drm/i915/i915_drv.c | 49 +- + drivers/gpu/drm/i915/i915_drv.h | 145 ++- + drivers/gpu/drm/i915/i915_gem.c | 516 +++++---- + drivers/gpu/drm/i915/i915_gem_evict.c | 2 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 205 +++-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 275 +++++- + drivers/gpu/drm/i915/i915_gem_tiling.c | 23 +- + drivers/gpu/drm/i915/i915_irq.c | 197 +++-- + drivers/gpu/drm/i915/i915_mem.c | 387 ------- + drivers/gpu/drm/i915/i915_reg.h | 132 ++- + drivers/gpu/drm/i915/intel_acpi.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 2 +- + drivers/gpu/drm/i915/intel_crt.c | 5 +- + drivers/gpu/drm/i915/intel_display.c | 386 ++++--- + drivers/gpu/drm/i915/intel_dp.c | 13 +- + drivers/gpu/drm/i915/intel_drv.h | 1 + + drivers/gpu/drm/i915/intel_dvo.c | 1 - + drivers/gpu/drm/i915/intel_fb.c | 6 +- + drivers/gpu/drm/i915/intel_hdmi.c | 23 +- + drivers/gpu/drm/i915/intel_i2c.c | 28 +- + drivers/gpu/drm/i915/intel_lvds.c | 15 + + drivers/gpu/drm/i915/intel_modes.c | 29 +- + drivers/gpu/drm/i915/intel_overlay.c | 18 +- + drivers/gpu/drm/i915/intel_panel.c | 6 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 210 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 35 +- + drivers/gpu/drm/i915/intel_sdvo.c | 33 +- + drivers/gpu/drm/i915/intel_sprite.c | 4 +- + drivers/gpu/drm/i915/intel_tv.c | 2 +- + drivers/gpu/drm/mga/mga_dma.c | 2 + + drivers/gpu/drm/nouveau/nouveau_display.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_state.c | 2 + + drivers/gpu/drm/r128/r128_drv.c | 1 + + drivers/gpu/drm/radeon/Makefile | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 20 +- + drivers/gpu/drm/radeon/atombios_i2c.c | 139 +++ + drivers/gpu/drm/radeon/evergreen.c | 56 +- + drivers/gpu/drm/radeon/evergreen_blit_kms.c | 12 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 958 ++++++++++++++++- + drivers/gpu/drm/radeon/evergreen_reg.h | 1 + + drivers/gpu/drm/radeon/evergreend.h | 377 +++++++ + drivers/gpu/drm/radeon/ni.c | 6 +- + drivers/gpu/drm/radeon/r100.c | 109 ++- + drivers/gpu/drm/radeon/r200.c | 29 +- + drivers/gpu/drm/radeon/r300.c | 9 +- + drivers/gpu/drm/radeon/r420.c | 2 +- + drivers/gpu/drm/radeon/r500_reg.h | 2 + + drivers/gpu/drm/radeon/r520.c | 4 +- + drivers/gpu/drm/radeon/r600.c | 26 +- + drivers/gpu/drm/radeon/r600_blit_kms.c | 15 +- + drivers/gpu/drm/radeon/r600_cs.c | 282 ++++- + drivers/gpu/drm/radeon/r600d.h | 20 + + drivers/gpu/drm/radeon/radeon.h | 238 +++-- + drivers/gpu/drm/radeon/radeon_asic.c | 1579 +++++++++++++++++---------- + drivers/gpu/drm/radeon/radeon_asic.h | 24 +- + drivers/gpu/drm/radeon/radeon_benchmark.c | 24 +- + drivers/gpu/drm/radeon/radeon_blit_common.h | 44 + + drivers/gpu/drm/radeon/radeon_clocks.c | 2 +- + drivers/gpu/drm/radeon/radeon_cp.c | 2 + + drivers/gpu/drm/radeon/radeon_cs.c | 23 +- + drivers/gpu/drm/radeon/radeon_display.c | 86 +- + drivers/gpu/drm/radeon/radeon_drv.c | 5 +- + drivers/gpu/drm/radeon/radeon_fb.c | 6 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 27 +- + drivers/gpu/drm/radeon/radeon_kms.c | 2 + + drivers/gpu/drm/radeon/radeon_object.c | 46 + + drivers/gpu/drm/radeon/radeon_pm.c | 6 +- + drivers/gpu/drm/radeon/radeon_reg.h | 2 + + drivers/gpu/drm/radeon/radeon_ring.c | 8 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 15 +- + drivers/gpu/drm/radeon/reg_srcs/cayman | 11 +- + drivers/gpu/drm/radeon/reg_srcs/evergreen | 11 +- + drivers/gpu/drm/radeon/reg_srcs/r600 | 19 +- + drivers/gpu/drm/radeon/rs400.c | 2 +- + drivers/gpu/drm/radeon/rs600.c | 23 +- + drivers/gpu/drm/radeon/rs690.c | 4 +- + drivers/gpu/drm/radeon/rv515.c | 5 +- + drivers/gpu/drm/radeon/rv770.c | 4 +- + drivers/gpu/drm/sis/sis_drv.c | 2 + + drivers/gpu/drm/via/via_map.c | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 55 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 252 +++-- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 91 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 8 + + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 38 +- + include/drm/drm.h | 2 + + include/drm/drmP.h | 9 - + include/drm/drm_crtc.h | 16 +- + include/drm/drm_fb_helper.h | 2 - + include/drm/i915_drm.h | 1 + + include/drm/intel-gtt.h | 4 + + include/drm/radeon_drm.h | 24 +- + 120 files changed, 5622 insertions(+), 2848 deletions(-) + delete mode 100644 drivers/gpu/drm/i915/i915_mem.c + create mode 100644 drivers/gpu/drm/radeon/atombios_i2c.c + create mode 100644 drivers/gpu/drm/radeon/radeon_blit_common.h +Merging fbdev/fbdev-next (0d04c58 Merge branch 'fbdev-for-linus' into fbdev-next) +$ git merge fbdev/fbdev-next +Auto-merging drivers/video/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/plat-samsung/include/plat/regs-fb.h | 9 + + drivers/video/Kconfig | 14 +- + drivers/video/Makefile | 3 + + drivers/video/atmel_lcdfb.c | 12 +- + drivers/video/au1100fb.c | 32 +- + drivers/video/au1200fb.c | 9 +- + drivers/video/bf537-lq035.c | 12 +- + drivers/video/bf54x-lq043fb.c | 4 +- + drivers/video/bfin-lq035q1-fb.c | 8 +- + drivers/video/bfin_adv7393fb.c | 5 +- + drivers/video/da8xx-fb.c | 37 +- + drivers/video/exynos/Kconfig | 37 + + drivers/video/exynos/Makefile | 8 + + drivers/video/exynos/exynos_dp_core.c | 1058 ++++++++++++++++ + drivers/video/exynos/exynos_dp_core.h | 206 +++ + drivers/video/exynos/exynos_dp_reg.c | 1173 +++++++++++++++++ + drivers/video/exynos/exynos_dp_reg.h | 335 +++++ + drivers/video/exynos/exynos_mipi_dsi.c | 600 +++++++++ + drivers/video/exynos/exynos_mipi_dsi_common.c | 896 +++++++++++++ + drivers/video/exynos/exynos_mipi_dsi_common.h | 46 + + drivers/video/exynos/exynos_mipi_dsi_lowlevel.c | 618 +++++++++ + drivers/video/exynos/exynos_mipi_dsi_lowlevel.h | 112 ++ + drivers/video/exynos/exynos_mipi_dsi_regs.h | 149 +++ + drivers/video/exynos/s6e8ax0.c | 898 +++++++++++++ + drivers/video/exynos/s6e8ax0.h | 21 + + drivers/video/fbmem.c | 18 +- + drivers/video/i740_reg.h | 309 +++++ + drivers/video/i740fb.c | 1337 ++++++++++++++++++++ + drivers/video/msm/mddi_client_nt35399.c | 7 +- + drivers/video/msm/mddi_client_toshiba.c | 7 +- + drivers/video/omap/lcd_inn1610.c | 10 +- + drivers/video/omap/lcd_mipid.c | 14 +- + drivers/video/omap2/displays/panel-acx565akm.c | 13 +- + .../omap2/displays/panel-lgphilips-lb035q02.c | 12 +- + .../omap2/displays/panel-nec-nl8048hl11-01b.c | 12 +- + drivers/video/omap2/displays/panel-taal.c | 4 +- + .../video/omap2/displays/panel-tpo-td043mtea1.c | 24 +- + drivers/video/pxa168fb.c | 15 +- + drivers/video/riva/fbdev.c | 5 +- + drivers/video/s3c-fb.c | 81 +- + drivers/video/udlfb.c | 2 +- + include/linux/fb.h | 1 + + include/video/exynos_dp.h | 131 ++ + include/video/exynos_mipi_dsim.h | 359 ++++++ + 44 files changed, 8465 insertions(+), 198 deletions(-) + create mode 100644 drivers/video/exynos/Kconfig + create mode 100644 drivers/video/exynos/Makefile + create mode 100644 drivers/video/exynos/exynos_dp_core.c + create mode 100644 drivers/video/exynos/exynos_dp_core.h + create mode 100644 drivers/video/exynos/exynos_dp_reg.c + create mode 100644 drivers/video/exynos/exynos_dp_reg.h + create mode 100644 drivers/video/exynos/exynos_mipi_dsi.c + create mode 100644 drivers/video/exynos/exynos_mipi_dsi_common.c + create mode 100644 drivers/video/exynos/exynos_mipi_dsi_common.h + create mode 100644 drivers/video/exynos/exynos_mipi_dsi_lowlevel.c + create mode 100644 drivers/video/exynos/exynos_mipi_dsi_lowlevel.h + create mode 100644 drivers/video/exynos/exynos_mipi_dsi_regs.h + create mode 100644 drivers/video/exynos/s6e8ax0.c + create mode 100644 drivers/video/exynos/s6e8ax0.h + create mode 100644 drivers/video/i740_reg.h + create mode 100644 drivers/video/i740fb.c + create mode 100644 include/video/exynos_dp.h + create mode 100644 include/video/exynos_mipi_dsim.h +Merging viafb/viafb-next (91dc1be viafb: LCD bpp cleanup) +$ git merge viafb/viafb-next +Auto-merging drivers/video/via/hw.c +Merge made by the 'recursive' strategy. + drivers/video/via/Makefile | 5 ++- + drivers/video/via/chip.h | 3 - + drivers/video/via/dvi.c | 5 +- + drivers/video/via/dvi.h | 3 +- + drivers/video/via/hw.c | 95 +++++++++++++++------------------- + drivers/video/via/hw.h | 5 +- + drivers/video/via/lcd.c | 29 ++++------ + drivers/video/via/lcd.h | 3 +- + drivers/video/via/via_aux.c | 88 +++++++++++++++++++++++++++++++ + drivers/video/via/via_aux.h | 93 +++++++++++++++++++++++++++++++++ + drivers/video/via/via_aux_ch7301.c | 50 ++++++++++++++++++ + drivers/video/via/via_aux_edid.c | 100 ++++++++++++++++++++++++++++++++++++ + drivers/video/via/via_aux_sii164.c | 54 +++++++++++++++++++ + drivers/video/via/via_aux_vt1621.c | 44 ++++++++++++++++ + drivers/video/via/via_aux_vt1622.c | 50 ++++++++++++++++++ + drivers/video/via/via_aux_vt1625.c | 50 ++++++++++++++++++ + drivers/video/via/via_aux_vt1631.c | 46 ++++++++++++++++ + drivers/video/via/via_aux_vt1632.c | 54 +++++++++++++++++++ + drivers/video/via/via_aux_vt1636.c | 46 ++++++++++++++++ + drivers/video/via/via_i2c.c | 10 +++- + drivers/video/via/viafbdev.c | 57 +++++++++++++++++--- + drivers/video/via/viafbdev.h | 6 ++ + 22 files changed, 806 insertions(+), 90 deletions(-) + create mode 100644 drivers/video/via/via_aux.c + create mode 100644 drivers/video/via/via_aux.h + create mode 100644 drivers/video/via/via_aux_ch7301.c + create mode 100644 drivers/video/via/via_aux_edid.c + create mode 100644 drivers/video/via/via_aux_sii164.c + create mode 100644 drivers/video/via/via_aux_vt1621.c + create mode 100644 drivers/video/via/via_aux_vt1622.c + create mode 100644 drivers/video/via/via_aux_vt1625.c + create mode 100644 drivers/video/via/via_aux_vt1631.c + create mode 100644 drivers/video/via/via_aux_vt1632.c + create mode 100644 drivers/video/via/via_aux_vt1636.c +Merging omap_dss2/for-next (9a90168 OMAPDSS: HDMI: Disable DDC internal pull up) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (564c984 Merge branch 'regulator-stub' into regulator-next) +$ git merge regulator/for-next +Auto-merging include/linux/mfd/tps65910.h +Auto-merging include/linux/i2c/twl.h +Auto-merging drivers/mfd/twl-core.c +Merge made by the 'recursive' strategy. + .../bindings/regulator/twl-regulator.txt | 68 ++ + Documentation/driver-model/devres.txt | 2 + + arch/arm/mach-imx/mach-pcm037.c | 9 + + arch/arm/mach-u300/i2c.c | 2 - + arch/arm/plat-mxc/3ds_debugboard.c | 9 + + drivers/mfd/twl-core.c | 41 +- + drivers/regulator/Kconfig | 291 ++++---- + drivers/regulator/Makefile | 45 +- + drivers/regulator/aat2870-regulator.c | 14 +- + drivers/regulator/ab8500.c | 10 +- + drivers/regulator/ad5398.c | 4 +- + drivers/regulator/core.c | 90 +-- + drivers/regulator/db8500-prcmu.c | 118 +--- + drivers/regulator/dbx500-prcmu.c | 241 ++++++ + drivers/regulator/dbx500-prcmu.h | 63 ++ + drivers/regulator/fixed-helper.c | 53 ++ + drivers/regulator/fixed.c | 4 +- + drivers/regulator/isl6271a-regulator.c | 14 +- + drivers/regulator/max1586.c | 4 +- + drivers/regulator/max8649.c | 2 +- + drivers/regulator/max8660.c | 16 +- + drivers/regulator/max8997.c | 37 +- + drivers/regulator/max8998.c | 15 +- + drivers/regulator/mc13783-regulator.c | 3 + + drivers/regulator/pcf50633-regulator.c | 27 +- + drivers/regulator/s5m8767.c | 806 ++++++++++++++++++++ + drivers/regulator/tps62360-regulator.c | 472 ++++++++++++ + drivers/regulator/tps65023-regulator.c | 4 - + drivers/regulator/tps65217-regulator.c | 493 ++++++++++++ + drivers/regulator/tps65910-regulator.c | 289 +++++++- + drivers/regulator/twl-regulator.c | 327 ++++++-- + drivers/regulator/wm8350-regulator.c | 4 +- + drivers/regulator/wm8994-regulator.c | 4 +- + include/linux/i2c/twl.h | 14 +- + include/linux/mfd/tps65910.h | 8 + + include/linux/regulator/consumer.h | 12 +- + include/linux/regulator/driver.h | 6 +- + include/linux/regulator/fixed.h | 13 + + include/linux/regulator/machine.h | 2 - + include/linux/regulator/tps62360.h | 57 ++ + 40 files changed, 3184 insertions(+), 509 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/twl-regulator.txt + create mode 100644 drivers/regulator/dbx500-prcmu.c + create mode 100644 drivers/regulator/dbx500-prcmu.h + create mode 100644 drivers/regulator/fixed-helper.c + create mode 100644 drivers/regulator/s5m8767.c + create mode 100644 drivers/regulator/tps62360-regulator.c + create mode 100644 drivers/regulator/tps65217-regulator.c + create mode 100644 include/linux/regulator/tps62360.h +Merging security/next (df91e49 TOMOYO: Fix mount flags checking order.) +$ git merge security/next +Auto-merging mm/shmem.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging include/net/sock.h +Auto-merging fs/super.c +Auto-merging fs/quota/dquot.c +Auto-merging fs/nfs/idmap.c +Auto-merging fs/nfs/client.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Merge made by the 'recursive' strategy. + Documentation/networking/dns_resolver.txt | 4 + + Documentation/security/00-INDEX | 2 + + Documentation/security/Yama.txt | 65 ++++++ + Documentation/security/keys.txt | 4 + + drivers/char/tpm/Kconfig | 1 - + drivers/char/tpm/tpm.c | 3 +- + drivers/char/tpm/tpm.h | 2 + + drivers/char/tpm/tpm_tis.c | 17 +- + drivers/net/macvtap.c | 1 + + drivers/target/iscsi/iscsi_target.c | 1 + + drivers/target/iscsi/iscsi_target_login.c | 1 + + fs/cifs/cifsacl.c | 1 + + fs/nfs/client.c | 1 + + fs/nfs/idmap.c | 1 + + fs/proc/proc_sysctl.c | 2 + + fs/quota/dquot.c | 1 + + fs/super.c | 1 + + include/linux/key.h | 1 + + include/linux/prctl.h | 7 + + include/linux/security.h | 80 ++++---- + include/net/sock.h | 2 + + ipc/msgutil.c | 2 + + kernel/cred.c | 1 + + kernel/exit.c | 1 + + kernel/fork.c | 3 +- + kernel/sched/core.c | 1 + + kernel/sysctl.c | 1 + + mm/mmap.c | 17 ++- + mm/mprotect.c | 2 +- + mm/mremap.c | 2 +- + mm/shmem.c | 4 +- + mm/swapfile.c | 4 +- + net/dns_resolver/dns_key.c | 1 + + security/Kconfig | 6 + + security/Makefile | 2 + + security/apparmor/Makefile | 24 ++- + security/apparmor/apparmorfs.c | 195 ++++++++++++++---- + security/apparmor/audit.c | 1 + + security/apparmor/file.c | 3 +- + security/apparmor/include/apparmorfs.h | 44 ++++ + security/apparmor/include/audit.h | 5 +- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/resource.h | 4 + + security/apparmor/path.c | 5 +- + security/apparmor/policy_unpack.c | 2 + + security/apparmor/resource.c | 5 + + security/capability.c | 5 + + security/commoncap.c | 1 + + security/integrity/ima/Kconfig | 4 +- + security/integrity/ima/ima_audit.c | 2 +- + security/integrity/ima/ima_policy.c | 3 +- + security/keys/keyctl.c | 15 ++- + security/security.c | 21 +-- + security/selinux/hooks.c | 2 + + security/smack/smack_lsm.c | 3 + + security/tomoyo/mount.c | 38 ++-- + security/yama/Kconfig | 13 ++ + security/yama/Makefile | 3 + + security/yama/yama_lsm.c | 323 +++++++++++++++++++++++++++++ + 59 files changed, 815 insertions(+), 153 deletions(-) + create mode 100644 Documentation/security/Yama.txt + create mode 100644 security/yama/Kconfig + create mode 100644 security/yama/Makefile + create mode 100644 security/yama/yama_lsm.c +Merging selinux/master (a9ab18a selinux: include flow.h where used rather than get it indirectly) +$ git merge selinux/master +Auto-merging security/selinux/selinuxfs.c +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_policy.c | 1 + + security/selinux/include/xfrm.h | 2 ++ + security/selinux/selinuxfs.c | 3 ++- + 3 files changed, 5 insertions(+), 1 deletions(-) +Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/linux-next (1f033c1 Merge git://www.linux-watchdog.org/linux-watchdog) +$ git merge watchdog/linux-next +Already up-to-date. +Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (8479939 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + arch/arm/mach-tegra/include/mach/smmu.h | 63 ++ + drivers/iommu/Kconfig | 20 + + drivers/iommu/Makefile | 2 + + drivers/iommu/amd_iommu_init.c | 123 +++-- + drivers/iommu/tegra-gart.c | 451 ++++++++++++++ + drivers/iommu/tegra-smmu.c | 1034 +++++++++++++++++++++++++++++++ + include/linux/amd-iommu.h | 2 +- + 7 files changed, 1650 insertions(+), 45 deletions(-) + create mode 100644 arch/arm/mach-tegra/include/mach/smmu.h + create mode 100644 drivers/iommu/tegra-gart.c + create mode 100644 drivers/iommu/tegra-smmu.c +Merging osd/linux-next (0aa436b exofs: Cap on the memcpy() size) +$ git merge osd/linux-next +Auto-merging fs/exofs/super.c +Merge made by the 'recursive' strategy. + fs/exofs/super.c | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (c3363c9 Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c") +$ git merge trivial/for-next +Auto-merging tools/testing/ktest/ktest.pl +Auto-merging sound/pci/hda/patch_conexant.c +Auto-merging include/linux/security.h +Auto-merging fs/cramfs/inode.c +Auto-merging fs/btrfs/free-space-cache.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging drivers/tty/serial/sn_console.c +Auto-merging drivers/scsi/qla4xxx/ql4_os.c +Auto-merging drivers/scsi/qla2xxx/qla_bsg.c +Auto-merging drivers/scsi/pm8001/pm8001_hwi.c +Auto-merging drivers/power/bq27x00_battery.c +Auto-merging drivers/net/wireless/zd1211rw/zd_mac.c +Auto-merging drivers/net/wireless/hostap/hostap_hw.c +Auto-merging drivers/hwmon/tmp401.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/gpu/drm/radeon/rv515.c +Auto-merging drivers/block/nvme.c +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/mach-spear3xx/spear300.c +Auto-merging arch/arm/mach-bcmring/dma.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 4 +- + Documentation/DocBook/filesystems.tmpl | 2 +- + Documentation/DocBook/libata.tmpl | 4 +- + Documentation/device-mapper/thin-provisioning.txt | 2 +- + .../filesystems/ramfs-rootfs-initramfs.txt | 2 +- + Documentation/kernel-parameters.txt | 6 ++-- + Documentation/numastat.txt | 27 +++++++++++-------- + Documentation/scsi/scsi-generic.txt | 2 +- + Documentation/trace/events-power.txt | 2 +- + Documentation/usb/mtouchusb.txt | 2 +- + Documentation/usb/power-management.txt | 2 +- + Documentation/usb/proc_usb_info.txt | 2 +- + Documentation/vm/cleancache.txt | 2 +- + Documentation/vm/unevictable-lru.txt | 6 ++-- + Documentation/watchdog/watchdog-kernel-api.txt | 2 +- + arch/arm/mach-bcmring/dma.c | 1 - + arch/arm/mach-ks8695/leds.c | 1 - + arch/arm/mach-omap1/lcd_dma.c | 2 +- + arch/arm/mach-orion5x/db88f5281-setup.c | 4 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 4 +- + arch/arm/mach-spear3xx/spear300.c | 2 +- + arch/arm/mach-spear3xx/spear310.c | 2 +- + arch/arm/mach-spear3xx/spear320.c | 2 +- + arch/arm/mm/init.c | 1 - + arch/arm/plat-s3c24xx/pm-simtec.c | 2 +- + arch/ia64/xen/irq_xen.c | 2 +- + arch/mips/bcm63xx/setup.c | 2 +- + arch/powerpc/include/asm/keylargo.h | 2 +- + arch/score/Kconfig.debug | 2 +- + arch/x86/platform/scx200/scx200_32.c | 24 ++++++++--------- + drivers/block/nvme.c | 1 - + drivers/char/nvram.c | 2 +- + drivers/char/rtc.c | 4 +- + drivers/char/tlclk.c | 2 +- + drivers/char/viotape.c | 2 +- + drivers/dma/iop-adma.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 +++--- + drivers/gpu/drm/radeon/rv515.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- + drivers/hwmon/tmp401.c | 2 +- + drivers/iommu/intel-iommu.c | 2 +- + drivers/media/radio/radio-sf16fmr2.c | 2 +- + drivers/media/video/davinci/dm355_ccdc.c | 2 +- + drivers/mmc/host/s3cmci.c | 4 +- + drivers/net/wireless/hostap/hostap_hw.c | 4 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- + drivers/platform/x86/hdaps.c | 4 +- + drivers/power/bq27x00_battery.c | 4 +- + drivers/power/max8998_charger.c | 1 - + drivers/scsi/aic7xxx/aic79xx_core.c | 4 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- + drivers/scsi/mpt2sas/mpt2sas_config.c | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/pmcraid.h | 6 ++-- + drivers/scsi/qla2xxx/qla_bsg.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/staging/iio/dac/ad5686.c | 1 - + drivers/staging/mei/interrupt.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + drivers/tty/serial/sn_console.c | 4 +- + drivers/tty/synclink_gt.c | 2 +- + drivers/usb/host/ehci-dbg.c | 2 +- + fs/btrfs/check-integrity.c | 1 - + fs/btrfs/free-space-cache.c | 2 +- + fs/cramfs/inode.c | 6 ++-- + fs/ntfs/layout.h | 4 +- + fs/reiserfs/lbalance.c | 2 +- + include/linux/compiler.h | 2 +- + include/linux/security.h | 2 +- + include/trace/events/power.h | 1 - + kernel/resource.c | 3 +- + mm/truncate.c | 2 +- + net/rds/ib_recv.c | 2 +- + net/rds/iw_recv.c | 2 +- + sound/pci/hda/patch_conexant.c | 2 +- + tools/testing/ktest/ktest.pl | 2 +- + 77 files changed, 119 insertions(+), 126 deletions(-) +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge audit/for-next +Already up-to-date. +Merging pm/linux-next (ed819e3 Merge branch 'pm-qos') +$ git merge pm/linux-next +Auto-merging kernel/exit.c +Auto-merging drivers/devfreq/exynos4_bus.c +Merge made by the 'recursive' strategy. + Documentation/power/devices.txt | 93 +++++++---- + Documentation/power/freezing-of-tasks.txt | 21 +++ + arch/x86/kernel/apm_32.c | 11 +- + drivers/base/power/domain.c | 157 +++++++++++++------ + drivers/base/power/generic_ops.c | 157 ++++++++++++------ + drivers/base/power/main.c | 247 ++++++++++++++++++++++++++--- + drivers/base/power/wakeup.c | 85 ++++++++--- + drivers/devfreq/devfreq.c | 70 ++++++++ + drivers/devfreq/exynos4_bus.c | 17 +-- + drivers/devfreq/governor_performance.c | 5 +- + drivers/devfreq/governor_powersave.c | 2 +- + drivers/devfreq/governor_simpleondemand.c | 12 +- + drivers/devfreq/governor_userspace.c | 15 ++- + drivers/xen/manage.c | 6 +- + include/linux/devfreq.h | 9 +- + include/linux/pm.h | 58 ++++++- + include/linux/pm_domain.h | 10 +- + include/linux/pm_qos.h | 55 ++------ + include/linux/pm_wakeup.h | 22 +++- + include/linux/suspend.h | 4 + + kernel/exit.c | 2 +- + kernel/freezer.c | 6 +- + kernel/kexec.c | 8 +- + kernel/power/Makefile | 3 +- + kernel/power/hibernate.c | 47 +++--- + kernel/power/main.c | 20 +-- + kernel/power/power.h | 7 +- + kernel/power/process.c | 24 ++-- + kernel/power/qos.c | 23 ++-- + kernel/power/snapshot.c | 7 +- + kernel/power/suspend.c | 84 +++++----- + kernel/power/user.c | 12 +- + 32 files changed, 910 insertions(+), 389 deletions(-) +Merging apm/for-next (b4a133d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) +$ git merge apm/for-next +Already up-to-date. +Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared) +$ git merge fsnotify/for-next +Auto-merging include/linux/fsnotify_backend.h +Auto-merging fs/notify/mark.c +Auto-merging fs/notify/group.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/cachefiles/namei.c +Merge made by the 'recursive' strategy. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + Documentation/edac.txt | 4 +- + drivers/edac/amd64_edac.c | 50 ++++++++++++++++++++++++++++----------- + drivers/edac/amd76x_edac.c | 2 +- + drivers/edac/e752x_edac.c | 2 +- + drivers/edac/e7xxx_edac.c | 2 +- + drivers/edac/edac_mc_sysfs.c | 4 +- + drivers/edac/i3000_edac.c | 2 +- + drivers/edac/i3200_edac.c | 2 +- + drivers/edac/i5000_edac.c | 2 +- + drivers/edac/i5100_edac.c | 2 +- + drivers/edac/i5400_edac.c | 2 +- + drivers/edac/i7300_edac.c | 2 +- + drivers/edac/i7core_edac.c | 2 +- + drivers/edac/i82443bxgx_edac.c | 2 +- + drivers/edac/i82860_edac.c | 2 +- + drivers/edac/i82875p_edac.c | 2 +- + drivers/edac/i82975x_edac.c | 2 +- + drivers/edac/r82600_edac.c | 2 +- + drivers/edac/sb_edac.c | 2 +- + drivers/edac/x38_edac.c | 2 +- + 20 files changed, 57 insertions(+), 35 deletions(-) +Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries) +$ git merge devicetree/devicetree/next +Auto-merging include/linux/of.h +Auto-merging drivers/base/core.c +Auto-merging arch/powerpc/platforms/pseries/Kconfig +CONFLICT (modify/delete): arch/powerpc/platforms/iseries/Kconfig deleted in HEAD and modified in devicetree/devicetree/next. Version devicetree/devicetree/next of arch/powerpc/platforms/iseries/Kconfig left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/powerpc/platforms/iseries/Kconfig +arch/powerpc/platforms/iseries/Kconfig: needs merge +rm 'arch/powerpc/platforms/iseries/Kconfig' +$ git commit -v -a +[master a0e583e] Merge remote-tracking branch 'devicetree/devicetree/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/omap/omap.txt | 6 +++ + arch/arm/boot/dts/testcases/tests-phandle.dtsi | 2 + + arch/powerpc/kernel/ibmebus.c | 2 +- + arch/powerpc/platforms/8xx/Kconfig | 1 + + arch/powerpc/platforms/pseries/Kconfig | 1 + + arch/powerpc/platforms/wsp/Kconfig | 1 + + drivers/base/core.c | 5 ++ + drivers/base/platform.c | 2 +- + drivers/macintosh/macio_asic.c | 2 +- + drivers/of/Kconfig | 5 +- + drivers/of/base.c | 40 +++++++++++++++++++- + drivers/of/device.c | 30 ++++++++------- + drivers/of/selftest.c | 29 ++++++++++++++ + include/linux/of.h | 17 ++++---- + include/linux/of_device.h | 8 +++- + 15 files changed, 120 insertions(+), 31 deletions(-) +Merging spi/spi/next (14af60b spi/pl022: Add high priority message pump support) +$ git merge spi/spi/next +Auto-merging drivers/spi/spi-pl022.c +Merge made by the 'recursive' strategy. + drivers/spi/spi-nuc900.c | 2 - + drivers/spi/spi-pl022.c | 77 ++++++++++++++++++++---------- + drivers/spi/spi-s3c64xx.c | 114 +++++++++++++++++++++++++++++++++++++++---- + include/linux/amba/pl022.h | 3 + + 4 files changed, 158 insertions(+), 38 deletions(-) +Merging gpio/gpio/next (daefd89 Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next) +$ git merge gpio/gpio/next +Resolved 'include/linux/mfd/tps65910.h' using previous resolution. +Auto-merging include/linux/mfd/tps65910.h +CONFLICT (content): Merge conflict in include/linux/mfd/tps65910.h +Auto-merging arch/arm/mach-omap2/pm34xx.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2cff8fe] Merge remote-tracking branch 'gpio/gpio/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/sodaville.txt | 48 + + arch/arm/mach-omap1/gpio15xx.c | 7 +- + arch/arm/mach-omap1/gpio16xx.c | 47 +- + arch/arm/mach-omap1/gpio7xx.c | 14 +- + arch/arm/mach-omap2/gpio.c | 36 +- + arch/arm/mach-omap2/pm34xx.c | 14 - + arch/arm/plat-omap/include/plat/gpio.h | 29 +- + arch/x86/platform/ce4100/falconfalls.dts | 7 +- + drivers/gpio/Kconfig | 14 + + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-mc9s08dz60.c | 161 +++ + drivers/gpio/gpio-omap.c | 1106 ++++++++------------ + drivers/gpio/gpio-pl061.c | 7 +- + drivers/gpio/gpio-sodaville.c | 302 ++++++ + drivers/gpio/gpio-tps65910.c | 20 +- + drivers/gpio/gpiolib.c | 8 +- + drivers/of/gpio.c | 9 +- + include/linux/mfd/tps65910.h | 8 + + include/linux/of_gpio.h | 27 +- + 19 files changed, 1154 insertions(+), 712 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/sodaville.txt + create mode 100644 drivers/gpio/gpio-mc9s08dz60.c + create mode 100644 drivers/gpio/gpio-sodaville.c +Merging tip/auto-latest (93379d9 Merge branch 'sched/core' into auto-latest) +$ git merge tip/auto-latest +Resolved 'include/net/sock.h' using previous resolution. +Auto-merging security/selinux/hooks.c +Auto-merging net/mac80211/mesh_pathtbl.c +Auto-merging net/ipv4/ip_sockglue.c +Auto-merging net/core/sock.c +Auto-merging net/core/dev.c +Auto-merging net/bluetooth/hci_sock.c +Auto-merging mm/mmap.c +Auto-merging kernel/time/timekeeping.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/exit.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/trace/events/power.h +Auto-merging include/net/sock.h +CONFLICT (content): Merge conflict in include/net/sock.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/Kbuild +Removing arch/x86/platform/mrst/pmu.h +Removing arch/x86/platform/mrst/pmu.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kernel/process.c +Auto-merging arch/s390/kernel/irq.c +Auto-merging arch/powerpc/perf/core-book3s.c +CONFLICT (modify/delete): arch/m68k/kernel/process_no.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/m68k/kernel/process_no.c left in tree. +CONFLICT (modify/delete): arch/m68k/kernel/process_mm.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/m68k/kernel/process_mm.c left in tree. +Auto-merging arch/arm/kernel/process.c +Auto-merging arch/arm/include/asm/perf_event.h +Auto-merging MAINTAINERS +Removing Documentation/nmi_watchdog.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/m68k/kernel/process_no.c arch/m68k/kernel/process_mm.c +arch/m68k/kernel/process_mm.c: needs merge +arch/m68k/kernel/process_no.c: needs merge +include/net/sock.h: needs merge +rm 'arch/m68k/kernel/process_mm.c' +rm 'arch/m68k/kernel/process_no.c' +$ git commit -v -a +[master 72b9c67] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/RTFP.txt | 1902 ++++++++++++++++++-- + Documentation/RCU/checklist.txt | 14 + + Documentation/RCU/stallwarn.txt | 87 +- + Documentation/RCU/torture.txt | 33 +- + Documentation/RCU/trace.txt | 36 +- + Documentation/filesystems/files.txt | 4 +- + Documentation/lockup-watchdogs.txt | 63 + + Documentation/nmi_watchdog.txt | 83 - + Documentation/scheduler/sched-stats.txt | 3 +- + Documentation/static-keys.txt | 286 +++ + Documentation/trace/ftrace.txt | 7 + + MAINTAINERS | 8 + + arch/Kconfig | 44 +- + arch/alpha/include/asm/posix_types.h | 113 +-- + arch/arm/include/asm/perf_event.h | 4 - + arch/arm/include/asm/posix_types.h | 55 +- + arch/arm/kernel/process.c | 4 +- + arch/avr32/include/asm/posix_types.h | 107 +- + arch/avr32/kernel/process.c | 4 +- + arch/blackfin/kernel/process.c | 4 +- + arch/cris/include/asm/posix_types.h | 50 +- + arch/cris/kernel/process.c | 4 +- + arch/frv/include/asm/perf_event.h | 2 - + arch/frv/include/asm/posix_types.h | 53 +- + arch/frv/kernel/process.c | 4 +- + arch/h8300/include/asm/posix_types.h | 49 +- + arch/h8300/kernel/process.c | 4 +- + arch/hexagon/include/asm/perf_event.h | 2 - + arch/ia64/include/asm/paravirt.h | 6 +- + arch/ia64/include/asm/posix_types.h | 121 +-- + arch/ia64/kernel/paravirt.c | 4 +- + arch/ia64/kernel/process.c | 4 +- + arch/m32r/include/asm/posix_types.h | 108 +- + arch/m32r/kernel/process.c | 4 +- + arch/m68k/include/asm/posix_types.h | 53 +- + arch/microblaze/kernel/process.c | 4 +- + arch/mips/include/asm/jump_label.h | 2 +- + arch/mips/include/asm/posix_types.h | 121 +-- + arch/mips/kernel/kspd.c | 2 +- + arch/mips/kernel/process.c | 4 +- + arch/mn10300/include/asm/posix_types.h | 111 +- + arch/mn10300/kernel/process.c | 4 +- + arch/parisc/include/asm/posix_types.h | 119 +-- + arch/parisc/kernel/process.c | 4 +- + arch/powerpc/include/asm/jump_label.h | 2 +- + arch/powerpc/include/asm/perf_event_server.h | 2 - + arch/powerpc/include/asm/posix_types.h | 118 +-- + arch/powerpc/kernel/idle.c | 8 +- + arch/powerpc/perf/core-book3s.c | 6 + + arch/powerpc/platforms/cell/spufs/coredump.c | 2 +- + arch/powerpc/platforms/iseries/setup.c | 8 +- + arch/s390/include/asm/jump_label.h | 2 +- + arch/s390/include/asm/perf_event.h | 1 - + arch/s390/include/asm/posix_types.h | 70 +- + arch/s390/kernel/irq.c | 9 +- + arch/s390/kernel/process.c | 4 +- + arch/score/kernel/process.c | 4 +- + arch/sh/include/asm/posix_types_32.h | 5 - + arch/sh/include/asm/posix_types_64.h | 4 - + arch/sh/kernel/idle.c | 4 +- + arch/sparc/include/asm/jump_label.h | 2 +- + arch/sparc/include/asm/posix_types.h | 133 +-- + arch/sparc/kernel/process_32.c | 8 +- + arch/sparc/kernel/process_64.c | 10 +- + arch/tile/kernel/process.c | 4 +- + arch/x86/Kconfig | 79 +- + arch/x86/Makefile | 16 + + arch/x86/boot/Makefile | 5 +- + arch/x86/boot/boot.h | 2 +- + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/boot/compressed/mkpiggy.c | 11 +- + arch/x86/boot/compressed/relocs.c | 6 +- + arch/x86/boot/tools/build.c | 40 +- + arch/x86/ia32/ia32_signal.c | 13 +- + arch/x86/ia32/sys_ia32.c | 40 - + arch/x86/include/asm/Kbuild | 2 + + arch/x86/include/asm/alternative.h | 6 + + arch/x86/include/asm/atomic64_32.h | 146 +- + arch/x86/include/asm/compat.h | 39 +- + arch/x86/include/asm/cpufeature.h | 3 + + arch/x86/include/asm/e820.h | 7 + + arch/x86/include/asm/efi.h | 7 +- + arch/x86/include/asm/elf.h | 31 +- + arch/x86/include/asm/fpu-internal.h | 520 ++++++ + arch/x86/include/asm/hardirq.h | 1 - + arch/x86/include/asm/i387.h | 590 +------ + arch/x86/include/asm/ia32.h | 9 + + arch/x86/include/asm/inat.h | 5 +- + arch/x86/include/asm/insn.h | 18 +- + arch/x86/include/asm/jump_label.h | 6 +- + arch/x86/include/asm/mrst.h | 4 +- + arch/x86/include/asm/mtrr.h | 28 +- + arch/x86/include/asm/paravirt.h | 6 +- + arch/x86/include/asm/perf_event.h | 2 - + arch/x86/include/asm/posix_types.h | 4 +- + arch/x86/include/asm/posix_types_32.h | 75 +- + arch/x86/include/asm/posix_types_64.h | 106 +-- + arch/x86/include/asm/posix_types_x32.h | 19 + + arch/x86/include/asm/processor.h | 11 +- + arch/x86/include/asm/ptrace.h | 1 - + arch/x86/include/asm/sigcontext.h | 57 +- + arch/x86/include/asm/sigframe.h | 13 + + arch/x86/include/asm/sighandling.h | 24 + + arch/x86/include/asm/spinlock.h | 4 +- + arch/x86/include/asm/spinlock_types.h | 1 - + arch/x86/include/asm/sys_ia32.h | 7 +- + arch/x86/include/asm/syscall.h | 5 +- + arch/x86/include/asm/thread_info.h | 6 +- + arch/x86/include/asm/unistd.h | 15 +- + arch/x86/include/asm/uprobes.h | 43 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/asm-offsets_64.c | 6 + + arch/x86/kernel/cpu/amd.c | 3 + + arch/x86/kernel/cpu/common.c | 17 +- + arch/x86/kernel/cpu/mcheck/mce-severity.c | 26 +- + arch/x86/kernel/cpu/mcheck/mce.c | 179 ++- + arch/x86/kernel/cpu/mtrr/if.c | 10 +- + arch/x86/kernel/cpu/perf_event.c | 86 +- + arch/x86/kernel/cpu/perf_event.h | 8 + + arch/x86/kernel/e820.c | 3 +- + arch/x86/kernel/entry_64.S | 117 +- + arch/x86/kernel/i387.c | 83 +- + arch/x86/kernel/irq_32.c | 11 +- + arch/x86/kernel/kvm.c | 4 +- + arch/x86/kernel/nmi_selftest.c | 37 +- + arch/x86/kernel/paravirt.c | 4 +- + arch/x86/kernel/process.c | 25 +- + arch/x86/kernel/process_32.c | 5 +- + arch/x86/kernel/process_64.c | 33 +- + arch/x86/kernel/ptrace.c | 1 + + arch/x86/kernel/reboot.c | 277 ++-- + arch/x86/kernel/setup.c | 31 +- + arch/x86/kernel/signal.c | 139 ++- + arch/x86/kernel/smpboot.c | 7 +- + arch/x86/kernel/sys_x86_64.c | 6 +- + arch/x86/kernel/syscall_64.c | 8 + + arch/x86/kernel/time.c | 3 - + arch/x86/kernel/traps.c | 1 + + arch/x86/kernel/tsc_sync.c | 29 +- + arch/x86/kernel/uprobes.c | 422 +++++ + arch/x86/kernel/xsave.c | 1 + + arch/x86/kvm/mmu_audit.c | 8 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 1 + + arch/x86/lib/atomic64_32.c | 59 +- + arch/x86/lib/atomic64_386_32.S | 6 +- + arch/x86/lib/atomic64_cx8_32.S | 29 +- + arch/x86/lib/copy_page_64.S | 12 +- + arch/x86/lib/inat.c | 36 +- + arch/x86/lib/insn.c | 13 +- + arch/x86/lib/memcpy_64.S | 44 +- + arch/x86/lib/memset_64.S | 33 +- + arch/x86/oprofile/backtrace.c | 2 +- + arch/x86/platform/efi/efi.c | 414 +++-- + arch/x86/platform/efi/efi_64.c | 17 - + arch/x86/platform/mrst/Makefile | 1 - + arch/x86/platform/mrst/mrst.c | 70 +- + arch/x86/platform/mrst/pmu.c | 817 --------- + arch/x86/platform/mrst/pmu.h | 234 --- + arch/x86/platform/uv/uv_time.c | 6 +- + arch/x86/power/cpu.c | 1 + + arch/x86/syscalls/Makefile | 22 +- + arch/x86/syscalls/syscall_32.tbl | 2 +- + arch/x86/syscalls/syscall_64.tbl | 579 ++++--- + arch/x86/um/sys_call_table_64.c | 3 + + arch/x86/um/user-offsets.c | 2 + + arch/x86/vdso/.gitignore | 2 + + arch/x86/vdso/Makefile | 46 +- + arch/x86/vdso/vdso32-setup.c | 5 + + arch/x86/vdso/vdsox32.S | 22 + + arch/x86/vdso/vdsox32.lds.S | 28 + + arch/x86/vdso/vma.c | 78 +- + arch/xtensa/include/asm/posix_types.h | 97 +- + arch/xtensa/kernel/process.c | 4 +- + block/blk-softirq.c | 16 +- + block/blk.h | 16 - + drivers/base/memory.c | 2 +- + drivers/char/lp.c | 5 +- + drivers/clocksource/acpi_pm.c | 24 +- + drivers/clocksource/clksrc-dbx500-prcmu.c | 5 +- + drivers/clocksource/cyclone.c | 2 +- + drivers/clocksource/scx200_hrt.c | 24 +- + drivers/cpuidle/cpuidle.c | 8 +- + drivers/input/input-compat.c | 4 +- + drivers/input/input-compat.h | 2 +- + drivers/rtc/interface.c | 30 +- + drivers/staging/android/binder.c | 13 +- + drivers/target/tcm_fc/tfc_sess.c | 12 +- + fs/autofs4/dev-ioctl.c | 2 +- + fs/binfmt_elf.c | 24 +- + fs/compat.c | 26 +- + fs/exec.c | 17 +- + fs/fcntl.c | 18 +- + fs/file.c | 52 +- + fs/open.c | 4 +- + fs/proc/base.c | 5 +- + fs/select.c | 2 +- + include/asm-generic/getorder.h | 53 +- + include/asm-generic/posix_types.h | 109 +- + include/linux/Kbuild | 1 + + include/linux/aio_abi.h | 2 +- + include/linux/clocksource.h | 7 - + include/linux/compat.h | 20 + + include/linux/efi.h | 45 + + include/linux/fdtable.h | 46 +- + include/linux/ftrace.h | 77 +- + include/linux/ftrace_event.h | 9 +- + include/linux/init_task.h | 2 +- + include/linux/interrupt.h | 7 +- + include/linux/jump_label.h | 162 ++- + include/linux/kernel.h | 21 +- + include/linux/mm.h | 4 +- + include/linux/netdevice.h | 4 +- + include/linux/netfilter.h | 6 +- + include/linux/perf_event.h | 26 +- + include/linux/preempt.h | 5 +- + include/linux/rcupdate.h | 83 +- + include/linux/rcutiny.h | 10 +- + include/linux/rcutree.h | 19 + + include/linux/sched.h | 44 +- + include/linux/srcu.h | 15 +- + include/linux/static_key.h | 1 + + include/linux/sysinfo.h | 24 + + include/linux/time.h | 1 + + include/linux/timex.h | 17 +- + include/linux/tracepoint.h | 28 +- + include/linux/uprobes.h | 76 + + include/linux/wait.h | 5 +- + include/net/sock.h | 6 +- + include/trace/events/power.h | 2 + + include/trace/events/printk.h | 41 + + include/trace/events/rcu.h | 63 +- + include/trace/events/sched.h | 27 + + include/trace/events/signal.h | 85 +- + init/Kconfig | 9 - + init/main.c | 5 +- + kernel/compat.c | 68 +- + kernel/events/Makefile | 3 + + kernel/events/core.c | 69 +- + kernel/events/hw_breakpoint.c | 7 + + kernel/events/uprobes.c | 1026 +++++++++++ + kernel/exit.c | 2 +- + kernel/futex.c | 51 +- + kernel/irq/chip.c | 2 + + kernel/jump_label.c | 135 +- + kernel/lockdep.c | 8 +- + kernel/mutex.c | 4 +- + kernel/printk.c | 5 + + kernel/rcu.h | 26 +- + kernel/rcupdate.c | 5 + + kernel/rcutiny.c | 26 +- + kernel/rcutiny_plugin.h | 77 +- + kernel/rcutorture.c | 91 +- + kernel/rcutree.c | 507 ++++-- + kernel/rcutree.h | 27 +- + kernel/rcutree_plugin.h | 450 +++-- + kernel/rcutree_trace.c | 12 +- + kernel/sched/auto_group.c | 12 +- + kernel/sched/core.c | 70 +- + kernel/sched/debug.c | 1 - + kernel/sched/fair.c | 357 ++-- + kernel/sched/rt.c | 37 +- + kernel/sched/sched.h | 29 +- + kernel/sched/stats.c | 4 +- + kernel/signal.c | 28 +- + kernel/softirq.c | 16 +- + kernel/srcu.c | 33 +- + kernel/time/ntp.c | 83 +- + kernel/time/tick-broadcast.c | 4 + + kernel/time/tick-sched.c | 17 +- + kernel/time/timekeeping.c | 338 ++-- + kernel/trace/ftrace.c | 134 ++- + kernel/trace/trace.c | 6 +- + kernel/trace/trace.h | 38 +- + kernel/trace/trace_entries.h | 54 +- + kernel/trace/trace_event_perf.c | 208 ++- + kernel/trace/trace_events.c | 12 +- + kernel/trace/trace_events_filter.c | 175 ++- + kernel/trace/trace_export.c | 64 +- + kernel/trace/trace_kprobe.c | 8 +- + kernel/trace/trace_output.c | 12 +- + kernel/trace/trace_syscalls.c | 22 +- + kernel/tracepoint.c | 20 +- + kernel/watchdog.c | 24 +- + lib/Kconfig.debug | 42 +- + mm/hwpoison-inject.c | 4 +- + mm/madvise.c | 2 +- + mm/memory-failure.c | 96 +- + mm/mmap.c | 23 + + net/bluetooth/hci_sock.c | 3 +- + net/compat.c | 65 +- + net/core/dev.c | 24 +- + net/core/net-sysfs.c | 4 +- + net/core/sock.c | 4 +- + net/core/sysctl_net_core.c | 4 +- + net/ipv4/cipso_ipv4.c | 11 +- + net/ipv4/ip_sockglue.c | 7 +- + net/ipv4/tcp_memcontrol.c | 6 +- + net/mac80211/mesh_pathtbl.c | 8 +- + net/netfilter/core.c | 6 +- + net/socket.c | 18 +- + scripts/kconfig/Makefile | 7 +- + security/selinux/hooks.c | 2 +- + tools/include/tools/be_byteshift.h | 70 + + tools/include/tools/le_byteshift.h | 70 + + tools/kvm/.gitignore | 12 + + tools/kvm/CREDITS-Git | 30 + + tools/kvm/Documentation/kernel-debugging.txt | 15 + + tools/kvm/Documentation/kvm-balloon.txt | 24 + + tools/kvm/Documentation/kvm-debug.txt | 16 + + tools/kvm/Documentation/kvm-list.txt | 16 + + tools/kvm/Documentation/kvm-pause.txt | 16 + + tools/kvm/Documentation/kvm-resume.txt | 16 + + tools/kvm/Documentation/kvm-run.txt | 62 + + tools/kvm/Documentation/kvm-sandbox.txt | 16 + + tools/kvm/Documentation/kvm-setup.txt | 15 + + tools/kvm/Documentation/kvm-stat.txt | 19 + + tools/kvm/Documentation/kvm-stop.txt | 16 + + tools/kvm/Documentation/kvm-version.txt | 21 + + tools/kvm/Documentation/virtio-console.txt | 41 + + tools/kvm/Makefile | 427 +++++ + tools/kvm/README | 109 ++ + tools/kvm/builtin-balloon.c | 80 + + tools/kvm/builtin-debug.c | 103 ++ + tools/kvm/builtin-help.c | 63 + + tools/kvm/builtin-list.c | 149 ++ + tools/kvm/builtin-pause.c | 88 + + tools/kvm/builtin-resume.c | 88 + + tools/kvm/builtin-run.c | 1353 ++++++++++++++ + tools/kvm/builtin-sandbox.c | 9 + + tools/kvm/builtin-setup.c | 232 +++ + tools/kvm/builtin-stat.c | 127 ++ + tools/kvm/builtin-stop.c | 70 + + tools/kvm/builtin-version.c | 15 + + tools/kvm/code16gcc.h | 15 + + tools/kvm/command-list.txt | 15 + + tools/kvm/config/feature-tests.mak | 168 ++ + tools/kvm/config/utilities.mak | 188 ++ + tools/kvm/disk/blk.c | 42 + + tools/kvm/disk/core.c | 260 +++ + tools/kvm/disk/qcow.c | 1529 ++++++++++++++++ + tools/kvm/disk/raw.c | 141 ++ + tools/kvm/framebuffer.c | 75 + + tools/kvm/guest/init.c | 38 + + tools/kvm/guest/init_stage2.c | 55 + + tools/kvm/guest/passwd | 1 + + tools/kvm/guest_compat.c | 99 + + tools/kvm/hw/i8042.c | 348 ++++ + tools/kvm/hw/pci-shmem.c | 268 +++ + tools/kvm/hw/rtc.c | 137 ++ + tools/kvm/hw/serial.c | 447 +++++ + tools/kvm/hw/vesa.c | 85 + + tools/kvm/include/asm/hweight.h | 8 + + tools/kvm/include/bios/memcpy.h | 9 + + tools/kvm/include/kvm/8250-serial.h | 11 + + tools/kvm/include/kvm/apic.h | 17 + + tools/kvm/include/kvm/brlock.h | 41 + + tools/kvm/include/kvm/builtin-balloon.h | 9 + + tools/kvm/include/kvm/builtin-debug.h | 18 + + tools/kvm/include/kvm/builtin-help.h | 6 + + tools/kvm/include/kvm/builtin-list.h | 10 + + tools/kvm/include/kvm/builtin-pause.h | 9 + + tools/kvm/include/kvm/builtin-resume.h | 9 + + tools/kvm/include/kvm/builtin-run.h | 11 + + tools/kvm/include/kvm/builtin-sandbox.h | 6 + + tools/kvm/include/kvm/builtin-setup.h | 11 + + tools/kvm/include/kvm/builtin-stat.h | 9 + + tools/kvm/include/kvm/builtin-stop.h | 9 + + tools/kvm/include/kvm/builtin-version.h | 6 + + tools/kvm/include/kvm/compiler.h | 10 + + tools/kvm/include/kvm/disk-image.h | 81 + + tools/kvm/include/kvm/e820.h | 13 + + tools/kvm/include/kvm/framebuffer.h | 35 + + tools/kvm/include/kvm/guest_compat.h | 9 + + tools/kvm/include/kvm/i8042.h | 12 + + tools/kvm/include/kvm/ioeventfd.h | 27 + + tools/kvm/include/kvm/ioport.h | 69 + + tools/kvm/include/kvm/irq.h | 33 + + tools/kvm/include/kvm/kvm-cmd.h | 17 + + tools/kvm/include/kvm/kvm-cpu.h | 24 + + tools/kvm/include/kvm/kvm-ipc.h | 24 + + tools/kvm/include/kvm/kvm.h | 93 + + tools/kvm/include/kvm/msi.h | 10 + + tools/kvm/include/kvm/mutex.h | 33 + + tools/kvm/include/kvm/parse-options.h | 214 +++ + tools/kvm/include/kvm/pci-shmem.h | 28 + + tools/kvm/include/kvm/pci.h | 95 + + tools/kvm/include/kvm/qcow.h | 133 ++ + tools/kvm/include/kvm/rbtree-interval.h | 28 + + tools/kvm/include/kvm/read-write.h | 43 + + tools/kvm/include/kvm/rtc.h | 9 + + tools/kvm/include/kvm/rwsem.h | 39 + + tools/kvm/include/kvm/sdl.h | 22 + + tools/kvm/include/kvm/segment.h | 21 + + tools/kvm/include/kvm/strbuf.h | 19 + + tools/kvm/include/kvm/symbol.h | 30 + + tools/kvm/include/kvm/term.h | 20 + + tools/kvm/include/kvm/threadpool.h | 37 + + tools/kvm/include/kvm/types.h | 7 + + tools/kvm/include/kvm/uip.h | 358 ++++ + tools/kvm/include/kvm/util.h | 95 + + tools/kvm/include/kvm/vesa.h | 18 + + tools/kvm/include/kvm/virtio-9p.h | 74 + + tools/kvm/include/kvm/virtio-balloon.h | 8 + + tools/kvm/include/kvm/virtio-blk.h | 12 + + tools/kvm/include/kvm/virtio-console.h | 9 + + tools/kvm/include/kvm/virtio-net.h | 23 + + tools/kvm/include/kvm/virtio-pci-dev.h | 37 + + tools/kvm/include/kvm/virtio-pci.h | 49 + + tools/kvm/include/kvm/virtio-rng.h | 9 + + tools/kvm/include/kvm/virtio-trans.h | 44 + + tools/kvm/include/kvm/virtio.h | 67 + + tools/kvm/include/kvm/vnc.h | 20 + + tools/kvm/include/linux/bitops.h | 33 + + tools/kvm/include/linux/byteorder.h | 7 + + tools/kvm/include/linux/compiler.h | 19 + + tools/kvm/include/linux/kernel.h | 39 + + tools/kvm/include/linux/module.h | 6 + + tools/kvm/include/linux/prefetch.h | 6 + + tools/kvm/include/linux/types.h | 51 + + tools/kvm/ioeventfd.c | 209 +++ + tools/kvm/ioport.c | 195 ++ + tools/kvm/kvm-cmd.c | 91 + + tools/kvm/kvm-cpu.c | 175 ++ + tools/kvm/kvm-ipc.c | 231 +++ + tools/kvm/kvm.c | 587 ++++++ + tools/kvm/main.c | 19 + + tools/kvm/mmio.c | 137 ++ + tools/kvm/net/uip/arp.c | 30 + + tools/kvm/net/uip/buf.c | 114 ++ + tools/kvm/net/uip/core.c | 190 ++ + tools/kvm/net/uip/csum.c | 92 + + tools/kvm/net/uip/dhcp.c | 203 +++ + tools/kvm/net/uip/icmp.c | 29 + + tools/kvm/net/uip/ipv4.c | 29 + + tools/kvm/net/uip/tcp.c | 317 ++++ + tools/kvm/net/uip/udp.c | 236 +++ + tools/kvm/pci.c | 213 +++ + tools/kvm/powerpc/boot.c | 8 + + tools/kvm/powerpc/cpu_info.c | 83 + + tools/kvm/powerpc/cpu_info.h | 43 + + tools/kvm/powerpc/include/kvm/barrier.h | 6 + + tools/kvm/powerpc/include/kvm/kvm-arch.h | 88 + + tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 + + tools/kvm/powerpc/ioport.c | 18 + + tools/kvm/powerpc/irq.c | 75 + + tools/kvm/powerpc/kvm-cpu.c | 291 +++ + tools/kvm/powerpc/kvm.c | 460 +++++ + tools/kvm/powerpc/spapr.h | 93 + + tools/kvm/powerpc/spapr_hcall.c | 134 ++ + tools/kvm/powerpc/spapr_hvcons.c | 102 ++ + tools/kvm/powerpc/spapr_hvcons.h | 19 + + tools/kvm/powerpc/spapr_pci.c | 423 +++++ + tools/kvm/powerpc/spapr_pci.h | 57 + + tools/kvm/powerpc/spapr_rtas.c | 229 +++ + tools/kvm/powerpc/xics.c | 514 ++++++ + tools/kvm/powerpc/xics.h | 23 + + tools/kvm/symbol.c | 131 ++ + tools/kvm/term.c | 166 ++ + tools/kvm/tests/Makefile | 19 + + tools/kvm/tests/boot/Makefile | 13 + + tools/kvm/tests/boot/init.c | 11 + + tools/kvm/tests/kernel/.gitignore | 2 + + tools/kvm/tests/kernel/Makefile | 20 + + tools/kvm/tests/kernel/README | 16 + + tools/kvm/tests/kernel/kernel.S | 8 + + tools/kvm/tests/pit/.gitignore | 2 + + tools/kvm/tests/pit/Makefile | 20 + + tools/kvm/tests/pit/README | 16 + + tools/kvm/tests/pit/tick.S | 109 ++ + tools/kvm/ui/sdl.c | 303 ++++ + tools/kvm/ui/vnc.c | 230 +++ + tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 + + tools/kvm/util/generate-cmdlist.sh | 23 + + tools/kvm/util/kvm-ifup-vbr0 | 6 + + tools/kvm/util/parse-options.c | 577 ++++++ + tools/kvm/util/rbtree-interval.c | 89 + + tools/kvm/util/read-write.c | 344 ++++ + tools/kvm/util/set_private_br.sh | 51 + + tools/kvm/util/strbuf.c | 39 + + tools/kvm/util/threadpool.c | 145 ++ + tools/kvm/util/util.c | 115 ++ + tools/kvm/virtio/9p-pdu.c | 287 +++ + tools/kvm/virtio/9p.c | 1326 ++++++++++++++ + tools/kvm/virtio/balloon.c | 275 +++ + tools/kvm/virtio/blk.c | 290 +++ + tools/kvm/virtio/console.c | 203 +++ + tools/kvm/virtio/core.c | 158 ++ + tools/kvm/virtio/net.c | 547 ++++++ + tools/kvm/virtio/pci.c | 380 ++++ + tools/kvm/virtio/rng.c | 203 +++ + tools/kvm/virtio/trans.c | 24 + + tools/kvm/x86/bios.c | 174 ++ + tools/kvm/x86/bios/.gitignore | 3 + + tools/kvm/x86/bios/bios-rom.S | 12 + + tools/kvm/x86/bios/e820.c | 72 + + tools/kvm/x86/bios/entry.S | 92 + + tools/kvm/x86/bios/gen-offsets.sh | 14 + + tools/kvm/x86/bios/int10.c | 110 ++ + tools/kvm/x86/bios/int15.c | 18 + + tools/kvm/x86/bios/local.S | 7 + + tools/kvm/x86/bios/macro.S | 25 + + tools/kvm/x86/bios/memcpy.c | 23 + + tools/kvm/x86/bios/rom.ld.S | 10 + + tools/kvm/x86/boot.c | 41 + + tools/kvm/x86/cpuid.c | 55 + + tools/kvm/x86/include/kvm/assembly.h | 24 + + tools/kvm/x86/include/kvm/barrier.h | 16 + + tools/kvm/x86/include/kvm/bios-export.h | 13 + + tools/kvm/x86/include/kvm/bios.h | 89 + + tools/kvm/x86/include/kvm/boot-protocol.h | 16 + + tools/kvm/x86/include/kvm/cpufeature.h | 41 + + tools/kvm/x86/include/kvm/interrupt.h | 26 + + tools/kvm/x86/include/kvm/kvm-arch.h | 65 + + tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 + + tools/kvm/x86/include/kvm/mptable.h | 9 + + tools/kvm/x86/interrupt.c | 28 + + tools/kvm/x86/ioport.c | 77 + + tools/kvm/x86/irq.c | 229 +++ + tools/kvm/x86/kvm-cpu.c | 425 +++++ + tools/kvm/x86/kvm.c | 385 ++++ + tools/kvm/x86/mptable.c | 287 +++ + tools/perf/Documentation/Makefile | 86 +- + tools/perf/Documentation/perf-lock.txt | 20 +- + tools/perf/Documentation/perf-record.txt | 8 +- + tools/perf/Documentation/perf-script.txt | 5 +- + tools/perf/Documentation/perf-stat.txt | 4 +- + tools/perf/Documentation/perf-top.txt | 8 +- + tools/perf/MANIFEST | 1 + + tools/perf/Makefile | 12 +- + tools/perf/bench/bench.h | 1 + + tools/perf/bench/mem-memcpy-x86-64-asm-def.h | 8 + + tools/perf/bench/mem-memcpy-x86-64-asm.S | 6 +- + tools/perf/bench/mem-memcpy.c | 12 +- + tools/perf/bench/mem-memset-arch.h | 12 + + tools/perf/bench/mem-memset-x86-64-asm-def.h | 12 + + tools/perf/bench/mem-memset-x86-64-asm.S | 13 + + tools/perf/bench/mem-memset.c | 297 +++ + tools/perf/builtin-bench.c | 3 + + tools/perf/builtin-lock.c | 4 +- + tools/perf/builtin-probe.c | 12 +- + tools/perf/builtin-record.c | 86 +- + tools/perf/builtin-script.c | 80 +- + tools/perf/builtin-stat.c | 41 +- + tools/perf/builtin-test.c | 188 ++- + tools/perf/builtin-top.c | 64 +- + tools/perf/perf.h | 9 +- + tools/perf/python/twatch.py | 2 +- + tools/perf/util/bitmap.c | 10 + + tools/perf/util/cpumap.c | 11 + + tools/perf/util/cpumap.h | 4 + + tools/perf/util/ctype.c | 2 +- + tools/perf/util/debugfs.c | 141 -- + tools/perf/util/debugfs.h | 6 - + tools/perf/util/evlist.c | 16 +- + tools/perf/util/evlist.h | 9 +- + tools/perf/util/evsel.c | 8 +- + tools/perf/util/header.c | 421 +++-- + tools/perf/util/header.h | 1 + + tools/perf/util/hist.h | 2 + + tools/perf/util/include/asm/dwarf2.h | 4 +- + tools/perf/util/include/linux/bitmap.h | 11 + + tools/perf/util/map.c | 15 + + tools/perf/util/map.h | 1 + + tools/perf/util/probe-event.c | 33 +- + tools/perf/util/probe-finder.c | 1 - + tools/perf/util/python-ext-sources | 19 + + tools/perf/util/python.c | 10 +- + .../util/scripting-engines/trace-event-python.c | 1 - + tools/perf/util/session.c | 49 +- + tools/perf/util/session.h | 2 +- + tools/perf/util/setup.py | 8 +- + tools/perf/util/symbol.c | 24 +- + tools/perf/util/symbol.h | 4 + + tools/perf/util/sysfs.c | 60 + + tools/perf/util/sysfs.h | 6 + + tools/perf/util/thread_map.c | 237 +++- + tools/perf/util/thread_map.h | 11 +- + tools/perf/util/top.c | 13 +- + tools/perf/util/top.h | 7 +- + tools/perf/util/trace-event-parse.c | 13 +- + tools/perf/util/trace-event-read.c | 1 - + tools/perf/util/trace-event-scripting.c | 1 - + tools/perf/util/ui/browsers/hists.c | 3 + + tools/perf/util/ui/browsers/map.c | 2 +- + tools/perf/util/usage.c | 39 + + tools/perf/util/util.c | 4 +- + tools/perf/util/util.h | 6 + + tools/usb/Makefile | 2 +- + tools/usb/ffs-test.c | 29 +- + 590 files changed, 36000 insertions(+), 7061 deletions(-) + create mode 100644 Documentation/lockup-watchdogs.txt + delete mode 100644 Documentation/nmi_watchdog.txt + create mode 100644 Documentation/static-keys.txt + create mode 100644 arch/x86/include/asm/fpu-internal.h + create mode 100644 arch/x86/include/asm/posix_types_x32.h + create mode 100644 arch/x86/include/asm/sighandling.h + create mode 100644 arch/x86/include/asm/uprobes.h + create mode 100644 arch/x86/kernel/uprobes.c + delete mode 100644 arch/x86/platform/mrst/pmu.c + delete mode 100644 arch/x86/platform/mrst/pmu.h + create mode 100644 arch/x86/vdso/vdsox32.S + create mode 100644 arch/x86/vdso/vdsox32.lds.S + create mode 100644 include/linux/static_key.h + create mode 100644 include/linux/sysinfo.h + create mode 100644 include/linux/uprobes.h + create mode 100644 include/trace/events/printk.h + create mode 100644 kernel/events/uprobes.c + create mode 100644 tools/include/tools/be_byteshift.h + create mode 100644 tools/include/tools/le_byteshift.h + create mode 100644 tools/kvm/.gitignore + create mode 100644 tools/kvm/CREDITS-Git + create mode 100644 tools/kvm/Documentation/kernel-debugging.txt + create mode 100644 tools/kvm/Documentation/kvm-balloon.txt + create mode 100644 tools/kvm/Documentation/kvm-debug.txt + create mode 100644 tools/kvm/Documentation/kvm-list.txt + create mode 100644 tools/kvm/Documentation/kvm-pause.txt + create mode 100644 tools/kvm/Documentation/kvm-resume.txt + create mode 100644 tools/kvm/Documentation/kvm-run.txt + create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt + create mode 100644 tools/kvm/Documentation/kvm-setup.txt + create mode 100644 tools/kvm/Documentation/kvm-stat.txt + create mode 100644 tools/kvm/Documentation/kvm-stop.txt + create mode 100644 tools/kvm/Documentation/kvm-version.txt + create mode 100644 tools/kvm/Documentation/virtio-console.txt + create mode 100644 tools/kvm/Makefile + create mode 100644 tools/kvm/README + create mode 100644 tools/kvm/builtin-balloon.c + create mode 100644 tools/kvm/builtin-debug.c + create mode 100644 tools/kvm/builtin-help.c + create mode 100644 tools/kvm/builtin-list.c + create mode 100644 tools/kvm/builtin-pause.c + create mode 100644 tools/kvm/builtin-resume.c + create mode 100644 tools/kvm/builtin-run.c + create mode 100644 tools/kvm/builtin-sandbox.c + create mode 100644 tools/kvm/builtin-setup.c + create mode 100644 tools/kvm/builtin-stat.c + create mode 100644 tools/kvm/builtin-stop.c + create mode 100644 tools/kvm/builtin-version.c + create mode 100644 tools/kvm/code16gcc.h + create mode 100644 tools/kvm/command-list.txt + create mode 100644 tools/kvm/config/feature-tests.mak + create mode 100644 tools/kvm/config/utilities.mak + create mode 100644 tools/kvm/disk/blk.c + create mode 100644 tools/kvm/disk/core.c + create mode 100644 tools/kvm/disk/qcow.c + create mode 100644 tools/kvm/disk/raw.c + create mode 100644 tools/kvm/framebuffer.c + create mode 100644 tools/kvm/guest/init.c + create mode 100644 tools/kvm/guest/init_stage2.c + create mode 100644 tools/kvm/guest/passwd + create mode 100644 tools/kvm/guest_compat.c + create mode 100644 tools/kvm/hw/i8042.c + create mode 100644 tools/kvm/hw/pci-shmem.c + create mode 100644 tools/kvm/hw/rtc.c + create mode 100644 tools/kvm/hw/serial.c + create mode 100644 tools/kvm/hw/vesa.c + create mode 100644 tools/kvm/include/asm/hweight.h + create mode 100644 tools/kvm/include/bios/memcpy.h + create mode 100644 tools/kvm/include/kvm/8250-serial.h + create mode 100644 tools/kvm/include/kvm/apic.h + create mode 100644 tools/kvm/include/kvm/brlock.h + create mode 100644 tools/kvm/include/kvm/builtin-balloon.h + create mode 100644 tools/kvm/include/kvm/builtin-debug.h + create mode 100644 tools/kvm/include/kvm/builtin-help.h + create mode 100644 tools/kvm/include/kvm/builtin-list.h + create mode 100644 tools/kvm/include/kvm/builtin-pause.h + create mode 100644 tools/kvm/include/kvm/builtin-resume.h + create mode 100644 tools/kvm/include/kvm/builtin-run.h + create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h + create mode 100644 tools/kvm/include/kvm/builtin-setup.h + create mode 100644 tools/kvm/include/kvm/builtin-stat.h + create mode 100644 tools/kvm/include/kvm/builtin-stop.h + create mode 100644 tools/kvm/include/kvm/builtin-version.h + create mode 100644 tools/kvm/include/kvm/compiler.h + create mode 100644 tools/kvm/include/kvm/disk-image.h + create mode 100644 tools/kvm/include/kvm/e820.h + create mode 100644 tools/kvm/include/kvm/framebuffer.h + create mode 100644 tools/kvm/include/kvm/guest_compat.h + create mode 100644 tools/kvm/include/kvm/i8042.h + create mode 100644 tools/kvm/include/kvm/ioeventfd.h + create mode 100644 tools/kvm/include/kvm/ioport.h + create mode 100644 tools/kvm/include/kvm/irq.h + create mode 100644 tools/kvm/include/kvm/kvm-cmd.h + create mode 100644 tools/kvm/include/kvm/kvm-cpu.h + create mode 100644 tools/kvm/include/kvm/kvm-ipc.h + create mode 100644 tools/kvm/include/kvm/kvm.h + create mode 100644 tools/kvm/include/kvm/msi.h + create mode 100644 tools/kvm/include/kvm/mutex.h + create mode 100644 tools/kvm/include/kvm/parse-options.h + create mode 100644 tools/kvm/include/kvm/pci-shmem.h + create mode 100644 tools/kvm/include/kvm/pci.h + create mode 100644 tools/kvm/include/kvm/qcow.h + create mode 100644 tools/kvm/include/kvm/rbtree-interval.h + create mode 100644 tools/kvm/include/kvm/read-write.h + create mode 100644 tools/kvm/include/kvm/rtc.h + create mode 100644 tools/kvm/include/kvm/rwsem.h + create mode 100644 tools/kvm/include/kvm/sdl.h + create mode 100644 tools/kvm/include/kvm/segment.h + create mode 100644 tools/kvm/include/kvm/strbuf.h + create mode 100644 tools/kvm/include/kvm/symbol.h + create mode 100644 tools/kvm/include/kvm/term.h + create mode 100644 tools/kvm/include/kvm/threadpool.h + create mode 100644 tools/kvm/include/kvm/types.h + create mode 100644 tools/kvm/include/kvm/uip.h + create mode 100644 tools/kvm/include/kvm/util.h + create mode 100644 tools/kvm/include/kvm/vesa.h + create mode 100644 tools/kvm/include/kvm/virtio-9p.h + create mode 100644 tools/kvm/include/kvm/virtio-balloon.h + create mode 100644 tools/kvm/include/kvm/virtio-blk.h + create mode 100644 tools/kvm/include/kvm/virtio-console.h + create mode 100644 tools/kvm/include/kvm/virtio-net.h + create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h + create mode 100644 tools/kvm/include/kvm/virtio-pci.h + create mode 100644 tools/kvm/include/kvm/virtio-rng.h + create mode 100644 tools/kvm/include/kvm/virtio-trans.h + create mode 100644 tools/kvm/include/kvm/virtio.h + create mode 100644 tools/kvm/include/kvm/vnc.h + create mode 100644 tools/kvm/include/linux/bitops.h + create mode 100644 tools/kvm/include/linux/byteorder.h + create mode 100644 tools/kvm/include/linux/compiler.h + create mode 100644 tools/kvm/include/linux/kernel.h + create mode 100644 tools/kvm/include/linux/module.h + create mode 100644 tools/kvm/include/linux/prefetch.h + create mode 100644 tools/kvm/include/linux/types.h + create mode 100644 tools/kvm/ioeventfd.c + create mode 100644 tools/kvm/ioport.c + create mode 100644 tools/kvm/kvm-cmd.c + create mode 100644 tools/kvm/kvm-cpu.c + create mode 100644 tools/kvm/kvm-ipc.c + create mode 100644 tools/kvm/kvm.c + create mode 100644 tools/kvm/main.c + create mode 100644 tools/kvm/mmio.c + create mode 100644 tools/kvm/net/uip/arp.c + create mode 100644 tools/kvm/net/uip/buf.c + create mode 100644 tools/kvm/net/uip/core.c + create mode 100644 tools/kvm/net/uip/csum.c + create mode 100644 tools/kvm/net/uip/dhcp.c + create mode 100644 tools/kvm/net/uip/icmp.c + create mode 100644 tools/kvm/net/uip/ipv4.c + create mode 100644 tools/kvm/net/uip/tcp.c + create mode 100644 tools/kvm/net/uip/udp.c + create mode 100644 tools/kvm/pci.c + create mode 100644 tools/kvm/powerpc/boot.c + create mode 100644 tools/kvm/powerpc/cpu_info.c + create mode 100644 tools/kvm/powerpc/cpu_info.h + create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h + create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h + create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h + create mode 100644 tools/kvm/powerpc/ioport.c + create mode 100644 tools/kvm/powerpc/irq.c + create mode 100644 tools/kvm/powerpc/kvm-cpu.c + create mode 100644 tools/kvm/powerpc/kvm.c + create mode 100644 tools/kvm/powerpc/spapr.h + create mode 100644 tools/kvm/powerpc/spapr_hcall.c + create mode 100644 tools/kvm/powerpc/spapr_hvcons.c + create mode 100644 tools/kvm/powerpc/spapr_hvcons.h + create mode 100644 tools/kvm/powerpc/spapr_pci.c + create mode 100644 tools/kvm/powerpc/spapr_pci.h + create mode 100644 tools/kvm/powerpc/spapr_rtas.c + create mode 100644 tools/kvm/powerpc/xics.c + create mode 100644 tools/kvm/powerpc/xics.h + create mode 100644 tools/kvm/symbol.c + create mode 100644 tools/kvm/term.c + create mode 100644 tools/kvm/tests/Makefile + create mode 100644 tools/kvm/tests/boot/Makefile + create mode 100644 tools/kvm/tests/boot/init.c + create mode 100644 tools/kvm/tests/kernel/.gitignore + create mode 100644 tools/kvm/tests/kernel/Makefile + create mode 100644 tools/kvm/tests/kernel/README + create mode 100644 tools/kvm/tests/kernel/kernel.S + create mode 100644 tools/kvm/tests/pit/.gitignore + create mode 100644 tools/kvm/tests/pit/Makefile + create mode 100644 tools/kvm/tests/pit/README + create mode 100644 tools/kvm/tests/pit/tick.S + create mode 100644 tools/kvm/ui/sdl.c + create mode 100644 tools/kvm/ui/vnc.c + create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN + create mode 100755 tools/kvm/util/generate-cmdlist.sh + create mode 100755 tools/kvm/util/kvm-ifup-vbr0 + create mode 100644 tools/kvm/util/parse-options.c + create mode 100644 tools/kvm/util/rbtree-interval.c + create mode 100644 tools/kvm/util/read-write.c + create mode 100755 tools/kvm/util/set_private_br.sh + create mode 100644 tools/kvm/util/strbuf.c + create mode 100644 tools/kvm/util/threadpool.c + create mode 100644 tools/kvm/util/util.c + create mode 100644 tools/kvm/virtio/9p-pdu.c + create mode 100644 tools/kvm/virtio/9p.c + create mode 100644 tools/kvm/virtio/balloon.c + create mode 100644 tools/kvm/virtio/blk.c + create mode 100644 tools/kvm/virtio/console.c + create mode 100644 tools/kvm/virtio/core.c + create mode 100644 tools/kvm/virtio/net.c + create mode 100644 tools/kvm/virtio/pci.c + create mode 100644 tools/kvm/virtio/rng.c + create mode 100644 tools/kvm/virtio/trans.c + create mode 100644 tools/kvm/x86/bios.c + create mode 100644 tools/kvm/x86/bios/.gitignore + create mode 100644 tools/kvm/x86/bios/bios-rom.S + create mode 100644 tools/kvm/x86/bios/e820.c + create mode 100644 tools/kvm/x86/bios/entry.S + create mode 100644 tools/kvm/x86/bios/gen-offsets.sh + create mode 100644 tools/kvm/x86/bios/int10.c + create mode 100644 tools/kvm/x86/bios/int15.c + create mode 100644 tools/kvm/x86/bios/local.S + create mode 100644 tools/kvm/x86/bios/macro.S + create mode 100644 tools/kvm/x86/bios/memcpy.c + create mode 100644 tools/kvm/x86/bios/rom.ld.S + create mode 100644 tools/kvm/x86/boot.c + create mode 100644 tools/kvm/x86/cpuid.c + create mode 100644 tools/kvm/x86/include/kvm/assembly.h + create mode 100644 tools/kvm/x86/include/kvm/barrier.h + create mode 100644 tools/kvm/x86/include/kvm/bios-export.h + create mode 100644 tools/kvm/x86/include/kvm/bios.h + create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h + create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h + create mode 100644 tools/kvm/x86/include/kvm/interrupt.h + create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h + create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h + create mode 100644 tools/kvm/x86/include/kvm/mptable.h + create mode 100644 tools/kvm/x86/interrupt.c + create mode 100644 tools/kvm/x86/ioport.c + create mode 100644 tools/kvm/x86/irq.c + create mode 100644 tools/kvm/x86/kvm-cpu.c + create mode 100644 tools/kvm/x86/kvm.c + create mode 100644 tools/kvm/x86/mptable.c + create mode 100644 tools/perf/bench/mem-memset-arch.h + create mode 100644 tools/perf/bench/mem-memset-x86-64-asm-def.h + create mode 100644 tools/perf/bench/mem-memset-x86-64-asm.S + create mode 100644 tools/perf/bench/mem-memset.c + create mode 100644 tools/perf/util/python-ext-sources + create mode 100644 tools/perf/util/sysfs.c + create mode 100644 tools/perf/util/sysfs.h +$ git am -3 ../patches/0001-sched-rt-Use-schedule_preempt_disabled-in-m68k.patch +Applying: sched/rt: Use schedule_preempt_disabled() in m68k +$ git reset HEAD^ +Unstaged changes after reset: +M arch/m68k/kernel/process.c +$ git add . +$ git commit -v -a --amend +[master 9b6fdaf] Merge remote-tracking branch 'tip/auto-latest' +Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited) +$ git merge rcu/rcu/next +Already up-to-date. +Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) +$ git merge cputime/cputime +Already up-to-date. +Merging uprobes/for-next (f0b42ab uprobes/core: handle breakpoint and signal step exception.) +$ git merge uprobes/for-next +Resolved 'arch/x86/include/asm/uprobes.h' using previous resolution. +Resolved 'arch/x86/kernel/uprobes.c' using previous resolution. +Resolved 'fs/eventpoll.c' using previous resolution. +Resolved 'fs/signalfd.c' using previous resolution. +Resolved 'include/linux/uprobes.h' using previous resolution. +Resolved 'kernel/events/uprobes.c' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging kernel/events/uprobes.c +CONFLICT (add/add): Merge conflict in kernel/events/uprobes.c +Auto-merging kernel/events/Makefile +CONFLICT (content): Merge conflict in kernel/events/Makefile +Auto-merging include/linux/uprobes.h +CONFLICT (add/add): Merge conflict in include/linux/uprobes.h +Auto-merging include/linux/sched.h +Auto-merging fs/signalfd.c +CONFLICT (content): Merge conflict in fs/signalfd.c +Auto-merging fs/eventpoll.c +CONFLICT (content): Merge conflict in fs/eventpoll.c +Auto-merging arch/x86/kernel/uprobes.c +CONFLICT (add/add): Merge conflict in arch/x86/kernel/uprobes.c +Auto-merging arch/x86/kernel/signal.c +Auto-merging arch/x86/include/asm/uprobes.h +CONFLICT (add/add): Merge conflict in arch/x86/include/asm/uprobes.h +Auto-merging arch/x86/include/asm/thread_info.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/events/Makefile'. +[master 23903d2] Merge remote-tracking branch 'uprobes/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/thread_info.h | 2 + + arch/x86/include/asm/uprobes.h | 16 ++- + arch/x86/kernel/signal.c | 6 + + arch/x86/kernel/uprobes.c | 275 ++++++++++++++++++++++++++++++++++- + include/linux/sched.h | 4 + + include/linux/uprobes.h | 44 ++++++ + kernel/events/uprobes.c | 279 +++++++++++++++++++++++++++++++++++- + kernel/fork.c | 7 + + kernel/signal.c | 6 +- + 9 files changed, 629 insertions(+), 10 deletions(-) +Merging cgroup/for-next (3ce3230 cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list) +$ git merge cgroup/for-next +Auto-merging net/ipv4/tcp_memcontrol.c +Auto-merging net/core/sock.c +Auto-merging net/core/netprio_cgroup.c +Auto-merging mm/memcontrol.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/events/core.c +Auto-merging kernel/cpuset.c +Auto-merging kernel/cgroup.c +Auto-merging include/net/sock.h +Auto-merging block/blk-cgroup.c +Merge made by the 'recursive' strategy. + Documentation/cgroups/cgroups.txt | 26 ++-- + block/blk-cgroup.c | 22 +-- + include/linux/cgroup.h | 70 ++------- + include/net/sock.h | 7 +- + include/net/tcp_memcontrol.h | 2 +- + kernel/cgroup.c | 327 +++++++++++++++--------------------- + kernel/cgroup_freezer.c | 11 +- + kernel/cpuset.c | 16 +-- + kernel/events/core.c | 13 +- + kernel/sched/core.c | 20 +-- + mm/memcontrol.c | 48 ++---- + net/core/netprio_cgroup.c | 10 +- + net/core/sock.c | 6 +- + net/ipv4/tcp_memcontrol.c | 2 +- + net/sched/cls_cgroup.c | 10 +- + security/device_cgroup.c | 10 +- + 16 files changed, 228 insertions(+), 372 deletions(-) +Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3) +$ git merge kmemleak/kmemleak +Already up-to-date. +Merging kvm/linux-next (4b99f72 KVM: mmu_notifier: Flush TLBs before releasing mmu_lock) +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/x86.c +Merge made by the 'recursive' strategy. + arch/s390/kvm/intercept.c | 20 ++++++++++++-------- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/x86/kvm/x86.c | 11 +++++------ + virt/kvm/kvm_main.c | 19 ++++++++++--------- + 4 files changed, 28 insertions(+), 24 deletions(-) +Merging oprofile/for-next (b9e7f8e Merge branches 'oprofile/urgent' and 'oprofile/core' into oprofile/master) +$ git merge oprofile/for-next +Resolved 'tools/perf/util/header.c' using previous resolution. +Auto-merging tools/perf/util/header.c +CONFLICT (content): Merge conflict in tools/perf/util/header.c +Auto-merging arch/x86/include/asm/perf_event.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 164be78] Merge remote-tracking branch 'oprofile/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/msr-index.h | 5 + + arch/x86/include/asm/perf_event.h | 2 + + arch/x86/kernel/cpu/perf_event_amd_ibs.c | 438 +++++++++++++++++++++++++++++- + tools/perf/scripts/perl/bin/ibs-record | 23 ++ + tools/perf/scripts/perl/bin/ibs-report | 6 + + tools/perf/scripts/perl/ibs.pl | 47 ++++ + tools/perf/util/header.c | 99 +++++++ + tools/perf/util/header.h | 1 + + tools/perf/util/parse-events.c | 84 ++++++- + 9 files changed, 696 insertions(+), 9 deletions(-) + create mode 100644 tools/perf/scripts/perl/bin/ibs-record + create mode 100644 tools/perf/scripts/perl/bin/ibs-report + create mode 100644 tools/perf/scripts/perl/ibs.pl +Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen) +$ git merge xen/upstream/xen +Resolved 'arch/x86/include/asm/cmpxchg.h' using previous resolution. +Auto-merging arch/x86/include/asm/cmpxchg.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6994e69] Merge remote-tracking branch 'xen/upstream/xen' +$ git diff -M --stat --summary HEAD^.. +Merging xen-two/linux-next (eb76442 Merge branch 'stable/for-linus-3.4' into linux-next) +$ git merge xen-two/linux-next +Auto-merging arch/x86/xen/enlighten.c +Merge made by the 'recursive' strategy. + arch/x86/pci/xen.c | 27 +++++++++++++++++++++++++++ + arch/x86/xen/enlighten.c | 6 +++--- + arch/x86/xen/irq.c | 8 ++++---- + arch/x86/xen/mmu.c | 20 ++++++++++---------- + arch/x86/xen/multicalls.h | 2 +- + arch/x86/xen/smp.c | 2 +- + drivers/xen/cpu_hotplug.c | 15 ++++++++------- + drivers/xen/xenbus/xenbus_client.c | 6 +++--- + include/xen/interface/physdev.h | 7 +++++++ + 9 files changed, 64 insertions(+), 29 deletions(-) +Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/percpu.h | 29 +++++++++++++++-------------- + mm/percpu-vm.c | 3 +-- + 2 files changed, 16 insertions(+), 16 deletions(-) +Merging workqueues/for-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu) +$ git merge workqueues/for-next +Already up-to-date. +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (4e75732 sysctl: Don't call sysctl_follow_link unless we are a link.) +$ git merge sysctl/master +Resolved 'fs/proc/proc_sysctl.c' using previous resolution. +Auto-merging lib/Kconfig.debug +Removing kernel/sysctl_check.c +Auto-merging kernel/sysctl.c +Auto-merging fs/proc/proc_sysctl.c +CONFLICT (content): Merge conflict in fs/proc/proc_sysctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8fefc1a] Merge remote-tracking branch 'sysctl/master' +$ git diff -M --stat --summary HEAD^.. + fs/proc/internal.h | 3 + + fs/proc/proc_sysctl.c | 1257 +++++++++++++++++++++++++++++++++++++++++++++--- + include/linux/sysctl.h | 106 +++-- + kernel/Makefile | 1 - + kernel/sysctl.c | 501 +------------------- + kernel/sysctl_check.c | 160 ------ + lib/Kconfig.debug | 8 - + net/sysctl_net.c | 24 +- + 8 files changed, 1264 insertions(+), 796 deletions(-) + delete mode 100644 kernel/sysctl_check.c +Merging regmap/for-next (ed492c2 Merge remote-tracking branch 'regmap/topic/bulk' into regmap-next) +$ git merge regmap/for-next +Auto-merging sound/soc/codecs/wm8994.c +Auto-merging drivers/mfd/wm8994-core.c +Auto-merging drivers/mfd/wm8400-core.c +Auto-merging drivers/mfd/wm831x-spi.c +Auto-merging drivers/base/regmap/regmap.c +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 11 +- + drivers/base/regmap/regcache-lzo.c | 16 ++- + drivers/base/regmap/regcache-rbtree.c | 25 +++- + drivers/base/regmap/regcache.c | 97 ++++++++++---- + drivers/base/regmap/regmap-debugfs.c | 84 ++++++++++++- + drivers/base/regmap/regmap-i2c.c | 17 +++ + drivers/base/regmap/regmap-spi.c | 17 +++ + drivers/base/regmap/regmap.c | 235 +++++++++++++++++++++++++++++---- + drivers/mfd/wm831x-core.c | 20 ++-- + drivers/mfd/wm831x-i2c.c | 2 +- + drivers/mfd/wm831x-spi.c | 2 +- + drivers/mfd/wm8400-core.c | 7 +- + drivers/mfd/wm8994-core.c | 84 ++++++++++-- + include/linux/regmap.h | 127 ++++++++++++++++++ + include/trace/events/regmap.h | 36 +++++ + sound/soc/codecs/wm8994.c | 25 +---- + 16 files changed, 688 insertions(+), 117 deletions(-) +Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Auto-merging include/linux/Kbuild +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging Documentation/DocBook/device-drivers.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/device-drivers.tmpl | 17 + + Documentation/ioctl/ioctl-number.txt | 1 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/hsi/Kconfig | 19 + + drivers/hsi/Makefile | 6 + + drivers/hsi/clients/Kconfig | 13 + + drivers/hsi/clients/Makefile | 5 + + drivers/hsi/clients/hsi_char.c | 802 +++++++++++++++++++++++++++++ + drivers/hsi/hsi.c | 494 ++++++++++++++++++ + drivers/hsi/hsi_boardinfo.c | 62 +++ + drivers/hsi/hsi_core.h | 35 ++ + include/linux/Kbuild | 1 + + include/linux/hsi/Kbuild | 1 + + include/linux/hsi/hsi.h | 410 +++++++++++++++ + include/linux/hsi/hsi_char.h | 63 +++ + 16 files changed, 1932 insertions(+), 0 deletions(-) + create mode 100644 drivers/hsi/Kconfig + create mode 100644 drivers/hsi/Makefile + create mode 100644 drivers/hsi/clients/Kconfig + create mode 100644 drivers/hsi/clients/Makefile + create mode 100644 drivers/hsi/clients/hsi_char.c + create mode 100644 drivers/hsi/hsi.c + create mode 100644 drivers/hsi/hsi_boardinfo.c + create mode 100644 drivers/hsi/hsi_core.h + create mode 100644 include/linux/hsi/Kbuild + create mode 100644 include/linux/hsi/hsi.h + create mode 100644 include/linux/hsi/hsi_char.h +Merging driver-core/driver-core-next (f6e8a1d w1_bq27000: Only one thread can access the bq27000 at a time.) +$ git merge driver-core/driver-core-next +Resolved 'drivers/base/cpu.c' using previous resolution. +Resolved 'include/linux/pci.h' using previous resolution. +Auto-merging scripts/mod/file2alias.c +Auto-merging include/linux/pci.h +CONFLICT (content): Merge conflict in include/linux/pci.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/hyperv.h +Auto-merging fs/sysfs/mount.c +Auto-merging drivers/ssb/main.c +Auto-merging drivers/pcmcia/ds.c +Auto-merging drivers/pci/xen-pcifront.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/hwmon/coretemp.c +Removing drivers/hv/hv_kvp.h +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/base/cpu.c +CONFLICT (content): Merge conflict in drivers/base/cpu.c +Auto-merging drivers/acpi/processor_driver.c +Auto-merging arch/x86/include/asm/cpufeature.h +Auto-merging arch/x86/Kconfig +Auto-merging Documentation/ioctl/ioctl-number.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3784de7] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/removed/devfs | 2 +- + Documentation/ABI/stable/sysfs-driver-usb-usbtmc | 10 +- + Documentation/ABI/testing/sysfs-class | 2 +- + Documentation/ABI/testing/sysfs-devices | 2 +- + Documentation/ABI/testing/sysfs-devices-soc | 58 +++++ + .../ABI/testing/sysfs-driver-samsung-laptop | 2 +- + Documentation/dynamic-debug-howto.txt | 30 +-- + Documentation/filesystems/debugfs.txt | 5 +- + Documentation/ioctl/ioctl-number.txt | 2 +- + Documentation/ko_KR/HOWTO | 2 +- + Documentation/kobject.txt | 2 +- + Documentation/zh_CN/HOWTO | 2 +- + arch/x86/Kconfig | 3 + + arch/x86/crypto/aesni-intel_glue.c | 12 +- + arch/x86/crypto/crc32c-intel.c | 11 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 12 +- + arch/x86/include/asm/cpu_device_id.h | 13 + + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/kernel/cpu/Makefile | 1 + + arch/x86/kernel/cpu/match.c | 91 +++++++ + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/microcode_core.c | 15 + + drivers/acpi/processor_driver.c | 1 + + drivers/acpi/processor_perflib.c | 22 ++ + drivers/base/Kconfig | 3 + + drivers/base/Makefile | 1 + + drivers/base/bus.c | 6 +- + drivers/base/cpu.c | 11 + + drivers/base/driver.c | 35 +--- + drivers/base/soc.c | 183 +++++++++++++ + drivers/cpufreq/cpufreq-nforce2.c | 8 + + drivers/cpufreq/e_powersaver.c | 20 +- + drivers/cpufreq/elanfreq.c | 14 +- + drivers/cpufreq/gx-suspmod.c | 9 +- + drivers/cpufreq/longhaul.c | 8 +- + drivers/cpufreq/longrun.c | 13 +- + drivers/cpufreq/p4-clockmod.c | 17 +- + drivers/cpufreq/powernow-k6.c | 12 +- + drivers/cpufreq/powernow-k7.c | 14 +- + drivers/cpufreq/powernow-k8.c | 19 +- + drivers/cpufreq/sc520_freq.c | 14 +- + drivers/cpufreq/speedstep-centrino.c | 24 ++- + drivers/cpufreq/speedstep-ich.c | 15 + + drivers/cpufreq/speedstep-lib.c | 1 + + drivers/cpufreq/speedstep-smi.c | 15 + + drivers/crypto/padlock-aes.c | 9 +- + drivers/crypto/padlock-sha.c | 16 +- + drivers/hid/hid-core.c | 6 +- + drivers/hv/channel_mgmt.c | 87 ------- + drivers/hv/hv.c | 4 +- + drivers/hv/hv_kvp.c | 43 ++-- + drivers/hv/hv_kvp.h | 184 ------------- + drivers/hv/hv_util.c | 3 - + drivers/hv/hyperv_vmbus.h | 5 +- + drivers/hwmon/coretemp.c | 17 +- + drivers/hwmon/via-cputemp.c | 16 +- + drivers/idle/intel_idle.c | 112 +++++---- + drivers/input/gameport/gameport.c | 1 - + drivers/input/serio/serio.c | 1 - + drivers/media/video/cx18/cx18-alsa-main.c | 1 - + drivers/media/video/ivtv/ivtvfb.c | 2 - + drivers/media/video/s5p-fimc/fimc-mdevice.c | 5 +- + drivers/media/video/s5p-tv/mixer_video.c | 1 - + drivers/net/phy/phy_device.c | 6 +- + drivers/pci/pci-driver.c | 52 ++--- + drivers/pci/xen-pcifront.c | 3 +- + drivers/pcmcia/ds.c | 11 +- + drivers/s390/cio/ccwgroup.c | 2 - + drivers/s390/cio/device.c | 8 +- + drivers/s390/net/smsgiucv_app.c | 9 +- + drivers/ssb/main.c | 20 +-- + drivers/usb/core/driver.c | 66 ++---- + drivers/usb/dwc3/dwc3-pci.c | 12 +- + drivers/w1/masters/w1-gpio.c | 3 +- + drivers/w1/slaves/w1_bq27000.c | 36 +-- + fs/debugfs/inode.c | 149 +++++++++++- + fs/sysfs/dir.c | 228 +++++++++-------- + fs/sysfs/inode.c | 14 +- + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 18 +- + include/acpi/processor.h | 1 + + include/linux/connector.h | 1 + + include/linux/cpu.h | 7 + + include/linux/device.h | 10 +- + include/linux/dynamic_debug.h | 19 +- + include/linux/hyperv.h | 146 +++++++++++ + include/linux/mod_devicetable.h | 21 ++ + include/linux/netdevice.h | 8 +- + include/linux/pci.h | 13 + + include/linux/printk.h | 8 +- + include/linux/sys_soc.h | 37 +++ + lib/dma-debug.c | 3 +- + lib/dynamic_debug.c | 270 ++++++++++++++------ + scripts/mod/file2alias.c | 25 ++ + tools/hv/hv_kvp_daemon.c | 62 ++---- + 95 files changed, 1572 insertions(+), 955 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-soc + create mode 100644 arch/x86/include/asm/cpu_device_id.h + create mode 100644 arch/x86/kernel/cpu/match.c + create mode 100644 drivers/base/soc.c + delete mode 100644 drivers/hv/hv_kvp.h + create mode 100644 include/linux/sys_soc.h +Merging tty/tty-next (6623d64 tty: keyboard.c: add uaccess.h to fix a build problem on sparc32) +$ git merge tty/tty-next +Auto-merging include/linux/sunserialcore.h +Auto-merging fs/devpts/inode.c +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/isdn/capi/capi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/tty/serial/efm32-uart.txt | 14 + + MAINTAINERS | 2 +- + drivers/isdn/capi/capi.c | 9 +- + drivers/misc/pti.c | 6 +- + drivers/mmc/card/sdio_uart.c | 9 +- + drivers/tty/hvc/hvc_beat.c | 2 +- + drivers/tty/hvc/hvc_rtas.c | 2 +- + drivers/tty/hvc/hvc_udbg.c | 2 +- + drivers/tty/hvc/hvc_xen.c | 2 +- + drivers/tty/hvc/hvcs.c | 4 +- + drivers/tty/hvc/hvsi.c | 2 +- + drivers/tty/nozomi.c | 8 +- + drivers/tty/pty.c | 59 +-- + drivers/tty/serial/21285.c | 4 +- + drivers/tty/serial/8250/8250.c | 28 +- + drivers/tty/serial/Kconfig | 13 + + drivers/tty/serial/Makefile | 3 +- + drivers/tty/serial/altera_uart.c | 47 +- + drivers/tty/serial/amba-pl011.c | 17 +- + drivers/tty/serial/efm32-uart.c | 830 ++++++++++++++++++++ + drivers/tty/serial/m32r_sio.c | 11 +- + drivers/tty/serial/mpc52xx_uart.c | 4 +- + drivers/tty/serial/mux.c | 3 +- + drivers/tty/serial/pch_uart.c | 115 ++- + drivers/tty/serial/pmac_zilog.c | 2 +- + drivers/tty/serial/samsung.c | 2 +- + drivers/tty/serial/suncore.c | 2 +- + drivers/tty/serial/sunhv.c | 3 +- + drivers/tty/serial/sunsab.c | 2 +- + drivers/tty/serial/sunsu.c | 3 +- + drivers/tty/serial/sunzilog.c | 12 +- + drivers/tty/serial/ucc_uart.c | 2 +- + drivers/tty/serial/vr41xx_siu.c | 4 +- + drivers/tty/sysrq.c | 11 +- + drivers/tty/tty_io.c | 42 +- + drivers/tty/vt/keyboard.c | 181 ++++- + drivers/tty/vt/vt_ioctl.c | 81 +-- + drivers/usb/serial/usb-serial.c | 16 +- + fs/devpts/inode.c | 85 ++- + include/linux/altera_uart.h | 4 - + include/linux/platform_data/efm32-uart.h | 18 + + include/linux/serial_core.h | 2 + + .../suncore.h => include/linux/sunserialcore.h | 2 +- + include/linux/tty.h | 6 +- + include/linux/vt_kern.h | 3 + + 45 files changed, 1354 insertions(+), 325 deletions(-) + create mode 100644 Documentation/devicetree/bindings/tty/serial/efm32-uart.txt + create mode 100644 drivers/tty/serial/efm32-uart.c + create mode 100644 include/linux/platform_data/efm32-uart.h + rename drivers/tty/serial/suncore.h => include/linux/sunserialcore.h (98%) +Merging usb/usb-next (5f0b3f9 usb: otg: ab8500-usb: make probe() work again) +$ git merge usb/usb-next +Recorded preimage for 'drivers/usb/host/ehci-fsl.h' +Auto-merging tools/usb/ffs-test.c +Auto-merging drivers/usb/serial/usb-serial.c +Auto-merging drivers/usb/host/ohci-hcd.c +Removing drivers/usb/host/ehci-pxa168.c +Auto-merging drivers/usb/host/ehci-fsl.h +CONFLICT (content): Merge conflict in drivers/usb/host/ehci-fsl.h +Auto-merging drivers/usb/host/ehci-fsl.c +Auto-merging drivers/usb/gadget/u_uac1.h +Auto-merging drivers/usb/gadget/u_uac1.c +Auto-merging drivers/usb/gadget/inode.c +Auto-merging drivers/usb/gadget/f_uac1.c +Auto-merging drivers/usb/gadget/f_fs.c +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/dwc3/dwc3-pci.c +Auto-merging drivers/usb/core/driver.c +Auto-merging drivers/usb/Kconfig +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_scan.c +Auto-merging arch/arm/mach-tegra/usb_phy.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/host/ehci-fsl.h'. +[master 8bf105a] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-usb | 11 + + arch/arm/mach-imx/mx31moboard-devboard.c | 24 +- + arch/arm/mach-imx/mx31moboard-marxbot.c | 24 +- + arch/arm/mach-pxa/pxa3xx-ulpi.c | 20 +- + arch/arm/mach-tegra/include/mach/usb_phy.h | 2 +- + arch/arm/mach-tegra/usb_phy.c | 4 +- + arch/arm/plat-mxc/include/mach/mxc_ehci.h | 2 +- + arch/arm/plat-mxc/include/mach/ulpi.h | 6 +- + arch/arm/plat-mxc/ulpi.c | 8 +- + drivers/block/ub.c | 37 - + drivers/power/isp1704_charger.c | 106 ++- + drivers/power/pda_power.c | 10 +- + drivers/power/twl4030_charger.c | 20 +- + drivers/scsi/scsi_scan.c | 4 + + drivers/scsi/sd.c | 2 +- + drivers/staging/keucr/transport.h | 37 - + drivers/staging/quatech_usb2/quatech_usb2.c | 40 +- + drivers/staging/serqt_usb2/serqt_usb2.c | 40 +- + drivers/usb/Kconfig | 1 + + drivers/usb/class/cdc-acm.c | 30 +- + drivers/usb/class/cdc-wdm.c | 136 ++-- + drivers/usb/core/driver.c | 120 ++- + drivers/usb/core/hcd-pci.c | 2 + + drivers/usb/core/hcd.c | 6 +- + drivers/usb/core/hub.c | 202 +++- + drivers/usb/core/sysfs.c | 23 + + drivers/usb/core/urb.c | 32 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/core/usb.h | 1 + + drivers/usb/dwc3/Makefile | 13 + + drivers/usb/dwc3/core.c | 122 +-- + drivers/usb/dwc3/core.h | 200 ++--- + drivers/usb/dwc3/debugfs.c | 214 ++++- + drivers/usb/dwc3/dwc3-exynos.c | 151 +++ + drivers/usb/dwc3/dwc3-omap.c | 116 +-- + drivers/usb/dwc3/dwc3-pci.c | 52 +- + drivers/usb/dwc3/ep0.c | 98 +- + drivers/usb/dwc3/gadget.c | 429 +++++--- + drivers/usb/dwc3/gadget.h | 5 +- + drivers/usb/dwc3/host.c | 2 +- + drivers/usb/gadget/Kconfig | 25 +- + drivers/usb/gadget/amd5536udc.c | 147 +-- + drivers/usb/gadget/at91_udc.c | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 1 + + drivers/usb/gadget/audio.c | 47 +- + drivers/usb/gadget/ci13xxx_msm.c | 4 +- + drivers/usb/gadget/ci13xxx_udc.c | 18 +- + drivers/usb/gadget/ci13xxx_udc.h | 2 +- + drivers/usb/gadget/dummy_hcd.c | 755 +++++++++----- + drivers/usb/gadget/epautoconf.c | 16 +- + drivers/usb/gadget/f_acm.c | 52 +- + drivers/usb/gadget/f_ecm.c | 25 + + drivers/usb/gadget/f_fs.c | 2 +- + drivers/usb/gadget/f_mass_storage.c | 29 +- + drivers/usb/gadget/f_midi.c | 2 +- + drivers/usb/gadget/f_rndis.c | 2 +- + drivers/usb/gadget/f_serial.c | 42 + + drivers/usb/gadget/{f_audio.c => f_uac1.c} | 25 +- + drivers/usb/gadget/f_uac2.c | 1449 +++++++++++++++++++++++++++ + drivers/usb/gadget/file_storage.c | 26 +- + drivers/usb/gadget/fsl_qe_udc.c | 1 + + drivers/usb/gadget/fsl_udc_core.c | 28 +- + drivers/usb/gadget/fsl_usb2_udc.h | 2 +- + drivers/usb/gadget/g_ffs.c | 2 +- + drivers/usb/gadget/goku_udc.c | 19 +- + drivers/usb/gadget/inode.c | 2 + + drivers/usb/gadget/langwell_udc.c | 52 +- + drivers/usb/gadget/langwell_udc.h | 2 +- + drivers/usb/gadget/mass_storage.c | 2 +- + drivers/usb/gadget/multi.c | 2 +- + drivers/usb/gadget/mv_udc.h | 2 +- + drivers/usb/gadget/mv_udc_core.c | 9 +- + drivers/usb/gadget/net2272.c | 18 +- + drivers/usb/gadget/net2280.c | 19 +- + drivers/usb/gadget/omap_udc.c | 26 +- + drivers/usb/gadget/omap_udc.h | 2 +- + drivers/usb/gadget/pch_udc.c | 322 ++++++- + drivers/usb/gadget/pxa25x_udc.c | 15 +- + drivers/usb/gadget/pxa25x_udc.h | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 11 +- + drivers/usb/gadget/pxa27x_udc.h | 2 +- + drivers/usb/gadget/r8a66597-udc.c | 10 +- + drivers/usb/gadget/s3c-hsudc.c | 34 +- + drivers/usb/gadget/s3c2410_udc.c | 2 + + drivers/usb/gadget/serial.c | 2 +- + drivers/usb/gadget/storage_common.c | 42 +- + drivers/usb/gadget/{u_audio.c => u_uac1.c} | 4 +- + drivers/usb/gadget/{u_audio.h => u_uac1.h} | 2 +- + drivers/usb/gadget/udc-core.c | 52 + + drivers/usb/host/Kconfig | 9 +- + drivers/usb/host/ehci-fsl.c | 47 +- + drivers/usb/host/ehci-fsl.h | 3 + + drivers/usb/host/ehci-hcd.c | 10 +- + drivers/usb/host/ehci-hub.c | 10 +- + drivers/usb/host/ehci-ls1x.c | 159 +++ + drivers/usb/host/ehci-msm.c | 14 +- + drivers/usb/host/ehci-mv.c | 12 +- + drivers/usb/host/ehci-mxc.c | 12 +- + drivers/usb/host/ehci-pxa168.c | 363 ------- + drivers/usb/host/ehci-spear.c | 83 ++- + drivers/usb/host/ehci-tegra.c | 14 +- + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/fsl-mph-dr-of.c | 1 - + drivers/usb/host/imx21-dbg.c | 2 +- + drivers/usb/host/isp116x-hcd.c | 23 +- + drivers/usb/host/isp1362-hcd.c | 20 +- + drivers/usb/host/ohci-exynos.c | 6 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/ohci-omap.c | 8 +- + drivers/usb/host/ohci-pxa27x.c | 1 + + drivers/usb/host/ohci.h | 2 +- + drivers/usb/host/r8a66597-hcd.c | 21 +- + drivers/usb/host/sl811-hcd.c | 21 +- + drivers/usb/host/uhci-hcd.c | 3 + + drivers/usb/host/xhci-hub.c | 41 + + drivers/usb/host/xhci-mem.c | 11 +- + drivers/usb/host/xhci-ring.c | 76 ++- + drivers/usb/host/xhci.c | 8 +- + drivers/usb/host/xhci.h | 1 + + drivers/usb/musb/am35x.c | 20 +- + drivers/usb/musb/blackfin.c | 15 +- + drivers/usb/musb/da8xx.c | 20 +- + drivers/usb/musb/davinci.c | 24 +- + drivers/usb/musb/musb_core.c | 77 +- + drivers/usb/musb/musb_core.h | 2 +- + drivers/usb/musb/musb_debugfs.c | 14 +- + drivers/usb/musb/musb_gadget.c | 39 +- + drivers/usb/musb/musb_virthub.c | 9 +- + drivers/usb/musb/omap2430.c | 46 +- + drivers/usb/musb/tusb6010.c | 33 +- + drivers/usb/musb/ux500.c | 19 +- + drivers/usb/otg/Kconfig | 2 +- + drivers/usb/otg/ab8500-usb.c | 95 +- + drivers/usb/otg/fsl_otg.c | 113 ++- + drivers/usb/otg/fsl_otg.h | 2 +- + drivers/usb/otg/gpio_vbus.c | 61 +- + drivers/usb/otg/isp1301_omap.c | 234 +++-- + drivers/usb/otg/msm_otg.c | 398 ++++---- + drivers/usb/otg/mv_otg.c | 110 ++- + drivers/usb/otg/mv_otg.h | 2 +- + drivers/usb/otg/nop-usb-xceiv.c | 66 +- + drivers/usb/otg/otg.c | 38 +- + drivers/usb/otg/otg_fsm.c | 22 +- + drivers/usb/otg/otg_fsm.h | 2 +- + drivers/usb/otg/twl4030-usb.c | 83 +- + drivers/usb/otg/twl6030-usb.c | 119 ++- + drivers/usb/otg/ulpi.c | 116 ++- + drivers/usb/otg/ulpi_viewport.c | 6 +- + drivers/usb/renesas_usbhs/common.c | 11 +- + drivers/usb/renesas_usbhs/common.h | 1 + + drivers/usb/renesas_usbhs/fifo.c | 29 +- + drivers/usb/renesas_usbhs/fifo.h | 3 +- + drivers/usb/renesas_usbhs/mod.c | 2 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 79 +- + drivers/usb/serial/Kconfig | 9 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/aircable.c | 30 +- + drivers/usb/serial/ark3116.c | 30 +- + drivers/usb/serial/belkin_sa.c | 35 +- + drivers/usb/serial/ch341.c | 27 +- + drivers/usb/serial/cp210x.c | 77 +- + drivers/usb/serial/cyberjack.c | 36 +- + drivers/usb/serial/cypress_m8.c | 64 +-- + drivers/usb/serial/digi_acceleport.c | 45 +- + drivers/usb/serial/empeg.c | 34 +- + drivers/usb/serial/f81232.c | 405 ++++++++ + drivers/usb/serial/ftdi_sio.c | 33 +- + drivers/usb/serial/ftdi_sio_ids.h | 4 + + drivers/usb/serial/funsoft.c | 25 +- + drivers/usb/serial/garmin_gps.c | 40 +- + drivers/usb/serial/generic.c | 19 +- + drivers/usb/serial/hp4x.c | 31 +- + drivers/usb/serial/io_edgeport.c | 66 +-- + drivers/usb/serial/io_tables.h | 10 +- + drivers/usb/serial/io_ti.c | 44 +- + drivers/usb/serial/ipaq.c | 28 +- + drivers/usb/serial/ipw.c | 32 +- + drivers/usb/serial/ir-usb.c | 30 +- + drivers/usb/serial/iuu_phoenix.c | 31 +- + drivers/usb/serial/keyspan.c | 48 +- + drivers/usb/serial/keyspan.h | 10 +- + drivers/usb/serial/keyspan_pda.c | 62 +- + drivers/usb/serial/kl5kusb105.c | 37 +- + drivers/usb/serial/kobil_sct.c | 35 +- + drivers/usb/serial/mct_u232.c | 34 +- + drivers/usb/serial/mos7720.c | 46 +- + drivers/usb/serial/mos7840.c | 59 +- + drivers/usb/serial/moto_modem.c | 26 +- + drivers/usb/serial/navman.c | 25 +- + drivers/usb/serial/omninet.c | 38 +- + drivers/usb/serial/opticon.c | 25 +- + drivers/usb/serial/option.c | 50 +- + drivers/usb/serial/oti6858.c | 36 +- + drivers/usb/serial/pl2303.c | 31 +- + drivers/usb/serial/qcaux.c | 26 +- + drivers/usb/serial/qcserial.c | 134 ++-- + drivers/usb/serial/safe_serial.c | 24 +- + drivers/usb/serial/siemens_mpi.c | 30 +- + drivers/usb/serial/sierra.c | 37 +- + drivers/usb/serial/spcp8x5.c | 31 +- + drivers/usb/serial/ssu100.c | 40 +- + drivers/usb/serial/symbolserial.c | 25 +- + drivers/usb/serial/ti_usb_3410_5052.c | 40 +- + drivers/usb/serial/usb-serial.c | 77 ++- + drivers/usb/serial/usb_debug.c | 26 +- + drivers/usb/serial/visor.c | 37 +- + drivers/usb/serial/vivopay-serial.c | 31 +- + drivers/usb/serial/whiteheat.c | 47 +- + drivers/usb/serial/zio.c | 26 +- + drivers/usb/storage/alauda.c | 1 + + drivers/usb/storage/cypress_atacb.c | 1 + + drivers/usb/storage/datafab.c | 1 + + drivers/usb/storage/ene_ub6250.c | 27 +- + drivers/usb/storage/freecom.c | 1 + + drivers/usb/storage/isd200.c | 1 + + drivers/usb/storage/jumpshot.c | 1 + + drivers/usb/storage/karma.c | 1 + + drivers/usb/storage/onetouch.c | 1 + + drivers/usb/storage/realtek_cr.c | 13 +- + drivers/usb/storage/scsiglue.c | 55 +- + drivers/usb/storage/sddr09.c | 1 + + drivers/usb/storage/sddr55.c | 1 + + drivers/usb/storage/shuttle_usbat.c | 1 + + drivers/usb/storage/transport.c | 3 +- + drivers/usb/storage/transport.h | 39 - + drivers/usb/storage/uas.c | 328 ++++--- + drivers/usb/storage/usb.c | 21 +- + include/linux/platform_data/dwc3-exynos.h | 24 + + include/linux/usb.h | 8 + + include/linux/usb/audio-v2.h | 21 + + include/linux/usb/ch11.h | 5 + + include/linux/usb/gadget.h | 10 + + include/linux/usb/hcd.h | 4 +- + include/linux/usb/intel_mid_otg.h | 6 +- + include/linux/usb/msm_hsusb.h | 2 +- + include/linux/usb/otg.h | 164 ++-- + include/linux/usb/renesas_usbhs.h | 1 + + include/linux/usb/serial.h | 49 +- + include/linux/usb/storage.h | 38 + + include/linux/usb/uas.h | 69 ++ + include/linux/usb/ulpi.h | 4 +- + include/scsi/scsi_device.h | 7 +- + tools/usb/ffs-test.c | 2 +- + tools/usb/testusb.c | 2 +- + 244 files changed, 7122 insertions(+), 4780 deletions(-) + create mode 100644 drivers/usb/dwc3/dwc3-exynos.c + rename drivers/usb/gadget/{f_audio.c => f_uac1.c} (97%) + create mode 100644 drivers/usb/gadget/f_uac2.c + rename drivers/usb/gadget/{u_audio.c => u_uac1.c} (99%) + rename drivers/usb/gadget/{u_audio.h => u_uac1.h} (94%) + create mode 100644 drivers/usb/host/ehci-ls1x.c + delete mode 100644 drivers/usb/host/ehci-pxa168.c + create mode 100644 drivers/usb/serial/f81232.c + create mode 100644 include/linux/platform_data/dwc3-exynos.h + create mode 100644 include/linux/usb/uas.h +Merging staging/staging-next (1ec41a3 staging: ozwpan: remove debug allocator) +$ git merge staging/staging-next +Removing drivers/staging/tidspbridge/rmgr/drv_interface.h +Removing drivers/staging/tidspbridge/include/dspbridge/dbc.h +Removing drivers/staging/sep/sep_driver.c +Auto-merging drivers/staging/mei/interrupt.c +Removing drivers/staging/hv/TODO +Removing drivers/staging/hv/Makefile +Removing drivers/staging/hv/Kconfig +Auto-merging drivers/staging/et131x/et131x.c +Removing drivers/staging/crystalhd/bc_dts_types.h +Auto-merging drivers/staging/android/binder.c +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/scsi/Makefile +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Merge made by the 'recursive' strategy. + drivers/Kconfig | 2 - + drivers/Makefile | 1 - + drivers/scsi/Kconfig | 7 + + drivers/scsi/Makefile | 3 + + drivers/{staging/hv => scsi}/storvsc_drv.c | 1300 +++--- + drivers/staging/Kconfig | 10 +- + drivers/staging/Makefile | 6 +- + drivers/staging/android/Kconfig | 26 + + drivers/staging/android/Makefile | 2 + + drivers/staging/android/TODO | 2 +- + drivers/staging/android/alarm-dev.c | 297 ++ + drivers/staging/android/alarm.c | 601 +++ + drivers/staging/android/android_alarm.h | 121 + + drivers/staging/android/ashmem.c | 4 +- + drivers/staging/android/binder.c | 2 +- + drivers/staging/android/logger.c | 78 +- + drivers/staging/android/lowmemorykiller.c | 75 +- + drivers/staging/android/ram_console.c | 7 +- + drivers/staging/android/timed_gpio.c | 6 +- + drivers/staging/android/timed_gpio.h | 6 +- + drivers/staging/asus_oled/asus_oled.c | 19 +- + drivers/staging/bcm/Bcmchar.c | 41 +- + drivers/staging/bcm/CmHost.c | 3113 ++++++-------- + drivers/staging/bcm/led_control.h | 80 +- + drivers/staging/comedi/Kconfig | 5 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 29 +- + drivers/staging/comedi/drivers/dt2801.c | 12 +- + drivers/staging/comedi/drivers/dt9812.c | 4 +- + drivers/staging/comedi/drivers/me4000.c | 12 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 61 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 27 +- + drivers/staging/comedi/drivers/unioxx5.c | 2 +- + drivers/staging/crystalhd/bc_dts_glob_lnx.h | 3 +- + drivers/staging/crystalhd/bc_dts_types.h | 40 - + drivers/staging/crystalhd/crystalhd.h | 14 + + drivers/staging/crystalhd/crystalhd_cmds.c | 3 +- + drivers/staging/crystalhd/crystalhd_cmds.h | 4 +- + drivers/staging/crystalhd/crystalhd_hw.c | 9 +- + drivers/staging/crystalhd/crystalhd_hw.h | 3 +- + drivers/staging/crystalhd/crystalhd_lnx.c | 7 +- + drivers/staging/crystalhd/crystalhd_lnx.h | 5 +- + drivers/staging/crystalhd/crystalhd_misc.c | 5 +- + drivers/staging/crystalhd/crystalhd_misc.h | 34 +- + drivers/staging/et131x/README | 2 +- + drivers/staging/et131x/et131x.c | 8 +- + drivers/staging/et131x/et131x.h | 4 +- + drivers/staging/frontier/alphatrack.c | 2 +- + drivers/staging/frontier/tranzport.c | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 6 +- + drivers/staging/hv/Kconfig | 5 - + drivers/staging/hv/Makefile | 3 - + drivers/staging/hv/TODO | 5 - + drivers/staging/iio/Documentation/device.txt | 2 +- + .../staging/iio/Documentation/iio_event_monitor.c | 241 ++ + drivers/staging/iio/Documentation/inkernel.txt | 58 + + drivers/staging/iio/Kconfig | 9 +- + drivers/staging/iio/Makefile | 4 +- + drivers/staging/iio/accel/adis16201_ring.c | 2 - + drivers/staging/iio/accel/adis16203_ring.c | 2 - + drivers/staging/iio/accel/adis16204_ring.c | 2 - + drivers/staging/iio/accel/adis16209_ring.c | 2 - + drivers/staging/iio/accel/adis16240_ring.c | 2 - + drivers/staging/iio/accel/lis3l02dq.h | 2 - + drivers/staging/iio/accel/lis3l02dq_ring.c | 4 +- + drivers/staging/iio/accel/sca3000.h | 2 +- + drivers/staging/iio/adc/Kconfig | 9 + + drivers/staging/iio/adc/Makefile | 1 + + drivers/staging/iio/adc/ad7192.c | 45 +- + drivers/staging/iio/adc/ad7291.c | 14 +- + drivers/staging/iio/adc/ad7298_ring.c | 3 - + drivers/staging/iio/adc/ad7476_ring.c | 4 +- + drivers/staging/iio/adc/ad7606_core.c | 83 +- + drivers/staging/iio/adc/ad7606_par.c | 13 +- + drivers/staging/iio/adc/ad7606_ring.c | 2 - + drivers/staging/iio/adc/ad7793.c | 2 - + drivers/staging/iio/adc/ad7887_ring.c | 2 - + drivers/staging/iio/adc/ad799x_core.c | 4 +- + drivers/staging/iio/adc/ad799x_ring.c | 4 +- + drivers/staging/iio/adc/adt7310.c | 21 +- + drivers/staging/iio/adc/adt7410.c | 21 +- + drivers/staging/iio/adc/lpc32xx_adc.c | 237 + + drivers/staging/iio/adc/max1363_core.c | 50 +- + drivers/staging/iio/adc/max1363_ring.c | 2 - + drivers/staging/iio/addac/adt7316-i2c.c | 18 +- + drivers/staging/iio/addac/adt7316-spi.c | 18 +- + drivers/staging/iio/addac/adt7316.c | 11 +- + drivers/staging/iio/addac/adt7316.h | 9 +- + drivers/staging/iio/buffer.h | 2 - + drivers/staging/iio/cdc/ad7150.c | 10 +- + drivers/staging/iio/consumer.h | 96 + + drivers/staging/iio/dac/Kconfig | 7 +- + drivers/staging/iio/dac/ad5064.c | 369 +- + drivers/staging/iio/dac/ad5360.c | 4 +- + drivers/staging/iio/dac/ad5380.c | 4 +- + drivers/staging/iio/dac/ad5421.c | 13 +- + drivers/staging/iio/dac/ad5446.c | 35 +- + drivers/staging/iio/dac/ad5764.c | 13 +- + drivers/staging/iio/dac/max517.c | 18 +- + drivers/staging/iio/dds/ad9834.c | 53 +- + drivers/staging/iio/driver.h | 34 + + drivers/staging/iio/events.h | 4 +- + drivers/staging/iio/gyro/adis16260_ring.c | 2 - + drivers/staging/iio/iio.h | 70 +- + drivers/staging/iio/iio_core.h | 4 + + drivers/staging/iio/iio_dummy_evgen.c | 2 +- + drivers/staging/iio/iio_hwmon.c | 232 + + drivers/staging/iio/iio_simple_dummy_buffer.c | 2 - + drivers/staging/iio/impedance-analyzer/ad5933.c | 3 - + drivers/staging/iio/imu/adis16400_ring.c | 2 - + drivers/staging/iio/industrialio-buffer.c | 6 +- + drivers/staging/iio/industrialio-core.c | 658 +-- + drivers/staging/iio/industrialio-event.c | 453 ++ + drivers/staging/iio/inkern.c | 292 ++ + drivers/staging/iio/kfifo_buf.c | 46 +- + drivers/staging/iio/kfifo_buf.h | 2 - + drivers/staging/iio/light/isl29018.c | 7 + + drivers/staging/iio/light/tsl2563.c | 26 +- + drivers/staging/iio/light/tsl2583.c | 19 +- + drivers/staging/iio/machine.h | 24 + + drivers/staging/iio/magnetometer/ak8975.c | 8 + + drivers/staging/iio/magnetometer/hmc5843.c | 26 +- + drivers/staging/iio/meter/ade7758_ring.c | 4 +- + drivers/staging/iio/meter/meter.h | 2 +- + drivers/staging/iio/ring_sw.c | 26 +- + drivers/staging/iio/ring_sw.h | 5 - + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 12 +- + drivers/staging/iio/trigger/iio-trig-gpio.c | 12 +- + .../staging/iio/trigger/iio-trig-periodic-rtc.c | 12 +- + drivers/staging/iio/types.h | 4 + + drivers/staging/keucr/TODO | 2 +- + drivers/staging/line6/capture.c | 54 +- + drivers/staging/line6/capture.h | 2 +- + drivers/staging/line6/driver.c | 2 +- + drivers/staging/line6/pcm.c | 109 +- + drivers/staging/line6/pcm.h | 167 +- + drivers/staging/line6/playback.c | 68 +- + drivers/staging/line6/playback.h | 2 +- + drivers/staging/line6/toneport.c | 12 +- + drivers/staging/line6/usbdefs.h | 44 +- + drivers/staging/media/lirc/lirc_sasem.c | 17 +- + drivers/staging/mei/TODO | 3 + + drivers/staging/mei/hw.h | 47 +- + drivers/staging/mei/init.c | 8 +- + drivers/staging/mei/interface.c | 31 +- + drivers/staging/mei/interface.h | 5 +- + drivers/staging/mei/interrupt.c | 29 +- + drivers/staging/mei/iorw.c | 2 +- + drivers/staging/mei/main.c | 2 +- + drivers/staging/mei/mei-amt-version.c | 481 +++ + drivers/staging/mei/mei.h | 125 +- + drivers/staging/mei/mei_dev.h | 8 +- + drivers/staging/mei/mei_version.h | 2 +- + drivers/staging/mei/wd.c | 2 +- + drivers/staging/nvec/Kconfig | 6 +- + drivers/staging/nvec/nvec.c | 19 +- + drivers/staging/nvec/nvec_ps2.c | 53 +- + drivers/staging/octeon/ethernet-mdio.c | 4 +- + drivers/staging/omapdrm/omap_gem_helpers.c | 2 +- + drivers/staging/ozwpan/Kbuild | 19 + + drivers/staging/ozwpan/Kconfig | 9 + + drivers/staging/ozwpan/README | 25 + + drivers/staging/ozwpan/TODO | 12 + + drivers/staging/ozwpan/ozappif.h | 46 + + drivers/staging/ozwpan/ozcdev.c | 521 +++ + drivers/staging/ozwpan/ozcdev.h | 18 + + drivers/staging/ozwpan/ozconfig.h | 27 + + drivers/staging/ozwpan/ozeltbuf.c | 339 ++ + drivers/staging/ozwpan/ozeltbuf.h | 70 + + drivers/staging/ozwpan/ozevent.c | 116 + + drivers/staging/ozwpan/ozevent.h | 31 + + drivers/staging/ozwpan/ozeventdef.h | 47 + + drivers/staging/ozwpan/ozhcd.c | 2256 ++++++++++ + drivers/staging/ozwpan/ozhcd.h | 15 + + drivers/staging/ozwpan/ozmain.c | 58 + + drivers/staging/ozwpan/ozpd.c | 832 ++++ + drivers/staging/ozwpan/ozpd.h | 121 + + drivers/staging/ozwpan/ozproto.c | 957 +++++ + drivers/staging/ozwpan/ozproto.h | 69 + + drivers/staging/ozwpan/ozprotocol.h | 372 ++ + drivers/staging/ozwpan/oztrace.c | 36 + + drivers/staging/ozwpan/oztrace.h | 35 + + drivers/staging/ozwpan/ozurbparanoia.c | 53 + + drivers/staging/ozwpan/ozurbparanoia.h | 19 + + drivers/staging/ozwpan/ozusbif.h | 43 + + drivers/staging/ozwpan/ozusbsvc.c | 245 ++ + drivers/staging/ozwpan/ozusbsvc.h | 32 + + drivers/staging/ozwpan/ozusbsvc1.c | 437 ++ + drivers/staging/quickstart/quickstart.c | 370 +- + drivers/staging/ramster/Kconfig | 17 + + drivers/staging/ramster/Makefile | 1 + + drivers/staging/ramster/TODO | 13 + + drivers/staging/ramster/cluster/Makefile | 3 + + drivers/staging/ramster/cluster/heartbeat.c | 464 ++ + drivers/staging/ramster/cluster/heartbeat.h | 87 + + drivers/staging/ramster/cluster/masklog.c | 155 + + drivers/staging/ramster/cluster/masklog.h | 220 + + drivers/staging/ramster/cluster/nodemanager.c | 992 +++++ + drivers/staging/ramster/cluster/nodemanager.h | 88 + + .../staging/ramster/cluster/ramster_nodemanager.h | 39 + + drivers/staging/ramster/cluster/tcp.c | 2256 ++++++++++ + drivers/staging/ramster/cluster/tcp.h | 159 + + drivers/staging/ramster/cluster/tcp_internal.h | 248 ++ + drivers/staging/ramster/r2net.c | 401 ++ + drivers/staging/ramster/ramster.h | 118 + + drivers/staging/ramster/tmem.c | 851 ++++ + drivers/staging/ramster/tmem.h | 244 ++ + drivers/staging/{zram => ramster}/xvmalloc.c | 0 + drivers/staging/{zram => ramster}/xvmalloc.h | 0 + drivers/staging/{zram => ramster}/xvmalloc_int.h | 0 + drivers/staging/ramster/zcache-main.c | 3320 ++++++++++++++ + drivers/staging/ramster/zcache.h | 22 + + drivers/staging/rtl8192e/rtllib_rx.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 3 +- + drivers/staging/rtl8192u/r8192U_core.c | 1 - + drivers/staging/rtl8712/Kconfig | 7 - + drivers/staging/rtl8712/drv_types.h | 1 - + drivers/staging/rtl8712/os_intfs.c | 6 - + drivers/staging/rtl8712/osdep_service.h | 17 - + drivers/staging/rtl8712/rtl8712_recv.c | 2 - + drivers/staging/rtl8712/rtl871x_io.c | 1 - + drivers/staging/rtl8712/rtl871x_io.h | 1 - + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 8 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 11 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 1 - + drivers/staging/rtl8712/rtl871x_recv.c | 1 - + drivers/staging/rtl8712/rtl871x_recv.h | 3 - + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 4 - + drivers/staging/rtl8712/rtl871x_xmit.c | 3 - + drivers/staging/rtl8712/rtl871x_xmit.h | 3 - + drivers/staging/rtl8712/sta_info.h | 4 - + drivers/staging/rtl8712/usb_intf.c | 9 +- + drivers/staging/rts5139/TODO | 6 +- + drivers/staging/rts5139/ms.h | 4 +- + drivers/staging/rts5139/rts51x_chip.c | 14 +- + drivers/staging/rts5139/rts51x_chip.h | 6 +- + drivers/staging/rts5139/rts51x_fop.h | 2 +- + drivers/staging/rts5139/rts51x_transport.c | 2 +- + drivers/staging/rts5139/rts51x_transport.h | 2 +- + drivers/staging/rts5139/sd_cprm.c | 2 +- + drivers/staging/rts_pstor/TODO | 6 +- + drivers/staging/sbe-2t3e3/intr.c | 2 +- + drivers/staging/sep/Kconfig | 3 +- + drivers/staging/sep/Makefile | 5 +- + drivers/staging/sep/TODO | 5 +- + drivers/staging/sep/sep_crypto.c | 4058 ++++++++++++++++++ + drivers/staging/sep/sep_crypto.h | 359 ++ + drivers/staging/sep/sep_dev.h | 98 +- + drivers/staging/sep/sep_driver.c | 2932 ------------- + drivers/staging/sep/sep_driver_api.h | 293 ++- + drivers/staging/sep/sep_driver_config.h | 79 +- + drivers/staging/sep/sep_driver_hw_defs.h | 185 +- + drivers/staging/sep/sep_main.c | 4518 ++++++++++++++++++++ + drivers/staging/sep/sep_trace_events.h | 188 + + drivers/staging/slicoss/README | 2 +- + drivers/staging/sm7xx/smtcfb.c | 3 +- + drivers/staging/sm7xx/smtcfb.h | 2 +- + drivers/{ => staging}/telephony/Kconfig | 0 + drivers/{ => staging}/telephony/Makefile | 0 + drivers/staging/telephony/TODO | 10 + + drivers/{ => staging}/telephony/ixj-ver.h | 0 + drivers/{ => staging}/telephony/ixj.c | 0 + drivers/{ => staging}/telephony/ixj.h | 0 + drivers/{ => staging}/telephony/ixj_pcmcia.c | 0 + drivers/{ => staging}/telephony/phonedev.c | 0 + drivers/staging/tidspbridge/Kconfig | 22 - + drivers/staging/tidspbridge/Makefile | 4 +- + drivers/staging/tidspbridge/core/chnl_sm.c | 34 +- + drivers/staging/tidspbridge/core/dsp-clock.c | 3 - + drivers/staging/tidspbridge/core/io_sm.c | 29 +- + drivers/staging/tidspbridge/core/msg_sm.c | 3 - + drivers/staging/tidspbridge/core/tiomap3430.c | 19 +- + drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 1 - + drivers/staging/tidspbridge/core/tiomap_io.c | 18 - + drivers/staging/tidspbridge/core/wdt.c | 24 +- + drivers/staging/tidspbridge/gen/uuidutil.c | 7 - + .../tidspbridge/include/dspbridge/_chnl_sm.h | 4 - + .../staging/tidspbridge/include/dspbridge/dbc.h | 46 - + .../staging/tidspbridge/include/dspbridge/io_sm.h | 2 - + drivers/staging/tidspbridge/pmgr/chnl.c | 19 - + drivers/staging/tidspbridge/pmgr/cmm.c | 68 +- + drivers/staging/tidspbridge/pmgr/cod.c | 74 - + drivers/staging/tidspbridge/pmgr/dbll.c | 113 +- + drivers/staging/tidspbridge/pmgr/dev.c | 132 - + drivers/staging/tidspbridge/pmgr/dmm.c | 14 - + drivers/staging/tidspbridge/pmgr/dspapi.c | 7 - + drivers/staging/tidspbridge/pmgr/io.c | 17 - + drivers/staging/tidspbridge/pmgr/msg.c | 17 - + drivers/staging/tidspbridge/rmgr/dbdcd.c | 88 - + drivers/staging/tidspbridge/rmgr/disp.c | 44 - + drivers/staging/tidspbridge/rmgr/drv.c | 48 - + drivers/staging/tidspbridge/rmgr/drv_interface.c | 366 +- + drivers/staging/tidspbridge/rmgr/drv_interface.h | 28 - + drivers/staging/tidspbridge/rmgr/dspdrv.c | 5 - + drivers/staging/tidspbridge/rmgr/mgr.c | 36 - + drivers/staging/tidspbridge/rmgr/nldr.c | 71 - + drivers/staging/tidspbridge/rmgr/node.c | 98 - + drivers/staging/tidspbridge/rmgr/proc.c | 91 - + drivers/staging/tidspbridge/rmgr/rmm.c | 36 - + drivers/staging/tidspbridge/rmgr/strm.c | 86 +- + drivers/staging/usbip/stub.h | 1 - + drivers/staging/usbip/stub_dev.c | 2 - + drivers/staging/usbip/stub_rx.c | 9 - + drivers/staging/usbip/usbip_common.c | 11 +- + drivers/staging/usbip/usbip_common.h | 2 +- + drivers/staging/usbip/vhci_hcd.c | 41 - + drivers/staging/usbip/vhci_rx.c | 3 +- + drivers/staging/vme/vme.h | 2 +- + drivers/staging/vt6655/bssdb.c | 4 +- + drivers/staging/vt6655/ioctl.c | 23 +- + drivers/staging/vt6656/bssdb.c | 4 +- + drivers/staging/vt6656/iwctl.c | 230 +- + drivers/staging/vt6656/iwctl.h | 13 +- + drivers/staging/vt6656/main_usb.c | 13 +- + drivers/staging/vt6656/wpactl.c | 937 ++--- + drivers/staging/wlan-ng/cfg80211.c | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/staging/wlan-ng/prism2mgmt.c | 1 + + drivers/staging/xgifb/XGI_main.h | 78 +- + drivers/staging/xgifb/XGI_main_26.c | 208 +- + drivers/staging/xgifb/XGIfb.h | 2 +- + drivers/staging/xgifb/vb_def.h | 178 +- + drivers/staging/xgifb/vb_init.c | 20 +- + drivers/staging/xgifb/vb_setmode.c | 836 ++-- + drivers/staging/xgifb/vb_struct.h | 79 +- + drivers/staging/xgifb/vb_table.h | 346 +- + drivers/staging/xgifb/vgatypes.h | 9 + + drivers/staging/zcache/Kconfig | 11 +- + drivers/staging/zcache/zcache-main.c | 237 +- + drivers/staging/zram/Kconfig | 10 +- + drivers/staging/zram/Makefile | 1 - + drivers/staging/zram/zram_drv.c | 116 +- + drivers/staging/zram/zram_drv.h | 12 +- + drivers/staging/zram/zram_sysfs.c | 4 +- + drivers/staging/zsmalloc/Kconfig | 14 + + drivers/staging/zsmalloc/Makefile | 3 + + drivers/staging/zsmalloc/zsmalloc-main.c | 757 ++++ + drivers/staging/zsmalloc/zsmalloc.h | 31 + + drivers/staging/zsmalloc/zsmalloc_int.h | 126 + + 338 files changed, 35730 insertions(+), 11085 deletions(-) + rename drivers/{staging/hv => scsi}/storvsc_drv.c (84%) + create mode 100644 drivers/staging/android/alarm-dev.c + create mode 100644 drivers/staging/android/alarm.c + create mode 100644 drivers/staging/android/android_alarm.h + delete mode 100644 drivers/staging/crystalhd/bc_dts_types.h + create mode 100644 drivers/staging/crystalhd/crystalhd.h + delete mode 100644 drivers/staging/hv/Kconfig + delete mode 100644 drivers/staging/hv/Makefile + delete mode 100644 drivers/staging/hv/TODO + create mode 100644 drivers/staging/iio/Documentation/iio_event_monitor.c + create mode 100644 drivers/staging/iio/Documentation/inkernel.txt + create mode 100644 drivers/staging/iio/adc/lpc32xx_adc.c + create mode 100644 drivers/staging/iio/consumer.h + create mode 100644 drivers/staging/iio/driver.h + create mode 100644 drivers/staging/iio/iio_hwmon.c + create mode 100644 drivers/staging/iio/industrialio-event.c + create mode 100644 drivers/staging/iio/inkern.c + create mode 100644 drivers/staging/iio/machine.h + create mode 100644 drivers/staging/mei/mei-amt-version.c + create mode 100644 drivers/staging/ozwpan/Kbuild + create mode 100644 drivers/staging/ozwpan/Kconfig + create mode 100644 drivers/staging/ozwpan/README + create mode 100644 drivers/staging/ozwpan/TODO + create mode 100644 drivers/staging/ozwpan/ozappif.h + create mode 100644 drivers/staging/ozwpan/ozcdev.c + create mode 100644 drivers/staging/ozwpan/ozcdev.h + create mode 100644 drivers/staging/ozwpan/ozconfig.h + create mode 100644 drivers/staging/ozwpan/ozeltbuf.c + create mode 100644 drivers/staging/ozwpan/ozeltbuf.h + create mode 100644 drivers/staging/ozwpan/ozevent.c + create mode 100644 drivers/staging/ozwpan/ozevent.h + create mode 100644 drivers/staging/ozwpan/ozeventdef.h + create mode 100644 drivers/staging/ozwpan/ozhcd.c + create mode 100644 drivers/staging/ozwpan/ozhcd.h + create mode 100644 drivers/staging/ozwpan/ozmain.c + create mode 100644 drivers/staging/ozwpan/ozpd.c + create mode 100644 drivers/staging/ozwpan/ozpd.h + create mode 100644 drivers/staging/ozwpan/ozproto.c + create mode 100644 drivers/staging/ozwpan/ozproto.h + create mode 100644 drivers/staging/ozwpan/ozprotocol.h + create mode 100644 drivers/staging/ozwpan/oztrace.c + create mode 100644 drivers/staging/ozwpan/oztrace.h + create mode 100644 drivers/staging/ozwpan/ozurbparanoia.c + create mode 100644 drivers/staging/ozwpan/ozurbparanoia.h + create mode 100644 drivers/staging/ozwpan/ozusbif.h + create mode 100644 drivers/staging/ozwpan/ozusbsvc.c + create mode 100644 drivers/staging/ozwpan/ozusbsvc.h + create mode 100644 drivers/staging/ozwpan/ozusbsvc1.c + create mode 100644 drivers/staging/ramster/Kconfig + create mode 100644 drivers/staging/ramster/Makefile + create mode 100644 drivers/staging/ramster/TODO + create mode 100644 drivers/staging/ramster/cluster/Makefile + create mode 100644 drivers/staging/ramster/cluster/heartbeat.c + create mode 100644 drivers/staging/ramster/cluster/heartbeat.h + create mode 100644 drivers/staging/ramster/cluster/masklog.c + create mode 100644 drivers/staging/ramster/cluster/masklog.h + create mode 100644 drivers/staging/ramster/cluster/nodemanager.c + create mode 100644 drivers/staging/ramster/cluster/nodemanager.h + create mode 100644 drivers/staging/ramster/cluster/ramster_nodemanager.h + create mode 100644 drivers/staging/ramster/cluster/tcp.c + create mode 100644 drivers/staging/ramster/cluster/tcp.h + create mode 100644 drivers/staging/ramster/cluster/tcp_internal.h + create mode 100644 drivers/staging/ramster/r2net.c + create mode 100644 drivers/staging/ramster/ramster.h + create mode 100644 drivers/staging/ramster/tmem.c + create mode 100644 drivers/staging/ramster/tmem.h + rename drivers/staging/{zram => ramster}/xvmalloc.c (100%) + rename drivers/staging/{zram => ramster}/xvmalloc.h (100%) + rename drivers/staging/{zram => ramster}/xvmalloc_int.h (100%) + create mode 100644 drivers/staging/ramster/zcache-main.c + create mode 100644 drivers/staging/ramster/zcache.h + create mode 100644 drivers/staging/sep/sep_crypto.c + create mode 100644 drivers/staging/sep/sep_crypto.h + delete mode 100644 drivers/staging/sep/sep_driver.c + create mode 100644 drivers/staging/sep/sep_main.c + create mode 100644 drivers/staging/sep/sep_trace_events.h + rename drivers/{ => staging}/telephony/Kconfig (100%) + rename drivers/{ => staging}/telephony/Makefile (100%) + create mode 100644 drivers/staging/telephony/TODO + rename drivers/{ => staging}/telephony/ixj-ver.h (100%) + rename drivers/{ => staging}/telephony/ixj.c (100%) + rename drivers/{ => staging}/telephony/ixj.h (100%) + rename drivers/{ => staging}/telephony/ixj_pcmcia.c (100%) + rename drivers/{ => staging}/telephony/phonedev.c (100%) + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbc.h + delete mode 100644 drivers/staging/tidspbridge/rmgr/drv_interface.h + create mode 100644 drivers/staging/zsmalloc/Kconfig + create mode 100644 drivers/staging/zsmalloc/Makefile + create mode 100644 drivers/staging/zsmalloc/zsmalloc-main.c + create mode 100644 drivers/staging/zsmalloc/zsmalloc.h + create mode 100644 drivers/staging/zsmalloc/zsmalloc_int.h +Merging char-misc/char-misc-next (b222258 misc: bmp085: Use unsigned long to store jiffies) +$ git merge char-misc/char-misc-next +Auto-merging drivers/misc/cs5535-mfgpt.c +Auto-merging drivers/misc/carma/carma-fpga.c +Merge made by the 'recursive' strategy. + drivers/char/ramoops.c | 1 - + drivers/misc/ad525x_dpot-i2c.c | 12 +----------- + drivers/misc/ad525x_dpot-spi.c | 12 +----------- + drivers/misc/apds9802als.c | 12 +----------- + drivers/misc/apds990x.c | 13 +------------ + drivers/misc/bh1770glc.c | 13 +------------ + drivers/misc/bh1780gli.c | 15 ++------------- + drivers/misc/bmp085.c | 19 ++++--------------- + drivers/misc/carma/carma-fpga.c | 17 +---------------- + drivers/misc/cs5535-mfgpt.c | 2 +- + drivers/misc/ds1682.c | 13 +------------ + drivers/misc/eeprom/at25.c | 12 +----------- + drivers/misc/eeprom/eeprom.c | 14 +------------- + drivers/misc/eeprom/eeprom_93xx46.c | 12 +----------- + drivers/misc/eeprom/max6875.c | 14 +------------- + drivers/misc/fsa9480.c | 14 +------------- + drivers/misc/hmc6352.c | 13 +------------ + drivers/misc/ics932s401.c | 13 +------------ + drivers/misc/isl29003.c | 14 +------------- + drivers/misc/isl29020.c | 13 +------------ + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 13 +------------ + drivers/misc/lis3lv02d/lis3lv02d_spi.c | 13 +------------ + drivers/misc/max8997-muic.c | 12 +----------- + drivers/misc/spear13xx_pcie_gadget.c | 12 +----------- + drivers/misc/ti-st/st_kim.c | 13 +------------ + drivers/misc/ti_dac7512.c | 13 +------------ + drivers/misc/tsl2550.c | 13 +------------ + 27 files changed, 30 insertions(+), 307 deletions(-) +Merging tmem/linux-next (b05b561 Merge branch 'devel/frontswap.v13' into linux-next) +$ git merge tmem/linux-next +Auto-merging mm/truncate.c +Auto-merging mm/swapfile.c +Auto-merging mm/filemap.c +Auto-merging include/linux/swap.h +Auto-merging fs/super.c +Auto-merging drivers/staging/zcache/zcache-main.c +Auto-merging Documentation/vm/cleancache.txt +Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 - + Documentation/vm/cleancache.txt | 41 ++-- + Documentation/vm/frontswap.txt | 210 +++++++++++++++ + drivers/staging/zcache/zcache-main.c | 10 +- + drivers/xen/tmem.c | 10 +- + fs/block_dev.c | 2 +- + fs/super.c | 2 +- + include/linux/cleancache.h | 24 +- + include/linux/frontswap.h | 126 +++++++++ + include/linux/swap.h | 4 + + include/linux/swapfile.h | 13 + + mm/Kconfig | 17 ++ + mm/Makefile | 1 + + mm/cleancache.c | 98 +++----- + mm/filemap.c | 2 +- + mm/frontswap.c | 273 ++++++++++++++++++++ + mm/page_io.c | 12 + + mm/swapfile.c | 64 ++++- + mm/truncate.c | 10 +- + 19 files changed, 796 insertions(+), 134 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/frontswap.txt + create mode 100644 include/linux/frontswap.h + create mode 100644 include/linux/swapfile.h + create mode 100644 mm/frontswap.c +$ git am -3 ../patches/0001-mm-frontswap-update-for-security_vm_enough_memory-AP.patch +Applying: mm: frontswap: update for security_vm_enough_memory API change +$ git reset HEAD^ +Unstaged changes after reset: +M mm/frontswap.c +$ git add . +$ git commit -v -a --amend +[master 5a42225] Merge remote-tracking branch 'tmem/linux-next' +Merging writeback/writeback-for-next (977b7e3 writeback: fix dereferencing NULL bdi->dev on trace_writeback_queue) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) +$ git merge arm-dt/devicetree/arm-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (1bbfa4d Merge branch 'pinctrl-tegra-for-next-diet' into for-next) +$ git merge pinctrl/for-next +Auto-merging arch/arm/mach-u300/core.c +Auto-merging arch/arm/mach-tegra/Kconfig +Merge made by the 'recursive' strategy. + Documentation/pinctrl.txt | 171 +- + arch/arm/mach-tegra/Kconfig | 4 + + arch/arm/mach-tegra/include/mach/pinconf-tegra.h | 63 + + arch/arm/mach-u300/core.c | 54 +- + arch/arm/mach-u300/include/mach/gpio-u300.h | 2 + + drivers/pinctrl/Kconfig | 37 + + drivers/pinctrl/Makefile | 7 + + drivers/pinctrl/core.c | 510 +++- + drivers/pinctrl/core.h | 54 +- + drivers/pinctrl/pinconf.c | 41 +- + drivers/pinctrl/pinconf.h | 5 +- + drivers/pinctrl/pinctrl-coh901.c | 16 +- + drivers/pinctrl/pinctrl-mmp2.c | 722 +++++ + drivers/pinctrl/pinctrl-pxa168.c | 651 ++++ + drivers/pinctrl/pinctrl-pxa3xx.c | 244 ++ + drivers/pinctrl/pinctrl-pxa3xx.h | 264 ++ + drivers/pinctrl/pinctrl-pxa910.c | 1007 ++++++ + drivers/pinctrl/pinctrl-tegra.c | 559 ++++ + drivers/pinctrl/pinctrl-tegra.h | 163 + + drivers/pinctrl/pinctrl-tegra20.c | 2860 +++++++++++++++++ + drivers/pinctrl/pinctrl-tegra30.c | 3726 ++++++++++++++++++++++ + drivers/pinctrl/pinctrl-u300.c | 20 +- + drivers/pinctrl/pinmux.c | 910 ++----- + drivers/pinctrl/pinmux.h | 70 +- + drivers/tty/serial/sirfsoc_uart.c | 20 +- + drivers/tty/serial/sirfsoc_uart.h | 2 +- + include/linux/pinctrl/consumer.h | 118 + + include/linux/pinctrl/machine.h | 66 +- + include/linux/pinctrl/pinconf.h | 39 - + include/linux/pinctrl/pinctrl.h | 2 + + include/linux/pinctrl/pinmux.h | 52 - + 31 files changed, 11375 insertions(+), 1084 deletions(-) + create mode 100644 arch/arm/mach-tegra/include/mach/pinconf-tegra.h + create mode 100644 drivers/pinctrl/pinctrl-mmp2.c + create mode 100644 drivers/pinctrl/pinctrl-pxa168.c + create mode 100644 drivers/pinctrl/pinctrl-pxa3xx.c + create mode 100644 drivers/pinctrl/pinctrl-pxa3xx.h + create mode 100644 drivers/pinctrl/pinctrl-pxa910.c + create mode 100644 drivers/pinctrl/pinctrl-tegra.c + create mode 100644 drivers/pinctrl/pinctrl-tegra.h + create mode 100644 drivers/pinctrl/pinctrl-tegra20.c + create mode 100644 drivers/pinctrl/pinctrl-tegra30.c + create mode 100644 include/linux/pinctrl/consumer.h +Merging moduleh/for-sfr (1901ea5 kernel.h: doesn't explicitly use bug.h, so don't include it.) +$ git merge moduleh/for-sfr +Auto-merging include/net/tcp.h +Auto-merging include/net/mac80211.h +Auto-merging include/net/cfg80211.h +Auto-merging include/linux/slub_def.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/regset.h +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dmaengine.h +Auto-merging include/linux/crypto.h +Auto-merging include/linux/cpumask.h +Auto-merging arch/x86/kernel/paravirt.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/include/asm/paravirt.h +Merge made by the 'recursive' strategy. + arch/arm/mach-imx/cpu_op-mx51.c | 1 + + arch/arm/mach-ux500/board-mop500-pins.c | 1 + + arch/m68k/include/asm/system.h | 1 + + arch/mips/fw/arc/cmdline.c | 1 + + arch/mips/fw/arc/identify.c | 1 + + arch/parisc/math-emu/fpudispatch.c | 1 + + arch/powerpc/kernel/pmc.c | 1 + + arch/powerpc/xmon/ppc-opc.c | 1 + + arch/powerpc/xmon/spu-opc.c | 1 + + arch/sparc/include/asm/vga.h | 1 + + arch/x86/include/asm/debugreg.h | 67 +++++++++++++++++++++++ + arch/x86/include/asm/paravirt.h | 1 + + arch/x86/include/asm/processor.h | 63 --------------------- + arch/x86/kernel/cpu/common.c | 1 + + arch/x86/kernel/paravirt.c | 1 + + arch/x86/mm/kmemcheck/selftest.c | 1 + + drivers/gpu/drm/radeon/cayman_blit_shaders.c | 1 + + drivers/gpu/drm/radeon/evergreen_blit_shaders.c | 1 + + drivers/gpu/drm/radeon/r600_blit_shaders.c | 1 + + drivers/staging/wlags49_h2/hcf.c | 1 + + include/asm-generic/dma-mapping-common.h | 1 + + include/asm-generic/pgtable.h | 1 + + include/asm-generic/tlbflush.h | 2 + + include/drm/ttm/ttm_memory.h | 1 + + include/linux/atmdev.h | 1 + + include/linux/bio.h | 1 + + include/linux/bit_spinlock.h | 1 + + include/linux/bug.h | 61 +++++++++++++++++++++ + include/linux/ceph/decode.h | 3 +- + include/linux/ceph/libceph.h | 1 + + include/linux/ceph/mdsmap.h | 1 + + include/linux/cpumask.h | 1 + + include/linux/crypto.h | 1 + + include/linux/debug_locks.h | 1 + + include/linux/dmaengine.h | 1 + + include/linux/elfcore.h | 1 + + include/linux/ext3_fs.h | 1 + + include/linux/fs.h | 1 + + include/linux/fsnotify.h | 1 + + include/linux/gpio.h | 1 + + include/linux/highmem.h | 1 + + include/linux/i2o.h | 1 + + include/linux/if_vlan.h | 1 + + include/linux/io-mapping.h | 1 + + include/linux/kernel.h | 62 --------------------- + include/linux/kprobes.h | 1 + + include/linux/kvm_host.h | 1 + + include/linux/memory_hotplug.h | 1 + + include/linux/mm.h | 1 + + include/linux/mtd/cfi.h | 1 + + include/linux/netdevice.h | 1 + + include/linux/nilfs2_fs.h | 1 + + include/linux/page-flags.h | 1 + + include/linux/pid_namespace.h | 1 + + include/linux/posix_acl.h | 1 + + include/linux/ptrace.h | 1 + + include/linux/radix-tree.h | 1 + + include/linux/rcupdate.h | 1 + + include/linux/regset.h | 1 + + include/linux/reiserfs_fs.h | 1 + + include/linux/relay.h | 1 + + include/linux/scatterlist.h | 6 ++- + include/linux/seq_file.h | 1 + + include/linux/skbuff.h | 1 + + include/linux/slub_def.h | 1 + + include/linux/spinlock.h | 5 +-- + include/linux/ssb/ssb_driver_gige.h | 1 + + include/linux/swapops.h | 1 + + include/linux/syscalls.h | 1 + + include/linux/transport_class.h | 1 + + include/linux/virtio_config.h | 1 + + include/net/cfg80211.h | 1 + + include/net/dst.h | 1 + + include/net/ip_vs.h | 1 + + include/net/mac80211.h | 1 + + include/net/netns/generic.h | 1 + + include/net/red.h | 1 + + include/net/tcp.h | 1 + + include/net/timewait_sock.h | 1 + + include/net/udp.h | 1 + + include/net/wpan-phy.h | 1 + + include/scsi/osd_ore.h | 1 + + include/scsi/scsi_transport.h | 1 + + lib/atomic64_test.c | 1 + + lib/average.c | 1 + + lib/bitmap.c | 1 + + lib/iommu-helper.c | 1 + + lib/list_debug.c | 2 + + lib/plist.c | 1 + + lib/string.c | 1 + + lib/timerqueue.c | 1 + + 91 files changed, 221 insertions(+), 132 deletions(-) +Merging vhost/linux-next (1e05b62 sh: use the the PCI channels's io_map_base) +$ git merge vhost/linux-next +Already up-to-date. +Merging kmap_atomic/kmap_atomic (019e9ad feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal) +$ git merge kmap_atomic/kmap_atomic +Resolved 'drivers/net/ethernet/intel/e1000e/netdev.c' using previous resolution. +Resolved 'drivers/scsi/storvsc_drv.c' using previous resolution. +Resolved 'drivers/staging/zcache/zcache-main.c' using previous resolution. +Resolved 'drivers/staging/zram/zram_drv.c' using previous resolution. +Auto-merging net/rds/iw_recv.c +Auto-merging net/rds/ib_recv.c +Auto-merging mm/swapfile.c +Auto-merging mm/shmem.c +Auto-merging mm/filemap.c +Auto-merging kernel/power/snapshot.c +Auto-merging include/linux/highmem.h +Auto-merging include/linux/bio.h +Auto-merging fs/udf/file.c +Auto-merging fs/ntfs/super.c +Auto-merging fs/ntfs/attrib.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/namei.c +Auto-merging fs/logfs/dir.c +Auto-merging fs/jbd2/transaction.c +Auto-merging fs/jbd2/journal.c +Auto-merging fs/jbd2/commit.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/exec.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/compression.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/staging/zram/zram_drv.c +CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c +Auto-merging drivers/staging/zcache/zcache-main.c +CONFLICT (content): Merge conflict in drivers/staging/zcache/zcache-main.c +Removing drivers/staging/rtl8192u/ieee80211/kmap_types.h +Auto-merging drivers/staging/ramster/xvmalloc.c +Auto-merging drivers/scsi/storvsc_drv.c +CONFLICT (content): Merge conflict in drivers/scsi/storvsc_drv.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/mvsas/mv_sas.c +Auto-merging drivers/scsi/libsas/sas_host_smp.c +Auto-merging drivers/scsi/libiscsi_tcp.c +Auto-merging drivers/scsi/libfc/fc_lport.c +Auto-merging drivers/scsi/libfc/fc_fcp.c +Auto-merging drivers/scsi/isci/request.c +Auto-merging drivers/scsi/fcoe/fcoe_transport.c +Auto-merging drivers/scsi/fcoe/fcoe.c +Auto-merging drivers/scsi/cxgbi/libcxgbi.c +Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c +Auto-merging drivers/net/ethernet/sun/cassini.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c +Auto-merging drivers/crypto/hifn_795x.c +Auto-merging drivers/block/loop.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/crypto/aesni-intel_glue.c +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/arm/mm/highmem.c +Auto-merging arch/arm/mm/copypage-xscale.c +Auto-merging arch/arm/mm/copypage-v6.c +Auto-merging arch/arm/mm/copypage-v4mc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 68f36e7] Merge remote-tracking branch 'kmap_atomic/kmap_atomic' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 ++ + arch/arm/include/asm/highmem.h | 2 +- + arch/arm/mm/copypage-fa.c | 12 ++-- + arch/arm/mm/copypage-feroceon.c | 12 ++-- + arch/arm/mm/copypage-v3.c | 12 ++-- + arch/arm/mm/copypage-v4mc.c | 8 +- + arch/arm/mm/copypage-v4wb.c | 12 ++-- + arch/arm/mm/copypage-v4wt.c | 12 ++-- + arch/arm/mm/copypage-v6.c | 12 ++-- + arch/arm/mm/copypage-xsc3.c | 12 ++-- + arch/arm/mm/copypage-xscale.c | 8 +- + arch/arm/mm/highmem.c | 4 +- + arch/frv/include/asm/highmem.h | 2 +- + arch/frv/mm/highmem.c | 4 +- + arch/mips/include/asm/highmem.h | 2 +- + arch/mips/mm/c-r4k.c | 4 +- + arch/mips/mm/highmem.c | 4 +- + arch/mips/mm/init.c | 8 +- + arch/mn10300/include/asm/highmem.h | 2 +- + arch/parisc/include/asm/cacheflush.h | 2 +- + arch/powerpc/include/asm/highmem.h | 2 +- + arch/powerpc/kvm/book3s_pr.c | 4 +- + arch/powerpc/mm/dma-noncoherent.c | 5 +- + arch/powerpc/mm/hugetlbpage.c | 4 +- + arch/powerpc/mm/mem.c | 4 +- + arch/sh/mm/cache-sh4.c | 4 +- + arch/sh/mm/cache.c | 12 ++-- + arch/sparc/include/asm/highmem.h | 2 +- + arch/sparc/mm/highmem.c | 4 +- + arch/tile/include/asm/highmem.h | 2 +- + arch/tile/mm/highmem.c | 4 +- + arch/um/kernel/skas/uaccess.c | 4 +- + arch/x86/crypto/aesni-intel_glue.c | 24 +++--- + arch/x86/include/asm/highmem.h | 2 +- + arch/x86/kernel/crash_dump_32.c | 6 +- + arch/x86/kvm/lapic.c | 8 +- + arch/x86/kvm/paging_tmpl.h | 4 +- + arch/x86/kvm/x86.c | 8 +- + arch/x86/lib/usercopy_32.c | 4 +- + arch/x86/mm/highmem_32.c | 4 +- + crypto/ahash.c | 4 +- + crypto/async_tx/async_memcpy.c | 8 +- + crypto/blkcipher.c | 8 +- + crypto/ccm.c | 4 +- + crypto/scatterwalk.c | 8 +- + crypto/shash.c | 8 +- + drivers/ata/libata-sff.c | 8 +- + drivers/block/brd.c | 20 +++--- + drivers/block/drbd/drbd_bitmap.c | 50 ++++++------ + drivers/block/drbd/drbd_nl.c | 4 +- + drivers/block/loop.c | 16 ++-- + drivers/block/pktcdvd.c | 8 +- + drivers/crypto/hifn_795x.c | 10 +- + drivers/edac/edac_mc.c | 4 +- + drivers/gpu/drm/drm_cache.c | 8 +- + drivers/gpu/drm/gma500/mmu.c | 30 ++++---- + drivers/gpu/drm/ttm/ttm_tt.c | 16 ++-- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 6 +- + drivers/ide/ide-taskfile.c | 4 +- + drivers/infiniband/ulp/iser/iser_memory.c | 8 +- + drivers/md/bitmap.c | 42 +++++----- + drivers/media/video/ivtv/ivtv-udma.c | 4 +- + drivers/memstick/host/jmb38x_ms.c | 4 +- + drivers/memstick/host/tifm_ms.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 6 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 11 +-- + drivers/net/ethernet/sun/cassini.c | 4 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 5 +- + drivers/scsi/cxgbi/libcxgbi.c | 5 +- + drivers/scsi/fcoe/fcoe.c | 4 +- + drivers/scsi/fcoe/fcoe_transport.c | 5 +- + drivers/scsi/gdth.c | 4 +- + drivers/scsi/ips.c | 6 +- + drivers/scsi/isci/request.c | 16 ++-- + drivers/scsi/libfc/fc_fcp.c | 8 +- + drivers/scsi/libfc/fc_libfc.c | 8 +- + drivers/scsi/libfc/fc_libfc.h | 2 +- + drivers/scsi/libfc/fc_lport.c | 2 +- + drivers/scsi/libiscsi_tcp.c | 4 +- + drivers/scsi/libsas/sas_host_smp.c | 8 +- + drivers/scsi/megaraid.c | 4 +- + drivers/scsi/mvsas/mv_sas.c | 4 +- + drivers/scsi/scsi_debug.c | 24 +++--- + drivers/scsi/scsi_lib.c | 4 +- + drivers/scsi/sd_dif.c | 12 ++-- + drivers/scsi/storvsc_drv.c | 34 ++++----- + drivers/staging/ramster/xvmalloc.c | 39 +++++----- + drivers/staging/rtl8192u/ieee80211/cipher.c | 8 +- + drivers/staging/rtl8192u/ieee80211/digest.c | 8 +- + drivers/staging/rtl8192u/ieee80211/internal.h | 17 ---- + drivers/staging/rtl8192u/ieee80211/kmap_types.h | 20 ----- + drivers/staging/rtl8192u/ieee80211/scatterwalk.c | 19 +--- + drivers/staging/zcache/zcache-main.c | 12 ++-- + drivers/staging/zram/zram_drv.c | 32 ++++---- + drivers/target/target_core_transport.c | 4 +- + drivers/target/tcm_fc/tfc_io.c | 10 +-- + drivers/vhost/vhost.c | 4 +- + fs/afs/fsclient.c | 8 +- + fs/afs/mntpt.c | 4 +- + fs/aio.c | 30 ++++---- + fs/bio-integrity.c | 10 +- + fs/btrfs/compression.c | 12 ++-- + fs/btrfs/extent_io.c | 16 ++-- + fs/btrfs/file-item.c | 4 +- + fs/btrfs/inode.c | 26 +++--- + fs/btrfs/lzo.c | 4 +- + fs/btrfs/scrub.c | 8 +- + fs/btrfs/zlib.c | 4 +- + fs/exec.c | 4 +- + fs/exofs/dir.c | 4 +- + fs/ext2/dir.c | 4 +- + fs/fuse/dev.c | 4 +- + fs/fuse/file.c | 4 +- + fs/gfs2/aops.c | 12 ++-- + fs/gfs2/lops.c | 8 +- + fs/gfs2/quota.c | 4 +- + fs/jbd/journal.c | 12 ++-- + fs/jbd/transaction.c | 4 +- + fs/jbd2/commit.c | 4 +- + fs/jbd2/journal.c | 12 ++-- + fs/jbd2/transaction.c | 4 +- + fs/logfs/dir.c | 18 ++-- + fs/logfs/readwrite.c | 38 +++++----- + fs/logfs/segment.c | 4 +- + fs/minix/dir.c | 4 +- + fs/namei.c | 4 +- + fs/nfs/dir.c | 8 +- + fs/nfs/nfs4proc.c | 4 +- + fs/nilfs2/cpfile.c | 94 +++++++++++----------- + fs/nilfs2/dat.c | 38 +++++----- + fs/nilfs2/dir.c | 4 +- + fs/nilfs2/ifile.c | 4 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/page.c | 8 +- + fs/nilfs2/recovery.c | 4 +- + fs/nilfs2/segbuf.c | 4 +- + fs/nilfs2/sufile.c | 68 ++++++++-------- + fs/ntfs/aops.c | 20 +++--- + fs/ntfs/attrib.c | 20 +++--- + fs/ntfs/file.c | 16 ++-- + fs/ntfs/super.c | 8 +- + fs/ocfs2/aops.c | 16 ++-- + fs/pipe.c | 8 +- + fs/reiserfs/stree.c | 4 +- + fs/reiserfs/tail_conversion.c | 4 +- + fs/splice.c | 7 +- + fs/squashfs/file.c | 8 +- + fs/squashfs/symlink.c | 4 +- + fs/ubifs/file.c | 4 +- + fs/udf/file.c | 4 +- + include/crypto/scatterwalk.h | 28 +------ + include/linux/bio.h | 8 +- + include/linux/highmem.h | 79 +++++++++++++----- + kernel/debug/kdb/kdb_support.c | 4 +- + kernel/power/snapshot.c | 28 +++--- + lib/scatterlist.c | 4 +- + lib/swiotlb.c | 5 +- + mm/bounce.c | 4 +- + mm/filemap.c | 8 +- + mm/ksm.c | 12 ++-- + mm/memory.c | 4 +- + mm/shmem.c | 4 +- + mm/swapfile.c | 30 ++++---- + mm/vmalloc.c | 8 +- + net/core/kmap_skb.h | 4 +- + net/rds/ib_recv.c | 7 +- + net/rds/info.c | 6 +- + net/rds/iw_recv.c | 7 +- + net/rds/loop.c | 2 +- + net/rds/rds.h | 2 +- + net/rds/recv.c | 2 +- + net/rds/tcp_recv.c | 11 +-- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- + net/sunrpc/socklib.c | 4 +- + net/sunrpc/xdr.c | 20 +++--- + net/sunrpc/xprtrdma/rpc_rdma.c | 8 +- + security/tomoyo/domain.c | 4 +- + 178 files changed, 896 insertions(+), 948 deletions(-) + delete mode 100644 drivers/staging/rtl8192u/ieee80211/kmap_types.h +Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400) +$ git merge modem-shm/for-next +Auto-merging include/linux/Kbuild +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Merge made by the 'recursive' strategy. + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/modem_shm/Kconfig | 62 ++ + drivers/modem_shm/Makefile | 5 + + drivers/modem_shm/dummy_c2c_genio.c | 76 ++ + drivers/modem_shm/shm_boot.c | 1208 ++++++++++++++++++++++++++ + drivers/modem_shm/shm_bus.c | 113 +++ + drivers/modem_shm/shm_chr.c | 1242 +++++++++++++++++++++++++++ + drivers/modem_shm/shm_dev.c | 527 ++++++++++++ + drivers/modem_shm/shm_ipctoc.h | 154 ++++ + drivers/net/caif/Kconfig | 12 +- + drivers/net/caif/Makefile | 3 +- + drivers/net/caif/caif_shm.c | 900 +++++++++++++++++++ + include/linux/Kbuild | 1 + + include/linux/c2c_genio.h | 195 +++++ + include/linux/modem_shm/Kbuild | 1 + + include/linux/modem_shm/modem_shm_netlink.h | 95 ++ + include/linux/modem_shm/shm_dev.h | 245 ++++++ + 18 files changed, 4840 insertions(+), 2 deletions(-) + create mode 100644 drivers/modem_shm/Kconfig + create mode 100644 drivers/modem_shm/Makefile + create mode 100644 drivers/modem_shm/dummy_c2c_genio.c + create mode 100644 drivers/modem_shm/shm_boot.c + create mode 100644 drivers/modem_shm/shm_bus.c + create mode 100644 drivers/modem_shm/shm_chr.c + create mode 100644 drivers/modem_shm/shm_dev.c + create mode 100644 drivers/modem_shm/shm_ipctoc.h + create mode 100644 drivers/net/caif/caif_shm.c + create mode 100644 include/linux/c2c_genio.h + create mode 100644 include/linux/modem_shm/Kbuild + create mode 100644 include/linux/modem_shm/modem_shm_netlink.h + create mode 100644 include/linux/modem_shm/shm_dev.h +Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) +$ git merge memblock/memblock-kill-early_node_map +Already up-to-date. +Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/) +$ git merge remoteproc/for-next +Resolved 'include/linux/virtio_ids.h' using previous resolution. +Auto-merging include/linux/virtio_ids.h +CONFLICT (content): Merge conflict in include/linux/virtio_ids.h +Auto-merging include/linux/mod_devicetable.h +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0cc990c] Merge remote-tracking branch 'remoteproc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-rpmsg | 75 ++ + Documentation/remoteproc.txt | 324 ++++++ + Documentation/rpmsg.txt | 293 ++++++ + MAINTAINERS | 7 + + arch/arm/plat-omap/include/plat/remoteproc.h | 57 + + drivers/Kconfig | 4 + + drivers/Makefile | 2 + + drivers/remoteproc/Kconfig | 29 + + drivers/remoteproc/Makefile | 9 + + drivers/remoteproc/omap_remoteproc.c | 238 +++++ + drivers/remoteproc/omap_remoteproc.h | 69 ++ + drivers/remoteproc/remoteproc_core.c | 1450 ++++++++++++++++++++++++++ + drivers/remoteproc/remoteproc_debugfs.c | 179 ++++ + drivers/remoteproc/remoteproc_internal.h | 44 + + drivers/remoteproc/remoteproc_rpmsg.c | 299 ++++++ + drivers/rpmsg/Kconfig | 10 + + drivers/rpmsg/Makefile | 1 + + drivers/rpmsg/virtio_rpmsg_bus.c | 1026 ++++++++++++++++++ + include/linux/mod_devicetable.h | 9 + + include/linux/remoteproc.h | 271 +++++ + include/linux/rpmsg.h | 326 ++++++ + include/linux/virtio_ids.h | 1 + + samples/Kconfig | 8 + + samples/Makefile | 2 +- + samples/rpmsg/Makefile | 1 + + samples/rpmsg/rpmsg_client_sample.c | 100 ++ + 26 files changed, 4833 insertions(+), 1 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-rpmsg + create mode 100644 Documentation/remoteproc.txt + create mode 100644 Documentation/rpmsg.txt + create mode 100644 arch/arm/plat-omap/include/plat/remoteproc.h + create mode 100644 drivers/remoteproc/Kconfig + create mode 100644 drivers/remoteproc/Makefile + create mode 100644 drivers/remoteproc/omap_remoteproc.c + create mode 100644 drivers/remoteproc/omap_remoteproc.h + create mode 100644 drivers/remoteproc/remoteproc_core.c + create mode 100644 drivers/remoteproc/remoteproc_debugfs.c + create mode 100644 drivers/remoteproc/remoteproc_internal.h + create mode 100644 drivers/remoteproc/remoteproc_rpmsg.c + create mode 100644 drivers/rpmsg/Kconfig + create mode 100644 drivers/rpmsg/Makefile + create mode 100644 drivers/rpmsg/virtio_rpmsg_bus.c + create mode 100644 include/linux/remoteproc.h + create mode 100644 include/linux/rpmsg.h + create mode 100644 samples/rpmsg/Makefile + create mode 100644 samples/rpmsg/rpmsg_client_sample.c +Merging irqdomain/irqdomain/next (280ad7f mfd: twl-core: Add IRQ_DOMAIN dependency) +$ git merge irqdomain/irqdomain/next +Resolved 'arch/arm/common/gic.c' using previous resolution. +Resolved 'arch/c6x/Kconfig' using previous resolution. +Resolved 'arch/powerpc/sysdev/mpic.c' using previous resolution. +Auto-merging drivers/of/platform.c +Auto-merging drivers/mfd/twl-core.c +Auto-merging drivers/mfd/Kconfig +Removing arch/x86/include/asm/irq_controller.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/sysdev/mpic_msi.c +Auto-merging arch/powerpc/sysdev/mpic.c +CONFLICT (content): Merge conflict in arch/powerpc/sysdev/mpic.c +Auto-merging arch/powerpc/platforms/powermac/pic.c +Auto-merging arch/powerpc/kernel/irq.c +Auto-merging arch/powerpc/include/asm/mpic.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/c6x/Kconfig +CONFLICT (content): Merge conflict in arch/c6x/Kconfig +Auto-merging arch/arm/mach-versatile/core.c +Auto-merging arch/arm/mach-omap2/board-generic.c +Auto-merging arch/arm/mach-exynos/common.c +Auto-merging arch/arm/common/gic.c +CONFLICT (content): Merge conflict in arch/arm/common/gic.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9b71675] Merge remote-tracking branch 'irqdomain/irqdomain/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/IRQ-domain.txt | 117 +++ + MAINTAINERS | 9 + + arch/arm/common/gic.c | 95 ++-- + arch/arm/common/vic.c | 16 +- + arch/arm/include/asm/hardware/gic.h | 4 +- + arch/arm/include/asm/hardware/vic.h | 2 + + arch/arm/mach-exynos/common.c | 2 +- + arch/arm/mach-imx/imx51-dt.c | 4 +- + arch/arm/mach-imx/imx53-dt.c | 4 +- + arch/arm/mach-imx/mach-imx6q.c | 3 +- + arch/arm/mach-msm/board-msm8x60.c | 8 +- + arch/arm/mach-omap2/board-generic.c | 2 +- + arch/arm/mach-prima2/irq.c | 2 +- + arch/arm/mach-versatile/core.c | 7 +- + arch/c6x/Kconfig | 1 + + arch/c6x/include/asm/irq.h | 245 +------- + arch/c6x/kernel/irq.c | 612 +---------------- + arch/c6x/platforms/megamod-pic.c | 25 +- + arch/microblaze/Kconfig | 1 + + arch/microblaze/include/asm/hardirq.h | 16 - + arch/microblaze/include/asm/irq.h | 42 +- + arch/microblaze/kernel/intc.c | 61 +- + arch/microblaze/kernel/irq.c | 24 +- + arch/microblaze/kernel/setup.c | 2 - + arch/mips/Kconfig | 1 + + arch/mips/include/asm/irq.h | 5 +- + arch/mips/kernel/prom.c | 14 - + arch/openrisc/include/asm/prom.h | 10 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/ehv_pic.h | 2 +- + arch/powerpc/include/asm/i8259.h | 2 +- + arch/powerpc/include/asm/irq.h | 247 +------- + arch/powerpc/include/asm/mpic.h | 2 +- + arch/powerpc/include/asm/xics.h | 2 +- + arch/powerpc/kernel/irq.c | 617 +---------------- + arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 12 +- + arch/powerpc/platforms/52xx/media5200.c | 15 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 16 +- + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 12 +- + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 14 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 15 +- + arch/powerpc/platforms/86xx/gef_pic.c | 15 +- + arch/powerpc/platforms/cell/axon_msi.c | 29 +- + arch/powerpc/platforms/cell/beat_interrupt.c | 16 +- + arch/powerpc/platforms/cell/interrupt.c | 16 +- + arch/powerpc/platforms/cell/spider-pic.c | 14 +- + arch/powerpc/platforms/embedded6xx/flipper-pic.c | 24 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 29 +- + arch/powerpc/platforms/iseries/irq.c | 11 +- + arch/powerpc/platforms/powermac/pic.c | 26 +- + arch/powerpc/platforms/powermac/smp.c | 9 +- + arch/powerpc/platforms/ps3/interrupt.c | 11 +- + arch/powerpc/platforms/wsp/opb_pic.c | 26 +- + arch/powerpc/sysdev/cpm1.c | 9 +- + arch/powerpc/sysdev/cpm2_pic.c | 23 +- + arch/powerpc/sysdev/ehv_pic.c | 14 +- + arch/powerpc/sysdev/fsl_msi.c | 10 +- + arch/powerpc/sysdev/fsl_msi.h | 2 +- + arch/powerpc/sysdev/i8259.c | 15 +- + arch/powerpc/sysdev/ipic.c | 31 +- + arch/powerpc/sysdev/ipic.h | 2 +- + arch/powerpc/sysdev/mpc8xx_pic.c | 11 +- + arch/powerpc/sysdev/mpic.c | 16 +- + arch/powerpc/sysdev/mpic_msi.c | 2 +- + arch/powerpc/sysdev/mv64x60_pic.c | 11 +- + arch/powerpc/sysdev/qe_lib/qe_ic.c | 26 +- + arch/powerpc/sysdev/qe_lib/qe_ic.h | 2 +- + arch/powerpc/sysdev/tsi108_pci.c | 13 +- + arch/powerpc/sysdev/uic.c | 26 +- + arch/powerpc/sysdev/xics/xics-common.c | 25 +- + arch/powerpc/sysdev/xilinx_intc.c | 19 +- + arch/sparc/include/asm/prom.h | 10 +- + arch/x86/Kconfig | 2 + + arch/x86/include/asm/irq_controller.h | 12 - + arch/x86/include/asm/prom.h | 10 - + arch/x86/kernel/devicetree.c | 101 +-- + drivers/gpio/gpio-mpc8xxx.c | 30 +- + drivers/mfd/Kconfig | 1 + + drivers/mfd/twl-core.c | 21 +- + drivers/net/phy/mdio-gpio.c | 4 +- + drivers/of/platform.c | 4 +- + include/linux/irqdomain.h | 191 ++++-- + include/linux/of_address.h | 33 +- + include/linux/of_irq.h | 4 +- + include/linux/of_platform.h | 12 +- + kernel/irq/irqdomain.c | 828 +++++++++++++++++++--- + 86 files changed, 1435 insertions(+), 2602 deletions(-) + create mode 100644 Documentation/IRQ-domain.txt + delete mode 100644 arch/x86/include/asm/irq_controller.h +Merging arm-soc/for-next (6469d9d Merge branch 'staging/kirkwood/dt' into for-next) +$ git merge arm-soc/for-next +Recorded preimage for 'arch/arm/mach-tegra/Makefile' +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Resolved 'arch/arm/Kconfig' using previous resolution. +Auto-merging sound/soc/omap/ams-delta.c +Auto-merging drivers/usb/gadget/atmel_usba_udc.c +Auto-merging drivers/usb/gadget/at91_udc.c +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/rtc/rtc-sa1100.c +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/pcmcia/at91_cf.c +Auto-merging drivers/net/ethernet/cirrus/cs89x0.c +Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c +Removing drivers/leds/leds-ams-delta.c +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/i2c/busses/i2c-imx.c +Auto-merging arch/avr32/mach-at32ap/at32ap700x.c +Removing arch/arm/plat-mxc/include/mach/board-mx31ads.h +Auto-merging arch/arm/mach-ux500/board-mop500-sdi.c +Auto-merging arch/arm/mach-tegra/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Makefile +Auto-merging arch/arm/mach-sa1100/generic.c +Auto-merging arch/arm/mach-pxa/pxa3xx.c +Auto-merging arch/arm/mach-pxa/devices.c +Auto-merging arch/arm/mach-omap2/iomap.h +Auto-merging arch/arm/mach-omap2/hsmmc.h +Auto-merging arch/arm/mach-omap2/hsmmc.c +Auto-merging arch/arm/mach-omap2/board-omap4panda.c +Auto-merging arch/arm/mach-omap2/board-generic.c +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/arm/mach-omap1/lcd_dma.c +Removing arch/arm/mach-nomadik/include/mach/setup.h +Auto-merging arch/arm/mach-mmp/ttc_dkb.c +Auto-merging arch/arm/mach-imx/crmregs-imx3.h +Auto-merging arch/arm/mach-imx/clock-imx27.c +Removing arch/arm/mach-highbank/include/mach/memory.h +Auto-merging arch/arm/mach-highbank/highbank.c +Removing arch/arm/mach-davinci/include/mach/dm644x.h +Removing arch/arm/mach-davinci/include/mach/dm355.h +Removing arch/arm/mach-at91/include/mach/at91cap9_matrix.h +Removing arch/arm/mach-at91/include/mach/at91cap9.h +Removing arch/arm/mach-at91/board-cap9adk.c +Removing arch/arm/mach-at91/at91cap9_devices.c +Removing arch/arm/mach-at91/at91cap9.c +Removing arch/arm/configs/at91cap9_defconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-tegra/Makefile'. +[master 661a40a] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/atmel-aic.txt | 38 + + .../devicetree/bindings/arm/atmel-at91.txt | 32 + + Documentation/devicetree/bindings/arm/fsl.txt | 22 + + Documentation/devicetree/bindings/arm/vexpress.txt | 146 +++ + .../devicetree/bindings/gpio/gpio_atmel.txt | 20 + + Documentation/feature-removal-schedule.txt | 14 - + MAINTAINERS | 1 - + arch/arm/Kconfig | 7 +- + arch/arm/Kconfig.debug | 8 +- + arch/arm/Makefile | 4 +- + arch/arm/arm-soc-for-next-contents.txt | 86 ++ + arch/arm/boot/dts/at91sam9g20.dtsi | 68 +- + arch/arm/boot/dts/at91sam9g25ek.dts | 37 + + arch/arm/boot/dts/at91sam9g45.dtsi | 87 ++- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 72 ++ + arch/arm/boot/dts/at91sam9x5.dtsi | 176 +++ + arch/arm/boot/dts/at91sam9x5cm.dtsi | 29 + + arch/arm/boot/dts/imx27-phytec-phycore.dts | 76 ++ + arch/arm/boot/dts/imx27.dtsi | 217 ++++ + arch/arm/boot/dts/imx51-babbage.dts | 91 ++- + arch/arm/boot/dts/imx6q-arm2.dts | 14 + + arch/arm/boot/dts/imx6q-sabrelite.dts | 34 + + arch/arm/boot/dts/kirkwood-dreamplug.dts | 59 + + arch/arm/boot/dts/kirkwood.dtsi | 18 + + arch/arm/boot/dts/omap3-beagle.dts | 9 - + arch/arm/boot/dts/omap3-evm.dts | 20 + + arch/arm/boot/dts/omap3.dtsi | 29 +- + arch/arm/boot/dts/omap4-panda.dts | 9 - + arch/arm/boot/dts/omap4-sdp.dts | 9 - + arch/arm/boot/dts/omap4.dtsi | 38 +- + arch/arm/boot/dts/usb_a9g20.dts | 23 + + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 201 +++ + arch/arm/boot/dts/vexpress-v2m.dtsi | 200 +++ + arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 157 +++ + arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 162 +++ + arch/arm/boot/dts/vexpress-v2p-ca9.dts | 192 +++ + arch/arm/common/timer-sp.c | 17 +- + arch/arm/configs/at91cap9_defconfig | 108 -- + arch/arm/configs/imx_v4_v5_defconfig | 19 + + arch/arm/configs/imx_v6_v7_defconfig | 39 +- + arch/arm/configs/lpc32xx_defconfig | 145 +++ + arch/arm/configs/mxs_defconfig | 20 +- + arch/arm/include/asm/hardware/arm_timer.h | 5 + + arch/arm/include/asm/hardware/timer-sp.h | 15 +- + arch/arm/mach-at91/Kconfig | 23 +- + arch/arm/mach-at91/Makefile | 5 +- + arch/arm/mach-at91/Makefile.boot | 14 +- + arch/arm/mach-at91/at91cap9.c | 404 ------- + arch/arm/mach-at91/at91cap9_devices.c | 1273 -------------------- + arch/arm/mach-at91/at91rm9200.c | 8 +- + arch/arm/mach-at91/at91rm9200_devices.c | 14 +- + arch/arm/mach-at91/at91rm9200_time.c | 37 +- + arch/arm/mach-at91/at91sam9260.c | 30 +- + arch/arm/mach-at91/at91sam9260_devices.c | 59 +- + arch/arm/mach-at91/at91sam9261.c | 10 +- + arch/arm/mach-at91/at91sam9261_devices.c | 31 +- + arch/arm/mach-at91/at91sam9263.c | 11 +- + arch/arm/mach-at91/at91sam9263_devices.c | 72 +- + arch/arm/mach-at91/at91sam926x_time.c | 68 +- + arch/arm/mach-at91/at91sam9_alt_reset.S | 12 +- + arch/arm/mach-at91/at91sam9g45.c | 14 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 165 +++- + arch/arm/mach-at91/at91sam9g45_reset.S | 12 +- + arch/arm/mach-at91/at91sam9rl.c | 10 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 39 +- + arch/arm/mach-at91/at91sam9x5.c | 368 ++++++ + arch/arm/mach-at91/at91x40.c | 2 +- + arch/arm/mach-at91/at91x40_time.c | 28 +- + arch/arm/mach-at91/board-cap9adk.c | 396 ------ + arch/arm/mach-at91/board-cpu9krea.c | 5 +- + arch/arm/mach-at91/board-cpuat91.c | 1 + + arch/arm/mach-at91/board-dt.c | 21 +- + arch/arm/mach-at91/board-eco920.c | 5 +- + arch/arm/mach-at91/board-flexibity.c | 12 +- + arch/arm/mach-at91/board-kb9202.c | 1 + + arch/arm/mach-at91/board-picotux200.c | 1 + + arch/arm/mach-at91/board-rm9200dk.c | 1 + + arch/arm/mach-at91/board-rm9200ek.c | 1 + + arch/arm/mach-at91/board-sam9m10g45ek.c | 80 ++- + arch/arm/mach-at91/board-snapper9260.c | 10 +- + arch/arm/mach-at91/board-yl-9200.c | 3 +- + arch/arm/mach-at91/clock.c | 176 ++- + arch/arm/mach-at91/cpuidle.c | 11 +- + arch/arm/mach-at91/generic.h | 17 +- + arch/arm/mach-at91/gpio.c | 625 +++++++++-- + arch/arm/mach-at91/include/mach/at91_matrix.h | 23 + + arch/arm/mach-at91/include/mach/at91_pio.h | 25 + + arch/arm/mach-at91/include/mach/at91_pmc.h | 118 ++- + arch/arm/mach-at91/include/mach/at91_ramc.h | 32 + + arch/arm/mach-at91/include/mach/at91_st.h | 32 +- + arch/arm/mach-at91/include/mach/at91cap9.h | 122 -- + arch/arm/mach-at91/include/mach/at91cap9_matrix.h | 137 --- + arch/arm/mach-at91/include/mach/at91rm9200.h | 10 +- + arch/arm/mach-at91/include/mach/at91rm9200_mc.h | 58 +- + .../arm/mach-at91/include/mach/at91rm9200_sdramc.h | 63 + + arch/arm/mach-at91/include/mach/at91sam9260.h | 14 +- + .../mach-at91/include/mach/at91sam9260_matrix.h | 36 +- + arch/arm/mach-at91/include/mach/at91sam9261.h | 10 +- + .../mach-at91/include/mach/at91sam9261_matrix.h | 18 +- + arch/arm/mach-at91/include/mach/at91sam9263.h | 12 +- + .../mach-at91/include/mach/at91sam9263_matrix.h | 74 +- + arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h | 16 - + arch/arm/mach-at91/include/mach/at91sam9_sdramc.h | 6 - + arch/arm/mach-at91/include/mach/at91sam9g45.h | 12 +- + .../mach-at91/include/mach/at91sam9g45_matrix.h | 84 +- + arch/arm/mach-at91/include/mach/at91sam9rl.h | 7 +- + .../arm/mach-at91/include/mach/at91sam9rl_matrix.h | 42 +- + arch/arm/mach-at91/include/mach/at91sam9x5.h | 79 ++ + .../arm/mach-at91/include/mach/at91sam9x5_matrix.h | 53 + + arch/arm/mach-at91/include/mach/at91x40.h | 18 +- + arch/arm/mach-at91/include/mach/board.h | 6 +- + arch/arm/mach-at91/include/mach/cpu.h | 21 - + arch/arm/mach-at91/include/mach/gpio.h | 17 +- + arch/arm/mach-at91/include/mach/hardware.h | 9 +- + arch/arm/mach-at91/include/mach/io.h | 18 - + arch/arm/mach-at91/irq.c | 132 ++- + arch/arm/mach-at91/pm.c | 52 +- + arch/arm/mach-at91/pm.h | 96 +- + arch/arm/mach-at91/pm_slowclock.S | 275 +++-- + arch/arm/mach-at91/setup.c | 26 +- + arch/arm/mach-at91/soc.h | 5 - + arch/arm/mach-davinci/board-dm355-evm.c | 3 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 3 +- + arch/arm/mach-davinci/board-dm365-evm.c | 3 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 28 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 32 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 3 +- + arch/arm/mach-davinci/board-sffsdr.c | 3 +- + arch/arm/mach-davinci/davinci.h | 96 ++ + arch/arm/mach-davinci/devices.c | 32 +- + arch/arm/mach-davinci/dm355.c | 3 +- + arch/arm/mach-davinci/dm365.c | 19 +- + arch/arm/mach-davinci/dm644x.c | 53 +- + arch/arm/mach-davinci/dm646x.c | 21 +- + arch/arm/mach-davinci/dma.c | 6 +- + arch/arm/mach-davinci/include/mach/dm355.h | 32 - + arch/arm/mach-davinci/include/mach/dm365.h | 53 +- + arch/arm/mach-davinci/include/mach/dm644x.h | 47 - + arch/arm/mach-davinci/include/mach/dm646x.h | 42 +- + arch/arm/mach-davinci/include/mach/edma.h | 5 + + arch/arm/mach-davinci/include/mach/hardware.h | 2 - + arch/arm/mach-highbank/highbank.c | 2 +- + arch/arm/mach-highbank/include/mach/memory.h | 1 - + arch/arm/mach-imx/Kconfig | 14 +- + arch/arm/mach-imx/Makefile | 5 +- + arch/arm/mach-imx/Makefile.boot | 3 + + arch/arm/mach-imx/clock-imx27.c | 18 + + arch/arm/mach-imx/clock-imx31.c | 2 +- + arch/arm/mach-imx/clock-imx35.c | 166 ++-- + arch/arm/mach-imx/clock-imx6q.c | 74 ++- + .../mach-imx/{crmregs-imx31.h => crmregs-imx3.h} | 16 +- + arch/arm/mach-imx/imx27-dt.c | 89 ++ + arch/arm/mach-imx/imx51-dt.c | 1 + + arch/arm/mach-imx/imx53-dt.c | 1 + + arch/arm/mach-imx/lluart.c | 2 +- + arch/arm/mach-imx/mach-armadillo5x0.c | 2 +- + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 139 +++- + arch/arm/mach-imx/mach-imx6q.c | 1 + + arch/arm/mach-imx/mach-mx21ads.c | 16 +- + arch/arm/mach-imx/mach-mx27_3ds.c | 108 ++ + arch/arm/mach-imx/mach-mx31ads.c | 35 +- + arch/arm/mach-imx/mach-mx31moboard.c | 6 +- + arch/arm/mach-imx/mach-pcm038.c | 2 +- + arch/arm/mach-imx/mm-imx3.c | 7 +- + arch/arm/mach-imx/pm-imx3.c | 37 + + arch/arm/mach-imx/pm-imx5.c | 4 +- + arch/arm/mach-kirkwood/Kconfig | 14 + + arch/arm/mach-kirkwood/Makefile | 1 + + arch/arm/mach-kirkwood/Makefile.boot | 2 + + arch/arm/mach-kirkwood/board-dt.c | 165 +++ + arch/arm/mach-kirkwood/common.c | 21 +- + arch/arm/mach-kirkwood/common.h | 6 + + arch/arm/mach-lpc32xx/clock.c | 98 +- + arch/arm/mach-lpc32xx/common.c | 22 + + arch/arm/mach-lpc32xx/common.h | 2 +- + arch/arm/mach-lpc32xx/include/mach/platform.h | 51 +- + arch/arm/mach-lpc32xx/phy3250.c | 3 + + arch/arm/mach-lpc32xx/pm.c | 2 +- + arch/arm/mach-lpc32xx/timer.c | 48 +- + arch/arm/mach-mmp/include/mach/pxa910.h | 1 + + arch/arm/mach-mmp/include/mach/regs-apbc.h | 1 + + arch/arm/mach-mmp/include/mach/regs-rtc.h | 23 + + arch/arm/mach-mmp/mmp2.c | 1 + + arch/arm/mach-mmp/pxa168.c | 1 + + arch/arm/mach-mmp/pxa910.c | 28 + + arch/arm/mach-mmp/ttc_dkb.c | 1 + + arch/arm/mach-mxs/Kconfig | 16 + + arch/arm/mach-mxs/Makefile | 1 + + arch/arm/mach-mxs/clock-mx23.c | 35 +- + arch/arm/mach-mxs/clock-mx28.c | 58 +- + arch/arm/mach-mxs/devices-mx23.h | 4 + + arch/arm/mach-mxs/devices-mx28.h | 4 + + arch/arm/mach-mxs/devices/Kconfig | 3 + + arch/arm/mach-mxs/devices/Makefile | 1 + + arch/arm/mach-mxs/devices/platform-gpmi-nand.c | 81 ++ + arch/arm/mach-mxs/devices/platform-mxs-mmc.c | 2 + + arch/arm/mach-mxs/include/mach/common.h | 2 + + arch/arm/mach-mxs/include/mach/devices-common.h | 10 + + arch/arm/mach-mxs/include/mach/digctl.h | 1 + + arch/arm/mach-mxs/include/mach/mxs.h | 29 +- + arch/arm/mach-mxs/include/mach/uncompress.h | 13 +- + arch/arm/mach-mxs/mach-apx4devkit.c | 260 ++++ + arch/arm/mach-mxs/mach-m28evk.c | 7 +- + arch/arm/mach-mxs/mach-mx28evk.c | 80 +- + arch/arm/mach-mxs/system.c | 16 + + arch/arm/mach-nomadik/board-nhk8815.c | 7 +- + arch/arm/mach-nomadik/include/mach/setup.h | 19 - + arch/arm/mach-omap1/Kconfig | 2 + + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +- + arch/arm/mach-omap1/ams-delta-fiq.c | 1 + + arch/arm/mach-omap1/board-ams-delta.c | 234 +++- + arch/arm/mach-omap1/board-fsample.c | 7 +- + arch/arm/mach-omap1/board-h2.c | 6 +- + arch/arm/mach-omap1/board-h3.c | 8 +- + arch/arm/mach-omap1/board-htcherald.c | 5 +- + arch/arm/mach-omap1/board-innovator.c | 7 +- + arch/arm/mach-omap1/board-nokia770.c | 6 +- + arch/arm/mach-omap1/board-osk.c | 7 +- + arch/arm/mach-omap1/board-palmte.c | 4 +- + arch/arm/mach-omap1/board-palmtt.c | 9 +- + arch/arm/mach-omap1/board-palmz71.c | 9 +- + arch/arm/mach-omap1/board-perseus2.c | 7 +- + arch/arm/mach-omap1/board-sx1.c | 6 +- + arch/arm/mach-omap1/board-voiceblue.c | 6 +- + arch/arm/mach-omap1/clock.c | 5 +- + arch/arm/mach-omap1/clock_data.c | 5 +- + arch/arm/mach-omap1/common.h | 1 + + arch/arm/mach-omap1/devices.c | 8 +- + arch/arm/mach-omap1/dma.c | 2 +- + arch/arm/mach-omap1/flash.c | 4 +- + arch/arm/mach-omap1/fpga.c | 5 +- + arch/arm/mach-omap1/gpio16xx.c | 14 +- + arch/arm/mach-omap1/id.c | 3 + + arch/arm/mach-omap1/include/mach/entry-macro.S | 4 +- + arch/arm/mach-omap1/include/mach/hardware.h | 36 + + arch/arm/mach-omap1/include/mach/io.h | 43 +- + arch/arm/mach-omap1/include/mach/memory.h | 3 +- + arch/arm/mach-omap1/io.c | 3 + + arch/arm/mach-omap1/iomap.h | 42 + + arch/arm/mach-omap1/irq.c | 4 +- + arch/arm/mach-omap1/lcd_dma.c | 3 +- + arch/arm/mach-omap1/mcbsp.c | 5 +- + arch/arm/mach-omap1/pm.c | 4 +- + arch/arm/mach-omap1/reset.c | 3 +- + arch/arm/mach-omap1/sleep.S | 4 + + arch/arm/mach-omap1/sram.S | 4 + + arch/arm/mach-omap1/time.c | 3 +- + arch/arm/mach-omap1/timer32k.c | 7 +- + arch/arm/mach-omap2/Kconfig | 56 +- + arch/arm/mach-omap2/Makefile | 5 +- + arch/arm/mach-omap2/board-2430sdp.c | 2 +- + arch/arm/mach-omap2/board-3430sdp.c | 5 +- + arch/arm/mach-omap2/board-4430sdp.c | 4 +- + arch/arm/mach-omap2/board-am3517evm.c | 2 +- + arch/arm/mach-omap2/board-cm-t35.c | 6 +- + arch/arm/mach-omap2/board-devkit8000.c | 4 +- + arch/arm/mach-omap2/board-flash.c | 2 +- + arch/arm/mach-omap2/board-generic.c | 12 +- + arch/arm/mach-omap2/board-igep0020.c | 6 +- + arch/arm/mach-omap2/board-ldp.c | 2 +- + arch/arm/mach-omap2/board-n8x0.c | 1 - + arch/arm/mach-omap2/board-omap3beagle.c | 10 +- + arch/arm/mach-omap2/board-omap3evm.c | 7 +- + arch/arm/mach-omap2/board-omap3logic.c | 2 +- + arch/arm/mach-omap2/board-omap3pandora.c | 5 +- + arch/arm/mach-omap2/board-omap3stalker.c | 15 +- + arch/arm/mach-omap2/board-omap3touchbook.c | 17 +- + arch/arm/mach-omap2/board-omap4panda.c | 6 +- + arch/arm/mach-omap2/board-overo.c | 3 +- + arch/arm/mach-omap2/board-rm680.c | 2 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 5 +- + arch/arm/mach-omap2/board-zoom-display.c | 5 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 4 +- + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 1 + + arch/arm/mach-omap2/clkt_dpll.c | 1 + + arch/arm/mach-omap2/clock2420_data.c | 3 + + arch/arm/mach-omap2/clock2430.c | 2 + + arch/arm/mach-omap2/clock2430_data.c | 2 + + arch/arm/mach-omap2/clock2xxx.c | 1 + + arch/arm/mach-omap2/clock3xxx.c | 1 + + arch/arm/mach-omap2/clock3xxx_data.c | 3 +- + arch/arm/mach-omap2/clock44xx_data.c | 3 + + arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 +- + arch/arm/mach-omap2/cm44xx.c | 2 +- + arch/arm/mach-omap2/cminst44xx.c | 2 +- + arch/arm/mach-omap2/common-board-devices.c | 1 - + arch/arm/mach-omap2/common.c | 4 +- + arch/arm/mach-omap2/common.h | 7 + + arch/arm/mach-omap2/control.c | 3 +- + arch/arm/mach-omap2/control.h | 1 - + arch/arm/mach-omap2/devices.c | 17 +- + arch/arm/mach-omap2/display.c | 9 +- + arch/arm/mach-omap2/dma.c | 2 +- + arch/arm/mach-omap2/emu.c | 4 + + arch/arm/mach-omap2/gpio.c | 2 +- + arch/arm/mach-omap2/gpmc-nand.c | 1 + + arch/arm/mach-omap2/gpmc-onenand.c | 1 + + arch/arm/mach-omap2/hsmmc.c | 123 ++- + arch/arm/mach-omap2/hsmmc.h | 12 +- + arch/arm/mach-omap2/id.c | 186 ++-- + arch/arm/mach-omap2/include/mach/io.h | 46 +- + arch/arm/mach-omap2/io.c | 66 +- + .../include/plat/io.h => mach-omap2/iomap.h} | 80 +-- + arch/arm/mach-omap2/irq.c | 5 +- + arch/arm/mach-omap2/mcbsp.c | 2 +- + arch/arm/mach-omap2/mux.c | 16 +- + arch/arm/mach-omap2/mux.h | 2 +- + arch/arm/mach-omap2/omap-hotplug.c | 2 +- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +- + arch/arm/mach-omap2/omap-smp.c | 3 +- + arch/arm/mach-omap2/opp2420_data.c | 2 + + arch/arm/mach-omap2/opp2430_data.c | 2 + + arch/arm/mach-omap2/pm.c | 10 +- + arch/arm/mach-omap2/pm24xx.c | 27 +- + arch/arm/mach-omap2/prcm_mpu44xx.c | 2 +- + arch/arm/mach-omap2/prm44xx.c | 3 +- + arch/arm/mach-omap2/prminst44xx.c | 2 +- + arch/arm/mach-omap2/sdram-nokia.c | 1 - + arch/arm/mach-omap2/sdrc2xxx.c | 5 +- + arch/arm/mach-omap2/sleep24xx.S | 1 - + arch/arm/mach-omap2/sleep34xx.S | 5 +- + arch/arm/mach-omap2/smartreflex.c | 2 +- + arch/arm/mach-omap2/sr_device.c | 2 +- + arch/arm/mach-omap2/sram242x.S | 4 +- + arch/arm/mach-omap2/sram243x.S | 4 +- + arch/arm/mach-omap2/sram34xx.S | 5 +- + arch/arm/mach-pxa/devices.c | 28 +- + arch/arm/mach-pxa/hx4700.c | 27 +- + arch/arm/mach-pxa/pxa25x.c | 2 + + arch/arm/mach-pxa/pxa27x.c | 2 + + arch/arm/mach-pxa/pxa3xx.c | 1 + + arch/arm/mach-pxa/pxa95x.c | 1 + + arch/arm/mach-sa1100/clock.c | 82 +- + arch/arm/mach-sa1100/generic.c | 8 + + arch/arm/mach-tegra/Makefile | 2 +- + arch/arm/mach-ux500/Kconfig | 1 + + arch/arm/mach-ux500/board-mop500-sdi.c | 31 +- + arch/arm/mach-ux500/board-mop500.c | 74 +- + arch/arm/mach-ux500/board-mop500.h | 8 +- + arch/arm/mach-ux500/board-u5500-sdi.c | 4 +- + arch/arm/mach-ux500/board-u5500.c | 27 +- + arch/arm/mach-ux500/cpu-db5500.c | 36 +- + arch/arm/mach-ux500/cpu-db8500.c | 44 +- + arch/arm/mach-ux500/cpu.c | 75 ++ + arch/arm/mach-ux500/devices-common.c | 79 +- + arch/arm/mach-ux500/devices-common.h | 83 +- + arch/arm/mach-ux500/devices-db5500.h | 116 ++- + arch/arm/mach-ux500/devices-db8500.h | 176 ++-- + arch/arm/mach-ux500/dma-db5500.c | 3 +- + arch/arm/mach-ux500/include/mach/db8500-regs.h | 3 + + arch/arm/mach-ux500/include/mach/setup.h | 11 +- + arch/arm/mach-ux500/include/mach/usb.h | 4 +- + arch/arm/mach-ux500/timer.c | 7 +- + arch/arm/mach-ux500/usb.c | 7 +- + arch/arm/mach-vexpress/Kconfig | 47 +- + arch/arm/mach-vexpress/Makefile.boot | 6 + + arch/arm/mach-vexpress/core.h | 9 +- + arch/arm/mach-vexpress/ct-ca9x4.c | 58 +- + arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 3 - + arch/arm/mach-vexpress/include/mach/debug-macro.S | 30 +- + arch/arm/mach-vexpress/include/mach/irqs.h | 2 +- + arch/arm/mach-vexpress/include/mach/motherboard.h | 58 +- + arch/arm/mach-vexpress/include/mach/uncompress.h | 22 +- + arch/arm/mach-vexpress/platsmp.c | 160 +++- + arch/arm/mach-vexpress/v2m.c | 281 ++++- + arch/arm/plat-mxc/audmux-v1.c | 5 +- + arch/arm/plat-mxc/audmux-v2.c | 8 +- + arch/arm/plat-mxc/avic.c | 2 +- + arch/arm/plat-mxc/cpu.c | 24 + + arch/arm/plat-mxc/devices/platform-ahci-imx.c | 16 +- + arch/arm/plat-mxc/epit.c | 2 +- + arch/arm/plat-mxc/include/mach/board-mx31ads.h | 33 - + arch/arm/plat-mxc/include/mach/common.h | 10 + + arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +- + arch/arm/plat-mxc/include/mach/dma.h | 3 +- + arch/arm/plat-mxc/pwm.c | 4 +- + arch/arm/plat-mxc/system.c | 2 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-nomadik/include/plat/mtu.h | 4 +- + arch/arm/plat-nomadik/timer.c | 33 +- + arch/arm/plat-omap/Kconfig | 3 + + arch/arm/plat-omap/counter_32k.c | 1 + + arch/arm/plat-omap/dma.c | 4 +- + arch/arm/plat-omap/dmtimer.c | 2 + + arch/arm/plat-omap/include/plat/board-ams-delta.h | 48 +- + arch/arm/plat-omap/include/plat/cpu.h | 7 +- + arch/arm/plat-omap/include/plat/hardware.h | 6 + + arch/arm/plat-omap/include/plat/keypad.h | 2 + + arch/arm/plat-omap/include/plat/mcspi.h | 3 - + arch/arm/plat-omap/include/plat/omap_device.h | 7 + + arch/arm/plat-omap/include/plat/tc.h | 17 - + arch/arm/plat-omap/include/plat/usb.h | 41 + + arch/arm/plat-omap/mux.c | 5 +- + arch/arm/plat-omap/omap_device.c | 22 +- + arch/arm/plat-omap/sram.c | 9 +- + arch/arm/plat-omap/usb.c | 4 + + arch/arm/plat-orion/common.c | 7 +- + arch/arm/plat-versatile/localtimer.c | 26 + + arch/avr32/mach-at32ap/at32ap700x.c | 2 - + arch/avr32/mach-at32ap/include/mach/cpu.h | 3 - + drivers/char/hw_random/omap-rng.c | 2 + + drivers/clocksource/tcb_clksrc.c | 90 +- + drivers/i2c/busses/i2c-imx.c | 4 +- + drivers/input/serio/ams_delta_serio.c | 54 +- + drivers/leds/Kconfig | 7 - + drivers/leds/Makefile | 1 - + drivers/leds/leds-ams-delta.c | 126 -- + drivers/misc/atmel_tclib.c | 64 +- + drivers/mmc/host/at91_mci.c | 1 - + drivers/mmc/host/sdhci-esdhc-imx.c | 6 +- + drivers/mtd/nand/ams-delta.c | 74 +- + drivers/net/Space.c | 2 + + drivers/net/ethernet/cirrus/Kconfig | 19 +- + drivers/net/ethernet/cirrus/cs89x0.c | 148 ++- + drivers/pcmcia/at91_cf.c | 5 +- + drivers/rtc/Kconfig | 4 +- + drivers/rtc/rtc-at91sam9.c | 85 +- + drivers/rtc/rtc-mv.c | 7 + + drivers/rtc/rtc-sa1100.c | 198 ++-- + drivers/spi/spi-orion.c | 37 +- + drivers/tty/serial/atmel_serial.c | 2 + + drivers/tty/serial/imx.c | 7 +- + drivers/usb/gadget/Kconfig | 4 +- + drivers/usb/gadget/at91_udc.c | 9 +- + drivers/usb/gadget/atmel_usba_udc.c | 6 +- + drivers/usb/host/ohci-at91.c | 5 +- + drivers/video/omap/lcd_ams_delta.c | 27 +- + drivers/video/omap2/dss/dispc.c | 5 - + drivers/video/omap2/dss/dss.c | 3 + + drivers/watchdog/at91rm9200_wdt.c | 8 +- + drivers/watchdog/orion_wdt.c | 46 +- + include/linux/atmel_tc.h | 10 + + sound/soc/omap/ams-delta.c | 2 +- + 433 files changed, 9717 insertions(+), 5748 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/atmel-aic.txt + create mode 100644 Documentation/devicetree/bindings/arm/atmel-at91.txt + create mode 100644 Documentation/devicetree/bindings/arm/vexpress.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio_atmel.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/at91sam9g25ek.dts + create mode 100644 arch/arm/boot/dts/at91sam9x5.dtsi + create mode 100644 arch/arm/boot/dts/at91sam9x5cm.dtsi + create mode 100644 arch/arm/boot/dts/imx27-phytec-phycore.dts + create mode 100644 arch/arm/boot/dts/imx27.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-dreamplug.dts + create mode 100644 arch/arm/boot/dts/kirkwood.dtsi + create mode 100644 arch/arm/boot/dts/omap3-evm.dts + create mode 100644 arch/arm/boot/dts/vexpress-v2m-rs1.dtsi + create mode 100644 arch/arm/boot/dts/vexpress-v2m.dtsi + create mode 100644 arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts + create mode 100644 arch/arm/boot/dts/vexpress-v2p-ca5s.dts + create mode 100644 arch/arm/boot/dts/vexpress-v2p-ca9.dts + delete mode 100644 arch/arm/configs/at91cap9_defconfig + create mode 100644 arch/arm/configs/lpc32xx_defconfig + delete mode 100644 arch/arm/mach-at91/at91cap9.c + delete mode 100644 arch/arm/mach-at91/at91cap9_devices.c + create mode 100644 arch/arm/mach-at91/at91sam9x5.c + delete mode 100644 arch/arm/mach-at91/board-cap9adk.c + create mode 100644 arch/arm/mach-at91/include/mach/at91_matrix.h + create mode 100644 arch/arm/mach-at91/include/mach/at91_ramc.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91cap9.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91cap9_matrix.h + create mode 100644 arch/arm/mach-at91/include/mach/at91rm9200_sdramc.h + create mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5.h + create mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h + create mode 100644 arch/arm/mach-davinci/davinci.h + delete mode 100644 arch/arm/mach-davinci/include/mach/dm355.h + delete mode 100644 arch/arm/mach-davinci/include/mach/dm644x.h + delete mode 100644 arch/arm/mach-highbank/include/mach/memory.h + rename arch/arm/mach-imx/{crmregs-imx31.h => crmregs-imx3.h} (94%) + create mode 100644 arch/arm/mach-imx/imx27-dt.c + create mode 100644 arch/arm/mach-imx/pm-imx3.c + create mode 100644 arch/arm/mach-kirkwood/board-dt.c + create mode 100644 arch/arm/mach-mmp/include/mach/regs-rtc.h + create mode 100644 arch/arm/mach-mxs/devices/platform-gpmi-nand.c + create mode 100644 arch/arm/mach-mxs/mach-apx4devkit.c + delete mode 100644 arch/arm/mach-nomadik/include/mach/setup.h + create mode 100644 arch/arm/mach-omap1/iomap.h + rename arch/arm/{plat-omap/include/plat/io.h => mach-omap2/iomap.h} (77%) + delete mode 100644 arch/arm/plat-mxc/include/mach/board-mx31ads.h + delete mode 100644 drivers/leds/leds-ams-delta.c +Merging kvmtool/master (d8a4934 kvm tools, seabios: Add support for SeaBIOS debugging output) +$ git merge kvmtool/master +Already up-to-date. +Merging dma-mapping/dma-mapping-next (6cc2bf1 common: DMA-mapping: add NON-CONSISTENT attribute) +$ git merge dma-mapping/dma-mapping-next +Auto-merging lib/swiotlb.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging arch/x86/kernel/pci-dma.c +Auto-merging arch/powerpc/kernel/ibmebus.c +Auto-merging arch/hexagon/kernel/dma.c +Merge made by the 'recursive' strategy. + Documentation/DMA-attributes.txt | 19 +++++++++++++++++++ + arch/alpha/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/alpha/kernel/pci-noop.c | 10 ++++++---- + arch/alpha/kernel/pci_iommu.c | 10 ++++++---- + arch/hexagon/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/hexagon/kernel/dma.c | 9 +++++---- + arch/ia64/hp/common/sba_iommu.c | 11 ++++++----- + arch/ia64/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/ia64/kernel/pci-swiotlb.c | 9 +++++---- + arch/ia64/sn/pci/pci_dma.c | 9 +++++---- + arch/microblaze/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/microblaze/kernel/dma.c | 10 ++++++---- + arch/mips/cavium-octeon/dma-octeon.c | 16 ++++++++-------- + arch/mips/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/mips/mm/dma-default.c | 8 ++++---- + arch/powerpc/include/asm/dma-mapping.h | 24 ++++++++++++++++-------- + arch/powerpc/kernel/dma-iommu.c | 10 ++++++---- + arch/powerpc/kernel/dma-swiotlb.c | 4 ++-- + arch/powerpc/kernel/dma.c | 10 ++++++---- + arch/powerpc/kernel/ibmebus.c | 10 ++++++---- + arch/powerpc/kernel/vio.c | 14 ++++++++------ + arch/powerpc/platforms/cell/iommu.c | 16 +++++++++------- + arch/powerpc/platforms/ps3/system-bus.c | 13 +++++++------ + arch/sh/include/asm/dma-mapping.h | 28 ++++++++++++++++++---------- + arch/sh/kernel/dma-nommu.c | 4 ++-- + arch/sh/mm/consistent.c | 6 ++++-- + arch/sparc/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/sparc/kernel/iommu.c | 10 ++++++---- + arch/sparc/kernel/ioport.c | 18 ++++++++++-------- + arch/sparc/kernel/pci_sun4v.c | 9 +++++---- + arch/unicore32/include/asm/dma-mapping.h | 18 ++++++++++++------ + arch/unicore32/mm/dma-swiotlb.c | 4 ++-- + arch/x86/include/asm/dma-mapping.h | 26 ++++++++++++++++---------- + arch/x86/kernel/amd_gart_64.c | 11 ++++++----- + arch/x86/kernel/pci-calgary_64.c | 9 +++++---- + arch/x86/kernel/pci-dma.c | 3 ++- + arch/x86/kernel/pci-nommu.c | 6 +++--- + arch/x86/kernel/pci-swiotlb.c | 12 +++++++----- + arch/x86/xen/pci-swiotlb-xen.c | 4 ++-- + drivers/iommu/amd_iommu.c | 10 ++++++---- + drivers/iommu/intel-iommu.c | 9 +++++---- + drivers/xen/swiotlb-xen.c | 5 +++-- + include/linux/dma-attrs.h | 2 ++ + include/linux/dma-mapping.h | 13 +++++++++---- + include/linux/swiotlb.h | 6 ++++-- + include/xen/swiotlb-xen.h | 6 ++++-- + lib/swiotlb.c | 5 +++-- + 47 files changed, 338 insertions(+), 206 deletions(-) +Merging ktest/for-next (be405f9 ktest: Add INGORE_ERRORS to ignore warnings in boot up) +$ git merge ktest/for-next +Already up-to-date. +Merging scsi-post-merge/merge-base:master () +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm +From ../next + * [new branch] quilt/akpm -> akpm +$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base +From ../next + * [new branch] quilt/akpm-base -> akpm-base +$ git checkout akpm +Switched to branch 'akpm' +$ git rebase --onto master akpm-base +First, rewinding head to replay your work on top of it... +Applying: kmsg_dump: don't run on non-error paths by default +Applying: kprobes: return proper error code from register_kprobe() +Applying: aio: wake up waiters when freeing unused kiocbs +Applying: vfork: introduce complete_vfork_done() +Applying: vfork: make it killable +Applying: coredump_wait: don't call complete_vfork_done() +Applying: vfork: kill PF_STARTING +Applying: hung_task: fix the broken rcu_lock_break() logic +Applying: pps: class_create() returns an ERR_PTR, not NULL +Applying: c2port: class_create() returns an ERR_PTR +Applying: sparsemem/bootmem: catch greater than section size allocations +Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy +Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314 +Applying: acerhdf: add support for new hardware +Applying: acerhdf: lowered default temp fanon/fanoff values +Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver +Applying: x86, olpc-xo15-sci: enable lid close wakeup control through sysfs +Applying: geos: platform driver for Geos and Geos2 single-board computers +Applying: platform-drivers-x86: convert drivers/platform/x86/* to use module_platform_driver() +Applying: drivers/platform/x86/sony-laptop.c: fix scancodes +Applying: platform, x86: kill off Moorestown +Applying: intel_scu_ipc: remove Moorestown support +Applying: platform-x86: intel_mid_thermal: add msic_thermal alias +Applying: platform-x86: intel_mid_thermal: convert to use Intel MSIC API +Applying: platform-x86: intel_mid_thermal: turn off thermistor voltage by default +Applying: intel_mid_powerbtn: use MSIC read/write instead of ipc_scu +Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND +Applying: drivers/platform/x86/acer-wmi.c: no wifi rfkill on Lenovo machines +Applying: x86, olpc: add debugfs interface for EC commands +Applying: x86, mm: fix the size calculation of mapping tables +Applying: alix2: supplement driver to include GPIO button support +Applying: x86: net5501: platform driver for Soekris Engineering net5501 single-board computer +Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs +Applying: x86: change percpu_read_stable() to this_cpu_read_stable() +Applying: x86-change-percpu_read_stable-to-this_cpu_read_stable-fix +Applying: x86 PCI: fix identity mapping for sandy bridge +Applying: x86, pci: increase the number of iommus supported to be MAX_IO_APICS +Applying: x86-pci-increase-the-number-of-iommus-supported-to-be-max_io_apics-v2 +Applying: x86-pci-increase-the-number-of-iommus-supported-to-be-max_io_apics-v2-fix +Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file +Applying: arm, exec: remove redundant set_fs(USER_DS) +Applying: arm: use set_current_blocked() and block_sigmask() +Applying: avr32: don't mask signals in the error path +Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn +Applying: avr32: use block_sigmask() +Applying: powerpc: use set_current_blocked() and block_sigmask() +Applying: Hexagon: use set_current_blocked() and block_sigmask() +Applying: irqs: fix long-term regression in genirq irq_set_irq_type() handling +Applying: softirq: reduce invoke_softirq() code duplication +Applying: tile: use set_current_blocked() and block_sigmask() +Applying: hrtimers: Special-case zero length sleeps +Applying: cs5535-clockevt: don't ignore MFGPT on SMP-capable kernels +Applying: cs5535-clockevt: allow the MFGPT IRQ to be shared +Applying: hpet: factor timer allocate from open +Applying: ia64: use set_current_blocked() and block_sigmask() +Applying: headers_check: recursively search for linux/types.h inclusion +Applying: microblaze: don't reimplement force_sigsegv() +Applying: microblaze: no need to reset handler if SA_ONESHOT +Applying: microblaze: fix signal masking +Applying: microblaze: use set_current_blocked() and block_sigmask() +Applying: MIPS: use set_current_blocked() and block_sigmask() +Applying: score: don't mask signals if we fail to setup signal stack +Applying: score: use set_current_blocked() and block_sigmask() +Applying: drivers/thermal/thermal_sys.c: fix build warning +Applying: thermal_sys: remove unnecessary line continuations +Applying: thermal_sys: remove obfuscating used-once macros +Applying: thermal_sys: kernel style cleanups +Applying: thermal_sys: convert printks to pr_<level> +Applying: thermal: add support for thermal sensor present on SPEAr13xx machines +Applying: thermal-add-support-for-thermal-sensor-present-on-spear13xx-machines-fix +Applying: thermal-add-support-for-thermal-sensor-present-on-spear13xx-machines-fix-fix +Applying: unicore32: use block_sigmask() +Applying: blackfin: use set_current_blocked() and block_sigmask() +Applying: bluetooth: add support for BCM20702A0 [0a5c:21e6] +Applying: debugobjects: Fix selftest for static warnings +Applying: ocfs2: use find_last_bit() +Applying: ocfs2: use bitmap_weight() +Applying: parisc: use set_current_blocked() and block_sigmask() +Applying: xtensa: don't reimplement force_sigsegv() +Applying: xtensa: no need to reset handler if SA_ONESHOT +Applying: xtensa: don't mask signals if we fail to setup signal stack +Applying: xtensa: use set_current_blocked() and block_sigmask() +Applying: slab: introduce kmalloc_array() +Applying: sparc: use block_sigmask() +Applying: mm, oom: avoid looping when chosen thread detaches its mm +Applying: mm, oom: fold oom_kill_task() into oom_kill_process() +Applying: mm, oom: do not emit oom killer warning if chosen thread is already exiting +Applying: mm, oom: introduce independent oom killer ratelimit state +Applying: mm: add rss counters consistency check +Applying: mm/vmscan.c: cleanup with s/reclaim_mode/isolate_mode/ +Applying: mm: make get_mm_counter static-inline +Applying: mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone() +Applying: mm: make swapin readahead skip over holes +Applying: make-swapin-readahead-skip-over-holes-fix +Applying: vmscan: reclaim at order 0 when compaction is enabled +Applying: vmscan: kswapd carefully call compaction +Applying: vmscan-kswapd-carefully-call-compaction-fix +Applying: vmscan: only defer compaction for failed order and higher +Applying: compact_pgdat: workaround lockdep warning in kswapd +Applying: mm: compaction: make compact_control order signed +Applying: mm-compaction-make-compact_control-order-signed-fix +Applying: hugetlbfs: fix hugetlb_get_unmapped_area() +Applying: hugetlb: drop prev_vma in hugetlb_get_unmapped_area_topdown() +Applying: hugetlb: try to search again if it is really needed +Applying: hugetlb-try-to-search-again-if-it-is-really-needed-fix +Applying: mm: do not reset cached_hole_size when vma is unmapped +Applying: mm: search from free_area_cache for the bigger size +Applying: pagemap: avoid splitting thp when reading /proc/pid/pagemap +Applying: thp: optimize away unnecessary page table locking +Applying: fix mremap bug of failing to split thp +Applying: thp-optimize-away-unnecessary-page-table-locking-fix-checkpatch-fixes +Applying: pagemap: export KPF_THP +Applying: pagemap: document KPF_THP and make page-types aware of it +Applying: pagemap: introduce data structure for pagemap entry +Applying: mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION) +Applying: mm: vmscan: forcibly scan highmem if there are too many buffer_heads pinning highmem +Applying: mm: move buffer_heads_over_limit check up +Applying: mm-vmscan-forcibly-scan-highmem-if-there-are-too-many-buffer_heads-pinning-highmem-fix-fix +Applying: mm: hugetlb: defer freeing pages when gathering surplus pages +Applying: rmap: anon_vma_prepare: Reduce code duplication by calling anon_vma_chain_link +Applying: vmscan: handle isolated pages with lru lock released +Applying: thp: documentation: 'transparent_hugepage=' can also be specified on cmdline +Applying: mm: hugetlb: bail out unmapping after serving reference page +Applying: mm: hugetlb: cleanup duplicated code in unmapping vm range +Applying: procfs: mark thread stack correctly in proc/<pid>/maps +Applying: procfs-mark-thread-stack-correctly-in-proc-pid-maps-checkpatch-fixes +Applying: procfs-mark-thread-stack-correctly-in-proc-pid-maps-fix +Applying: mm, oom: force oom kill on sysrq+f +Applying: mm: fix page-faults detection in swap-token logic +Applying: mm: add extra free kbytes tunable +Applying: mm-add-extra-free-kbytes-tunable-update +Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes +Applying: memcg: replace MEM_CONT by MEM_RES_CTLR +Applying: memcg: replace mem and mem_cont stragglers +Applying: memcg: lru_size instead of MEM_CGROUP_ZSTAT +Applying: memcg: enum lru_list lru +Applying: memcg: remove redundant returns +Applying: memcg: remove unnecessary thp check in page stat accounting +Applying: idr: make idr_get_next() good for rcu_read_lock() +Applying: cgroup: revert ss_id_lock to spinlock +Applying: memcg: let css_get_next() rely upon rcu_read_lock() +Applying: memcg: remove PCG_CACHE page_cgroup flag +Applying: memcg-remove-pcg_cache-page_cgroup-flag-checkpatch-fixes +Applying: memcg: kill dead prev_priority stubs +Applying: memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat) +Applying: memcg: simplify move_account() check +Applying: memcg-simplify-move_account-check-fix +Applying: memcg: remove PCG_MOVE_LOCK flag from page_cgroup +Applying: memcg: use new logic for page stat accounting +Applying: memcg-use-new-logic-for-page-stat-accounting-fix +Applying: memcg: remove PCG_FILE_MAPPED +Applying: memcg-remove-pcg_file_mapped-fix +Applying: memcg: fix performance of mem_cgroup_begin_update_page_stat() +Applying: memcg-fix-performance-of-mem_cgroup_begin_update_page_stat-fix +Applying: mm/memcontrol.c: s/stealed/stolen/ +Applying: mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event() +Applying: mm/memcontrol.c: remove unnecessary 'break' in mem_cgroup_read() +Applying: frv: use set_current_blocked() and block_sigmask() +Applying: sh: no need to reset handler if SA_ONESHOT +Applying: sh: use set_current_blocked() and block_sigmask() +Applying: h8300: use set_current_blocked() and block_sigmask() +Applying: alpha: use set_current_blocked() and block_sigmask() +Applying: m32r: use set_current_blocked() and block_sigmask() +Applying: m68k: use set_current_blocked() and block_sigmask() +Applying: mn10300: use set_current_blocked() and block_sigmask() +Applying: C6X: use set_current_blocked() and block_sigmask() +Applying: cris: use set_current_blocked() and block_sigmask() +Applying: cris: select GENERIC_ATOMIC64 +Applying: um: don't restore current->blocked on error +Applying: um: use set_current_blocked() and block_sigmask() +Applying: magic.h: move some FS magic numbers into magic.h +Applying: nmi watchdog: do not use cpp symbol in Kconfig +Applying: ceph, cifs, nfs, fuse: boolean and / or confusion +Applying: net: use this_cpu_xxx replace percpu_xxx funcs +Applying: percpu: remove percpu_xxx() functions +Applying: percpu-remove-percpu_xxx-functions-fix +Applying: headers: include linux/types.h where appropriate +Applying: prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision +Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix +Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix +Applying: kernel/exit.c: if init dies, log a signal which killed it, if any +Applying: kernel-exitc-if-init-dies-log-a-signal-which-killed-it-if-any-fix +Applying: powerpc/eeh: remove eeh_event_handler()->daemonize() +Applying: vfs: increment iversion when a file is truncated +Applying: brlocks/lglocks: cleanups +Applying: brlocks-lglocks-cleanups-checkpatch-fixes +Applying: vfs: correctly set the dir i_mutex lockdep class +Applying: seq_file: fix mishandling of consecutive pread() invocations. +Applying: fs: symlink restrictions on sticky directories +Applying: fs-symlink-restrictions-on-sticky-directories-fix-2 +Applying: fs: hardlink creation restrictions +Applying: fs-hardlink-creation-restrictions-fix +Applying: fs: hardlink creation restriction cleanup +Applying: MAINTAINERS: fix REMOTEPROC F: typo +Applying: MAINTAINERS: Update MCA section +Applying: MAINTAINERS: update git urls for 2.6 deletions +Applying: backlight: convert backlight i2c drivers to module_i2c_driver +Applying: backlight: convert backlight spi drivers to module_spi_driver +Applying: drivers/video/backlight/wm831x_bl.c: use devm_ functions +Applying: drivers/video/backlight: use devm_ functions +Applying: drivers/video/backlight/adp5520_bl.c: use devm_ functions +Applying: backlight: new backlight driver for LP855x devices +Applying: backlight: lp855x_bl: Add missing mutex_unlock in lp855x_read_byte error path +Applying: backlight/lp855x_bl.c: check platform data in lp855x_probe() +Applying: backlight/lp855x_bl.c: small cleanups +Applying: lp855x-bl: remove unnecessary platform data +Applying: lp855x-bl: remove unnecessary headers +Applying: backlight: add driver for Bachmann's ot200 +Applying: backlight-add-driver-for-bachmanns-ot200-fix +Applying: backlight: add support for Pandora backlight +Applying: backlight-add-support-for-pandora-backlight-v2 +Applying: backlight: convert platform_lcd to dev_pm_ops +Applying: bitops: rename for_each_set_bit_cont() in favor of analogous list.h function +Applying: bitops: remove for_each_set_bit_cont() +Applying: bitops: introduce for_each_clear_bit() +Applying: mtd: use for_each_clear_bit() +Applying: s390/char: use for_each_clear_bit() +Applying: uwb: use for_each_clear_bit() +Applying: x86: use for_each_clear_bit_from() +Applying: drivers/leds/leds-lp5521.c: fix typo +Applying: drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe() +Applying: drivers/leds/leds-tca6507.c: remove obsolete cleanup for clientdata +Applying: drivers/leds/leds-lp5521.c: add 'name' in the lp5521_led_config +Applying: drivers/leds/leds-lp5521.c: add 'update_config' in the lp5521_platform_data +Applying: drivers/leds/leds-lp5521.c: support led pattern data +Applying: leds-lp5521-support-led-pattern-data-checkpatch-fixes +Applying: drivers/leds/leds-lp5521.c: redefinition of register bits +Applying: drivers/leds/leds-lp5523.c: constify some data +Applying: drivers/leds: add driver for PCA9633 I2C chip +Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix +Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix-2 +Applying: drivers/leds/leds-pca9633.c: fix kcalloc parameters swapped +Applying: drivers/leds/leds-gpio.c: use linux/gpio.h rather than asm/gpio.h +Applying: leds-lm3530: set the max_brightness to 127 +Applying: leds-lm3530: replace i2c_client with led_classdev +Applying: leds-lm3530-replace-i2c_client-with-led_classdev-fix +Applying: leds-lm3530: support pwm input mode +Applying: leds-lm3530: remove LM3530_ALS_ZONE_REG code +Applying: leds-lm3530: replace pltfm with pdata +Applying: drivers/leds/leds-pca9633.c: remove unused 'adapter' variable +Applying: drivers/leds/leds-lm3530.c: move the code setting gen_config to one place +Applying: drivers-leds-leds-lm3530c-move-the-code-setting-gen_config-to-one-place-fix +Applying: string: memchr_inv speed improvements +Applying: prio_tree: remove unnecessary code in prio_tree_replace +Applying: prio_tree: cleanup prio_tree_left()/prio_tree_right() +Applying: prio_tree: simplify prio_tree_expand() +Applying: prio_tree: introduce prio_set_parent() +Applying: include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...) +Applying: checkpatch: add some --strict coding style checks +Applying: crc32: remove two instances of trailing whitespaces +Applying: crc32: move long comment about crc32 fundamentals to Documentation/ +Applying: crc32-move-long-comment-about-crc32-fundamentals-to-documentation-fix +Applying: crc32: simplify unit test code +Applying: crc32: miscellaneous cleanups +Applying: crc32: fix mixing of endian-specific types +Applying: crc32: make CRC_*_BITS definition correspond to actual bit counts +Applying: crc32: add slice-by-8 algorithm to existing code +Applying: crc32: optimize loop counter for x86 +Applying: crc32: add note about this patchset to crc32.c +Applying: crc32: bolt on crc32c +Applying: crc32: Don't reference unnecessary crc32 tables in single-bit mode +Applying: crypto: crc32c should use library implementation +Applying: crc32: add self-test code for crc32c +Applying: crc32: select an algorithm via Kconfig +Applying: epoll: comment the funky #ifdef +Applying: epoll: remove unneeded variable in reverse_path_check() +Applying: init/do_mounts.c: create /root if it does not exist +Applying: rtc-spear: fix for balancing the enable_irq_wake in Power Mgmt +Applying: rtc/spear: fix for RTC_AIE_ON and RTC_AIE_OFF ioctl errors +Applying: rtc/rtc-spear: call platform_set_drvdata() before registering rtc device +Applying: rtc: convert rtc spi drivers to module_spi_driver +Applying: rtc: convert rtc i2c drivers to module_i2c_driver +Applying: MIPS: add RTC support for loongson1B +Applying: drivers/rtc/rtc-twl.c: optimize IRQ bit access +Applying: drivers/rtc/rtc-twl.c: enable RTC irrespective of its prior state +Applying: drivers/rtc/rtc-twl.c: simplify RTC interrupt clearing +Applying: drivers/rtc/rtc-twl.c: return correct RTC event from ISR +Applying: drivers/rtc: remove IRQF_DISABLED +Applying: drivers/rtc/rtc-pm8xxx.c: make pm8xxx_rtc_pm_ops static +Applying: drivers/rtc/rtc-max8925.c: fix max8925_rtc_read_alarm() return value error +Applying: drivers/rtc/rtc-max8925.c: fix alarm->enabled mistake in max8925_rtc_read_alarm/max8925_rtc_set_alarm +Applying: rtc: driver for DA9052/53 PMIC v1 +Applying: rtc-rtc-driver-for-da9052-53-pmic-v1-fix +Applying: rtc: ds1307: refactor chip_desc table +Applying: rtc: ds1307: simplify irq setup code +Applying: rtc: ds1307: comment and format cleanup +Applying: rtc: ds1307: generalise ram size and offset +Applying: ptrace: the killed tracee should not enter the syscall +Applying: ptrace: don't send SIGTRAP on exec if SEIZED +Applying: ptrace: don't modify flags on PTRACE_SETOPTIONS failure +Applying: ptrace: simplify PTRACE_foo constants and PTRACE_SETOPTIONS code +Applying: ptrace: make PTRACE_SEIZE set ptrace options specified in 'data' parameter +Applying: ptrace: renumber PTRACE_EVENT_STOP so that future new options and events can match +Applying: ptrace: remove PTRACE_SEIZE_DEVEL bit +Applying: signal: give SEND_SIG_FORCED more power to beat SIGNAL_UNKILLABLE +Applying: signal: cosmetic, s/from_ancestor_ns/force/ in prepare_signal() paths +Applying: signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig() +Applying: signal: zap_pid_ns_processes: s/SEND_SIG_NOINFO/SEND_SIG_FORCED/ +Applying: usermodehelper: use UMH_WAIT_PROC consistently +Applying: usermodehelper: introduce umh_complete(sub_info) +Applying: usermodehelper: implement UMH_KILLABLE +Applying: usermodehelper: kill umh_wait, renumber UMH_* constants +Applying: usermodehelper: ____call_usermodehelper() doesn't need do_exit() +Applying: kmod: introduce call_modprobe() helper +Applying: kmod: make __request_module() killable +Applying: kmod: avoid deadlock from recursive kmod call +Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix +Applying: fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static +Applying: proc: speedup /proc/stat handling +Applying: procfs: add num_to_str() to speed up /proc/stat +Applying: procfs-add-num_to_str-to-speed-up-proc-stat-fix +Applying: procfs: avoid breaking the ABI in /proc/stat +Applying: procfs: speed up /proc/pid/stat, statm +Applying: procfs-speed-up-proc-pid-stat-statm-checkpatch-fixes +Applying: proc: clean up /proc/<pid>/environ handling +Applying: seq_file: add seq_set_overflow(), seq_overflow() +Applying: seq_file-add-seq_set_overflow-seq_overflow-fix +Applying: smp: introduce a generic on_each_cpu_mask() function +Applying: arm: move arm over to generic on_each_cpu_mask +Applying: tile: move tile to use generic on_each_cpu_mask +Applying: smp: add func to IPI cpus based on parameter func +Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-fix +Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update +Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update-fix +Applying: smp: add func to IPI cpus based on parameter func +Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-v9-fix +Applying: slub: only IPI CPUs that have per cpu obj to flush +Applying: fs: only send IPI to invalidate LRU BH when needed +Applying: mm: only IPI CPUs to drain local pages if they exist +Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-update +Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-v9 +Applying: lib/cpumask.c: remove __any_online_cpu() +Applying: arch/ia64: remove references to cpu_*_map +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: ipc: provide generic compat versions of IPC syscalls +Applying: ipmi: decrease the IPMI message transaction time in interrupt mode +Applying: ipmi: increase KCS timeouts +Applying: ipmi: use a tasklet for handling received messages +Applying: ipmi: fix message handling during panics +Applying: ipmi: simplify locking +Applying: ipmi: use locks on watchdog timeout set on reboot +Applying: sysctl: use bitmap library functions +Applying: pidns: add reboot_pid_ns() to handle the reboot syscall +Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-fix +Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-checkpatch-fixes +Applying: fs/proc/namespaces.c: prevent crash when ns_entries[] is empty +Applying: selftests: launch individual selftests from the main Makefile +Applying: selftests/Makefile: make `run_tests' depend on `all' +Applying: mm: move page-types.c from Documentation to tools/vm +Applying: mm: move slabinfo.c to tools/vm +Applying: mm: move hugepage test examples to tools/testing/selftests/vm +Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix +Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix-fix +Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE +Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry +Applying: syscalls, x86: add __NR_kcmp syscall +Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix +Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix-2 +Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat +Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries +Applying: ramoops: use pstore interface +Applying: ramoops: fix printk format warnings +Applying: notify_change(): check that i_mutex is held +Applying: regmap: cope with bitops API change (for_each_set_bit_cont) +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm +From ../rebase-tmp + + 61a87ea...8da3246 akpm -> akpm (forced update) +$ rm -rf ../rebase-tmp +Merging akpm (8da3246 regmap: cope with bitops API change (for_each_set_bit_cont)) +$ git merge --no-ff akpm +Auto-merging tools/vm/page-types.c +Auto-merging tools/testing/selftests/vm/map_hugetlb.c +Auto-merging tools/testing/selftests/vm/hugepage-shm.c +Auto-merging tools/testing/selftests/vm/hugepage-mmap.c +Removing tools/testing/selftests/run_tests +Removing include/linux/rar_register.h +Removing drivers/platform/x86/intel_rar_register.c +Removing drivers/leds/leds-net5501.c +Removing Documentation/vm/Makefile +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 2 + + Documentation/ABI/testing/debugfs-olpc | 16 + + Documentation/Makefile | 2 +- + Documentation/backlight/lp855x-driver.txt | 78 ++ + Documentation/crc32.txt | 183 +++ + Documentation/filesystems/proc.txt | 33 +- + Documentation/kernel-parameters.txt | 13 + + Documentation/laptops/sony-laptop.txt | 5 + + Documentation/leds/leds-lp5521.txt | 63 + + Documentation/ramoops.txt | 8 +- + Documentation/sysctl/fs.txt | 42 + + Documentation/sysctl/vm.txt | 16 + + Documentation/vm/Makefile | 8 - + Documentation/vm/pagemap.txt | 4 + + MAINTAINERS | 121 +- + arch/Kconfig | 6 + + arch/alpha/kernel/signal.c | 31 +- + arch/arm/include/asm/processor.h | 1 - + arch/arm/kernel/signal.c | 24 +- + arch/arm/kernel/smp_tlb.c | 20 +- + arch/arm/mach-ux500/mbox-db5500.c | 2 +- + arch/avr32/kernel/signal.c | 26 +- + arch/blackfin/Kconfig | 1 + + arch/blackfin/include/asm/irq.h | 4 - + arch/blackfin/kernel/signal.c | 17 +- + arch/c6x/kernel/signal.c | 16 +- + arch/cris/Kconfig | 1 + + arch/cris/arch-v10/kernel/signal.c | 34 +- + arch/cris/arch-v32/kernel/signal.c | 37 +- + arch/frv/kernel/signal.c | 32 +- + arch/h8300/kernel/signal.c | 33 +- + arch/hexagon/kernel/signal.c | 12 +- + arch/ia64/kernel/acpi.c | 6 +- + arch/ia64/kernel/irq_ia64.c | 8 +- + arch/ia64/kernel/mca.c | 6 +- + arch/ia64/kernel/msi_ia64.c | 4 +- + arch/ia64/kernel/setup.c | 2 +- + arch/ia64/kernel/signal.c | 15 +- + arch/ia64/kernel/smp.c | 2 +- + arch/ia64/kernel/smpboot.c | 19 +- + arch/ia64/kernel/topology.c | 3 +- + arch/m32r/kernel/signal.c | 12 +- + arch/m68k/kernel/signal_mm.c | 22 +- + arch/m68k/kernel/signal_no.c | 28 +- + arch/microblaze/kernel/signal.c | 42 +- + arch/mips/Kconfig | 1 + + arch/mips/kernel/signal.c | 27 +- + arch/mips/kernel/signal32.c | 20 +- + arch/mips/kernel/signal_n32.c | 10 +- + arch/mn10300/Kconfig | 1 + + arch/mn10300/include/asm/reset-regs.h | 4 - + arch/mn10300/kernel/signal.c | 32 +- + arch/parisc/kernel/signal.c | 12 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/signal.c | 13 +- + arch/powerpc/kernel/signal_32.c | 11 +- + arch/powerpc/platforms/pseries/eeh_event.c | 2 +- + arch/s390/Kconfig | 1 + + arch/score/kernel/signal.c | 13 +- + arch/sh/kernel/signal_32.c | 35 +- + arch/sh/kernel/signal_64.c | 40 +- + arch/sparc/Kconfig | 2 + + arch/sparc/include/asm/irq_64.h | 1 - + arch/sparc/kernel/signal32.c | 7 +- + arch/sparc/kernel/signal_32.c | 7 +- + arch/sparc/kernel/signal_64.c | 6 +- + arch/tile/include/asm/compat.h | 11 - + arch/tile/include/asm/smp.h | 7 - + arch/tile/kernel/compat.c | 43 - + arch/tile/kernel/compat_signal.c | 5 +- + arch/tile/kernel/signal.c | 13 +- + arch/tile/kernel/smp.c | 19 - + arch/um/kernel/signal.c | 26 +- + arch/unicore32/kernel/signal.c | 5 +- + arch/x86/Kconfig | 14 + + arch/x86/include/asm/current.h | 2 +- + arch/x86/include/asm/desc.h | 1 + + arch/x86/include/asm/fpu-internal.h | 6 +- + arch/x86/include/asm/hardirq.h | 9 +- + arch/x86/include/asm/irq_regs.h | 4 +- + arch/x86/include/asm/mmu_context.h | 12 +- + arch/x86/include/asm/percpu.h | 24 +- + arch/x86/include/asm/smp.h | 4 +- + arch/x86/include/asm/stackprotector.h | 4 +- + arch/x86/include/asm/thread_info.h | 2 +- + arch/x86/include/asm/tlbflush.h | 4 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce.c | 4 +- + arch/x86/kernel/cpu/perf_event.c | 4 +- + arch/x86/kernel/i387.c | 2 +- + arch/x86/kernel/irqinit.c | 6 +- + arch/x86/kernel/nmi_selftest.c | 1 + + arch/x86/kernel/paravirt.c | 12 +- + arch/x86/kernel/process_32.c | 2 +- + arch/x86/kernel/process_64.c | 12 +- + arch/x86/kernel/sys_x86_64.c | 34 +- + arch/x86/mm/hugetlbpage.c | 31 +- + arch/x86/mm/init.c | 21 +- + arch/x86/mm/tlb.c | 10 +- + arch/x86/platform/geode/Makefile | 2 + + arch/x86/platform/geode/alix.c | 76 +- + arch/x86/platform/geode/geos.c | 128 ++ + arch/x86/platform/geode/net5501.c | 154 +++ + arch/x86/platform/iris/iris.c | 67 +- + arch/x86/platform/olpc/olpc-xo15-sci.c | 67 + + arch/x86/platform/olpc/olpc.c | 86 ++ + arch/x86/syscalls/syscall_32.tbl | 1 + + arch/x86/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/signal.c | 35 +- + crypto/Kconfig | 1 + + crypto/crc32c.c | 94 +-- + drivers/base/regmap/regcache-lzo.c | 2 +- + drivers/block/drbd/drbd_nl.c | 2 +- + drivers/bluetooth/btusb.c | 1 + + drivers/char/Kconfig | 1 + + drivers/char/hpet.c | 56 +- + drivers/char/ipmi/ipmi_kcs_sm.c | 4 +- + drivers/char/ipmi/ipmi_msghandler.c | 242 ++-- + drivers/char/ipmi/ipmi_si_intf.c | 72 +- + drivers/char/ipmi/ipmi_watchdog.c | 21 +- + drivers/char/ramoops.c | 204 +++- + drivers/clocksource/cs5535-clockevt.c | 3 +- + drivers/iommu/intel-iommu.c | 59 +- + drivers/leds/Kconfig | 18 +- + drivers/leds/Makefile | 2 +- + drivers/leds/leds-gpio.c | 3 +- + drivers/leds/leds-lm3530.c | 135 ++- + drivers/leds/leds-lp5521.c | 145 ++- + drivers/leds/leds-lp5523.c | 6 +- + drivers/leds/leds-net5501.c | 97 -- + drivers/leds/leds-pca9633.c | 193 +++ + drivers/leds/leds-tca6507.c | 9 +- + drivers/misc/c2port/core.c | 4 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 6 +- + drivers/mtd/mtdchar.c | 2 +- + drivers/platform/x86/Kconfig | 24 +- + drivers/platform/x86/Makefile | 1 - + drivers/platform/x86/acer-wmi.c | 30 +- + drivers/platform/x86/acerhdf.c | 67 +- + drivers/platform/x86/intel_mid_powerbtn.c | 46 +- + drivers/platform/x86/intel_mid_thermal.c | 60 +- + drivers/platform/x86/intel_rar_register.c | 669 ---------- + drivers/platform/x86/intel_scu_ipc.c | 208 +--- + drivers/platform/x86/intel_scu_ipcutil.c | 32 +- + drivers/platform/x86/sony-laptop.c | 16 +- + drivers/platform/x86/xo1-rfkill.c | 13 +- + drivers/pps/pps.c | 4 +- + drivers/rtc/Kconfig | 17 + + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-bq32k.c | 12 +- + drivers/rtc/rtc-cmos.c | 2 +- + drivers/rtc/rtc-coh901331.c | 2 +- + drivers/rtc/rtc-da9052.c | 293 +++++ + drivers/rtc/rtc-davinci.c | 2 +- + drivers/rtc/rtc-ds1305.c | 12 +- + drivers/rtc/rtc-ds1307.c | 182 ++-- + drivers/rtc/rtc-ds1374.c | 13 +- + drivers/rtc/rtc-ds1390.c | 12 +- + drivers/rtc/rtc-ds1511.c | 2 +- + drivers/rtc/rtc-ds1553.c | 2 +- + drivers/rtc/rtc-ds1672.c | 13 +- + drivers/rtc/rtc-ds3232.c | 13 +- + drivers/rtc/rtc-ds3234.c | 12 +- + drivers/rtc/rtc-em3027.c | 13 +- + drivers/rtc/rtc-fm3130.c | 12 +- + drivers/rtc/rtc-isl12022.c | 13 +- + drivers/rtc/rtc-isl1208.c | 15 +- + drivers/rtc/rtc-lpc32xx.c | 2 +- + drivers/rtc/rtc-ls1x.c | 211 ++++ + drivers/rtc/rtc-m41t80.c | 13 +- + drivers/rtc/rtc-m41t93.c | 12 +- + drivers/rtc/rtc-m41t94.c | 14 +- + drivers/rtc/rtc-max6900.c | 13 +- + drivers/rtc/rtc-max6902.c | 12 +- + drivers/rtc/rtc-max8925.c | 21 +- + drivers/rtc/rtc-mpc5121.c | 4 +- + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-mv.c | 2 +- + drivers/rtc/rtc-nuc900.c | 2 +- + drivers/rtc/rtc-omap.c | 4 +- + drivers/rtc/rtc-pcf2123.c | 13 +- + drivers/rtc/rtc-pcf8563.c | 13 +- + drivers/rtc/rtc-pcf8583.c | 13 +- + drivers/rtc/rtc-pl030.c | 2 +- + drivers/rtc/rtc-pl031.c | 2 +- + drivers/rtc/rtc-pm8xxx.c | 2 +- + drivers/rtc/rtc-pxa.c | 4 +- + drivers/rtc/rtc-r9701.c | 12 +- + drivers/rtc/rtc-rs5c348.c | 13 +- + drivers/rtc/rtc-rs5c372.c | 13 +- + drivers/rtc/rtc-rv3029c2.c | 13 +- + drivers/rtc/rtc-rx8025.c | 13 +- + drivers/rtc/rtc-rx8581.c | 13 +- + drivers/rtc/rtc-s35390a.c | 13 +- + drivers/rtc/rtc-s3c.c | 4 +- + drivers/rtc/rtc-sa1100.c | 4 +- + drivers/rtc/rtc-sh.c | 8 +- + drivers/rtc/rtc-spear.c | 100 +- + drivers/rtc/rtc-stk17ta8.c | 2 +- + drivers/rtc/rtc-twl.c | 28 +- + drivers/rtc/rtc-tx4939.c | 2 +- + drivers/rtc/rtc-vr41xx.c | 4 +- + drivers/rtc/rtc-x1205.c | 13 +- + drivers/s390/char/sclp_cmd.c | 5 +- + drivers/staging/rtl8187se/r8180_core.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 +- + drivers/thermal/Kconfig | 7 + + drivers/thermal/Makefile | 1 + + drivers/thermal/spear_thermal.c | 206 ++++ + drivers/thermal/thermal_sys.c | 90 +- + drivers/tty/sysrq.c | 2 +- + drivers/uwb/allocator.c | 6 +- + drivers/video/backlight/88pm860x_bl.c | 8 +- + drivers/video/backlight/Kconfig | 21 + + drivers/video/backlight/Makefile | 4 +- + drivers/video/backlight/aat2870_bl.c | 9 +- + drivers/video/backlight/adp5520_bl.c | 6 +- + drivers/video/backlight/adp8860_bl.c | 12 +- + drivers/video/backlight/adp8870_bl.c | 12 +- + drivers/video/backlight/ams369fg06.c | 13 +- + drivers/video/backlight/corgi_lcd.c | 12 +- + drivers/video/backlight/cr_bllcd.c | 3 +- + drivers/video/backlight/da903x_bl.c | 6 +- + drivers/video/backlight/l4f00242t03.c | 13 +- + drivers/video/backlight/ld9040.c | 13 +- + drivers/video/backlight/lms283gf05.c | 13 +- + drivers/video/backlight/lp855x_bl.c | 323 +++++ + drivers/video/backlight/ltv350qv.c | 12 +- + drivers/video/backlight/max8925_bl.c | 7 +- + drivers/video/backlight/omap1_bl.c | 9 +- + drivers/video/backlight/ot200_bl.c | 175 +++ + drivers/video/backlight/pandora_bl.c | 171 +++ + drivers/video/backlight/pcf50633-backlight.c | 16 +- + drivers/video/backlight/platform_lcd.c | 19 +- + drivers/video/backlight/pwm_bl.c | 7 +- + drivers/video/backlight/s6e63m0.c | 13 +- + drivers/video/backlight/tdo24m.c | 12 +- + drivers/video/backlight/tosa_bl.c | 13 +- + drivers/video/backlight/tosa_lcd.c | 13 +- + drivers/video/backlight/vgg2432a4.c | 15 +- + drivers/video/backlight/wm831x_bl.c | 6 +- + drivers/video/uvesafb.c | 2 +- + fs/Kconfig | 60 + + fs/aio.c | 2 + + fs/attr.c | 8 +- + fs/binfmt_misc.c | 3 +- + fs/block_dev.c | 3 +- + fs/buffer.c | 15 +- + fs/cifs/cifsfs.c | 2 +- + fs/dcache.c | 4 +- + fs/eventpoll.c | 27 +- + fs/exec.c | 18 +- + fs/file_table.c | 17 +- + fs/hugetlbfs/inode.c | 15 +- + fs/inode.c | 3 +- + fs/internal.h | 3 +- + fs/namei.c | 193 +++- + fs/namespace.c | 140 ++-- + fs/ocfs2/cluster/heartbeat.c | 40 +- + fs/pipe.c | 1 + + fs/pnode.c | 4 +- + fs/proc/array.c | 256 +++- + fs/proc/base.c | 70 +- + fs/proc/internal.h | 10 +- + fs/proc/kcore.c | 6 +- + fs/proc/namespaces.c | 6 +- + fs/proc/page.c | 2 + + fs/proc/stat.c | 62 +- + fs/proc/task_mmu.c | 284 +++-- + fs/proc/task_nommu.c | 57 +- + fs/proc_namespace.c | 4 +- + fs/seq_file.c | 112 ++- + include/drm/drm_mode.h | 2 + + include/linux/bitops.h | 13 +- + include/linux/cgroup.h | 2 +- + include/linux/compaction.h | 20 +- + include/linux/compat.h | 12 +- + include/linux/compiler-gcc.h | 3 +- + include/linux/cpumask.h | 3 +- + include/linux/crc32.h | 2 + + include/linux/fs.h | 2 + + include/linux/hpet.h | 1 + + include/linux/huge_mm.h | 17 + + include/linux/kcmp.h | 17 + + include/linux/kernel-page-flags.h | 1 + + include/linux/kernel.h | 10 +- + include/linux/kmod.h | 18 +- + include/linux/kmsg_dump.h | 9 +- + include/linux/led-lm3530.h | 9 + + include/linux/leds-lp5521.h | 25 + + include/linux/lglock.h | 187 +--- + include/linux/lp855x.h | 131 ++ + include/linux/magic.h | 18 +- + include/linux/memcontrol.h | 55 +- + include/linux/migrate.h | 2 - + include/linux/mm.h | 24 +- + include/linux/mm_types.h | 1 + + include/linux/mmc/ioctl.h | 3 + + include/linux/mmzone.h | 5 +- + include/linux/nmi.h | 2 +- + include/linux/oom.h | 2 +- + include/linux/page_cgroup.h | 33 +- + include/linux/percpu.h | 54 - + include/linux/pid_namespace.h | 8 +- + include/linux/pipe_fs_i.h | 2 - + include/linux/platform_data/spear_thermal.h | 26 + + include/linux/prctl.h | 8 + + include/linux/ptrace.h | 44 +- + include/linux/rar_register.h | 60 - + include/linux/sched.h | 15 +- + include/linux/seq_file.h | 5 +- + include/linux/slab.h | 17 +- + include/linux/smp.h | 46 + + include/linux/swap.h | 37 +- + include/linux/syscalls.h | 2 + + include/linux/topology.h | 4 +- + include/linux/tracehook.h | 9 +- + include/scsi/scsi_netlink.h | 2 +- + include/sound/compress_params.h | 2 + + include/xen/xenbus.h | 4 +- + init/do_mounts.c | 3 + + ipc/compat.c | 70 +- + ipc/sem.c | 250 +++-- + kernel/Makefile | 5 +- + kernel/cgroup.c | 19 +- + kernel/exit.c | 40 +- + kernel/fork.c | 85 +- + kernel/hrtimer.c | 8 + + kernel/hung_task.c | 11 +- + kernel/irq/chip.c | 3 +- + kernel/kcmp.c | 187 +++ + kernel/kmod.c | 115 ++- + kernel/kprobes.c | 12 +- + kernel/lglock.c | 136 ++ + kernel/pid_namespace.c | 47 +- + kernel/printk.c | 6 + + kernel/ptrace.c | 66 +- + kernel/signal.c | 18 +- + kernel/smp.c | 90 ++ + kernel/softirq.c | 18 +- + kernel/sys.c | 130 ++- + kernel/sys_ni.c | 3 + + kernel/sysctl.c | 39 +- + lib/Kconfig | 61 +- + lib/Kconfig.debug | 2 +- + lib/cpumask.c | 12 - + lib/crc32.c | 1287 +++++++++++++++----- + lib/crc32defs.h | 56 +- + lib/debugobjects.c | 14 +- + lib/gen_crc32table.c | 81 +- + lib/idr.c | 8 +- + lib/prio_tree.c | 156 ++-- + lib/string.c | 20 +- + lib/vsprintf.c | 20 + + mm/bootmem.c | 5 +- + mm/compaction.c | 77 +- + mm/huge_memory.c | 122 +- + mm/hugetlb.c | 59 +- + mm/memcontrol.c | 361 +++--- + mm/memory.c | 60 +- + mm/mmap.c | 40 +- + mm/mprotect.c | 2 +- + mm/oom_kill.c | 161 ++-- + mm/page_alloc.c | 85 ++- + mm/rmap.c | 60 +- + mm/slub.c | 10 +- + mm/swap_state.c | 24 +- + mm/swapfile.c | 62 - + mm/vmscan.c | 143 ++- + net/netfilter/nf_conntrack_netlink.c | 5 + + net/netfilter/xt_TEE.c | 12 +- + net/socket.c | 4 +- + scripts/checkpatch.pl | 71 ++- + scripts/headers_check.pl | 38 +- + security/keys/request_key.c | 2 +- + security/tomoyo/load_policy.c | 2 +- + tools/perf/util/include/linux/bitops.h | 2 +- + tools/testing/selftests/Makefile | 7 +- + tools/testing/selftests/breakpoints/Makefile | 7 +- + tools/testing/selftests/kcmp/Makefile | 29 + + tools/testing/selftests/kcmp/kcmp_test.c | 94 ++ + tools/testing/selftests/run_tests | 8 - + tools/testing/selftests/vm/Makefile | 14 + + .../testing/selftests}/vm/hugepage-mmap.c | 13 +- + .../testing/selftests}/vm/hugepage-shm.c | 10 +- + .../testing/selftests}/vm/map_hugetlb.c | 10 +- + tools/testing/selftests/vm/run_vmtests | 77 ++ + tools/vm/Makefile | 11 + + {Documentation => tools}/vm/page-types.c | 8 +- + tools/{slub => vm}/slabinfo.c | 0 + 391 files changed, 9219 insertions(+), 5329 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-olpc + create mode 100644 Documentation/backlight/lp855x-driver.txt + create mode 100644 Documentation/crc32.txt + delete mode 100644 Documentation/vm/Makefile + create mode 100644 arch/x86/platform/geode/geos.c + create mode 100644 arch/x86/platform/geode/net5501.c + delete mode 100644 drivers/leds/leds-net5501.c + create mode 100644 drivers/leds/leds-pca9633.c + delete mode 100644 drivers/platform/x86/intel_rar_register.c + create mode 100644 drivers/rtc/rtc-da9052.c + create mode 100644 drivers/rtc/rtc-ls1x.c + create mode 100644 drivers/thermal/spear_thermal.c + create mode 100644 drivers/video/backlight/lp855x_bl.c + create mode 100644 drivers/video/backlight/ot200_bl.c + create mode 100644 drivers/video/backlight/pandora_bl.c + create mode 100644 include/linux/kcmp.h + create mode 100644 include/linux/lp855x.h + create mode 100644 include/linux/platform_data/spear_thermal.h + delete mode 100644 include/linux/rar_register.h + create mode 100644 kernel/kcmp.c + create mode 100644 kernel/lglock.c + create mode 100644 tools/testing/selftests/kcmp/Makefile + create mode 100644 tools/testing/selftests/kcmp/kcmp_test.c + delete mode 100644 tools/testing/selftests/run_tests + create mode 100644 tools/testing/selftests/vm/Makefile + rename {Documentation => tools/testing/selftests}/vm/hugepage-mmap.c (93%) + rename {Documentation => tools/testing/selftests}/vm/hugepage-shm.c (94%) + rename {Documentation => tools/testing/selftests}/vm/map_hugetlb.c (94%) + create mode 100644 tools/testing/selftests/vm/run_vmtests + create mode 100644 tools/vm/Makefile + rename {Documentation => tools}/vm/page-types.c (99%) + rename tools/{slub => vm}/slabinfo.c (100%) +$ git am -3 ../patches/0001-percpu-fix-for-removal-of-percpu_xxx-function.patch +Applying: percpu: fix for removal of percpu_xxx function +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/include/asm/compat.h +$ git add . +$ git commit -v -a --amend +[master 25bf476] Merge branch 'akpm' diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5c6922ccdcc7 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,45 @@ +Importing hexagon based on v3.2-rc2 +Unchanged quilt series hexagon +Importing i2c based on ce5afed937f0a823d3b00c9459409c3f5f2fbd5d +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 3.3-rc5 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 6b21d18ed50c7d145220b0724ea7f2613abf0f95 +HEAD is now at 6b21d18 Linux 3.3-rc5 +$ git am ../quilt/jdelvare-hwmon/hwmon-fam15h_power-01-correct-sign-extension-of-running_avg_capture.patch +Applying: hwmon: (fam15h_power) Correct sign extension of running_avg_capture +$ git am ../quilt/jdelvare-hwmon/hwmon-fam15h_power-02-increase-output-resolution.patch +Applying: hwmon: (fam15h_power) Increase output resolution +$ git am ../quilt/jdelvare-hwmon/hwmon-w83795-01-show-standard-pwm-attr.patch +Applying: hwmon: (w83795) Unconditionally support manual fan speed control +$ git am ../quilt/jdelvare-hwmon/hwmon-w83795-02-fix-multi-line-comments.patch +Applying: hwmon: (w83795) Fix multi-line comments +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-01-fix-multi-line-comments.patch +Applying: hwmon: (lm90) Fix multi-line comments +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-02-add-support-for-GMT-G781.patch +Applying: hwmon: (lm90) Add support for GMT G781 +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-03-restore-original-configuration-if-probe-function-fails.patch +Applying: hwmon: (lm90) Restore original configuration if probe function fails +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-01-rename-new_client.patch +Applying: hwmon: (lm63) Reorganize the code +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-02-make-fan-speed-control-strategy-changeable.patch +Applying: hwmon: (lm63) Make fan speed control strategy changeable +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-03-allow-editing-lut.patch +Applying: hwmon: (lm63) Let the user adjust the lookup table +$ git am ../quilt/jdelvare-hwmon/hwmon-mc13783-adc-01-remove-space-before-tab.patch +Applying: hwmon: (mc13783-adc) Remove space before tab +$ git am ../quilt/jdelvare-hwmon/hwmon-mc13783-adc-02-add-support-for-the-mc13892-pmic.patch +Applying: hwmon: (mc13xxx-adc) Add support for the MC13892 PMIC +$ git am ../quilt/jdelvare-hwmon/hwmon-add-mcp3021-adc-driver.patch +Applying: hwmon: Add MCP3021 ADC driver +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 0cac3d6...064628b master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 3.3-rc2 +Unchanged quilt series kernel-doc +Importing rr based on v3.3-rc5-86-g5ffca28 +Unchanged quilt series rr +Importing device-mapper based on v3.3-rc3 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..4b67db820ae6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20120305 |