diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-06 17:19:56 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-06 17:19:56 +1000 |
| commit | 1a4082f8c32a7f27ecb2f803c7324bf47ab07280 (patch) | |
| tree | 16ae7567f7dfbec28db70db0d32b35fbef7ebd8c | |
| parent | 8f1a6fb2e0f446931774de9c1085e4452e65c552 (diff) | |
Add linux-next specific files for 20130906next-20130906
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 225 | ||||
| -rw-r--r-- | Next/Trees | 226 | ||||
| -rw-r--r-- | Next/merge.log | 8794 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 9248 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..89bd6d7f5edd --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,225 @@ +Name SHA1 +---- ---- +origin fc8cc67787baf9a4cb00d3a1e8d1fe8c878f538a +fixes fa8218def1b1a16f0a410e2c1c767b4738cc81fa +kbuild-current ad81f0545ef01ea651886dddac4bef6cec930092 +arc-current 07b9b65147d1d7cc03b9ff1e1f3b1c163ba4d067 +arm-current e1f020371c08ea93be417ba3b1990b169e7e6e36 +m68k-current 55490050df0f5d82ce070be11351c65f7696101c +metag-fixes 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +powerpc-merge d220980b701d838560a70de691b53be007e99e78 +sparc dc76f9ca71ea597dbb0e9c77d1072ddca651f4f3 +net e2e5c4c07caf810d7849658dca42f598b3938e21 +ipsec 302a50bc941010d7a67f288fd0db31981e4d722d +sound-current b054087dbacee30a9dddaef2c9a96312146be04e +pci-current a9238741987386bb549d61572973c7e62b2a4145 +wireless d2779e99468fd83ef1493c34f3803fec9aad8345 +driver-core.current 816434ec4a674fcdb3c2221a6dffdc8f34020550 +tty.current c095ba7224d8edc71dcef0d655911399a8bd4a3f +usb.current d3474049ab6cfcf14274f5ab9f20c8f50b083eab +staging.current d8dfad3876e4386666b759da3c833d62fb8b2267 +char-misc.current b36f4be3de1b123d8601de062e7dbfc904f305fb +input-current fa46c7984092f3dbdbb3bcd7338d81a1168d9d2b +md-current f94c0b6658c7edea8bc19d13be321e3860a3fa54 +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current e70308ec0e4bff344fcfdf160de40e1150552c5f +ide 64110c16e012547d5c9ab71f8afd3bab025f1103 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +devicetree-current cf9e2368655d86cd800e4d9fe65a407b39d29373 +rr-fixes 6c2580c501c660fdfb506061e016d84570fceba1 +mfd-fixes 5649d8f9e335f2b093751fcc2bdd5953f79f66ef +vfio-fixes d24cdbfd28b7e0ffecb1e281d73e73c03a57f734 +drm-intel-fixes 6e4664525b1db28f8c4e1130957f70a94c19213e +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc d8dfad3876e4386666b759da3c833d62fb8b2267 +arm c0a27da1c489f5478096c2fd90f5d227608993e1 +arm-perf ad81f0545ef01ea651886dddac4bef6cec930092 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +arm64 d50240a5f6ceaf690a77b0fccb17be51cfa151c2 +blackfin eb043d36ace4b4720020fdef9e94854c549adda7 +c6x f934af05cb1bf20558542185299394a69060b829 +cris 32ade6a282a36aae1803b190bae452f1e46f6b6c +h8300-remove b307c3298f5e60d96c4907d093e6c28f1274970b +hexagon de44443a45e36b7467af2518d3bf7ec6ec909549 +ia64 174a9a01de7581f83161afd32b294813a821d917 +m68k 55490050df0f5d82ce070be11351c65f7696101c +m68knommu c065edde73508c6da4afaf064e5999eb3e5aead1 +metag b6ef9161e43ad58c3824bd76dc87716276f0cd70 +microblaze 54ea21f0785fd01fb3279d42fe6670cef64cf648 +mips 356948f042c59d94dc6700455263b7739f09e6b0 +openrisc 6af609515d788bd4c94116344f00601b058f75a6 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 9f0f4fb0de4be2adde060167b0effa54264f184f +powerpc 83c93e2bdfe33694032cc6d74e956755dd62e551 +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx f2110cb961200e5c382e9d0878ded015109b5dd6 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 82003c3e606905ca20c78a0ceca9f412e6f71474 +sh 37284bd93103ae36b5ea274a985d688fb16f7a38 +sparc-next f8ce1faf55955de62e0a12e330c6d9a526071f65 +tile b40f451d56de69477a2244a0b4082f644699673f +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +aio-direct b080082bc3e8de4fb9bad923dab2de7ea20dc21b +btrfs d7396f07358a7c6e22c238d36d1d85f9d652a414 +ceph ea1eb16d47785ecd6093b1ac12eda9d9a5287c26 +cifs de09ae6e17c50e80602accd3b4e5e4320177b7c3 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 07bc9dc1b01bad7084fed3d2659e5d83317869bc +ext3 97a2847d064e2fdd2e3cd4ff14cad2f377f0677a +ext4 ad4eec613536dc7e5ea0c6e59849e6edca634d8b +f2fs a26b7c8a0149ce1e3b6a10f2801aada6e447e4e7 +fscache 7258cdde6592ce130a361476a7a137df50fdc94b +fuse 05726acabef10faffcbc400c109ddb6c9d7560e4 +gfs2 0c9018097fe2966d80fe39e5c9ca94bb436ec369 +jfs 44512449c0ab368889dd13ae0031fba74ee7e1d2 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 2a0af4a5e97a80c32f33b2caecfcb5093092b0d1 +nfsd 11d2a1618e377236facdd404113992bde1083914 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 28d7b5684ba98e163ba37779fd09de01fac5261d +v9fs 50192abe02929586111fb33f216060a9341875f1 +ubifs c23e9b75ccd0edba81a506c7d97e0af626489256 +xfs 1d03c6fa88af35e55047a1f2ab116f0fdf2f55aa +vfs 02afc27faec94c9e068517a22acf55400976c698 +pci a9238741987386bb549d61572973c7e62b2a4145 +hid 2f395799c753a0910c7176a431660e0bb2e93c0c +i2c b720423a2627f045133bec39a31fe2bc0dab86f3 +jdelvare-hwmon 83842164c27b747a56204213960355dd552987d3 +hwmon-staging f060c658b820141f18abd7b71586d628464a03ea +v4l-dvb d6cd75eefe6c38fe902319bd4a6f5e8cfcf9d066 +kbuild b020bae0467b490797d61e6a658fb7df4568c074 +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata 062728a4ee6d351c784c7808295b4d84ef5840d1 +pstore bd08ec33b5c23833581e5a36b2a69ccae6b39a28 +pm cee905f6d4cedbc28b9d31604497d9ce5de7b4c1 +idle 5c99726b5faaf1ba4ca80c39d319f419c227f803 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal f61d5b4d52e077756ce9dbc47ce737da898ad01d +ieee1394 db9ae8fec7b19f0ac6c60d998cac968d801a998d +ubi 8930fa500f55215f0211db9b78255e727ac3f282 +dlm c6ca7bc91d51582ff9e8ab29f675dbc3c40f5742 +swiotlb af51a9f1848ff50079a10def56a2c064f326af22 +slave-dma 71af44220f31655bb0b7f275e9c77bcb305f94a4 +dmaengine e6a5fa63407bfc5b7b13e850a0a67e4db8c00ce7 +net-next 0d40f75bdab241868c0eb6f97aef9f8b3a66f7b3 +ipsec-next aba8269588301f7778bea811d6f7ec74c2e37279 +wireless-next f21278108204ab244cd534a0d45c174ecc559267 +bluetooth 5a30d1f60cd1f1d895fade5184316cbce5e30bd0 +infiniband 82af24ac6fc3f4910218419a0ca4f05d42b45c67 +mtd 6c3b88970175e18a67eb8e55c4eba10614d0d5dc +l2-mtd f3b391425d21e6138e57b2432d91134e0bc2b975 +crypto ff6f83fc9d44db09997937c3475d525a6866fbb4 +drm 86a7e1224a68511d3a1ae0b7e11581b9d37723ae +drm-intel f327a13466ae6f06841cec08897cd10fed636f14 +drm-tegra 03da0e7ba9e3a1fc700f60913ff6bcb19f7eac2a +sound b054087dbacee30a9dddaef2c9a96312146be04e +sound-asoc 84c89a9b5c8ab4fbf6b36f804b400eef08b740b1 +modules 942e443127e928a5631c3d5102aca8c8b3c2dd98 +virtio aa96a3c686b001a651c86dcb5b0b73d1a9b1d1ca +input 52764fed5049655926bcecaefd52f0a415ceb105 +input-mt ad81f0545ef01ea651886dddac4bef6cec930092 +cgroup 66c144c94cc3279b7bdb774ee6629e59beeff93f +block 3fe9649223d270a8eb2f649fa119b1995fe6b53d +device-mapper 3e690e1e2984335a2baf5d2b061f0f77ab05ea8f +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 490104ac597b8b4c858a6a6889a60d8897181baf +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 9de1bc875261411bf0a900e90cfe0c7a31c4917b +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md bfc90cb0936f5b972706625f38f72c7cb726c20a +mfd 9c31e8840836de447e1e508a6d756af419790ed6 +mfd-lj 02a0bf6e351de6bcda4ddeeb2af34197a4e6d591 +mfd-lj 02a0bf6e351de6bcda4ddeeb2af34197a4e6d591 +battery db15e6312efd537e2deb2cbad110c23f98704a3c +fbdev 5e8be022fb5b8badb033940cb807dff0112042b6 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 6f001cc8f932c54c6152864f940afab41ac7be85 +regulator 0f42823236b5faa49ca0dbc67b235ddff5737d54 +security 73203361468894c3c017bfbdd9ddcbb468039604 +selinux 0b4bdb3573a86a88c829b9e4ad702859eb923e7e +lblnet 07bc9dc1b01bad7084fed3d2659e5d83317869bc +watchdog f9a67f3d4b2695b49b24b55ac888054db56b5c61 +dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351 +iommu f098cc4c5c34c18fbd6d1d901783ba516ed84e4f +vfio dac09b57c0ff57e55dd6fa5109076c8af0468a75 +osd 861d66601acda6d7a2038fb3c95f68009128003a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial f8ea61e63442c25cbe6ddee48979b444f1f2a01c +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree 109b6236294b53d8eaa50be7d9e9ad37079f5f7e +dt-rh 8851b9f1625ce0858e9b1bb0ae4a57d4b43178b1 +spi 75c501eb1c1c4a7ea6df0a0f9553f42b6385a9a0 +tip 6eeb5410855b373f3b1f129634ef319f79046da8 +edac de4772c621487fd4cadb4138f2481297c8e0cb0d +edac-amd 75a9551f2b3792686df25501f248d1de92d5da0f +ftrace fc30f13b7c1b87b44ee364462c3408c913f01439 +rcu 25f27ce4a6a4995c8bdd69b4b2180465ed5ad2b8 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 6b9e4fa07443f5baf5bbd7ab043abd6976f8d7bc +kvm-arm 8bd4ffd6b3a98f00267051dc095076ea2ff06ea8 +kvm-ppc bf550fc93d9855872a95e69e4002256110d89858 +oprofile f722406faae2d073cc1d01063d1123c35425939e +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip 32d70ed4c34b5d8f3b331401ed40b9df854b1f28 +percpu abec1a806e0c3cf168999667d5fb6218398ef12a +workqueues 1fb9107081438957bf699f1c4c6c6e7a72660e79 +drivers-x86 5c07eae979dfb596141c6885e5f5ecf1cd22cad3 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 365c9ee0731de96046cc7749b46a5e7a0b0ceb65 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 61abeba5222895d6900b13115f5d8eba7988d7d6 +driver-core 816434ec4a674fcdb3c2221a6dffdc8f34020550 +tty 2d1d3f3ae985ec5676fb56ff2c7acad2e1c4e6eb +usb b9a1048137f4ae43ee90f61a3f34f0efe863cfeb +usb-gadget 0f2aa8caeaa043f6cbe6281eb72efba5ff860904 +staging 91121c103ae93ef117e58712786864270d7f488e +char-misc 3cc1f95283a125cf54ccf1e25065321d4385133b +scsi 1f962ebcdfa15cede59e9edb299d1330949eec92 +target-updates 62b62d6558d5509beb6091b1b7419a7978f0d5a6 +target-merge d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +bcon e284f3493206d4268267db4557c7ee6f89ed2314 +tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 +writeback 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl c9e3b2d8f75d84c7b333761471f6cef98ec4429a +vhost 8c325eed6438d5262e6e74df32eb40b1e657a967 +remoteproc b9777859ec015a78dae1476e317d04f851bfdd0d +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio be1a4b13089b1e18da83a549d49163ccad3c19ba +arm-soc ca5914710fb7bcb954f310eb14f92d472857fdfe +bcm2835 7d132055814ef17a6c7b69f342244c410a5e000f +cortex 3ad87ac5ac98d951bc51d1c815c533b65e072f45 +ep93xx 6868a891d0b45e283b0a20ef7f7f940ec656472c +imx-mxs 9445012f82f7a73049655388cdbbdbfad04d9295 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm 8fb0bf121867e2f3087368c9eef028e5d6305422 +mvebu e3cd46e2ec1f5161310ccf668c0a21b6d2ca89b4 +renesas 63c99722768222f32293ac8c969c4cfdf6964547 +samsung 84b6f2eb22fca448419712a7fad9fa8f8754e472 +tegra d8dfad3876e4386666b759da3c833d62fb8b2267 +dma-mapping 10bcdfb8ba24760f715f0a700c3812747eddddf5 +pwm 1e185c7aafbb56580feaa5bdbc9e4b1d8efaf710 +dma-buf 6e4664525b1db28f8c4e1130957f70a94c19213e +userns c7b96acf1456ef127fef461fcfedb54b81fecfbb +ktest df5f7c66013c46cec9aa8156af257bc5eb29b5c5 +signal 20b4fb485227404329e41ad15588afad3df23050 +clk b05c683637fd538686030ec46c6717439d5571ab +random b980955236922ae6106774511c5c05003d3ad225 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages af07484863e0c20796081e57093886c22dc16705 +ptr-ret ad151d544475df40ee0d18be7d5c945e29c1b545 +aio 77d30b14d24e557f89c41980011d72428514d729 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm-current ea8adcaa2d6a9d8b3f9c19975f4328e1e7b81840 +akpm 9ef0ec18906606064c29170f3959cc702d8fa9c8 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..ee2d381fb94f --- /dev/null +++ b/Next/Trees @@ -0,0 +1,226 @@ +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 +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.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/helgaas/pci.git#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 +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 +sh-current git git://github.com/pmundt/linux-sh.git#sh-fixes-for-linus +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +drm-intel-fixes git git://people.freedesktop.org/~danvet/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.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 +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git#upstream +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.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 +h8300-remove git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#h8300-remove +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#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 +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.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 +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +mpc5xxx git git://git.denx.de/linux-2.6-agust.git#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 +sh git git://github.com/pmundt/linux-sh.git#sh-latest +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 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +aio-direct git git://github.com/kleikamp/linux-shaggy.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +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 +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +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 +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +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/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/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 +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://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pstore git git://git.infradead.org/users/cbou/linux-pstore.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +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 +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +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 +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-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/bluetooth/bluetooth-next.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +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 +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-intel git git://people.freedesktop.org/~danvet/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/for-next +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 +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next +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 +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.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-next.git#master +mfd-lj git git://git.linaro.org/people/ljones/mfd.git#for-mfd-next +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/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-next.git#master +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 +vfio git git://github.com/awilliam/linux-vfio.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 +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://sources.calxeda.com/kernel/linux.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +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 +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://github.com/columbia/linux-kvm-arm.git#kvm-arm-next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.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 +drivers-x86 git git://cavan.codon.org.uk/platform-drivers-x86.git#linux-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 +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.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 +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#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 +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +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 +bcon git git://git.kernel.org/pub/scm/linux/kernel/git/joern/bcon2.git#master +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 +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 +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next +cortex git git://git.pengutronix.de/git/ukl/linux-2.6.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.linaro.org/people/shawnguo/linux-2.6.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung 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/swarren/linux-tegra.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://gitorious.org/linux-pwm/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update +arm64-hugepages git git://git.linaro.org/people/stevecapper/linux.git#for-next/hugepages +ptr-ret git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#PTR_RET +aio git git://git.kvack.org/~bcrl/aio-next.git#master +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..6e4525657ccb --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8794 @@ +$ date +Friday 6 September 09:22:07 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 816434e Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip +Merging origin/master (fc8cc67 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge origin/master +Updating 816434e..fc8cc67 +Fast-forward + CREDITS | 1 + + Documentation/DocBook/80211.tmpl | 1 + + Documentation/DocBook/drm.tmpl | 138 +- + Documentation/DocBook/media/v4l/controls.xml | 168 +- + .../DocBook/media/v4l/lirc_device_interface.xml | 4 +- + Documentation/DocBook/media/v4l/pixfmt-nv16m.xml | 171 + + Documentation/DocBook/media/v4l/pixfmt.xml | 7 +- + Documentation/DocBook/media/v4l/subdev-formats.xml | 611 +-- + .../DocBook/media/v4l/vidioc-create-bufs.xml | 41 +- + .../DocBook/media/v4l/vidioc-g-dv-timings.xml | 6 +- + .../DocBook/media/v4l/vidioc-g-jpegcomp.xml | 4 +- + Documentation/DocBook/media_api.tmpl | 6 + + Documentation/acpi/enumeration.txt | 16 +- + Documentation/devicetree/bindings/gpio/gpio.txt | 55 +- + .../devicetree/bindings/gpu/samsung-rotator.txt | 27 + + Documentation/devicetree/bindings/i2c/i2c-imx.txt | 5 +- + .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 10 + + .../devicetree/bindings/media/i2c/adv7343.txt | 48 + + .../devicetree/bindings/media/i2c/ths8200.txt | 19 + + .../devicetree/bindings/media/i2c/tvp7002.txt | 53 + + .../devicetree/bindings/media/s5p-mfc.txt | 1 + + .../devicetree/bindings/media/video-interfaces.txt | 2 + + .../devicetree/bindings/misc/atmel-ssc.txt | 23 +- + .../devicetree/bindings/net/micrel-ksz9021.txt | 49 + + .../devicetree/bindings/net/moxa,moxart-mac.txt | 21 + + Documentation/devicetree/bindings/net/stmmac.txt | 5 + + .../bindings/pinctrl/pinctrl-bindings.txt | 41 +- + .../devicetree/bindings/pinctrl/pinctrl-palmas.txt | 96 + + .../bindings/pinctrl/samsung-pinctrl.txt | 3 +- + .../devicetree/bindings/serial/mrvl,pxa-ssp.txt | 65 + + Documentation/devicetree/bindings/sound/ak4554.c | 11 + + .../devicetree/bindings/sound/alc5632.txt | 19 + + .../bindings/sound/atmel-sam9x5-wm8731-audio.txt | 35 + + .../devicetree/bindings/sound/atmel-wm8904.txt | 55 + + .../devicetree/bindings/sound/fsl,spdif.txt | 54 + + .../{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} | 12 + + .../devicetree/bindings/sound/imx-audio-spdif.txt | 34 + + .../devicetree/bindings/sound/imx-audmux.txt | 9 + + .../devicetree/bindings/sound/mrvl,pxa-ssp.txt | 28 + + .../devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt | 15 + + .../devicetree/bindings/sound/mvebu-audio.txt | 29 + + .../bindings/sound/nvidia,tegra-audio-alc5632.txt | 24 +- + .../bindings/sound/nvidia,tegra-audio-rt5640.txt | 26 +- + .../bindings/sound/nvidia,tegra-audio-wm8753.txt | 27 +- + .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 24 +- + .../devicetree/bindings/sound/pcm1792a.txt | 18 + + Documentation/devicetree/bindings/sound/rt5640.txt | 20 + + .../devicetree/bindings/sound/samsung-i2s.txt | 22 +- + .../devicetree/bindings/sound/soc-ac97link.txt | 28 + + .../devicetree/bindings/sound/ti,pcm1681.txt | 15 + + .../devicetree/bindings/sound/tlv320aic3x.txt | 9 +- + Documentation/devicetree/bindings/sound/wm8731.txt | 9 + + Documentation/devicetree/bindings/sound/wm8753.txt | 24 +- + Documentation/devicetree/bindings/sound/wm8903.txt | 19 + + Documentation/devicetree/bindings/sound/wm8994.txt | 4 + + .../bindings/video/simple-framebuffer.txt | 1 + + Documentation/filesystems/ext4.txt | 7 +- + Documentation/i2c/busses/i2c-piix4 | 7 +- + Documentation/i2c/instantiating-devices | 2 +- + Documentation/networking/00-INDEX | 2 + + Documentation/networking/e100.txt | 4 +- + Documentation/networking/e1000.txt | 12 +- + Documentation/networking/e1000e.txt | 16 +- + Documentation/networking/igb.txt | 67 +- + Documentation/networking/igbvf.txt | 8 +- + Documentation/networking/ip-sysctl.txt | 55 + + Documentation/networking/ixgb.txt | 14 +- + Documentation/networking/ixgbe.txt | 109 +- + Documentation/networking/ixgbevf.txt | 6 +- + Documentation/networking/netdev-FAQ.txt | 224 + + Documentation/networking/openvswitch.txt | 40 + + Documentation/networking/packet_mmap.txt | 8 + + Documentation/networking/sctp.txt | 5 +- + Documentation/networking/stmmac.txt | 3 + + Documentation/networking/tproxy.txt | 5 +- + Documentation/pinctrl.txt | 101 +- + Documentation/printk-formats.txt | 9 + + Documentation/sound/alsa/HD-Audio-Models.txt | 1 + + Documentation/sound/alsa/HD-Audio.txt | 2 + + Documentation/sysctl/net.txt | 13 + + Documentation/tpm/xen-tpmfront.txt | 113 + + Documentation/video4linux/v4l2-controls.txt | 21 +- + Documentation/virtual/kvm/cpuid.txt | 4 + + Documentation/virtual/kvm/hypercalls.txt | 14 + + MAINTAINERS | 77 +- + arch/alpha/oprofile/common.c | 22 +- + arch/arm/boot/dts/atlas6.dtsi | 6 + + arch/arm/boot/dts/exynos5250.dtsi | 9 +- + arch/arm/boot/dts/sama5d3xmb.dtsi | 8 + + arch/arm/configs/bockw_defconfig | 7 + + arch/arm/configs/keystone_defconfig | 1 + + arch/arm/configs/marzen_defconfig | 7 + + arch/arm/configs/omap2plus_defconfig | 13 +- + arch/arm/configs/tegra_defconfig | 1 + + arch/arm/include/asm/dma-contiguous.h | 2 +- + arch/arm/include/asm/kvm_mmu.h | 2 +- + arch/arm/kvm/arm.c | 4 + + arch/arm/kvm/interrupts.S | 8 +- + arch/arm/kvm/reset.c | 2 +- + arch/arm/kvm/trace.h | 7 +- + arch/arm/mach-davinci/board-da850-evm.c | 6 +- + arch/arm/mach-dove/common.c | 4 +- + arch/arm/mach-kirkwood/common.c | 24 +- + arch/arm/mach-omap2/board-2430sdp.c | 57 +- + arch/arm/mach-omap2/board-3430sdp.c | 83 +- + arch/arm/mach-omap2/board-am3517evm.c | 113 +- + arch/arm/mach-omap2/board-cm-t35.c | 100 +- + arch/arm/mach-omap2/board-devkit8000.c | 96 +- + arch/arm/mach-omap2/board-h4.c | 48 +- + arch/arm/mach-omap2/board-igep0020.c | 36 +- + arch/arm/mach-omap2/board-ldp.c | 68 +- + arch/arm/mach-omap2/board-omap3beagle.c | 56 +- + arch/arm/mach-omap2/board-omap3evm.c | 87 +- + arch/arm/mach-omap2/board-omap3pandora.c | 48 +- + arch/arm/mach-omap2/board-omap3stalker.c | 61 +- + arch/arm/mach-omap2/board-overo.c | 160 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 12 + + arch/arm/mach-omap2/board-rx51-video.c | 35 +- + arch/arm/mach-omap2/board-zoom-display.c | 30 +- + arch/arm/mach-omap2/display.c | 4 +- + arch/arm/mach-omap2/dss-common.c | 244 +- + arch/arm/mach-omap2/dss-common.h | 2 - + arch/arm/mach-omap2/i2c.c | 2 +- + arch/arm/mach-pxa/icontrol.c | 3 - + arch/arm/mach-pxa/zeus.c | 46 +- + arch/arm/mach-shmobile/board-armadillo800eva.c | 1 - + arch/arm/mach-shmobile/board-bockw.c | 42 +- + arch/arm/mach-shmobile/board-marzen.c | 44 +- + arch/arm/mach-shmobile/clock-r8a7778.c | 5 + + arch/arm/mach-shmobile/clock-r8a7779.c | 10 + + arch/arm/mach-shmobile/include/mach/r8a7778.h | 3 + + arch/arm/mach-shmobile/include/mach/r8a7779.h | 3 + + arch/arm/mach-shmobile/setup-r8a7778.c | 34 + + arch/arm/mach-shmobile/setup-r8a7779.c | 37 + + arch/arm/mm/dma-mapping.c | 6 +- + arch/arm/plat-pxa/ssp.c | 171 +- + arch/arm/plat-samsung/s3c-dma-ops.c | 13 +- + arch/avr32/oprofile/op_model_avr32.c | 17 +- + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/spinlock.h | 5 + + arch/ia64/kvm/kvm-ia64.c | 4 + + arch/m68k/amiga/platform.c | 2 +- + arch/m68k/kernel/time.c | 2 +- + arch/m68k/q40/config.c | 2 +- + arch/mips/kvm/kvm_locore.S | 969 ++-- + arch/mips/kvm/kvm_mips.c | 4 + + arch/mips/oprofile/common.c | 20 +- + arch/powerpc/include/asm/kvm_book3s.h | 38 + + arch/powerpc/include/asm/kvm_book3s_64.h | 4 +- + arch/powerpc/include/asm/kvm_host.h | 14 +- + arch/powerpc/include/asm/kvm_ppc.h | 25 +- + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/iommu.c | 2 +- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/kvm/Makefile | 1 + + arch/powerpc/kvm/book3s_64_mmu.c | 150 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 42 +- + arch/powerpc/kvm/book3s_64_vio.c | 2 +- + arch/powerpc/kvm/book3s_emulate.c | 2 + + arch/powerpc/kvm/book3s_hv.c | 36 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 246 +- + arch/powerpc/kvm/book3s_hv_cma.c | 240 + + arch/powerpc/kvm/book3s_hv_cma.h | 27 + + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 139 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +- + arch/powerpc/kvm/book3s_interrupts.S | 14 + + arch/powerpc/kvm/book3s_pr.c | 35 +- + arch/powerpc/kvm/book3s_xics.c | 1 + + arch/powerpc/kvm/booke.c | 6 +- + arch/powerpc/kvm/powerpc.c | 26 +- + arch/powerpc/oprofile/common.c | 28 +- + arch/powerpc/platforms/44x/warp.c | 1 - + arch/powerpc/platforms/ps3/time.c | 2 +- + arch/powerpc/sysdev/rtc_cmos_setup.c | 2 +- + arch/s390/hypfs/hypfs.h | 13 +- + arch/s390/hypfs/hypfs_dbfs.c | 2 +- + arch/s390/hypfs/hypfs_diag.c | 50 +- + arch/s390/hypfs/hypfs_vm.c | 65 +- + arch/s390/hypfs/inode.c | 36 +- + arch/s390/include/asm/kvm_host.h | 8 + + arch/s390/include/asm/mmu.h | 2 - + arch/s390/include/asm/mmu_context.h | 19 +- + arch/s390/include/asm/pgtable.h | 11 + + arch/s390/include/asm/processor.h | 2 + + arch/s390/kvm/diag.c | 17 +- + arch/s390/kvm/gaccess.h | 12 +- + arch/s390/kvm/kvm-s390.c | 27 +- + arch/s390/kvm/kvm-s390.h | 10 + + arch/s390/kvm/priv.c | 32 +- + arch/s390/mm/pgtable.c | 183 +- + arch/s390/oprofile/init.c | 35 +- + arch/sh/boards/board-espt.c | 1 - + arch/sh/boards/board-sh7757lcr.c | 4 - + arch/sh/boards/mach-ecovec24/setup.c | 1 - + arch/sh/boards/mach-se/7724/setup.c | 3 +- + arch/sh/boards/mach-sh7763rdp/setup.c | 1 - + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 11 +- + arch/sparc/include/asm/switch_to_64.h | 4 +- + arch/sparc/kernel/cpumap.c | 1 + + arch/sparc/kernel/entry.S | 2 +- + arch/sparc/kernel/kgdb_64.c | 4 +- + arch/sparc/kernel/ktlb.S | 3 +- + arch/sparc/kernel/ptrace_64.c | 4 +- + arch/sparc/kernel/setup_64.c | 12 +- + arch/sparc/kernel/syscalls.S | 12 +- + arch/sparc/kernel/trampoline_64.S | 2 - + arch/sparc/lib/ksyms.c | 9 - + arch/tile/gxio/iorpc_mpipe.c | 66 + + arch/tile/gxio/iorpc_mpipe_info.c | 18 + + arch/tile/gxio/mpipe.c | 43 +- + arch/tile/include/gxio/iorpc_mpipe.h | 14 +- + arch/tile/include/gxio/iorpc_mpipe_info.h | 4 + + arch/tile/include/gxio/mpipe.h | 143 +- + arch/tile/include/hv/drv_mpipe_intf.h | 3 + + arch/x86/include/asm/kvm_host.h | 14 +- + arch/x86/include/asm/pvclock.h | 1 - + arch/x86/include/asm/vmx.h | 2 + + arch/x86/include/asm/xen/events.h | 1 + + arch/x86/include/uapi/asm/vmx.h | 6 +- + arch/x86/kernel/paravirt.c | 5 - + arch/x86/kernel/pvclock.c | 44 - + arch/x86/kvm/cpuid.c | 3 +- + arch/x86/kvm/lapic.c | 38 +- + arch/x86/kvm/mmu.c | 181 +- + arch/x86/kvm/mmu.h | 2 + + arch/x86/kvm/paging_tmpl.h | 178 +- + arch/x86/kvm/pmu.c | 25 +- + arch/x86/kvm/vmx.c | 441 +- + arch/x86/kvm/x86.c | 224 +- + arch/x86/oprofile/nmi_int.c | 18 +- + arch/x86/oprofile/op_model_amd.c | 24 +- + arch/x86/vdso/vclock_gettime.c | 16 +- + arch/x86/xen/enlighten.c | 15 +- + arch/x86/xen/irq.c | 25 +- + arch/x86/xen/p2m.c | 22 +- + arch/x86/xen/setup.c | 29 +- + arch/x86/xen/smp.c | 6 + + drivers/acpi/Kconfig | 6 - + drivers/acpi/Makefile | 1 - + drivers/acpi/acpi_i2c.c | 103 - + drivers/acpi/acpi_pad.c | 13 +- + drivers/atm/he.c | 11 +- + drivers/atm/nicstar.c | 26 +- + drivers/base/Kconfig | 20 +- + drivers/base/Makefile | 2 +- + drivers/base/dma-buf.c | 2 +- + drivers/bcma/Kconfig | 10 +- + drivers/bcma/driver_pci.c | 65 +- + drivers/bcma/driver_pci_host.c | 6 + + drivers/bcma/main.c | 2 +- + drivers/bcma/scan.c | 28 +- + drivers/bluetooth/btmrvl_debugfs.c | 6 +- + drivers/bluetooth/btmrvl_sdio.c | 4 +- + drivers/char/ipmi/ipmi_devintf.c | 1 + + drivers/char/ipmi/ipmi_msghandler.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 77 + + drivers/char/tile-srom.c | 2 +- + drivers/char/tpm/Kconfig | 12 + + drivers/char/tpm/Makefile | 1 + + drivers/char/tpm/xen-tpmfront.c | 473 ++ + drivers/dma/coh901318.c | 26 +- + drivers/gpu/drm/Kconfig | 15 +- + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/ast/ast_drv.c | 5 +- + drivers/gpu/drm/ast/ast_drv.h | 3 - + drivers/gpu/drm/ast/ast_main.c | 9 +- + drivers/gpu/drm/ast/ast_ttm.c | 5 +- + drivers/gpu/drm/cirrus/cirrus_drv.c | 5 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 3 - + drivers/gpu/drm/cirrus/cirrus_main.c | 9 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 5 +- + drivers/gpu/drm/drm_agpsupport.c | 51 + + drivers/gpu/drm/drm_bufs.c | 236 +- + drivers/gpu/drm/drm_context.c | 81 +- + drivers/gpu/drm/drm_crtc.c | 173 +- + drivers/gpu/drm/drm_crtc_helper.c | 89 +- + drivers/gpu/drm/drm_dma.c | 17 +- + drivers/gpu/drm/drm_drv.c | 106 +- + drivers/gpu/drm/drm_edid.c | 306 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 5 +- + drivers/gpu/drm/drm_flip_work.c | 124 + + drivers/gpu/drm/drm_fops.c | 98 +- + drivers/gpu/drm/drm_gem.c | 440 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 28 +- + drivers/gpu/drm/drm_info.c | 6 +- + drivers/gpu/drm/drm_ioctl.c | 62 +- + drivers/gpu/drm/drm_memory.c | 2 - + drivers/gpu/drm/drm_mm.c | 229 +- + drivers/gpu/drm/drm_modes.c | 58 - + drivers/gpu/drm/drm_pci.c | 35 +- + drivers/gpu/drm/drm_platform.c | 16 +- + drivers/gpu/drm/drm_prime.c | 190 +- + drivers/gpu/drm/drm_proc.c | 209 - + drivers/gpu/drm/drm_scatter.c | 29 +- + drivers/gpu/drm/drm_stub.c | 73 +- + drivers/gpu/drm/drm_usb.c | 9 + + drivers/gpu/drm/drm_vm.c | 3 +- + drivers/gpu/drm/drm_vma_manager.c | 436 ++ + drivers/gpu/drm/exynos/Kconfig | 6 +- + drivers/gpu/drm/exynos/exynos_ddc.c | 13 +- + drivers/gpu/drm/exynos/exynos_drm_buf.c | 9 +- + drivers/gpu/drm/exynos/exynos_drm_connector.c | 38 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 37 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_encoder.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 20 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 263 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 60 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 53 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 9 - + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_iommu.c | 9 + + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 22 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 117 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 + + drivers/gpu/drm/exynos/exynos_hdmi.c | 87 +- + drivers/gpu/drm/exynos/exynos_hdmiphy.c | 12 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 9 +- + drivers/gpu/drm/gma500/Makefile | 1 + + drivers/gpu/drm/gma500/cdv_device.c | 3 + + drivers/gpu/drm/gma500/cdv_device.h | 12 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 57 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 920 +--- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 154 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 89 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 71 +- + drivers/gpu/drm/gma500/framebuffer.c | 31 +- + drivers/gpu/drm/gma500/framebuffer.h | 2 +- + drivers/gpu/drm/gma500/gem.c | 39 +- + drivers/gpu/drm/gma500/gma_display.c | 776 +++ + drivers/gpu/drm/gma500/gma_display.h | 103 + + drivers/gpu/drm/gma500/gtt.c | 38 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 15 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.h | 16 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 65 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 63 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 43 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 48 +- + drivers/gpu/drm/gma500/psb_device.c | 3 +- + .../gma500/{psb_intel_display.h => psb_device.h} | 13 +- + drivers/gpu/drm/gma500/psb_drv.c | 21 +- + drivers/gpu/drm/gma500/psb_drv.h | 7 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 944 +--- + drivers/gpu/drm/gma500/psb_intel_drv.h | 44 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 75 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 53 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 485 +- + drivers/gpu/drm/i810/i810_dma.c | 3 +- + drivers/gpu/drm/i810/i810_drv.c | 3 +- + drivers/gpu/drm/i810/i810_drv.h | 2 +- + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 986 ++-- + drivers/gpu/drm/i915/i915_dma.c | 141 +- + drivers/gpu/drm/i915/i915_drv.c | 322 +- + drivers/gpu/drm/i915/i915_drv.h | 602 ++- + drivers/gpu/drm/i915/i915_gem.c | 759 ++- + drivers/gpu/drm/i915/i915_gem_context.c | 34 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 73 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 41 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 93 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 191 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 313 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 208 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 19 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 1019 ++++ + drivers/gpu/drm/i915/i915_irq.c | 1595 ++---- + drivers/gpu/drm/i915/i915_reg.h | 150 +- + drivers/gpu/drm/i915/i915_sysfs.c | 71 + + drivers/gpu/drm/i915/i915_trace.h | 45 +- + drivers/gpu/drm/i915/intel_acpi.c | 14 +- + drivers/gpu/drm/i915/intel_crt.c | 38 +- + drivers/gpu/drm/i915/intel_ddi.c | 78 +- + drivers/gpu/drm/i915/intel_display.c | 1503 ++++-- + drivers/gpu/drm/i915/intel_dp.c | 518 +- + drivers/gpu/drm/i915/intel_drv.h | 148 +- + drivers/gpu/drm/i915/intel_dvo.c | 61 +- + drivers/gpu/drm/i915/intel_fb.c | 23 +- + drivers/gpu/drm/i915/intel_hdmi.c | 286 +- + drivers/gpu/drm/i915/intel_i2c.c | 2 + + drivers/gpu/drm/i915/intel_lvds.c | 40 +- + drivers/gpu/drm/i915/intel_overlay.c | 24 +- + drivers/gpu/drm/i915/intel_panel.c | 3 - + drivers/gpu/drm/i915/intel_pm.c | 1155 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.c | 79 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 16 +- + drivers/gpu/drm/i915/intel_sdvo.c | 94 +- + drivers/gpu/drm/i915/intel_sprite.c | 59 +- + drivers/gpu/drm/i915/intel_tv.c | 31 +- + drivers/gpu/drm/i915/intel_uncore.c | 595 +++ + drivers/gpu/drm/mga/mga_drv.c | 3 +- + drivers/gpu/drm/mga/mga_drv.h | 2 +- + drivers/gpu/drm/mga/mga_state.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 3 - + drivers/gpu/drm/mgag200/mgag200_main.c | 9 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 5 +- + drivers/gpu/drm/msm/Kconfig | 34 + + drivers/gpu/drm/msm/Makefile | 30 + + drivers/gpu/drm/msm/NOTES | 69 + + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 1438 +++++ + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 2193 ++++++++ + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 502 ++ + drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 30 + + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 432 ++ + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 370 ++ + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 141 + + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 254 + + drivers/gpu/drm/msm/dsi/dsi.xml.h | 502 ++ + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 114 + + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 48 + + drivers/gpu/drm/msm/hdmi/hdmi.c | 272 + + drivers/gpu/drm/msm/hdmi/hdmi.h | 131 + + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 508 ++ + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 167 + + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 367 ++ + drivers/gpu/drm/msm/hdmi/hdmi_i2c.c | 281 + + drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 141 + + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 214 + + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 50 + + drivers/gpu/drm/msm/mdp4/mdp4.xml.h | 1061 ++++ + drivers/gpu/drm/msm/mdp4/mdp4_crtc.c | 685 +++ + drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c | 305 ++ + drivers/gpu/drm/msm/mdp4/mdp4_format.c | 56 + + drivers/gpu/drm/msm/mdp4/mdp4_irq.c | 203 + + drivers/gpu/drm/msm/mdp4/mdp4_kms.c | 365 ++ + drivers/gpu/drm/msm/mdp4/mdp4_kms.h | 194 + + drivers/gpu/drm/msm/mdp4/mdp4_plane.c | 243 + + drivers/gpu/drm/msm/msm_drv.c | 776 +++ + drivers/gpu/drm/msm/msm_drv.h | 213 + + drivers/gpu/drm/msm/msm_fb.c | 202 + + drivers/gpu/drm/msm/msm_fbdev.c | 258 + + drivers/gpu/drm/msm/msm_gem.c | 597 +++ + drivers/gpu/drm/msm/msm_gem.h | 99 + + drivers/gpu/drm/msm/msm_gem_submit.c | 412 ++ + drivers/gpu/drm/msm/msm_gpu.c | 463 ++ + drivers/gpu/drm/msm/msm_gpu.h | 124 + + drivers/gpu/drm/msm/msm_ringbuffer.c | 61 + + drivers/gpu/drm/msm/msm_ringbuffer.h | 43 + + drivers/gpu/drm/nouveau/core/core/printk.c | 19 + + drivers/gpu/drm/nouveau/core/core/ramht.c | 3 +- + drivers/gpu/drm/nouveau/core/engine/bsp/nv98.c | 52 +- + drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 15 +- + drivers/gpu/drm/nouveau/core/engine/disp/dport.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 34 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c | 3 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c | 5 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c | 3 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 3 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv40.h | 3 + + drivers/gpu/drm/nouveau/core/engine/ppp/nv98.c | 52 +- + drivers/gpu/drm/nouveau/core/engine/vp/nv98.c | 47 +- + drivers/gpu/drm/nouveau/core/include/core/math.h | 16 - + drivers/gpu/drm/nouveau/core/include/core/printk.h | 13 + + drivers/gpu/drm/nouveau/core/include/subdev/i2c.h | 8 +- + drivers/gpu/drm/nouveau/core/include/subdev/mc.h | 1 + + .../gpu/drm/nouveau/core/include/subdev/timer.h | 2 + + drivers/gpu/drm/nouveau/core/os.h | 4 +- + drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/bios/therm.c | 3 +- + drivers/gpu/drm/nouveau/core/subdev/i2c/anx9805.c | 10 +- + drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | 2 + + drivers/gpu/drm/nouveau/core/subdev/i2c/nv04.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/i2c/nv4e.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c | 8 +- + drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c | 10 +- + drivers/gpu/drm/nouveau/core/subdev/mc/base.c | 28 + + drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c | 3 +- + drivers/gpu/drm/nouveau/core/subdev/therm/base.c | 19 +- + drivers/gpu/drm/nouveau/core/subdev/therm/fan.c | 20 + + drivers/gpu/drm/nouveau/core/subdev/therm/priv.h | 4 + + drivers/gpu/drm/nouveau/core/subdev/therm/temp.c | 21 + + drivers/gpu/drm/nouveau/core/subdev/timer/base.c | 7 + + drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c | 35 +- + drivers/gpu/drm/nouveau/core/subdev/vm/nv50.c | 1 + + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 49 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 42 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 27 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 29 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 7 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 284 +- + drivers/gpu/drm/nouveau/nouveau_drm.h | 9 + + drivers/gpu/drm/nouveau/nouveau_gem.c | 29 +- + drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_ioctl.h | 1 + + drivers/gpu/drm/nouveau/nouveau_vga.c | 14 +- + drivers/gpu/drm/nouveau/nv50_display.c | 4 +- + drivers/gpu/drm/omapdrm/Makefile | 3 - + drivers/gpu/drm/omapdrm/omap_crtc.c | 3 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 12 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 7 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 74 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 52 +- + drivers/gpu/drm/omapdrm/omap_gem_helpers.c | 169 - + drivers/gpu/drm/omapdrm/omap_plane.c | 51 +- + drivers/gpu/drm/qxl/qxl_drv.c | 3 +- + drivers/gpu/drm/qxl/qxl_drv.h | 8 +- + drivers/gpu/drm/qxl/qxl_dumb.c | 7 - + drivers/gpu/drm/qxl/qxl_gem.c | 26 - + drivers/gpu/drm/qxl/qxl_ioctl.c | 2 +- + drivers/gpu/drm/qxl/qxl_object.c | 1 - + drivers/gpu/drm/qxl/qxl_object.h | 2 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 4 +- + drivers/gpu/drm/r128/r128_cce.c | 2 +- + drivers/gpu/drm/r128/r128_drv.c | 3 +- + drivers/gpu/drm/r128/r128_drv.h | 2 +- + drivers/gpu/drm/r128/r128_state.c | 2 +- + drivers/gpu/drm/radeon/Makefile | 24 +- + drivers/gpu/drm/radeon/atombios.h | 615 +-- + drivers/gpu/drm/radeon/atombios_crtc.c | 6 + + drivers/gpu/drm/radeon/atombios_dp.c | 8 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 11 +- + drivers/gpu/drm/radeon/atombios_i2c.c | 16 +- + drivers/gpu/drm/radeon/btc_dpm.c | 6 + + drivers/gpu/drm/radeon/cayman_blit_shaders.c | 54 - + drivers/gpu/drm/radeon/ci_dpm.c | 5243 ++++++++++++++++++ + drivers/gpu/drm/radeon/ci_dpm.h | 332 ++ + drivers/gpu/drm/radeon/ci_smc.c | 262 + + drivers/gpu/drm/radeon/cik.c | 4395 ++++++++++------ + drivers/gpu/drm/radeon/cik_reg.h | 3 + + drivers/gpu/drm/radeon/cik_sdma.c | 785 +++ + drivers/gpu/drm/radeon/cikd.h | 594 ++- + drivers/gpu/drm/radeon/clearstate_cayman.h | 2 +- + drivers/gpu/drm/radeon/clearstate_ci.h | 944 ++++ + drivers/gpu/drm/radeon/clearstate_evergreen.h | 2 +- + drivers/gpu/drm/radeon/cypress_dpm.c | 3 +- + drivers/gpu/drm/radeon/dce6_afmt.c | 278 + + drivers/gpu/drm/radeon/evergreen.c | 536 +- + drivers/gpu/drm/radeon/evergreen_blit_kms.c | 729 --- + drivers/gpu/drm/radeon/evergreen_blit_shaders.c | 54 - + drivers/gpu/drm/radeon/evergreen_dma.c | 190 + + drivers/gpu/drm/radeon/evergreen_hdmi.c | 100 +- + drivers/gpu/drm/radeon/evergreend.h | 11 + + drivers/gpu/drm/radeon/kv_dpm.c | 2645 ++++++++++ + drivers/gpu/drm/radeon/kv_dpm.h | 199 + + drivers/gpu/drm/radeon/kv_smc.c | 207 + + drivers/gpu/drm/radeon/ni.c | 373 +- + drivers/gpu/drm/radeon/ni_dma.c | 338 ++ + drivers/gpu/drm/radeon/ni_dpm.c | 14 +- + drivers/gpu/drm/radeon/ppsmc.h | 57 + + drivers/gpu/drm/radeon/pptable.h | 682 +++ + drivers/gpu/drm/radeon/r100.c | 4 +- + drivers/gpu/drm/radeon/r600.c | 811 +-- + drivers/gpu/drm/radeon/r600_audio.c | 60 +- + drivers/gpu/drm/radeon/r600_blit.c | 31 + + drivers/gpu/drm/radeon/r600_blit_kms.c | 785 --- + drivers/gpu/drm/radeon/r600_blit_shaders.h | 1 - + drivers/gpu/drm/radeon/r600_cp.c | 6 +- + drivers/gpu/drm/radeon/r600_dma.c | 497 ++ + drivers/gpu/drm/radeon/r600_dpm.c | 300 +- + drivers/gpu/drm/radeon/r600_dpm.h | 6 + + drivers/gpu/drm/radeon/r600_hdmi.c | 113 +- + drivers/gpu/drm/radeon/r600d.h | 36 + + drivers/gpu/drm/radeon/radeon.h | 275 +- + drivers/gpu/drm/radeon/radeon_asic.c | 1262 ++--- + drivers/gpu/drm/radeon/radeon_asic.h | 119 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 186 +- + drivers/gpu/drm/radeon/radeon_blit_common.h | 44 - + drivers/gpu/drm/radeon/radeon_cp.c | 6 +- + drivers/gpu/drm/radeon/radeon_cs.c | 13 +- + drivers/gpu/drm/radeon/radeon_device.c | 24 +- + drivers/gpu/drm/radeon/radeon_display.c | 67 +- + drivers/gpu/drm/radeon/radeon_drv.c | 26 +- + drivers/gpu/drm/radeon/radeon_gem.c | 7 - + drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 +- + drivers/gpu/drm/radeon/radeon_kms.c | 50 +- + drivers/gpu/drm/radeon/radeon_mode.h | 3 +- + drivers/gpu/drm/radeon/radeon_object.c | 1 - + drivers/gpu/drm/radeon/radeon_object.h | 5 +- + drivers/gpu/drm/radeon/radeon_pm.c | 88 +- + drivers/gpu/drm/radeon/radeon_prime.c | 1 - + drivers/gpu/drm/radeon/radeon_ring.c | 13 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + drivers/gpu/drm/radeon/radeon_ucode.h | 17 + + drivers/gpu/drm/radeon/radeon_uvd.c | 58 +- + drivers/gpu/drm/radeon/rs400.c | 9 +- + drivers/gpu/drm/radeon/rv6xx_dpm.c | 5 +- + drivers/gpu/drm/radeon/rv770.c | 204 +- + drivers/gpu/drm/radeon/rv770_dma.c | 101 + + drivers/gpu/drm/radeon/rv770_dpm.c | 15 +- + drivers/gpu/drm/radeon/rv770d.h | 16 + + drivers/gpu/drm/radeon/si.c | 844 ++- + drivers/gpu/drm/radeon/si_dma.c | 235 + + drivers/gpu/drm/radeon/si_dpm.c | 80 +- + drivers/gpu/drm/radeon/sid.h | 71 + + drivers/gpu/drm/radeon/smu7.h | 170 + + drivers/gpu/drm/radeon/smu7_discrete.h | 486 ++ + drivers/gpu/drm/radeon/smu7_fusion.h | 300 ++ + drivers/gpu/drm/radeon/sumo_dpm.c | 22 +- + drivers/gpu/drm/radeon/sumo_dpm.h | 3 + + drivers/gpu/drm/radeon/trinity_dpm.c | 7 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 436 ++ + drivers/gpu/drm/radeon/uvd_v2_2.c | 165 + + drivers/gpu/drm/radeon/uvd_v3_1.c | 55 + + drivers/gpu/drm/radeon/uvd_v4_2.c | 68 + + drivers/gpu/drm/rcar-du/Kconfig | 7 + + drivers/gpu/drm/rcar-du/Makefile | 10 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 258 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 176 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 63 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 202 + + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 49 + + drivers/gpu/drm/rcar-du/rcar_du_group.c | 187 + + drivers/gpu/drm/rcar-du/rcar_du_group.h | 50 + + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 165 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.h | 29 +- + .../rcar-du/{rcar_du_lvds.c => rcar_du_lvdscon.c} | 101 +- + .../rcar-du/{rcar_du_lvds.h => rcar_du_lvdscon.h} | 17 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 196 + + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 46 + + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 170 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 26 +- + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 94 +- + .../rcar-du/{rcar_du_vga.c => rcar_du_vgacon.c} | 65 +- + .../rcar-du/{rcar_du_vga.h => rcar_du_vgacon.h} | 15 +- + drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 69 + + drivers/gpu/drm/savage/savage_bci.c | 2 +- + drivers/gpu/drm/savage/savage_drv.c | 3 +- + drivers/gpu/drm/savage/savage_drv.h | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 3 +- + drivers/gpu/drm/sis/sis_drv.c | 3 +- + drivers/gpu/drm/sis/sis_drv.h | 2 +- + drivers/gpu/drm/sis/sis_mm.c | 8 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 2 - + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 43 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_slave.c | 28 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 - + drivers/gpu/drm/ttm/ttm_bo.c | 102 +- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 41 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 3 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 231 +- + drivers/gpu/drm/udl/udl_drv.c | 3 +- + drivers/gpu/drm/udl/udl_drv.h | 2 - + drivers/gpu/drm/udl/udl_gem.c | 63 +- + drivers/gpu/drm/udl/udl_main.c | 4 +- + drivers/gpu/drm/via/via_dma.c | 2 +- + drivers/gpu/drm/via/via_drv.c | 3 +- + drivers/gpu/drm/via/via_drv.h | 2 +- + drivers/gpu/drm/via/via_mm.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- + drivers/gpu/host1x/dev.c | 2 +- + drivers/gpu/host1x/dev.h | 2 +- + drivers/gpu/host1x/drm/dc.c | 2 +- + drivers/gpu/host1x/drm/drm.c | 7 +- + drivers/gpu/host1x/drm/gem.c | 16 +- + drivers/gpu/host1x/drm/gem.h | 3 - + drivers/gpu/host1x/drm/hdmi.c | 27 +- + drivers/gpu/host1x/drm/output.c | 2 +- + drivers/gpu/host1x/drm/rgb.c | 14 +- + drivers/gpu/host1x/job.c | 15 +- + drivers/gpu/vga/vga_switcheroo.c | 147 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-at91.c | 3 - + drivers/i2c/busses/i2c-bfin-twi.c | 16 +- + drivers/i2c/busses/i2c-cbus-gpio.c | 5 +- + drivers/i2c/busses/i2c-cpm.c | 6 - + drivers/i2c/busses/i2c-davinci.c | 6 +- + drivers/i2c/busses/i2c-designware-core.c | 25 + + drivers/i2c/busses/i2c-designware-core.h | 12 + + drivers/i2c/busses/i2c-designware-platdrv.c | 46 +- + drivers/i2c/busses/i2c-gpio.c | 9 +- + drivers/i2c/busses/i2c-i801.c | 2 - + drivers/i2c/busses/i2c-ibm_iic.c | 4 - + drivers/i2c/busses/i2c-imx.c | 228 +- + drivers/i2c/busses/i2c-ismt.c | 1 + + drivers/i2c/busses/i2c-mpc.c | 44 +- + drivers/i2c/busses/i2c-mv64xxx.c | 207 +- + drivers/i2c/busses/i2c-mxs.c | 116 +- + drivers/i2c/busses/i2c-nomadik.c | 5 +- + drivers/i2c/busses/i2c-nuc900.c | 2 +- + drivers/i2c/busses/i2c-ocores.c | 12 +- + drivers/i2c/busses/i2c-octeon.c | 3 - + drivers/i2c/busses/i2c-omap.c | 27 +- + drivers/i2c/busses/i2c-pca-platform.c | 2 +- + drivers/i2c/busses/i2c-piix4.c | 41 +- + drivers/i2c/busses/i2c-pnx.c | 8 +- + drivers/i2c/busses/i2c-powermac.c | 14 +- + drivers/i2c/busses/i2c-puv3.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 70 +- + drivers/i2c/busses/i2c-rcar.c | 37 +- + drivers/i2c/busses/i2c-s3c2410.c | 4 +- + drivers/i2c/busses/i2c-s6000.c | 5 +- + drivers/i2c/busses/i2c-sh7760.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 4 +- + drivers/i2c/busses/i2c-sirf.c | 39 +- + drivers/i2c/busses/i2c-stu300.c | 7 +- + drivers/i2c/busses/i2c-tegra.c | 3 - + drivers/i2c/busses/i2c-tiny-usb.c | 49 +- + drivers/i2c/busses/i2c-versatile.c | 2 - + drivers/i2c/busses/i2c-wmt.c | 3 - + drivers/i2c/busses/i2c-xiic.c | 5 +- + drivers/i2c/i2c-core.c | 206 +- + drivers/i2c/i2c-mux.c | 3 - + drivers/i2c/i2c-smbus.c | 2 +- + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 3 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 9 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +- + drivers/i2c/muxes/i2c-mux-pinctrl.c | 3 +- + drivers/ide/gayle.c | 2 +- + drivers/ide/ide-ioctls.c | 4 +- + drivers/ide/ide-park.c | 6 +- + drivers/ide/ide_platform.c | 2 +- + drivers/ide/palm_bk3710.c | 4 +- + drivers/ide/sgiioc4.c | 2 +- + drivers/ide/tx4938ide.c | 4 +- + drivers/infiniband/core/cma.c | 46 +- + drivers/infiniband/core/uverbs.h | 4 + + drivers/infiniband/core/uverbs_cmd.c | 250 +- + drivers/infiniband/core/uverbs_main.c | 42 +- + drivers/infiniband/core/verbs.c | 30 + + drivers/infiniband/hw/amso1100/c2_ae.c | 18 +- + drivers/infiniband/hw/amso1100/c2_cm.c | 16 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 46 +- + drivers/infiniband/hw/cxgb4/Kconfig | 2 +- + drivers/infiniband/hw/cxgb4/cm.c | 860 ++- + drivers/infiniband/hw/cxgb4/cq.c | 329 +- + drivers/infiniband/hw/cxgb4/device.c | 116 +- + drivers/infiniband/hw/cxgb4/ev.c | 10 - + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 9 +- + drivers/infiniband/hw/cxgb4/qp.c | 41 +- + drivers/infiniband/hw/cxgb4/t4.h | 29 +- + drivers/infiniband/hw/mlx4/main.c | 235 + + drivers/infiniband/hw/mlx4/mlx4_ib.h | 12 + + drivers/infiniband/hw/nes/nes_cm.c | 153 +- + drivers/infiniband/hw/ocrdma/ocrdma.h | 22 +- + drivers/infiniband/hw/ocrdma/ocrdma_abi.h | 32 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 14 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 458 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 13 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 7 + + drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 210 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 878 +++- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 6 + + drivers/infiniband/hw/qib/qib.h | 5 +- + drivers/infiniband/hw/qib/qib_common.h | 32 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/hw/qib/qib_init.c | 2 +- + drivers/infiniband/hw/qib/qib_mad.h | 3 +- + drivers/infiniband/hw/qib/qib_pcie.c | 10 +- + drivers/infiniband/hw/qib/qib_sdma.c | 8 +- + drivers/infiniband/hw/qib/qib_user_sdma.c | 909 +++- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 3 - + drivers/infiniband/ulp/ipoib/ipoib_main.c | 9 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 19 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 73 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 139 +- + drivers/infiniband/ulp/iser/iser_memory.c | 231 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 292 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 12 +- + drivers/media/common/siano/Kconfig | 2 + + drivers/media/common/siano/smsdvb-main.c | 3 +- + drivers/media/dvb-core/dvb-usb-ids.h | 2 + + drivers/media/dvb-frontends/mb86a20s.c | 16 +- + drivers/media/i2c/Kconfig | 23 + + drivers/media/i2c/Makefile | 2 + + drivers/media/i2c/ad9389b.c | 163 +- + drivers/media/i2c/adv7343.c | 89 +- + drivers/media/i2c/adv7511.c | 1198 +++++ + drivers/media/i2c/adv7604.c | 156 +- + drivers/media/i2c/adv7842.c | 2946 +++++++++++ + drivers/media/i2c/ml86v7667.c | 3 +- + drivers/media/i2c/mt9v032.c | 17 +- + drivers/media/i2c/ov9650.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 5 + + drivers/media/i2c/s5k6aa.c | 2 +- + drivers/media/i2c/saa7115.c | 169 +- + drivers/media/i2c/saa711x_regs.h | 19 + + drivers/media/i2c/smiapp-pll.c | 17 + + drivers/media/i2c/smiapp/smiapp-core.c | 31 +- + drivers/media/i2c/soc_camera/mt9m111.c | 38 +- + drivers/media/i2c/soc_camera/mt9t031.c | 7 +- + drivers/media/i2c/ths7303.c | 6 +- + drivers/media/i2c/ths8200.c | 123 +- + drivers/media/i2c/tvp514x.c | 20 +- + drivers/media/i2c/tvp7002.c | 73 +- + drivers/media/media-entity.c | 14 +- + drivers/media/pci/bt8xx/bttv-cards.c | 26 +- + drivers/media/pci/bt8xx/bttvp.h | 3 + + drivers/media/pci/cx23885/Kconfig | 1 + + drivers/media/pci/cx23885/cx23885-av.c | 13 + + drivers/media/pci/cx23885/cx23885-cards.c | 6 +- + drivers/media/pci/cx23885/cx23885-core.c | 5 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 53 +- + drivers/media/pci/cx23885/cx23885-video.c | 5 +- + drivers/media/pci/cx23885/cx23885-video.h | 26 + + drivers/media/pci/cx23885/cx23885.h | 2 + + drivers/media/pci/cx88/Kconfig | 11 +- + drivers/media/pci/cx88/cx88.h | 2 +- + drivers/media/platform/Kconfig | 12 +- + drivers/media/platform/Makefile | 2 + + drivers/media/platform/blackfin/bfin_capture.c | 9 +- + drivers/media/platform/coda.c | 1506 +++++- + drivers/media/platform/coda.h | 107 +- + drivers/media/platform/davinci/vpbe_display.c | 23 +- + drivers/media/platform/davinci/vpbe_osd.c | 45 +- + drivers/media/platform/davinci/vpbe_venc.c | 97 +- + drivers/media/platform/davinci/vpif_capture.c | 162 +- + drivers/media/platform/davinci/vpif_capture.h | 2 + + drivers/media/platform/davinci/vpif_display.c | 221 +- + drivers/media/platform/davinci/vpif_display.h | 3 +- + drivers/media/platform/davinci/vpss.c | 62 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 22 +- + drivers/media/platform/exynos-gsc/gsc-core.h | 1 + + drivers/media/platform/exynos-gsc/gsc-m2m.c | 1 + + drivers/media/platform/exynos4-is/fimc-core.c | 2 + + drivers/media/platform/exynos4-is/fimc-is-i2c.c | 37 +- + drivers/media/platform/exynos4-is/fimc-is-param.c | 4 +- + drivers/media/platform/exynos4-is/fimc-is-regs.c | 4 +- + drivers/media/platform/exynos4-is/fimc-is.c | 3 +- + drivers/media/platform/exynos4-is/fimc-isp.c | 2 + + drivers/media/platform/exynos4-is/fimc-lite.c | 17 +- + drivers/media/platform/exynos4-is/media-dev.c | 18 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 4 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 325 +- + drivers/media/platform/marvell-ccic/mcam-core.h | 50 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 278 +- + drivers/media/platform/s3c-camif/camif-regs.c | 8 +- + drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 4 +- + drivers/media/platform/s5p-mfc/regs-mfc-v7.h | 61 + + drivers/media/platform/s5p-mfc/s5p_mfc.c | 32 + + drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 3 + + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 23 +- + drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 12 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 11 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 108 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 149 +- + drivers/media/platform/s5p-tv/hdmi_drv.c | 3 +- + drivers/media/platform/sh_veu.c | 2 +- + drivers/media/platform/soc_camera/Kconfig | 8 + + drivers/media/platform/soc_camera/Makefile | 1 + + drivers/media/platform/soc_camera/mx3_camera.c | 67 +- + drivers/media/platform/soc_camera/rcar_vin.c | 1486 ++++++ + .../platform/soc_camera/sh_mobile_ceu_camera.c | 9 +- + drivers/media/platform/soc_camera/soc_camera.c | 40 +- + drivers/media/platform/vsp1/Makefile | 5 + + drivers/media/platform/vsp1/vsp1.h | 74 + + drivers/media/platform/vsp1/vsp1_drv.c | 527 ++ + drivers/media/platform/vsp1/vsp1_entity.c | 181 + + drivers/media/platform/vsp1/vsp1_entity.h | 68 + + drivers/media/platform/vsp1/vsp1_lif.c | 238 + + drivers/media/platform/vsp1/vsp1_lif.h | 37 + + drivers/media/platform/vsp1/vsp1_regs.h | 581 ++ + drivers/media/platform/vsp1/vsp1_rpf.c | 209 + + drivers/media/platform/vsp1/vsp1_rwpf.c | 124 + + drivers/media/platform/vsp1/vsp1_rwpf.h | 53 + + drivers/media/platform/vsp1/vsp1_uds.c | 346 ++ + drivers/media/platform/vsp1/vsp1_uds.h | 40 + + drivers/media/platform/vsp1/vsp1_video.c | 1069 ++++ + drivers/media/platform/vsp1/vsp1_video.h | 144 + + drivers/media/platform/vsp1/vsp1_wpf.c | 233 + + drivers/media/radio/Kconfig | 12 +- + drivers/media/radio/Makefile | 1 + + drivers/media/radio/radio-aztech.c | 81 +- + drivers/media/radio/radio-maxiradio.c | 15 +- + drivers/media/radio/radio-sf16fmr2.c | 2 +- + drivers/media/radio/radio-shark.c | 2 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 11 - + .../media/radio/tea575x.c | 21 +- + drivers/media/rc/Kconfig | 3 +- + drivers/media/rc/ene_ir.c | 30 +- + drivers/media/rc/ene_ir.h | 2 +- + drivers/media/rc/iguanair.c | 4 +- + drivers/media/rc/ir-lirc-codec.c | 12 +- + drivers/media/rc/lirc_dev.c | 10 + + drivers/media/rc/rc-main.c | 52 +- + drivers/media/rc/redrat3.c | 120 +- + drivers/media/rc/ttusbir.c | 1 + + drivers/media/rc/winbond-cir.c | 38 +- + drivers/media/tuners/e4000.c | 82 +- + drivers/media/tuners/e4000.h | 2 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 40 + + drivers/media/usb/cx231xx/cx231xx-dvb.c | 1 + + drivers/media/usb/cx231xx/cx231xx.h | 1 + + drivers/media/usb/dvb-usb-v2/Kconfig | 2 +- + drivers/media/usb/dvb-usb-v2/dvb_usb.h | 5 - + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 134 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 2 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 12 +- + drivers/media/usb/dvb-usb/m920x.c | 2 +- + drivers/media/usb/em28xx/em28xx-video.c | 1 + + drivers/media/usb/gspca/Kconfig | 9 + + drivers/media/usb/gspca/Makefile | 2 + + drivers/media/usb/gspca/gspca.c | 6 +- + drivers/media/usb/gspca/ov519.c | 32 +- + drivers/media/usb/gspca/ov534.c | 3 +- + drivers/media/usb/gspca/stk1135.c | 685 +++ + drivers/media/usb/gspca/stk1135.h | 57 + + drivers/media/usb/hdpvr/hdpvr-video.c | 9 +- + drivers/media/usb/s2255/s2255drv.c | 9 +- + drivers/media/usb/stk1160/Kconfig | 16 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 6 +- + drivers/media/usb/tlg2300/pd-main.c | 37 +- + drivers/media/usb/usbtv/usbtv.c | 100 +- + drivers/media/v4l2-core/Makefile | 1 + + drivers/media/v4l2-core/v4l2-async.c | 112 +- + drivers/media/v4l2-core/v4l2-common.c | 357 -- + drivers/media/v4l2-core/v4l2-ctrls.c | 67 +- + drivers/media/v4l2-core/v4l2-dev.c | 5 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 609 +++ + drivers/media/v4l2-core/v4l2-mem2mem.c | 69 +- + drivers/media/v4l2-core/v4l2-of.c | 13 +- + drivers/media/v4l2-core/videobuf2-core.c | 269 +- + drivers/misc/ibmasm/ibmasmfs.c | 26 +- + drivers/net/appletalk/cops.c | 2 +- + drivers/net/appletalk/ltpc.c | 2 +- + drivers/net/bonding/bond_3ad.c | 52 +- + drivers/net/bonding/bond_alb.c | 144 +- + drivers/net/bonding/bond_alb.h | 3 - + drivers/net/bonding/bond_main.c | 961 ++-- + drivers/net/bonding/bond_procfs.c | 12 +- + drivers/net/bonding/bond_sysfs.c | 90 +- + drivers/net/bonding/bonding.h | 96 +- + drivers/net/caif/caif_serial.c | 4 +- + drivers/net/can/at91_can.c | 2 +- + drivers/net/can/c_can/c_can_platform.c | 2 +- + drivers/net/can/flexcan.c | 83 +- + drivers/net/can/mcp251x.c | 98 +- + drivers/net/can/mscan/mpc5xxx_can.c | 23 +- + drivers/net/can/mscan/mscan.c | 25 +- + drivers/net/can/mscan/mscan.h | 3 + + drivers/net/ethernet/8390/Kconfig | 2 +- + drivers/net/ethernet/8390/ax88796.c | 6 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/adi/bfin_mac.c | 6 +- + drivers/net/ethernet/aeroflex/greth.c | 12 +- + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/mvme147.c | 2 +- + drivers/net/ethernet/amd/ni65.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 6 +- + drivers/net/ethernet/amd/sun3lance.c | 2 +- + drivers/net/ethernet/arc/emac_main.c | 4 +- + drivers/net/ethernet/broadcom/Kconfig | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 23 +- + drivers/net/ethernet/broadcom/bnx2.c | 317 +- + drivers/net/ethernet/broadcom/bnx2.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 39 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 106 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 11 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 93 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 309 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 18 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 396 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 39 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 221 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 41 +- + drivers/net/ethernet/broadcom/cnic.c | 189 +- + drivers/net/ethernet/broadcom/cnic.h | 69 +- + drivers/net/ethernet/broadcom/cnic_defs.h | 6 +- + drivers/net/ethernet/broadcom/cnic_if.h | 12 +- + drivers/net/ethernet/broadcom/tg3.c | 146 +- + drivers/net/ethernet/broadcom/tg3.h | 12 +- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 10 +- + drivers/net/ethernet/brocade/bna/cna.h | 4 +- + drivers/net/ethernet/cadence/at91_ether.c | 2 +- + drivers/net/ethernet/cadence/macb.c | 53 +- + drivers/net/ethernet/calxeda/xgmac.c | 195 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 287 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 5 + + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 17 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 23 + + drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- + drivers/net/ethernet/cisco/enic/Makefile | 3 +- + drivers/net/ethernet/cisco/enic/enic.h | 55 +- + drivers/net/ethernet/cisco/enic/enic_api.c | 48 + + drivers/net/ethernet/cisco/enic/enic_api.h | 30 + + drivers/net/ethernet/cisco/enic/enic_dev.h | 1 + + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 257 + + drivers/net/ethernet/cisco/enic/enic_main.c | 329 +- + drivers/net/ethernet/cisco/enic/enic_res.h | 9 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 10 + + drivers/net/ethernet/cisco/enic/vnic_dev.h | 1 + + drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 176 +- + drivers/net/ethernet/cisco/enic/vnic_rq.c | 5 +- + drivers/net/ethernet/cisco/enic/vnic_rq.h | 5 +- + drivers/net/ethernet/cisco/enic/vnic_wq.c | 3 - + drivers/net/ethernet/cisco/enic/vnic_wq.h | 14 +- + drivers/net/ethernet/davicom/dm9000.c | 2 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 8 +- + drivers/net/ethernet/dlink/sundance.c | 14 + + drivers/net/ethernet/emulex/benet/be.h | 76 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 503 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 97 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 25 + + drivers/net/ethernet/emulex/benet/be_main.c | 777 +-- + drivers/net/ethernet/emulex/benet/be_roce.c | 8 +- + drivers/net/ethernet/emulex/benet/be_roce.h | 4 +- + drivers/net/ethernet/ethoc.c | 4 +- + drivers/net/ethernet/faraday/ftgmac100.c | 7 +- + drivers/net/ethernet/faraday/ftmac100.c | 8 +- + drivers/net/ethernet/freescale/fec.h | 3 + + drivers/net/ethernet/freescale/fec_main.c | 245 +- + drivers/net/ethernet/freescale/fec_mpc52xx_phy.c | 4 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 21 +- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 4 +- + drivers/net/ethernet/freescale/gianfar.c | 168 +- + drivers/net/ethernet/freescale/gianfar.h | 16 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 74 + + drivers/net/ethernet/freescale/ucc_geth.c | 4 +- + drivers/net/ethernet/i825xx/sun3_82586.h | 4 +- + drivers/net/ethernet/ibm/emac/core.c | 12 +- + drivers/net/ethernet/ibm/emac/mal.c | 4 +- + drivers/net/ethernet/ibm/ibmveth.c | 4 +- + drivers/net/ethernet/ibm/ibmveth.h | 19 +- + drivers/net/ethernet/icplus/ipg.c | 2 +- + drivers/net/ethernet/intel/e100.c | 15 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 8 +- + drivers/net/ethernet/intel/e1000e/82571.c | 6 + + drivers/net/ethernet/intel/e1000e/e1000.h | 3 - + drivers/net/ethernet/intel/e1000e/ethtool.c | 107 +- + drivers/net/ethernet/intel/e1000e/hw.h | 11 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 140 +- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 6 + + drivers/net/ethernet/intel/e1000e/netdev.c | 130 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 198 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 42 +- + drivers/net/ethernet/intel/igb/e1000_hw.h | 3 + + drivers/net/ethernet/intel/igb/e1000_i210.c | 155 +- + drivers/net/ethernet/intel/igb/e1000_i210.h | 5 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 11 - + drivers/net/ethernet/intel/igb/e1000_nvm.c | 80 +- + drivers/net/ethernet/intel/igb/e1000_nvm.h | 1 + + drivers/net/ethernet/intel/igb/e1000_phy.c | 31 +- + drivers/net/ethernet/intel/igb/igb.h | 8 + + drivers/net/ethernet/intel/igb/igb_ethtool.c | 132 +- + drivers/net/ethernet/intel/igb/igb_main.c | 148 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 8 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 34 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 321 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 157 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 133 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 180 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 542 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 46 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 12 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 105 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 14 + + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 4 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- + drivers/net/ethernet/marvell/mvneta.c | 90 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 21 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 22 +- + drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 15 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 177 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 9 + + drivers/net/ethernet/mellanox/mlx4/fw.c | 104 + + drivers/net/ethernet/mellanox/mlx4/fw.h | 1 + + drivers/net/ethernet/mellanox/mlx4/main.c | 35 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 11 - + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 13 + + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 3 +- + drivers/net/ethernet/micrel/ks8842.c | 12 +- + drivers/net/ethernet/micrel/ks8851_mll.c | 4 +- + drivers/net/ethernet/moxa/Kconfig | 30 + + drivers/net/ethernet/moxa/Makefile | 5 + + drivers/net/ethernet/moxa/moxart_ether.c | 559 ++ + drivers/net/ethernet/moxa/moxart_ether.h | 330 ++ + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 213 +- + drivers/net/ethernet/netx-eth.c | 2 +- + drivers/net/ethernet/nuvoton/w90p910_ether.c | 15 +- + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 15 + + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 1 + + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 67 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 98 + + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h | 1 + + drivers/net/ethernet/pasemi/pasemi_mac.c | 20 +- + drivers/net/ethernet/pasemi/pasemi_mac.h | 2 +- + drivers/net/ethernet/qlogic/Kconfig | 11 + + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 4 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 8 +- + drivers/net/ethernet/qlogic/qlcnic/Makefile | 2 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 304 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 743 ++- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 50 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 292 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 40 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 237 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 1179 +++++ + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 41 + + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 223 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 18 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 11 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 12 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 179 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 454 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 13 +- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 165 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 21 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 19 +- + drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +- + drivers/net/ethernet/realtek/r8169.c | 9 +- + drivers/net/ethernet/renesas/Kconfig | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 71 +- + drivers/net/ethernet/renesas/sh_eth.h | 10 + + drivers/net/ethernet/seeq/sgiseeq.c | 2 +- + drivers/net/ethernet/sfc/Kconfig | 9 +- + drivers/net/ethernet/sfc/Makefile | 7 +- + drivers/net/ethernet/sfc/bitfield.h | 8 +- + drivers/net/ethernet/sfc/ef10.c | 3043 +++++++++++ + drivers/net/ethernet/sfc/ef10_regs.h | 415 ++ + drivers/net/ethernet/sfc/efx.c | 500 +- + drivers/net/ethernet/sfc/efx.h | 129 +- + drivers/net/ethernet/sfc/enum.h | 10 +- + drivers/net/ethernet/sfc/ethtool.c | 399 +- + drivers/net/ethernet/sfc/falcon.c | 1171 ++++- + drivers/net/ethernet/sfc/falcon_boards.c | 4 +- + drivers/net/ethernet/sfc/falcon_xmac.c | 362 -- + drivers/net/ethernet/sfc/farch.c | 2942 +++++++++++ + drivers/net/ethernet/sfc/{regs.h => farch_regs.h} | 272 +- + drivers/net/ethernet/sfc/filter.c | 1274 ----- + drivers/net/ethernet/sfc/filter.h | 238 +- + drivers/net/ethernet/sfc/io.h | 50 +- + drivers/net/ethernet/sfc/mcdi.c | 1262 +++-- + drivers/net/ethernet/sfc/mcdi.h | 313 +- + drivers/net/ethernet/sfc/mcdi_mac.c | 130 - + drivers/net/ethernet/sfc/mcdi_mon.c | 274 +- + drivers/net/ethernet/sfc/mcdi_pcol.h | 5540 ++++++++++++++++++-- + .../net/ethernet/sfc/{mcdi_phy.c => mcdi_port.c} | 345 +- + drivers/net/ethernet/sfc/mdio_10g.c | 2 +- + drivers/net/ethernet/sfc/mdio_10g.h | 2 +- + drivers/net/ethernet/sfc/mtd.c | 634 +-- + drivers/net/ethernet/sfc/net_driver.h | 408 +- + drivers/net/ethernet/sfc/nic.c | 1928 +------ + drivers/net/ethernet/sfc/nic.h | 539 +- + drivers/net/ethernet/sfc/phy.h | 19 +- + drivers/net/ethernet/sfc/ptp.c | 95 +- + drivers/net/ethernet/sfc/qt202x_phy.c | 4 +- + drivers/net/ethernet/sfc/rx.c | 176 +- + drivers/net/ethernet/sfc/selftest.c | 15 +- + drivers/net/ethernet/sfc/selftest.h | 4 +- + drivers/net/ethernet/sfc/siena.c | 711 ++- + drivers/net/ethernet/sfc/siena_sriov.c | 102 +- + drivers/net/ethernet/sfc/spi.h | 99 - + drivers/net/ethernet/sfc/tenxpress.c | 2 +- + drivers/net/ethernet/sfc/tx.c | 35 +- + drivers/net/ethernet/sfc/txc43128_phy.c | 2 +- + drivers/net/ethernet/sfc/vfdi.h | 2 +- + drivers/net/ethernet/sfc/workarounds.h | 22 +- + drivers/net/ethernet/sgi/meth.c | 5 +- + drivers/net/ethernet/sis/sis190.c | 3 - + drivers/net/ethernet/sis/sis900.c | 28 +- + drivers/net/ethernet/smsc/smc911x.c | 2 +- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 - + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 9 +- + drivers/net/ethernet/sun/niu.c | 8 +- + drivers/net/ethernet/sun/sunbmac.c | 4 +- + drivers/net/ethernet/sun/sunhme.c | 12 +- + drivers/net/ethernet/ti/cpmac.c | 6 +- + drivers/net/ethernet/ti/cpsw.c | 263 +- + .../net/ethernet/ti}/cpsw.h | 12 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 1 + + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/ethernet/ti/davinci_mdio.c | 7 +- + drivers/net/ethernet/tile/Kconfig | 11 + + drivers/net/ethernet/tile/tilegx.c | 1116 ++-- + drivers/net/ethernet/tile/tilepro.c | 241 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 10 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 20 + + drivers/net/ethernet/wiznet/w5100.c | 2 +- + drivers/net/ethernet/wiznet/w5300.c | 2 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 12 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 14 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/fddi/defxx.c | 6 +- + drivers/net/irda/ali-ircc.c | 8 +- + drivers/net/irda/nsc-ircc.c | 8 +- + drivers/net/irda/pxaficp_ir.c | 2 +- + drivers/net/irda/smsc-ircc2.c | 8 +- + drivers/net/irda/via-ircc.c | 8 +- + drivers/net/irda/w83977af_ir.c | 8 +- + drivers/net/macvlan.c | 7 +- + drivers/net/macvtap.c | 105 +- + drivers/net/netconsole.c | 13 +- + drivers/net/phy/mdio-gpio.c | 2 +- + drivers/net/phy/mdio-mux-gpio.c | 2 +- + drivers/net/phy/mdio-mux-mmioreg.c | 2 +- + drivers/net/phy/mdio-octeon.c | 4 +- + drivers/net/phy/mdio-sun4i.c | 18 +- + drivers/net/phy/micrel.c | 105 +- + drivers/net/ppp/pptp.c | 12 +- + drivers/net/team/team.c | 203 +- + drivers/net/tun.c | 223 +- + drivers/net/usb/Kconfig | 8 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/asix.h | 2 + + drivers/net/usb/asix_devices.c | 5 +- + drivers/net/usb/ax88172a.c | 8 +- + drivers/net/usb/ax88179_178a.c | 24 +- + drivers/net/usb/qmi_wwan.c | 2 +- + drivers/net/usb/r8152.c | 845 ++- + drivers/net/usb/sr9700.c | 560 ++ + drivers/net/usb/sr9700.h | 173 + + drivers/net/usb/usbnet.c | 58 +- + drivers/net/virtio_net.c | 44 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 211 +- + drivers/net/vmxnet3/vmxnet3_int.h | 10 +- + drivers/net/vxlan.c | 1308 ++++- + drivers/net/wan/sbni.c | 2 +- + drivers/net/wireless/airo.c | 2 +- + drivers/net/wireless/ath/ath.h | 2 +- + drivers/net/wireless/ath/ath10k/bmi.c | 12 +- + drivers/net/wireless/ath/ath10k/bmi.h | 1 + + drivers/net/wireless/ath/ath10k/ce.c | 7 +- + drivers/net/wireless/ath/ath10k/core.c | 321 +- + drivers/net/wireless/ath/ath10k/core.h | 58 +- + drivers/net/wireless/ath/ath10k/debug.c | 87 +- + drivers/net/wireless/ath/ath10k/hif.h | 49 +- + drivers/net/wireless/ath/ath10k/htc.c | 61 +- + drivers/net/wireless/ath/ath10k/htc.h | 8 +- + drivers/net/wireless/ath/ath10k/htt.c | 27 +- + drivers/net/wireless/ath/ath10k/htt.h | 3 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 43 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 14 +- + drivers/net/wireless/ath/ath10k/mac.c | 488 +- + drivers/net/wireless/ath/ath10k/mac.h | 1 + + drivers/net/wireless/ath/ath10k/pci.c | 356 +- + drivers/net/wireless/ath/ath10k/pci.h | 15 +- + drivers/net/wireless/ath/ath10k/wmi.c | 127 +- + drivers/net/wireless/ath/ath10k/wmi.h | 24 + + drivers/net/wireless/ath/ath5k/ath5k.h | 1 + + drivers/net/wireless/ath/ath5k/base.c | 59 +- + drivers/net/wireless/ath/ath5k/base.h | 2 +- + drivers/net/wireless/ath/ath5k/debug.c | 24 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +- + drivers/net/wireless/ath/ath5k/pcu.c | 2 + + drivers/net/wireless/ath/ath5k/qcu.c | 25 +- + drivers/net/wireless/ath/ath6kl/init.c | 3 + + drivers/net/wireless/ath/ath6kl/main.c | 3 + + drivers/net/wireless/ath/ath6kl/testmode.c | 3 +- + drivers/net/wireless/ath/ath6kl/testmode.h | 7 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 7 +- + drivers/net/wireless/ath/ath9k/Kconfig | 12 +- + drivers/net/wireless/ath/ath9k/ani.c | 3 - + drivers/net/wireless/ath/ath9k/ani.h | 13 +- + drivers/net/wireless/ath/ath9k/antenna.c | 672 +-- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 - + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 29 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 67 + + drivers/net/wireless/ath/ath9k/ar9002_phy.h | 10 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 31 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 2 + + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 39 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 1 + + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 190 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 7 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 68 +- + drivers/net/wireless/ath/ath9k/beacon.c | 21 + + drivers/net/wireless/ath/ath9k/common.c | 67 +- + drivers/net/wireless/ath/ath9k/common.h | 3 +- + drivers/net/wireless/ath/ath9k/debug.c | 310 +- + drivers/net/wireless/ath/ath9k/debug.h | 33 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 19 + + drivers/net/wireless/ath/ath9k/hif_usb.c | 38 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 5 +- + drivers/net/wireless/ath/ath9k/hw-ops.h | 11 +- + drivers/net/wireless/ath/ath9k/hw.c | 115 +- + drivers/net/wireless/ath/ath9k/hw.h | 11 +- + drivers/net/wireless/ath/ath9k/init.c | 68 +- + drivers/net/wireless/ath/ath9k/link.c | 2 +- + drivers/net/wireless/ath/ath9k/mac.c | 4 +- + drivers/net/wireless/ath/ath9k/mac.h | 2 + + drivers/net/wireless/ath/ath9k/main.c | 45 +- + drivers/net/wireless/ath/ath9k/pci.c | 157 +- + drivers/net/wireless/ath/ath9k/phy.h | 7 + + drivers/net/wireless/ath/ath9k/rc.c | 11 +- + drivers/net/wireless/ath/ath9k/recv.c | 494 +- + drivers/net/wireless/ath/ath9k/reg.h | 6 +- + drivers/net/wireless/ath/ath9k/xmit.c | 533 +- + drivers/net/wireless/ath/carl9170/rx.c | 4 +- + drivers/net/wireless/ath/wil6210/Makefile | 3 - + drivers/net/wireless/ath/wil6210/debugfs.c | 4 +- + drivers/net/wireless/ath/wil6210/netdev.c | 2 + + drivers/net/wireless/ath/wil6210/trace.h | 22 +- + drivers/net/wireless/ath/wil6210/txrx.c | 160 +- + drivers/net/wireless/ath/wil6210/txrx.h | 20 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 27 +- + drivers/net/wireless/ath/wil6210/wmi.c | 22 +- + drivers/net/wireless/b43/dma.c | 6 +- + drivers/net/wireless/b43/main.c | 14 + + drivers/net/wireless/b43legacy/dma.c | 7 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 16 +- + .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 1 - + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 31 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 8 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 2 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 279 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 481 +- + drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 4 + + .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 21 + + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 228 +- + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 4 +- + .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 1 - + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 65 +- + drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 21 - + drivers/net/wireless/brcm80211/brcmsmac/aiutils.h | 3 - + drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 +- + drivers/net/wireless/brcm80211/brcmsmac/debug.c | 2 +- + drivers/net/wireless/brcm80211/brcmsmac/dma.c | 15 +- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 16 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 399 +- + .../wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c | 405 +- + .../wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h | 1 + + drivers/net/wireless/cw1200/bh.c | 4 +- + drivers/net/wireless/cw1200/main.c | 2 +- + drivers/net/wireless/cw1200/wsm.h | 2 +- + drivers/net/wireless/hostap/hostap_hw.c | 2 +- + drivers/net/wireless/hostap/hostap_main.c | 6 +- + drivers/net/wireless/iwlegacy/3945-rs.c | 1 + + drivers/net/wireless/iwlegacy/3945.c | 31 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 18 +- + drivers/net/wireless/iwlegacy/4965-rs.c | 1 + + drivers/net/wireless/iwlwifi/Kconfig | 30 +- + drivers/net/wireless/iwlwifi/dvm/agn.h | 6 - + drivers/net/wireless/iwlwifi/dvm/debugfs.c | 15 - + drivers/net/wireless/iwlwifi/dvm/dev.h | 7 - + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 172 +- + drivers/net/wireless/iwlwifi/dvm/main.c | 62 - + drivers/net/wireless/iwlwifi/dvm/rs.c | 6 +- + drivers/net/wireless/iwlwifi/dvm/rxon.c | 6 +- + drivers/net/wireless/iwlwifi/dvm/scan.c | 105 +- + drivers/net/wireless/iwlwifi/dvm/tx.c | 21 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 11 + + drivers/net/wireless/iwlwifi/iwl-config.h | 4 + + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-drv.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-fw.h | 24 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 67 + + drivers/net/wireless/iwlwifi/iwl-io.h | 3 + + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-op-mode.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-trans.h | 25 +- + drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 162 +- + drivers/net/wireless/iwlwifi/mvm/constants.h | 80 + + drivers/net/wireless/iwlwifi/mvm/d3.c | 217 +- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 271 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 49 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 147 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 5 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 2 - + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 255 +- + drivers/net/wireless/iwlwifi/mvm/fw.c | 55 - + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 3 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 82 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 112 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 58 +- + drivers/net/wireless/iwlwifi/mvm/power.c | 383 +- + drivers/net/wireless/iwlwifi/mvm/power_legacy.c | 319 ++ + drivers/net/wireless/iwlwifi/mvm/quota.c | 27 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 653 +-- + drivers/net/wireless/iwlwifi/mvm/rs.h | 80 +- + drivers/net/wireless/iwlwifi/mvm/rx.c | 158 +- + drivers/net/wireless/iwlwifi/mvm/scan.c | 2 + + drivers/net/wireless/iwlwifi/mvm/sta.c | 3 +- + drivers/net/wireless/iwlwifi/mvm/time-event.c | 103 +- + drivers/net/wireless/iwlwifi/mvm/tt.c | 32 +- + drivers/net/wireless/iwlwifi/mvm/tx.c | 13 +- + drivers/net/wireless/iwlwifi/mvm/utils.c | 23 + + drivers/net/wireless/iwlwifi/pcie/drv.c | 30 +- + drivers/net/wireless/iwlwifi/pcie/internal.h | 1 - + drivers/net/wireless/iwlwifi/pcie/rx.c | 45 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 144 +- + drivers/net/wireless/iwlwifi/pcie/tx.c | 60 +- + drivers/net/wireless/libertas/mesh.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 15 +- + drivers/net/wireless/mwifiex/11n.c | 16 +- + drivers/net/wireless/mwifiex/11n_aggr.c | 7 +- + drivers/net/wireless/mwifiex/cfg80211.c | 177 +- + drivers/net/wireless/mwifiex/cfp.c | 42 +- + drivers/net/wireless/mwifiex/decl.h | 12 +- + drivers/net/wireless/mwifiex/fw.h | 72 +- + drivers/net/wireless/mwifiex/ie.c | 2 +- + drivers/net/wireless/mwifiex/init.c | 15 +- + drivers/net/wireless/mwifiex/ioctl.h | 43 +- + drivers/net/wireless/mwifiex/join.c | 1 + + drivers/net/wireless/mwifiex/main.c | 110 +- + drivers/net/wireless/mwifiex/main.h | 11 +- + drivers/net/wireless/mwifiex/pcie.c | 39 +- + drivers/net/wireless/mwifiex/scan.c | 63 +- + drivers/net/wireless/mwifiex/sdio.c | 219 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 77 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 4 +- + drivers/net/wireless/mwifiex/sta_event.c | 10 + + drivers/net/wireless/mwifiex/sta_ioctl.c | 11 +- + drivers/net/wireless/mwifiex/sta_rx.c | 49 + + drivers/net/wireless/mwifiex/uap_cmd.c | 130 +- + drivers/net/wireless/mwifiex/uap_txrx.c | 70 +- + drivers/net/wireless/mwifiex/usb.c | 58 +- + drivers/net/wireless/mwifiex/util.c | 4 +- + drivers/net/wireless/mwifiex/wmm.c | 16 +- + drivers/net/wireless/rt2x00/Kconfig | 6 + + drivers/net/wireless/rt2x00/rt2800.h | 279 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 1655 +++++- + drivers/net/wireless/rt2x00/rt2800lib.h | 4 + + drivers/net/wireless/rt2x00/rt2800pci.c | 19 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 43 +- + drivers/net/wireless/rt2x00/rt2x00.h | 1 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 2 +- + drivers/net/wireless/rtl818x/rtl8180/dev.c | 6 +- + drivers/net/wireless/rtl818x/rtl8180/grf5101.c | 2 +- + drivers/net/wireless/rtl818x/rtl8180/grf5101.h | 2 +- + drivers/net/wireless/rtl818x/rtl8180/max2820.c | 2 +- + drivers/net/wireless/rtl818x/rtl8180/max2820.h | 2 +- + drivers/net/wireless/rtl818x/rtl8180/rtl8225.c | 4 +- + drivers/net/wireless/rtl818x/rtl8180/sa2400.c | 2 +- + drivers/net/wireless/rtl818x/rtl8180/sa2400.h | 2 +- + drivers/net/wireless/rtl818x/rtl8187/dev.c | 6 +- + drivers/net/wireless/rtl818x/rtl8187/rtl8187.h | 4 +- + drivers/net/wireless/rtl818x/rtl8187/rtl8225.c | 4 +- + drivers/net/wireless/rtl818x/rtl8187/rtl8225.h | 4 +- + drivers/net/wireless/rtl818x/rtl818x.h | 4 +- + drivers/net/wireless/rtlwifi/base.c | 2 +- + drivers/net/wireless/rtlwifi/ps.c | 18 +- + drivers/net/wireless/rtlwifi/rc.c | 1 + + drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 9 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 3 + + drivers/net/wireless/rtlwifi/rtl8192cu/sw.h | 3 - + drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 20 +- + drivers/net/wireless/ti/wlcore/main.c | 13 +- + drivers/net/wireless/ti/wlcore/testmode.c | 3 +- + drivers/net/wireless/ti/wlcore/testmode.h | 3 +- + drivers/net/wireless/zd1201.c | 8 +- + drivers/net/xen-netback/common.h | 150 +- + drivers/net/xen-netback/interface.c | 135 +- + drivers/net/xen-netback/netback.c | 833 +-- + drivers/nfc/nfcsim.c | 6 +- + drivers/nfc/pn533.c | 389 +- + drivers/nfc/pn544/i2c.c | 360 +- + drivers/nfc/pn544/mei.c | 2 +- + drivers/nfc/pn544/pn544.c | 20 +- + drivers/nfc/pn544/pn544.h | 7 +- + drivers/of/Kconfig | 6 - + drivers/of/Makefile | 1 - + drivers/of/of_i2c.c | 114 - + drivers/oprofile/oprof.h | 3 +- + drivers/oprofile/oprofile_files.c | 26 +- + drivers/oprofile/oprofile_perf.c | 16 +- + drivers/oprofile/oprofile_stats.c | 24 +- + drivers/oprofile/oprofile_stats.h | 3 +- + drivers/oprofile/oprofilefs.c | 44 +- + drivers/pci/pci.c | 43 + + drivers/pci/pci.h | 3 + + drivers/pci/probe.c | 4 +- + drivers/pinctrl/Kconfig | 15 +- + drivers/pinctrl/Makefile | 3 +- + drivers/pinctrl/core.c | 71 +- + drivers/pinctrl/mvebu/pinctrl-dove.c | 2 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 39 +- + drivers/pinctrl/pinconf-generic.c | 96 + + drivers/pinctrl/pinconf.c | 73 +- + drivers/pinctrl/pinctrl-abx500.c | 193 +- + drivers/pinctrl/pinctrl-at91.c | 68 +- + drivers/pinctrl/pinctrl-baytrail.c | 41 +- + drivers/pinctrl/pinctrl-bcm2835.c | 43 +- + drivers/pinctrl/pinctrl-exynos.c | 58 + + drivers/pinctrl/pinctrl-exynos5440.c | 113 +- + drivers/pinctrl/pinctrl-falcon.c | 70 +- + drivers/pinctrl/pinctrl-imx.c | 179 +- + drivers/pinctrl/pinctrl-imx.h | 36 +- + drivers/pinctrl/pinctrl-mxs.c | 91 +- + drivers/pinctrl/pinctrl-nomadik.c | 427 +- + drivers/pinctrl/pinctrl-palmas.c | 1095 ++++ + drivers/pinctrl/pinctrl-rockchip.c | 102 +- + drivers/pinctrl/pinctrl-s3c24xx.c | 2 +- + drivers/pinctrl/pinctrl-samsung.c | 29 +- + drivers/pinctrl/pinctrl-samsung.h | 1 + + drivers/pinctrl/pinctrl-single.c | 33 +- + drivers/pinctrl/pinctrl-st.c | 27 +- + drivers/pinctrl/pinctrl-sunxi-pins.h | 1848 ++++++- + drivers/pinctrl/pinctrl-sunxi.c | 99 +- + drivers/pinctrl/pinctrl-tegra.c | 221 +- + drivers/pinctrl/pinctrl-tz1090-pdc.c | 157 +- + drivers/pinctrl/pinctrl-tz1090.c | 162 +- + drivers/pinctrl/pinctrl-u300.c | 21 +- + drivers/pinctrl/pinctrl-utils.c | 142 + + drivers/pinctrl/pinctrl-utils.h | 43 + + drivers/pinctrl/pinctrl-xway.c | 149 +- + drivers/pinctrl/pinmux.c | 51 +- + drivers/pinctrl/sh-pfc/core.c | 101 +- + drivers/pinctrl/sh-pfc/core.h | 10 +- + drivers/pinctrl/sh-pfc/gpio.c | 45 +- + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 158 +- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 48 +- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 55 +- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 168 +- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 1934 ++++--- + drivers/pinctrl/sh-pfc/pfc-sh7203.c | 202 +- + drivers/pinctrl/sh-pfc/pfc-sh7264.c | 246 +- + drivers/pinctrl/sh-pfc/pfc-sh7269.c | 285 +- + drivers/pinctrl/sh-pfc/pfc-sh7372.c | 57 +- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 172 +- + drivers/pinctrl/sh-pfc/pfc-sh7720.c | 701 ++- + drivers/pinctrl/sh-pfc/pfc-sh7722.c | 747 ++- + drivers/pinctrl/sh-pfc/pfc-sh7723.c | 381 +- + drivers/pinctrl/sh-pfc/pfc-sh7724.c | 1093 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 60 +- + drivers/pinctrl/sh-pfc/pfc-sh7757.c | 709 ++- + drivers/pinctrl/sh-pfc/pfc-sh7785.c | 700 ++- + drivers/pinctrl/sh-pfc/pfc-sh7786.c | 383 +- + drivers/pinctrl/sh-pfc/pfc-shx3.c | 423 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 91 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 277 +- + drivers/pinctrl/sirf/pinctrl-atlas6.c | 4 + + drivers/pinctrl/sirf/pinctrl-sirf.c | 10 +- + drivers/pinctrl/spear/pinctrl-spear.c | 13 +- + drivers/pinctrl/spear/pinctrl-spear310.c | 2 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 54 +- + drivers/platform/x86/samsung-q10.c | 2 +- + drivers/regulator/fan53555.c | 2 +- + drivers/remoteproc/da8xx_remoteproc.c | 2 +- + drivers/rtc/rtc-da9052.c | 2 +- + drivers/rtc/rtc-isl12022.c | 2 +- + drivers/rtc/rtc-m48t35.c | 2 +- + drivers/rtc/rtc-pcf8563.c | 2 +- + drivers/rtc/rtc-pcf8583.c | 2 +- + drivers/scsi/bnx2i/57xx_iscsi_hsi.h | 12 +- + drivers/scsi/bnx2i/bnx2i_init.c | 12 +- + drivers/scsi/esp_scsi.c | 14 +- + drivers/scsi/esp_scsi.h | 1 + + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spidev.c | 2 +- + drivers/ssb/Kconfig | 2 +- + drivers/ssb/driver_chipcommon_sflash.c | 8 +- + drivers/staging/imx-drm/imx-drm-core.c | 5 +- + drivers/staging/imx-drm/imx-tve.c | 2 +- + drivers/staging/imx-drm/ipuv3-crtc.c | 3 +- + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/lirc/lirc_igorplugusb.c | 56 +- + drivers/staging/media/msi3101/Kconfig | 3 + + drivers/staging/media/msi3101/Makefile | 1 + + drivers/staging/media/msi3101/sdr-msi3101.c | 1931 +++++++ + drivers/staging/vt6655/hostap.c | 2 +- + drivers/staging/vt6655/ioctl.c | 2 +- + drivers/staging/vt6655/wpactl.c | 2 +- + drivers/vhost/net.c | 92 +- + drivers/vhost/vhost.c | 56 +- + drivers/video/Kconfig | 15 +- + drivers/video/atmel_lcdfb.c | 8 +- + drivers/video/backlight/hx8357.c | 269 +- + drivers/video/backlight/lp855x_bl.c | 2 +- + drivers/video/da8xx-fb.c | 387 +- + drivers/video/efifb.c | 1 + + drivers/video/exynos/exynos_mipi_dsi_lowlevel.c | 1 + + drivers/video/fbcmap.c | 7 +- + drivers/video/fbmem.c | 29 +- + drivers/video/hdmi.c | 141 +- + drivers/video/matrox/matroxfb_base.c | 3 +- + drivers/video/mxsfb.c | 15 +- + drivers/video/omap2/Kconfig | 1 - + drivers/video/omap2/Makefile | 1 - + drivers/video/omap2/displays-new/encoder-tfp410.c | 14 +- + .../video/omap2/displays-new/encoder-tpd12s015.c | 14 +- + drivers/video/omap2/displays/Kconfig | 75 - + drivers/video/omap2/displays/Makefile | 11 - + drivers/video/omap2/displays/panel-acx565akm.c | 798 --- + drivers/video/omap2/displays/panel-generic-dpi.c | 744 --- + .../omap2/displays/panel-lgphilips-lb035q02.c | 262 - + drivers/video/omap2/displays/panel-n8x0.c | 616 --- + .../omap2/displays/panel-nec-nl8048hl11-01b.c | 290 - + drivers/video/omap2/displays/panel-picodlp.c | 559 -- + drivers/video/omap2/displays/panel-picodlp.h | 288 - + .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 198 - + drivers/video/omap2/displays/panel-taal.c | 1551 ------ + drivers/video/omap2/displays/panel-tfp410.c | 353 -- + .../video/omap2/displays/panel-tpo-td043mtea1.c | 596 --- + drivers/video/omap2/dss/Kconfig | 1 + + drivers/video/omap2/dss/Makefile | 5 +- + drivers/video/omap2/dss/apply.c | 4 +- + drivers/video/omap2/dss/core.c | 326 +- + drivers/video/omap2/dss/dpi.c | 121 +- + drivers/video/omap2/dss/dsi.c | 275 +- + drivers/video/omap2/dss/dss.h | 45 - + drivers/video/omap2/dss/hdmi.c | 312 +- + drivers/video/omap2/dss/hdmi_panel.c | 414 -- + drivers/video/omap2/dss/manager-sysfs.c | 8 +- + drivers/video/omap2/dss/output.c | 22 +- + drivers/video/omap2/dss/rfbi.c | 135 +- + drivers/video/omap2/dss/sdi.c | 119 +- + drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 42 +- + drivers/video/omap2/dss/venc.c | 122 +- + drivers/video/output.c | 20 +- + drivers/video/xilinxfb.c | 8 +- + drivers/xen/balloon.c | 74 +- + drivers/xen/events.c | 30 +- + drivers/xen/evtchn.c | 191 +- + drivers/xen/gntdev.c | 11 +- + drivers/xen/grant-table.c | 13 +- + drivers/xen/privcmd.c | 83 +- + drivers/xen/swiotlb-xen.c | 8 +- + drivers/xen/xen-selfballoon.c | 54 +- + fs/block_dev.c | 2 +- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/file.c | 2 +- + fs/btrfs/inode.c | 2 +- + fs/btrfs/volumes.c | 2 +- + fs/cifs/file.c | 2 +- + fs/dcache.c | 13 +- + fs/direct-io.c | 126 +- + fs/dlm/ast.c | 5 +- + fs/dlm/user.c | 24 +- + fs/eventpoll.c | 31 +- + fs/ext3/dir.c | 2 +- + fs/ext4/balloc.c | 24 +- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4.h | 69 +- + fs/ext4/ext4_extents.h | 6 - + fs/ext4/ext4_jbd2.h | 2 +- + fs/ext4/extents.c | 296 +- + fs/ext4/extents_status.c | 125 +- + fs/ext4/extents_status.h | 51 +- + fs/ext4/file.c | 2 +- + fs/ext4/ialloc.c | 90 +- + fs/ext4/indirect.c | 1 - + fs/ext4/inode.c | 321 +- + fs/ext4/ioctl.c | 4 +- + fs/ext4/mballoc.c | 49 +- + fs/ext4/migrate.c | 4 +- + fs/ext4/move_extent.c | 2 +- + fs/ext4/namei.c | 35 +- + fs/ext4/page-io.c | 30 +- + fs/ext4/super.c | 63 +- + fs/file_table.c | 6 +- + fs/inode.c | 2 +- + fs/jbd2/commit.c | 6 +- + fs/jbd2/journal.c | 5 +- + fs/jbd2/recovery.c | 24 +- + fs/namei.c | 182 + + fs/namespace.c | 2 +- + fs/nfsd/nfs4xdr.c | 14 +- + fs/nilfs2/super.c | 26 +- + fs/ocfs2/aops.c | 8 +- + fs/open.c | 11 +- + fs/proc/inode.c | 16 + + fs/quota/dquot.c | 46 + + fs/stat.c | 11 +- + fs/super.c | 18 +- + fs/xfs/xfs_aops.c | 28 +- + fs/xfs/xfs_aops.h | 3 - + include/drm/drmP.h | 254 +- + include/drm/drm_agpsupport.h | 194 + + include/drm/drm_crtc.h | 85 +- + include/drm/drm_dp_helper.h | 31 +- + include/drm/drm_edid.h | 5 + + include/drm/drm_fb_cma_helper.h | 1 - + include/drm/drm_flip_work.h | 76 + + include/drm/drm_gem_cma_helper.h | 8 - + include/drm/drm_mm.h | 142 +- + include/drm/drm_pciids.h | 48 +- + include/drm/drm_vma_manager.h | 257 + + include/drm/exynos_drm.h | 3 +- + include/drm/i2c/tda998x.h | 30 + + include/drm/ttm/ttm_bo_api.h | 15 +- + include/drm/ttm/ttm_bo_driver.h | 10 +- + include/dt-bindings/sound/fsl-imx-audmux.h | 56 + + include/kvm/arm_vgic.h | 2 +- + include/linux/atmel-ssc.h | 2 +- + include/linux/bcma/bcma.h | 17 + + include/linux/bcma/bcma_driver_pci.h | 24 +- + include/linux/buffer_head.h | 2 + + include/linux/can/platform/mcp251x.h | 15 +- + include/linux/dm9000.h | 4 +- + include/linux/dma-contiguous.h | 2 +- + include/linux/dma-mapping.h | 5 +- + include/linux/err.h | 5 +- + include/linux/etherdevice.h | 15 + + include/linux/fs.h | 10 +- + include/linux/fs_enet_pd.h | 6 +- + include/linux/hdmi.h | 53 +- + include/linux/i2c.h | 24 +- + include/linux/i2c/pxa-i2c.h | 3 + + include/linux/ieee80211.h | 72 +- + include/linux/if_team.h | 14 +- + include/linux/igmp.h | 1 - + include/linux/ipv6.h | 3 + + include/linux/kvm_host.h | 13 + + include/linux/mfd/arizona/gpio.h | 96 + + include/linux/mfd/palmas.h | 35 +- + include/linux/mlx4/cmd.h | 1 + + include/linux/mlx4/device.h | 17 +- + include/linux/mlx4/qp.h | 5 +- + include/linux/module.h | 6 + + include/linux/moduleparam.h | 13 +- + include/linux/mv643xx_eth.h | 3 +- + include/linux/namei.h | 1 + + include/linux/netdevice.h | 54 +- + include/linux/netfilter.h | 15 +- + include/linux/of_i2c.h | 46 - + include/linux/oprofile.h | 16 +- + include/linux/pci.h | 15 + + include/linux/pci_hotplug.h | 13 - + include/linux/pinctrl/pinconf-generic.h | 33 + + include/linux/pinctrl/pinconf.h | 6 +- + include/linux/platform_data/asoc-s3c.h | 1 + + include/linux/platform_data/brcmfmac-sdio.h | 6 + + include/linux/platform_data/camera-mx3.h | 4 + + include/linux/platform_data/camera-rcar.h | 25 + + include/linux/platform_data/omap-abe-twl6040.h | 49 - + include/linux/platform_data/pinctrl-nomadik.h | 24 - + include/linux/platform_data/rcar-du.h | 34 +- + include/linux/platform_data/simplefb.h | 1 + + include/linux/platform_data/vsp1.h | 25 + + include/linux/pxa2xx_ssp.h | 11 + + include/linux/quotaops.h | 15 + + include/linux/sched.h | 8 - + include/linux/sh_eth.h | 10 +- + include/linux/skbuff.h | 19 +- + include/linux/smsc911x.h | 3 +- + include/linux/socket.h | 2 + + include/linux/stmmac.h | 1 + + include/linux/tcp.h | 2 +- + include/linux/usb/usbnet.h | 3 + + include/linux/uwb/spec.h | 5 +- + include/linux/vga_switcheroo.h | 13 +- + include/media/adv7343.h | 20 +- + include/media/adv7511.h | 48 + + include/media/adv7842.h | 226 + + include/media/davinci/vpif_types.h | 4 + + include/media/lirc_dev.h | 1 + + include/media/media-entity.h | 4 + + include/media/mt9v032.h | 4 - + include/media/rc-core.h | 4 + + include/media/saa7115.h | 77 +- + include/media/smiapp.h | 1 - + include/{sound/tea575x-tuner.h => media/tea575x.h} | 1 + + include/media/tveeprom.h | 4 +- + include/media/v4l2-async.h | 36 +- + include/media/v4l2-common.h | 14 +- + include/media/v4l2-dv-timings.h | 161 + + include/media/v4l2-mediabus.h | 3 + + include/media/v4l2-mem2mem.h | 13 + + include/media/v4l2-subdev.h | 13 +- + include/media/videobuf2-core.h | 11 +- + include/net/9p/transport.h | 3 - + include/net/act_api.h | 60 +- + include/net/addrconf.h | 180 +- + include/net/af_rxrpc.h | 35 +- + include/net/af_unix.h | 17 +- + {net/vmw_vsock => include/net}/af_vsock.h | 0 + include/net/arp.h | 30 +- + include/net/ax25.h | 215 +- + include/net/bluetooth/bluetooth.h | 8 + + include/net/bluetooth/hci.h | 7 + + include/net/bluetooth/hci_core.h | 10 +- + include/net/bluetooth/sco.h | 1 + + include/net/cfg80211.h | 239 +- + include/net/checksum.h | 10 +- + include/net/cls_cgroup.h | 2 +- + include/net/dst.h | 12 +- + include/net/fib_rules.h | 14 +- + include/net/ieee80211_radiotap.h | 4 + + include/net/if_inet6.h | 9 +- + include/net/ip.h | 12 +- + include/net/ip6_route.h | 2 - + include/net/ip6_tunnel.h | 2 +- + include/net/ip_tunnels.h | 11 +- + include/net/ipv6.h | 3 + + include/net/irda/irlan_common.h | 3 +- + include/net/llc_if.h | 30 - + include/net/mac80211.h | 192 +- + include/net/mld.h | 51 +- + include/net/ndisc.h | 5 + + include/net/neighbour.h | 98 +- + include/net/net_namespace.h | 37 +- + include/net/netfilter/nf_conntrack.h | 9 +- + include/net/netfilter/nf_conntrack_extend.h | 6 + + include/net/netfilter/nf_conntrack_l4proto.h | 7 - + include/net/netfilter/nf_conntrack_seqadj.h | 51 + + include/net/netfilter/nf_conntrack_synproxy.h | 77 + + include/net/netfilter/nf_nat.h | 10 - + include/net/netfilter/nf_nat_helper.h | 19 - + include/net/netfilter/nf_tproxy_core.h | 210 - + include/net/netfilter/nfnetlink_queue.h | 8 + + include/net/netns/ipv4.h | 1 + + include/net/netns/ipv6.h | 1 + + include/net/netprio_cgroup.h | 2 +- + include/net/nfc/nfc.h | 3 + + include/net/pkt_cls.h | 42 +- + include/net/pkt_sched.h | 53 +- + include/net/sch_generic.h | 54 +- + include/net/sctp/auth.h | 8 +- + include/net/sctp/checksum.h | 23 +- + include/net/sctp/command.h | 18 +- + include/net/sctp/constants.h | 8 +- + include/net/sctp/sctp.h | 10 +- + include/net/sctp/sm.h | 8 +- + include/net/sctp/structs.h | 29 +- + include/net/sctp/tsnmap.h | 8 +- + include/net/sctp/ulpevent.h | 8 +- + include/net/sctp/ulpqueue.h | 8 +- + include/net/sock.h | 29 +- + include/net/tcp.h | 44 +- + include/net/udp.h | 1 + + {net/vmw_vsock => include/net}/vsock_addr.h | 0 + include/net/vxlan.h | 40 + + include/net/xfrm.h | 2 +- + include/rdma/ib_verbs.h | 128 +- + include/rdma/iw_cm.h | 8 +- + include/sound/core.h | 8 + + include/sound/pxa2xx-lib.h | 7 - + include/sound/rcar_snd.h | 84 + + include/sound/soc-dapm.h | 201 +- + include/sound/soc-dpcm.h | 2 +- + include/sound/soc.h | 47 +- + include/trace/events/ext4.h | 29 +- + include/uapi/drm/Kbuild | 1 + + include/uapi/drm/drm.h | 3 +- + include/uapi/drm/drm_mode.h | 16 +- + include/uapi/drm/i915_drm.h | 49 + + include/uapi/drm/msm_drm.h | 207 + + include/uapi/drm/radeon_drm.h | 2 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/can/gw.h | 9 +- + include/uapi/linux/dn.h | 3 +- + include/uapi/linux/fib_rules.h | 4 +- + include/uapi/linux/fiemap.h | 1 + + include/uapi/linux/icmpv6.h | 2 + + include/uapi/linux/if_bridge.h | 3 +- + include/uapi/linux/if_link.h | 3 + + include/uapi/linux/if_packet.h | 1 + + include/uapi/linux/if_pppox.h | 2 +- + include/uapi/linux/if_tun.h | 6 + + include/uapi/linux/in.h | 49 +- + include/uapi/linux/in6.h | 36 +- + include/uapi/linux/ip.h | 2 + + include/uapi/linux/ipv6.h | 3 + + include/uapi/linux/kvm.h | 1 + + include/uapi/linux/libc-compat.h | 103 + + include/uapi/linux/netfilter/Kbuild | 2 + + include/uapi/linux/netfilter/nf_conntrack_common.h | 3 +- + include/uapi/linux/netfilter/nfnetlink_conntrack.h | 15 +- + include/uapi/linux/netfilter/nfnetlink_queue.h | 1 + + include/{ => uapi}/linux/netfilter/xt_HMARK.h | 0 + include/uapi/linux/netfilter/xt_SYNPROXY.h | 16 + + include/{ => uapi}/linux/netfilter/xt_rpfilter.h | 0 + include/uapi/linux/netfilter_bridge/ebt_802_3.h | 5 +- + include/uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 3 +- + include/uapi/linux/nfc.h | 20 + + include/uapi/linux/nl80211.h | 199 +- + include/uapi/linux/openvswitch.h | 26 +- + include/uapi/linux/pkt_sched.h | 41 + + include/uapi/linux/sctp.h | 2 +- + include/uapi/linux/snmp.h | 4 + + include/uapi/linux/tcp.h | 1 + + include/uapi/linux/v4l2-controls.h | 29 + + include/uapi/linux/v4l2-dv-timings.h | 8 - + include/uapi/linux/v4l2-mediabus.h | 6 +- + include/uapi/linux/videodev2.h | 12 + + include/uapi/linux/virtio_net.h | 6 +- + include/uapi/linux/wimax/i2400m.h | 4 +- + include/uapi/rdma/ib_user_verbs.h | 99 +- + include/uapi/sound/hdspm.h | 2 +- + include/video/da8xx-fb.h | 5 + + include/video/omap-panel-data.h | 118 - + include/video/omapdss.h | 106 +- + include/xen/balloon.h | 3 + + include/xen/interface/io/tpmif.h | 52 + + include/xen/interface/vcpu.h | 2 + + kernel/module.c | 30 +- + kernel/params.c | 22 +- + kernel/sched/core.c | 15 - + kernel/sched/cputime.c | 19 +- + lib/swiotlb.c | 8 +- + lib/vsprintf.c | 82 + + mm/Kconfig | 24 + + mm/filemap.c | 2 +- + mm/oom_kill.c | 6 +- + mm/shmem.c | 7 +- + net/8021q/vlan.c | 13 +- + net/8021q/vlan_dev.c | 8 +- + net/9p/client.c | 9 +- + net/9p/trans_rdma.c | 11 - + net/Kconfig | 2 +- + net/appletalk/atalk_proc.c | 2 +- + net/batman-adv/bat_iv_ogm.c | 32 +- + net/batman-adv/gateway_client.c | 27 + + net/batman-adv/gateway_client.h | 1 + + net/batman-adv/icmp_socket.c | 1 + + net/batman-adv/main.c | 58 + + net/batman-adv/main.h | 5 +- + net/batman-adv/routing.c | 20 +- + net/batman-adv/send.c | 1 - + net/batman-adv/soft-interface.c | 2 + + net/batman-adv/sysfs.c | 4 + + net/batman-adv/translation-table.c | 5 + + net/batman-adv/unicast.c | 2 + + net/batman-adv/vis.c | 2 + + net/bluetooth/hci_conn.c | 62 +- + net/bluetooth/hci_core.c | 14 +- + net/bluetooth/hci_event.c | 29 +- + net/bluetooth/hci_sysfs.c | 2 +- + net/bluetooth/hidp/core.c | 40 +- + net/bluetooth/l2cap_core.c | 3 +- + net/bluetooth/rfcomm/tty.c | 271 +- + net/bluetooth/sco.c | 85 +- + net/bridge/br_device.c | 12 +- + net/bridge/br_if.c | 6 +- + net/bridge/br_mdb.c | 6 +- + net/bridge/br_multicast.c | 17 +- + net/bridge/br_notify.c | 5 + + net/bridge/br_private.h | 22 +- + net/bridge/netfilter/ebtable_broute.c | 2 +- + net/bridge/netfilter/ebtable_filter.c | 2 +- + net/bridge/netfilter/ebtable_nat.c | 2 +- + net/caif/cfctrl.c | 3 +- + net/can/gw.c | 35 +- + net/ceph/messenger.c | 2 +- + net/core/datagram.c | 72 + + net/core/dev.c | 371 +- + net/core/fib_rules.c | 25 + + net/core/flow_dissector.c | 6 +- + net/core/iovec.c | 24 + + net/core/neighbour.c | 2 - + net/core/net-sysfs.c | 23 + + net/core/pktgen.c | 61 +- + net/core/rtnetlink.c | 29 +- + net/core/skbuff.c | 19 +- + net/core/sock.c | 166 +- + net/core/stream.c | 2 +- + net/core/sysctl_net_core.c | 30 +- + net/dccp/proto.c | 4 +- + net/dsa/slave.c | 2 +- + net/ieee802154/6lowpan.c | 286 +- + net/ieee802154/6lowpan.h | 20 +- + net/ipv4/Kconfig | 16 - + net/ipv4/af_inet.c | 12 - + net/ipv4/arp.c | 2 - + net/ipv4/devinet.c | 17 +- + net/ipv4/fib_rules.c | 25 + + net/ipv4/igmp.c | 80 +- + net/ipv4/ip_gre.c | 4 +- + net/ipv4/ip_input.c | 8 + + net/ipv4/ip_tunnel.c | 71 +- + net/ipv4/ip_tunnel_core.c | 10 +- + net/ipv4/ip_vti.c | 528 +- + net/ipv4/ipip.c | 3 +- + net/ipv4/ipmr.c | 18 +- + net/ipv4/netfilter/Kconfig | 13 + + net/ipv4/netfilter/Makefile | 1 + + net/ipv4/netfilter/arptable_filter.c | 2 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +- + net/ipv4/netfilter/ipt_REJECT.c | 21 +- + net/ipv4/netfilter/ipt_SYNPROXY.c | 476 ++ + net/ipv4/netfilter/iptable_filter.c | 2 +- + net/ipv4/netfilter/iptable_mangle.c | 2 +- + net/ipv4/netfilter/iptable_nat.c | 2 +- + net/ipv4/netfilter/iptable_raw.c | 2 +- + net/ipv4/netfilter/iptable_security.c | 2 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 7 +- + net/ipv4/ping.c | 2 +- + net/ipv4/proc.c | 7 +- + net/ipv4/raw.c | 2 +- + net/ipv4/route.c | 24 +- + net/ipv4/syncookies.c | 29 +- + net/ipv4/sysctl_net_ipv4.c | 17 + + net/ipv4/tcp.c | 46 +- + net/ipv4/tcp_fastopen.c | 13 +- + net/ipv4/tcp_input.c | 201 +- + net/ipv4/tcp_ipv4.c | 32 +- + net/ipv4/tcp_metrics.c | 42 +- + net/ipv4/tcp_minisocks.c | 8 +- + net/ipv4/tcp_output.c | 5 +- + net/ipv4/tcp_probe.c | 87 +- + net/ipv4/udp.c | 18 +- + net/ipv6/addrconf.c | 165 +- + net/ipv6/addrconf_core.c | 50 + + net/ipv6/addrlabel.c | 48 +- + net/ipv6/af_inet6.c | 15 + + net/ipv6/ah6.c | 2 +- + net/ipv6/datagram.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/fib6_rules.c | 37 +- + net/ipv6/icmp.c | 12 +- + net/ipv6/ip6_fib.c | 16 +- + net/ipv6/ip6_gre.c | 14 +- + net/ipv6/ip6_input.c | 6 +- + net/ipv6/ip6_offload.c | 4 +- + net/ipv6/ip6_output.c | 25 - + net/ipv6/ip6_tunnel.c | 46 +- + net/ipv6/ip6mr.c | 14 +- + net/ipv6/ipcomp6.c | 2 +- + net/ipv6/mcast.c | 289 +- + net/ipv6/ndisc.c | 45 +- + net/ipv6/netfilter/Kconfig | 13 + + net/ipv6/netfilter/Makefile | 3 +- + net/ipv6/netfilter/ip6t_MASQUERADE.c | 2 +- + net/ipv6/netfilter/ip6t_REJECT.c | 20 +- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 499 ++ + net/ipv6/netfilter/ip6table_filter.c | 2 +- + net/ipv6/netfilter/ip6table_mangle.c | 2 +- + net/ipv6/netfilter/ip6table_nat.c | 2 +- + net/ipv6/netfilter/ip6table_raw.c | 2 +- + net/ipv6/netfilter/ip6table_security.c | 2 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 7 +- + net/ipv6/output_core.c | 48 + + net/ipv6/proc.c | 4 + + net/ipv6/raw.c | 9 +- + net/ipv6/route.c | 105 +- + net/ipv6/sit.c | 15 +- + net/ipv6/syncookies.c | 25 +- + net/ipv6/tcp_ipv6.c | 15 +- + net/ipv6/udp_offload.c | 105 +- + net/ipx/ipx_proc.c | 2 +- + net/irda/irttp.c | 50 +- + net/key/af_key.c | 14 +- + net/llc/af_llc.c | 6 +- + net/llc/llc_conn.c | 6 +- + net/llc/llc_proc.c | 2 +- + net/llc/llc_sap.c | 4 +- + net/mac80211/cfg.c | 247 +- + net/mac80211/chan.c | 58 + + net/mac80211/debugfs_sta.c | 9 + + net/mac80211/driver-ops.h | 13 + + net/mac80211/ht.c | 53 +- + net/mac80211/ibss.c | 356 +- + net/mac80211/ieee80211_i.h | 70 +- + net/mac80211/iface.c | 30 +- + net/mac80211/key.c | 154 +- + net/mac80211/led.c | 19 +- + net/mac80211/led.h | 4 +- + net/mac80211/main.c | 18 +- + net/mac80211/mesh.c | 10 +- + net/mac80211/mesh_plink.c | 2 +- + net/mac80211/mlme.c | 118 +- + net/mac80211/rate.c | 69 +- + net/mac80211/rate.h | 22 +- + net/mac80211/rc80211_minstrel.c | 33 +- + net/mac80211/rc80211_minstrel_ht.c | 17 +- + net/mac80211/rc80211_pid_algo.c | 1 + + net/mac80211/rx.c | 504 +- + net/mac80211/scan.c | 72 +- + net/mac80211/status.c | 90 +- + net/mac80211/trace.h | 26 + + net/mac80211/tx.c | 122 +- + net/mac80211/util.c | 218 +- + net/netfilter/Kconfig | 26 +- + net/netfilter/Makefile | 6 +- + net/netfilter/core.c | 7 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 8 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 23 +- + net/netfilter/ipvs/ip_vs_sh.c | 6 + + net/netfilter/nf_conntrack_core.c | 89 +- + net/netfilter/nf_conntrack_labels.c | 4 - + net/netfilter/nf_conntrack_netlink.c | 384 +- + net/netfilter/nf_conntrack_proto.c | 4 +- + net/netfilter/nf_conntrack_proto_tcp.c | 36 +- + net/netfilter/nf_conntrack_seqadj.c | 238 + + net/netfilter/nf_nat_core.c | 22 +- + net/netfilter/nf_nat_helper.c | 230 +- + net/netfilter/nf_nat_proto_sctp.c | 8 +- + net/netfilter/nf_nat_sip.c | 3 +- + net/netfilter/nf_synproxy_core.c | 432 ++ + net/netfilter/nf_tproxy_core.c | 62 - + net/netfilter/nfnetlink_queue_core.c | 11 +- + net/netfilter/nfnetlink_queue_ct.c | 23 +- + net/netfilter/xt_TCPMSS.c | 2 +- + net/netfilter/xt_TPROXY.c | 169 +- + net/netfilter/xt_addrtype.c | 2 +- + net/netfilter/xt_socket.c | 66 +- + net/netlink/af_netlink.c | 101 +- + net/netlink/af_netlink.h | 3 +- + net/nfc/core.c | 22 +- + net/nfc/hci/core.c | 2 +- + net/nfc/netlink.c | 95 +- + net/nfc/nfc.h | 5 +- + net/openvswitch/Kconfig | 14 + + net/openvswitch/Makefile | 9 +- + net/openvswitch/actions.c | 45 +- + net/openvswitch/datapath.c | 176 +- + net/openvswitch/datapath.h | 6 + + net/openvswitch/flow.c | 1486 ++++-- + net/openvswitch/flow.h | 89 +- + net/openvswitch/vport-gre.c | 7 +- + net/openvswitch/vport-netdev.c | 20 +- + net/openvswitch/vport-vxlan.c | 204 + + net/openvswitch/vport.c | 6 +- + net/openvswitch/vport.h | 1 + + net/packet/af_packet.c | 65 +- + net/phonet/socket.c | 2 +- + net/rfkill/rfkill-regulator.c | 8 +- + net/sched/Kconfig | 14 + + net/sched/Makefile | 1 + + net/sched/sch_api.c | 53 + + net/sched/sch_fq.c | 793 +++ + net/sched/sch_generic.c | 20 +- + net/sched/sch_mq.c | 2 +- + net/sched/sch_mqprio.c | 2 +- + net/sched/sch_netem.c | 5 +- + net/sctp/associola.c | 8 +- + net/sctp/auth.c | 8 +- + net/sctp/bind_addr.c | 8 +- + net/sctp/chunk.c | 12 +- + net/sctp/command.c | 8 +- + net/sctp/debug.c | 8 +- + net/sctp/endpointola.c | 8 +- + net/sctp/input.c | 18 +- + net/sctp/inqueue.c | 8 +- + net/sctp/ipv6.c | 10 +- + net/sctp/objcnt.c | 8 +- + net/sctp/output.c | 8 +- + net/sctp/outqueue.c | 8 +- + net/sctp/primitive.c | 8 +- + net/sctp/probe.c | 27 +- + net/sctp/proc.c | 12 +- + net/sctp/protocol.c | 10 +- + net/sctp/sm_make_chunk.c | 133 +- + net/sctp/sm_sideeffect.c | 8 +- + net/sctp/sm_statefuns.c | 8 +- + net/sctp/sm_statetable.c | 8 +- + net/sctp/socket.c | 8 +- + net/sctp/ssnmap.c | 8 +- + net/sctp/sysctl.c | 8 +- + net/sctp/transport.c | 8 +- + net/sctp/tsnmap.c | 8 +- + net/sctp/ulpevent.c | 8 +- + net/sctp/ulpqueue.c | 8 +- + net/sunrpc/svcsock.c | 2 +- + net/sunrpc/xprtsock.c | 2 +- + net/unix/af_unix.c | 70 +- + net/vmw_vsock/af_vsock.c | 3 +- + net/vmw_vsock/vmci_transport.c | 2 +- + net/vmw_vsock/vmci_transport.h | 4 +- + net/vmw_vsock/vsock_addr.c | 3 +- + net/wireless/core.c | 9 + + net/wireless/core.h | 2 + + net/wireless/mesh.c | 5 +- + net/wireless/mlme.c | 4 +- + net/wireless/nl80211.c | 560 +- + net/wireless/nl80211.h | 4 +- + net/wireless/rdev-ops.h | 17 +- + net/wireless/scan.c | 35 +- + net/wireless/trace.h | 53 +- + net/wireless/util.c | 14 +- + net/x25/x25_facilities.c | 4 + + net/xfrm/xfrm_policy.c | 12 +- + net/xfrm/xfrm_state.c | 15 +- + scripts/coccinelle/api/ptr_ret.cocci | 10 +- + scripts/mod/modpost.c | 1 + + security/apparmor/lsm.c | 2 + + security/selinux/include/xfrm.h | 7 +- + sound/arm/pxa2xx-ac97.c | 26 +- + sound/arm/pxa2xx-pcm-lib.c | 52 +- + sound/arm/pxa2xx-pcm.c | 5 +- + sound/arm/pxa2xx-pcm.h | 6 +- + sound/core/Kconfig | 3 + + sound/core/Makefile | 3 + + .../soc-dmaengine-pcm.c => core/pcm_dmaengine.c} | 0 + sound/core/pcm_lib.c | 4 +- + sound/drivers/dummy.c | 2 +- + sound/firewire/speakers.c | 4 +- + sound/i2c/other/Makefile | 2 - + sound/isa/gus/interwave.c | 3 +- + sound/oss/dmabuf.c | 3 +- + sound/pci/Kconfig | 12 +- + sound/pci/es1968.c | 2 +- + sound/pci/fm801.c | 2 +- + sound/pci/hda/Kconfig | 9 +- + sound/pci/hda/hda_codec.c | 64 +- + sound/pci/hda/hda_codec.h | 21 + + sound/pci/hda/hda_generic.c | 79 +- + sound/pci/hda/hda_generic.h | 1 + + sound/pci/hda/hda_hwdep.c | 6 +- + sound/pci/hda/hda_intel.c | 70 +- + sound/pci/hda/hda_jack.c | 22 +- + sound/pci/hda/hda_jack.h | 13 +- + sound/pci/hda/hda_proc.c | 33 + + sound/pci/hda/patch_analog.c | 4662 +--------------- + sound/pci/hda/patch_conexant.c | 79 +- + sound/pci/hda/patch_hdmi.c | 61 +- + sound/pci/hda/patch_realtek.c | 190 +- + sound/pci/hda/patch_sigmatel.c | 14 +- + sound/pci/hda/patch_via.c | 2 +- + sound/pci/rme96.c | 307 +- + sound/pci/rme9652/hdspm.c | 779 ++- + sound/soc/Kconfig | 5 +- + sound/soc/Makefile | 4 - + sound/soc/atmel/Kconfig | 21 + + sound/soc/atmel/Makefile | 4 + + sound/soc/atmel/atmel-pcm-dma.c | 118 +- + sound/soc/atmel/atmel_ssc_dai.c | 36 +- + sound/soc/atmel/atmel_wm8904.c | 254 + + sound/soc/atmel/sam9x5_wm8731.c | 208 + + sound/soc/au1x/db1200.c | 4 + + sound/soc/au1x/psc-ac97.c | 3 - + sound/soc/blackfin/bf5xx-ac97.h | 1 - + sound/soc/cirrus/ep93xx-ac97.c | 3 - + sound/soc/cirrus/ep93xx-i2s.c | 5 - + sound/soc/codecs/Kconfig | 19 + + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ac97.c | 15 + + sound/soc/codecs/ad1980.c | 43 + + sound/soc/codecs/ad73311.c | 22 +- + sound/soc/codecs/adau1701.c | 25 +- + sound/soc/codecs/adav80x.c | 13 +- + sound/soc/codecs/ads117x.c | 29 +- + sound/soc/codecs/ak4104.c | 34 +- + sound/soc/codecs/ak4554.c | 106 + + sound/soc/codecs/ak5386.c | 17 +- + sound/soc/codecs/arizona.c | 69 +- + sound/soc/codecs/arizona.h | 5 +- + sound/soc/codecs/bt-sco.c | 22 +- + sound/soc/codecs/cs4270.c | 20 + + sound/soc/codecs/cs4271.c | 30 +- + sound/soc/codecs/dmic.c | 17 +- + sound/soc/codecs/hdmi.c | 30 +- + sound/soc/codecs/lm4857.c | 107 +- + sound/soc/codecs/max9768.c | 16 + + sound/soc/codecs/max98090.c | 10 +- + sound/soc/codecs/max9877.c | 294 +- + sound/soc/codecs/mc13783.c | 1 - + sound/soc/codecs/pcm1681.c | 339 ++ + sound/soc/codecs/pcm1792a.c | 257 + + sound/soc/codecs/pcm1792a.h | 26 + + sound/soc/codecs/pcm3008.c | 150 +- + sound/soc/codecs/rt5640.c | 235 +- + sound/soc/codecs/rt5640.h | 12 + + sound/soc/codecs/sgtl5000.c | 10 +- + sound/soc/codecs/si476x.c | 14 + + sound/soc/codecs/spdif_receiver.c | 17 +- + sound/soc/codecs/spdif_transmitter.c | 18 +- + sound/soc/codecs/ssm2602.c | 3 +- + sound/soc/codecs/sta32x.c | 10 +- + sound/soc/codecs/tlv320aic26.c | 51 +- + sound/soc/codecs/tlv320aic32x4.c | 22 +- + sound/soc/codecs/tlv320aic3x.c | 56 +- + sound/soc/codecs/twl4030.c | 2 - + sound/soc/codecs/twl6040.c | 7 +- + sound/soc/codecs/uda134x.c | 88 +- + sound/soc/codecs/wl1273.c | 17 + + sound/soc/codecs/wm0010.c | 12 +- + sound/soc/codecs/wm5102.c | 53 +- + sound/soc/codecs/wm5110.c | 35 +- + sound/soc/codecs/wm8350.c | 6 +- + sound/soc/codecs/wm8727.c | 17 +- + sound/soc/codecs/wm8731.c | 60 +- + sound/soc/codecs/wm8753.c | 5 +- + sound/soc/codecs/wm8782.c | 17 +- + sound/soc/codecs/wm8903.c | 4 +- + sound/soc/codecs/wm8904.c | 3 +- + sound/soc/codecs/wm8960.c | 10 +- + sound/soc/codecs/wm8962.c | 9 +- + sound/soc/codecs/wm8994.c | 39 +- + sound/soc/codecs/wm8995.c | 5 +- + sound/soc/codecs/wm8997.c | 1175 +++++ + sound/soc/codecs/wm8997.h | 23 + + sound/soc/codecs/wm_adsp.c | 124 +- + sound/soc/codecs/wm_adsp.h | 3 +- + sound/soc/codecs/wm_hubs.c | 8 +- + sound/soc/dwc/designware_i2s.c | 5 +- + sound/soc/fsl/Kconfig | 23 +- + sound/soc/fsl/Makefile | 4 + + sound/soc/fsl/fsl_spdif.c | 1225 +++++ + sound/soc/fsl/fsl_spdif.h | 191 + + sound/soc/fsl/fsl_ssi.c | 501 +- + sound/soc/fsl/imx-audmux.c | 78 +- + sound/soc/fsl/imx-audmux.h | 52 +- + sound/soc/fsl/imx-mc13783.c | 1 + + sound/soc/fsl/imx-pcm-dma.c | 4 +- + sound/soc/fsl/imx-pcm-fiq.c | 20 +- + sound/soc/fsl/imx-pcm.h | 26 +- + sound/soc/fsl/imx-sgtl5000.c | 6 +- + sound/soc/fsl/imx-spdif.c | 148 + + sound/soc/fsl/imx-ssi.c | 11 +- + sound/soc/fsl/imx-ssi.h | 1 + + sound/soc/fsl/imx-wm8962.c | 5 +- + sound/soc/generic/simple-card.c | 2 + + sound/soc/kirkwood/Kconfig | 13 +- + sound/soc/kirkwood/Makefile | 4 +- + sound/soc/kirkwood/kirkwood-dma.c | 108 +- + sound/soc/kirkwood/kirkwood-i2s.c | 93 +- + sound/soc/kirkwood/kirkwood-openrd.c | 6 +- + sound/soc/kirkwood/kirkwood-t5325.c | 6 +- + sound/soc/kirkwood/kirkwood.h | 11 +- + sound/soc/mxs/Kconfig | 3 +- + sound/soc/mxs/mxs-saif.c | 1 - + sound/soc/mxs/mxs-sgtl5000.c | 32 +- + sound/soc/nuc900/nuc900-ac97.c | 3 - + sound/soc/omap/Kconfig | 8 +- + sound/soc/omap/mcbsp.c | 2 +- + sound/soc/omap/omap-abe-twl6040.c | 133 +- + sound/soc/omap/omap-dmic.c | 9 +- + sound/soc/omap/omap-mcbsp.c | 5 + + sound/soc/omap/omap-mcpdm.c | 3 - + sound/soc/pxa/Kconfig | 2 +- + sound/soc/pxa/brownstone.c | 1 + + sound/soc/pxa/mioa701_wm9713.c | 7 +- + sound/soc/pxa/mmp-pcm.c | 7 +- + sound/soc/pxa/mmp-sspa.c | 15 +- + sound/soc/pxa/pxa-ssp.c | 76 +- + sound/soc/pxa/pxa2xx-ac97.c | 67 +- + sound/soc/pxa/pxa2xx-i2s.c | 28 +- + sound/soc/pxa/pxa2xx-pcm.c | 21 +- + sound/soc/pxa/ttc-dkb.c | 1 + + sound/soc/s6000/s6105-ipcam.c | 2 +- + sound/soc/samsung/ac97.c | 11 +- + sound/soc/samsung/dma.c | 19 +- + sound/soc/samsung/dma.h | 4 +- + sound/soc/samsung/i2s-regs.h | 51 +- + sound/soc/samsung/i2s.c | 193 +- + sound/soc/samsung/pcm.c | 4 +- + sound/soc/samsung/s3c2412-i2s.c | 4 +- + sound/soc/samsung/s3c24xx-i2s.c | 4 +- + sound/soc/samsung/smdk_wm8994.c | 58 +- + sound/soc/samsung/spdif.c | 12 +- + sound/soc/sh/Kconfig | 7 + + sound/soc/sh/Makefile | 3 + + sound/soc/sh/fsi.c | 51 +- + sound/soc/sh/rcar/Makefile | 2 + + sound/soc/sh/rcar/adg.c | 234 + + sound/soc/sh/rcar/core.c | 861 +++ + sound/soc/sh/rcar/gen.c | 280 + + sound/soc/sh/rcar/rsnd.h | 302 ++ + sound/soc/sh/rcar/scu.c | 236 + + sound/soc/sh/rcar/ssi.c | 728 +++ + sound/soc/soc-compress.c | 13 +- + sound/soc/soc-core.c | 253 +- + sound/soc/soc-dapm.c | 819 +-- + sound/soc/soc-io.c | 2 +- + sound/soc/soc-jack.c | 4 +- + sound/soc/soc-pcm.c | 25 +- + sound/soc/spear/Kconfig | 2 +- + sound/soc/tegra/Kconfig | 14 +- + sound/soc/tegra/tegra20_ac97.c | 8 - + sound/soc/tegra/tegra_alc5632.c | 2 - + sound/soc/tegra/tegra_rt5640.c | 1 + + sound/soc/tegra/tegra_wm8753.c | 2 - + sound/soc/tegra/trimslice.c | 2 - + sound/soc/txx9/txx9aclc-ac97.c | 3 - + sound/soc/ux500/mop500.c | 1 + + sound/usb/6fire/firmware.c | 4 +- + sound/usb/endpoint.c | 3 + + sound/usb/pcm.c | 243 +- + sound/usb/usx2y/usbusx2y.c | 8 +- + virt/kvm/arm/vgic.c | 22 +- + virt/kvm/eventfd.c | 20 +- + virt/kvm/kvm_main.c | 156 +- + 2377 files changed, 160801 insertions(+), 71650 deletions(-) + create mode 100644 Documentation/DocBook/media/v4l/pixfmt-nv16m.xml + create mode 100644 Documentation/devicetree/bindings/gpu/samsung-rotator.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv7343.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ths8200.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/tvp7002.txt + create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt + create mode 100644 Documentation/devicetree/bindings/net/moxa,moxart-mac.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt + create mode 100644 Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt + create mode 100644 Documentation/devicetree/bindings/sound/ak4554.c + create mode 100644 Documentation/devicetree/bindings/sound/atmel-sam9x5-wm8731-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/atmel-wm8904.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,spdif.txt + rename Documentation/devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} (87%) + create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-spdif.txt + create mode 100644 Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt + create mode 100644 Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt + create mode 100644 Documentation/devicetree/bindings/sound/mvebu-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/pcm1792a.txt + create mode 100644 Documentation/devicetree/bindings/sound/soc-ac97link.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.txt + create mode 100644 Documentation/networking/netdev-FAQ.txt + create mode 100644 Documentation/tpm/xen-tpmfront.txt + create mode 100644 arch/powerpc/kvm/book3s_hv_cma.c + create mode 100644 arch/powerpc/kvm/book3s_hv_cma.h + delete mode 100644 drivers/acpi/acpi_i2c.c + create mode 100644 drivers/char/tpm/xen-tpmfront.c + create mode 100644 drivers/gpu/drm/drm_flip_work.c + delete mode 100644 drivers/gpu/drm/drm_proc.c + create mode 100644 drivers/gpu/drm/drm_vma_manager.c + create mode 100644 drivers/gpu/drm/gma500/gma_display.c + create mode 100644 drivers/gpu/drm/gma500/gma_display.h + rename drivers/gpu/drm/gma500/{psb_intel_display.h => psb_device.h} (76%) + create mode 100644 drivers/gpu/drm/i915/i915_gpu_error.c + create mode 100644 drivers/gpu/drm/i915/intel_uncore.c + create mode 100644 drivers/gpu/drm/msm/Kconfig + create mode 100644 drivers/gpu/drm/msm/Makefile + create mode 100644 drivers/gpu/drm/msm/NOTES + create mode 100644 drivers/gpu/drm/msm/adreno/a2xx.xml.h + create mode 100644 drivers/gpu/drm/msm/adreno/a3xx.xml.h + create mode 100644 drivers/gpu/drm/msm/adreno/a3xx_gpu.c + create mode 100644 drivers/gpu/drm/msm/adreno/a3xx_gpu.h + create mode 100644 drivers/gpu/drm/msm/adreno/adreno_common.xml.h + create mode 100644 drivers/gpu/drm/msm/adreno/adreno_gpu.c + create mode 100644 drivers/gpu/drm/msm/adreno/adreno_gpu.h + create mode 100644 drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h + create mode 100644 drivers/gpu/drm/msm/dsi/dsi.xml.h + create mode 100644 drivers/gpu/drm/msm/dsi/mmss_cc.xml.h + create mode 100644 drivers/gpu/drm/msm/dsi/sfpb.xml.h + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi.h + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi.xml.h + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_bridge.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_connector.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_i2c.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c + create mode 100644 drivers/gpu/drm/msm/hdmi/qfprom.xml.h + create mode 100644 drivers/gpu/drm/msm/mdp4/mdp4.xml.h + create mode 100644 drivers/gpu/drm/msm/mdp4/mdp4_crtc.c + create mode 100644 drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c + create mode 100644 drivers/gpu/drm/msm/mdp4/mdp4_format.c + create mode 100644 drivers/gpu/drm/msm/mdp4/mdp4_irq.c + create mode 100644 drivers/gpu/drm/msm/mdp4/mdp4_kms.c + create mode 100644 drivers/gpu/drm/msm/mdp4/mdp4_kms.h + create mode 100644 drivers/gpu/drm/msm/mdp4/mdp4_plane.c + create mode 100644 drivers/gpu/drm/msm/msm_drv.c + create mode 100644 drivers/gpu/drm/msm/msm_drv.h + create mode 100644 drivers/gpu/drm/msm/msm_fb.c + create mode 100644 drivers/gpu/drm/msm/msm_fbdev.c + create mode 100644 drivers/gpu/drm/msm/msm_gem.c + create mode 100644 drivers/gpu/drm/msm/msm_gem.h + create mode 100644 drivers/gpu/drm/msm/msm_gem_submit.c + create mode 100644 drivers/gpu/drm/msm/msm_gpu.c + create mode 100644 drivers/gpu/drm/msm/msm_gpu.h + create mode 100644 drivers/gpu/drm/msm/msm_ringbuffer.c + create mode 100644 drivers/gpu/drm/msm/msm_ringbuffer.h + delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/math.h + delete mode 100644 drivers/gpu/drm/omapdrm/omap_gem_helpers.c + create mode 100644 drivers/gpu/drm/radeon/ci_dpm.c + create mode 100644 drivers/gpu/drm/radeon/ci_dpm.h + create mode 100644 drivers/gpu/drm/radeon/ci_smc.c + create mode 100644 drivers/gpu/drm/radeon/cik_sdma.c + create mode 100644 drivers/gpu/drm/radeon/clearstate_ci.h + create mode 100644 drivers/gpu/drm/radeon/dce6_afmt.c + delete mode 100644 drivers/gpu/drm/radeon/evergreen_blit_kms.c + create mode 100644 drivers/gpu/drm/radeon/evergreen_dma.c + create mode 100644 drivers/gpu/drm/radeon/kv_dpm.c + create mode 100644 drivers/gpu/drm/radeon/kv_dpm.h + create mode 100644 drivers/gpu/drm/radeon/kv_smc.c + create mode 100644 drivers/gpu/drm/radeon/ni_dma.c + create mode 100644 drivers/gpu/drm/radeon/pptable.h + delete mode 100644 drivers/gpu/drm/radeon/r600_blit_kms.c + create mode 100644 drivers/gpu/drm/radeon/r600_dma.c + delete mode 100644 drivers/gpu/drm/radeon/radeon_blit_common.h + create mode 100644 drivers/gpu/drm/radeon/rv770_dma.c + create mode 100644 drivers/gpu/drm/radeon/si_dma.c + create mode 100644 drivers/gpu/drm/radeon/smu7.h + create mode 100644 drivers/gpu/drm/radeon/smu7_discrete.h + create mode 100644 drivers/gpu/drm/radeon/smu7_fusion.h + create mode 100644 drivers/gpu/drm/radeon/uvd_v1_0.c + create mode 100644 drivers/gpu/drm/radeon/uvd_v2_2.c + create mode 100644 drivers/gpu/drm/radeon/uvd_v3_1.c + create mode 100644 drivers/gpu/drm/radeon/uvd_v4_2.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_encoder.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_encoder.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_group.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_group.h + rename drivers/gpu/drm/rcar-du/{rcar_du_lvds.c => rcar_du_lvdscon.c} (57%) + rename drivers/gpu/drm/rcar-du/{rcar_du_lvds.h => rcar_du_lvdscon.h} (53%) + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h + rename drivers/gpu/drm/rcar-du/{rcar_du_vga.c => rcar_du_vgacon.c} (59%) + rename drivers/gpu/drm/rcar-du/{rcar_du_vga.h => rcar_du_vgacon.h} (56%) + create mode 100644 drivers/gpu/drm/rcar-du/rcar_lvds_regs.h + create mode 100644 drivers/media/i2c/adv7511.c + create mode 100644 drivers/media/i2c/adv7842.c + create mode 100644 drivers/media/pci/cx23885/cx23885-video.h + create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v7.h + create mode 100644 drivers/media/platform/soc_camera/rcar_vin.c + create mode 100644 drivers/media/platform/vsp1/Makefile + create mode 100644 drivers/media/platform/vsp1/vsp1.h + create mode 100644 drivers/media/platform/vsp1/vsp1_drv.c + create mode 100644 drivers/media/platform/vsp1/vsp1_entity.c + create mode 100644 drivers/media/platform/vsp1/vsp1_entity.h + create mode 100644 drivers/media/platform/vsp1/vsp1_lif.c + create mode 100644 drivers/media/platform/vsp1/vsp1_lif.h + create mode 100644 drivers/media/platform/vsp1/vsp1_regs.h + create mode 100644 drivers/media/platform/vsp1/vsp1_rpf.c + create mode 100644 drivers/media/platform/vsp1/vsp1_rwpf.c + create mode 100644 drivers/media/platform/vsp1/vsp1_rwpf.h + create mode 100644 drivers/media/platform/vsp1/vsp1_uds.c + create mode 100644 drivers/media/platform/vsp1/vsp1_uds.h + create mode 100644 drivers/media/platform/vsp1/vsp1_video.c + create mode 100644 drivers/media/platform/vsp1/vsp1_video.h + create mode 100644 drivers/media/platform/vsp1/vsp1_wpf.c + rename sound/i2c/other/tea575x-tuner.c => drivers/media/radio/tea575x.c (98%) + create mode 100644 drivers/media/usb/gspca/stk1135.c + create mode 100644 drivers/media/usb/gspca/stk1135.h + create mode 100644 drivers/media/v4l2-core/v4l2-dv-timings.c + create mode 100644 drivers/net/ethernet/cisco/enic/enic_api.c + create mode 100644 drivers/net/ethernet/cisco/enic/enic_api.h + create mode 100644 drivers/net/ethernet/cisco/enic/enic_ethtool.c + create mode 100644 drivers/net/ethernet/moxa/Kconfig + create mode 100644 drivers/net/ethernet/moxa/Makefile + create mode 100644 drivers/net/ethernet/moxa/moxart_ether.c + create mode 100644 drivers/net/ethernet/moxa/moxart_ether.h + create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c + create mode 100644 drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h + create mode 100644 drivers/net/ethernet/sfc/ef10.c + create mode 100644 drivers/net/ethernet/sfc/ef10_regs.h + delete mode 100644 drivers/net/ethernet/sfc/falcon_xmac.c + create mode 100644 drivers/net/ethernet/sfc/farch.c + rename drivers/net/ethernet/sfc/{regs.h => farch_regs.h} (92%) + delete mode 100644 drivers/net/ethernet/sfc/filter.c + delete mode 100644 drivers/net/ethernet/sfc/mcdi_mac.c + rename drivers/net/ethernet/sfc/{mcdi_phy.c => mcdi_port.c} (73%) + delete mode 100644 drivers/net/ethernet/sfc/spi.h + rename {include/linux/platform_data => drivers/net/ethernet/ti}/cpsw.h (86%) + create mode 100644 drivers/net/usb/sr9700.c + create mode 100644 drivers/net/usb/sr9700.h + create mode 100644 drivers/net/wireless/iwlwifi/mvm/constants.h + create mode 100644 drivers/net/wireless/iwlwifi/mvm/power_legacy.c + delete mode 100644 drivers/of/of_i2c.c + create mode 100644 drivers/pinctrl/pinctrl-palmas.c + create mode 100644 drivers/pinctrl/pinctrl-utils.c + create mode 100644 drivers/pinctrl/pinctrl-utils.h + create mode 100644 drivers/staging/media/msi3101/Kconfig + create mode 100644 drivers/staging/media/msi3101/Makefile + create mode 100644 drivers/staging/media/msi3101/sdr-msi3101.c + delete mode 100644 drivers/video/omap2/displays/Kconfig + delete mode 100644 drivers/video/omap2/displays/Makefile + delete mode 100644 drivers/video/omap2/displays/panel-acx565akm.c + delete mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c + delete mode 100644 drivers/video/omap2/displays/panel-lgphilips-lb035q02.c + delete mode 100644 drivers/video/omap2/displays/panel-n8x0.c + delete mode 100644 drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c + delete mode 100644 drivers/video/omap2/displays/panel-picodlp.c + delete mode 100644 drivers/video/omap2/displays/panel-picodlp.h + delete mode 100644 drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c + delete mode 100644 drivers/video/omap2/displays/panel-taal.c + delete mode 100644 drivers/video/omap2/displays/panel-tfp410.c + delete mode 100644 drivers/video/omap2/displays/panel-tpo-td043mtea1.c + delete mode 100644 drivers/video/omap2/dss/hdmi_panel.c + create mode 100644 include/drm/drm_agpsupport.h + create mode 100644 include/drm/drm_flip_work.h + create mode 100644 include/drm/drm_vma_manager.h + create mode 100644 include/drm/i2c/tda998x.h + create mode 100644 include/dt-bindings/sound/fsl-imx-audmux.h + create mode 100644 include/linux/mfd/arizona/gpio.h + delete mode 100644 include/linux/of_i2c.h + create mode 100644 include/linux/platform_data/camera-rcar.h + delete mode 100644 include/linux/platform_data/omap-abe-twl6040.h + create mode 100644 include/linux/platform_data/vsp1.h + create mode 100644 include/media/adv7511.h + create mode 100644 include/media/adv7842.h + rename include/{sound/tea575x-tuner.h => media/tea575x.h} (98%) + create mode 100644 include/media/v4l2-dv-timings.h + rename {net/vmw_vsock => include/net}/af_vsock.h (100%) + create mode 100644 include/net/netfilter/nf_conntrack_seqadj.h + create mode 100644 include/net/netfilter/nf_conntrack_synproxy.h + delete mode 100644 include/net/netfilter/nf_tproxy_core.h + rename {net/vmw_vsock => include/net}/vsock_addr.h (100%) + create mode 100644 include/net/vxlan.h + create mode 100644 include/sound/rcar_snd.h + create mode 100644 include/uapi/drm/msm_drm.h + create mode 100644 include/uapi/linux/libc-compat.h + rename include/{ => uapi}/linux/netfilter/xt_HMARK.h (100%) + create mode 100644 include/uapi/linux/netfilter/xt_SYNPROXY.h + rename include/{ => uapi}/linux/netfilter/xt_rpfilter.h (100%) + create mode 100644 include/xen/interface/io/tpmif.h + create mode 100644 net/ipv4/netfilter/ipt_SYNPROXY.c + create mode 100644 net/ipv6/netfilter/ip6t_SYNPROXY.c + create mode 100644 net/netfilter/nf_conntrack_seqadj.c + create mode 100644 net/netfilter/nf_synproxy_core.c + delete mode 100644 net/netfilter/nf_tproxy_core.c + create mode 100644 net/openvswitch/vport-vxlan.c + create mode 100644 net/sched/sch_fq.c + rename sound/{soc/soc-dmaengine-pcm.c => core/pcm_dmaengine.c} (100%) + create mode 100644 sound/soc/atmel/atmel_wm8904.c + create mode 100644 sound/soc/atmel/sam9x5_wm8731.c + create mode 100644 sound/soc/codecs/ak4554.c + create mode 100644 sound/soc/codecs/pcm1681.c + create mode 100644 sound/soc/codecs/pcm1792a.c + create mode 100644 sound/soc/codecs/pcm1792a.h + create mode 100644 sound/soc/codecs/wm8997.c + create mode 100644 sound/soc/codecs/wm8997.h + create mode 100644 sound/soc/fsl/fsl_spdif.c + create mode 100644 sound/soc/fsl/fsl_spdif.h + create mode 100644 sound/soc/fsl/imx-spdif.c + create mode 100644 sound/soc/sh/rcar/Makefile + create mode 100644 sound/soc/sh/rcar/adg.c + create mode 100644 sound/soc/sh/rcar/core.c + create mode 100644 sound/soc/sh/rcar/gen.c + create mode 100644 sound/soc/sh/rcar/rsnd.h + create mode 100644 sound/soc/sh/rcar/scu.c + create mode 100644 sound/soc/sh/rcar/ssi.c +Merging fixes/master (fa8218d Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (07b9b65 ARC: fix new Section mismatches in build (post __cpuinit cleanup)) +$ git merge arc-current/for-curr +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + arch/arc/boot/.gitignore | 1 + + arch/arc/include/asm/cache.h | 2 +- + arch/arc/include/asm/delay.h | 5 +- + arch/arc/include/asm/entry.h | 24 +++- + arch/arc/include/asm/io.h | 4 + + arch/arc/include/asm/irqflags.h | 7 -- + arch/arc/include/asm/mmu.h | 11 +- + arch/arc/include/asm/mmu_context.h | 161 ++++++++------------------ + arch/arc/include/asm/pgtable.h | 61 ++++------ + arch/arc/include/asm/ptrace.h | 36 ++---- + arch/arc/include/asm/spinlock_types.h | 6 +- + arch/arc/kernel/.gitignore | 1 + + arch/arc/kernel/entry.S | 66 +++-------- + arch/arc/kernel/setup.c | 2 - + arch/arc/kernel/unaligned.c | 26 +++-- + arch/arc/mm/cache_arc700.c | 8 +- + arch/arc/mm/tlb.c | 174 +++++++++++++++-------------- + arch/arc/mm/tlbex.S | 205 ++++++++++++++++------------------ + lib/Kconfig.debug | 6 +- + 19 files changed, 352 insertions(+), 454 deletions(-) + create mode 100644 arch/arc/boot/.gitignore + create mode 100644 arch/arc/kernel/.gitignore +Merging arm-current/fixes (e1f0203 Merge branch 'security-fixes' into fixes) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (5549005 m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (3b2f64d Linux 3.11-rc2) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-merge/merge (d220980 powerpc/hvsi: Increase handshake timeout from 200ms to 400ms.) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (dc76f9c sparc64: Export flush_ptrace_access() (needed by lustre)) +$ git merge sparc/master +Already up-to-date. +Merging net/master (e2e5c4c tcp: Add missing braces to do_tcp_setsockopt) +$ git merge net/master +Already up-to-date. +Merging ipsec/master (302a50b xfrm: Fix potential null pointer dereference in xdst_queue_output) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (b054087 ALSA: hda - Re-setup HDMI pin and audio infoframe on stream switches) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (a923874 Merge tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (d2779e9 sh_eth: fix napi_{en|dis}able() calls racing against interrupts) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (816434e Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (c095ba7 Linux 3.11-rc4) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (d347404 USB: OHCI: fix build error related to ohci_suspend/resume) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (d8dfad3 Linux 3.11-rc7) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (b36f4be Linux 3.11-rc6) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (fa46c79 Input: i8042 - disable the driver on ARC platforms) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' and 'recovery'.) +$ 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 (e70308e Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework") +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (64110c1 ide: sgiioc4: Staticize ioc4_ide_attach_one()) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct resource to 0 in of_irq_to_resource()) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (6c2580c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) +$ git merge mfd-fixes/master +Already up-to-date. +Merging vfio-fixes/for-linus (d24cdbf vfio-pci: Avoid deadlock on remove) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (6e46645 Linux 3.11) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (d8dfad3 Linux 3.11-rc7) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (c0a27da Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/mm/dma-mapping.c +Removing arch/arm/mach-versatile/include/mach/debug-macro.S +Removing arch/arm/mach-spear/include/mach/debug-macro.S +Removing arch/arm/mach-rpc/include/mach/debug-macro.S +Removing arch/arm/mach-realview/include/mach/debug-macro.S +Removing arch/arm/mach-orion5x/include/mach/debug-macro.S +Removing arch/arm/mach-mv78xx0/include/mach/debug-macro.S +Removing arch/arm/mach-lpc32xx/include/mach/debug-macro.S +Removing arch/arm/mach-kirkwood/include/mach/debug-macro.S +Removing arch/arm/mach-ixp4xx/include/mach/debug-macro.S +Removing arch/arm/mach-iop33x/include/mach/debug-macro.S +Removing arch/arm/mach-iop32x/include/mach/debug-macro.S +Removing arch/arm/mach-iop13xx/include/mach/debug-macro.S +Removing arch/arm/mach-integrator/include/mach/debug-macro.S +Removing arch/arm/mach-gemini/include/mach/debug-macro.S +Removing arch/arm/mach-ep93xx/include/mach/debug-macro.S +Removing arch/arm/mach-ebsa110/include/mach/debug-macro.S +Removing arch/arm/mach-dove/include/mach/debug-macro.S +Removing arch/arm/mach-davinci/include/mach/debug-macro.S +Auto-merging arch/arm/kvm/interrupts.S +Auto-merging arch/arm/kernel/devtree.c +Removing arch/arm/include/debug/u300.S +Removing arch/arm/include/debug/sunxi.S +Removing arch/arm/include/debug/socfpga.S +Removing arch/arm/include/debug/rockchip.S +Removing arch/arm/include/debug/pxa.S +Auto-merging arch/arm/include/debug/pl01x.S +Removing arch/arm/include/debug/picoxcell.S +Removing arch/arm/include/debug/nspire.S +Removing arch/arm/include/debug/nomadik.S +Removing arch/arm/include/debug/mxs.S +Removing arch/arm/include/debug/mvebu.S +Removing arch/arm/include/debug/keystone.S +Removing arch/arm/include/debug/highbank.S +Removing arch/arm/include/debug/cns3xxx.S +Removing arch/arm/include/debug/bcm2835.S +Removing arch/arm/include/debug/8250_32.S +Removing arch/arm/include/asm/hardware/debug-8250.S +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/arm/Booting | 42 +- + Documentation/arm/kernel_mode_neon.txt | 121 +++++ + Documentation/devicetree/bindings/arm/l2cc.txt | 4 +- + arch/arm/Kconfig | 62 ++- + arch/arm/Kconfig.debug | 574 +++++++++++++++------ + arch/arm/common/mcpm_head.S | 2 +- + arch/arm/common/vlock.S | 4 +- + arch/arm/include/asm/assembler.h | 4 +- + arch/arm/include/asm/barrier.h | 32 +- + arch/arm/include/asm/cacheflush.h | 5 +- + arch/arm/include/asm/hardware/debug-8250.S | 29 -- + arch/arm/include/asm/mach/arch.h | 4 +- + arch/arm/include/asm/memblock.h | 3 +- + arch/arm/include/asm/module.h | 2 + + arch/arm/include/asm/neon.h | 36 ++ + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/include/asm/prom.h | 4 +- + arch/arm/include/asm/spinlock.h | 2 +- + arch/arm/include/asm/switch_to.h | 10 + + arch/arm/include/asm/thread_info.h | 11 + + arch/arm/include/asm/tlbflush.h | 181 +++++-- + arch/arm/include/asm/types.h | 40 ++ + arch/arm/include/asm/v7m.h | 12 + + arch/arm/include/asm/xor.h | 73 +++ + arch/arm/include/debug/8250.S | 54 ++ + arch/arm/include/debug/8250_32.S | 27 - + arch/arm/include/debug/bcm2835.S | 22 - + arch/arm/include/debug/cns3xxx.S | 19 - + arch/arm/include/debug/highbank.S | 17 - + arch/arm/include/debug/keystone.S | 43 -- + arch/arm/include/debug/mvebu.S | 30 -- + arch/arm/include/debug/mxs.S | 27 - + arch/arm/include/debug/nomadik.S | 20 - + arch/arm/include/debug/nspire.S | 28 - + arch/arm/include/debug/picoxcell.S | 19 - + .../{asm/hardware/debug-pl01x.S => debug/pl01x.S} | 9 +- + arch/arm/include/debug/pxa.S | 33 -- + arch/arm/include/debug/rockchip.S | 42 -- + arch/arm/include/debug/socfpga.S | 21 - + arch/arm/include/debug/sunxi.S | 27 - + arch/arm/include/debug/tegra.S | 29 ++ + arch/arm/include/debug/u300.S | 18 - + arch/arm/include/debug/ux500.S | 2 +- + arch/arm/include/debug/vexpress.S | 48 +- + arch/arm/kernel/Makefile | 2 +- + arch/arm/kernel/atags.h | 5 +- + arch/arm/kernel/atags_parse.c | 6 +- + arch/arm/kernel/devtree.c | 6 +- + arch/arm/kernel/entry-common.S | 4 +- + arch/arm/kernel/module.c | 8 + + arch/arm/kernel/perf_event_cpu.c | 3 +- + arch/arm/kernel/setup.c | 21 +- + arch/arm/kernel/smp.c | 13 +- + arch/arm/kernel/smp_tlb.c | 10 +- + arch/arm/kernel/traps.c | 66 ++- + arch/arm/kernel/v7m.c | 19 + + arch/arm/kvm/init.S | 2 +- + arch/arm/kvm/interrupts.S | 4 +- + arch/arm/kvm/mmu.c | 1 - + arch/arm/lib/Makefile | 6 + + arch/arm/lib/xor-neon.c | 42 ++ + arch/arm/mach-davinci/include/mach/debug-macro.S | 65 --- + arch/arm/mach-dove/include/mach/debug-macro.S | 19 - + arch/arm/mach-ebsa110/include/mach/debug-macro.S | 22 - + arch/arm/mach-ep93xx/Kconfig | 14 - + arch/arm/mach-ep93xx/include/mach/debug-macro.S | 21 - + arch/arm/mach-ep93xx/include/mach/uncompress.h | 14 +- + .../arm/mach-footbridge/include/mach/debug-macro.S | 15 - + arch/arm/mach-gemini/include/mach/debug-macro.S | 21 - + .../arm/mach-integrator/include/mach/debug-macro.S | 20 - + arch/arm/mach-iop13xx/include/mach/debug-macro.S | 24 - + arch/arm/mach-iop32x/include/mach/debug-macro.S | 21 - + arch/arm/mach-iop33x/include/mach/debug-macro.S | 22 - + arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 26 - + arch/arm/mach-kirkwood/include/mach/debug-macro.S | 19 - + arch/arm/mach-lpc32xx/include/mach/debug-macro.S | 29 -- + arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 19 - + arch/arm/mach-orion5x/include/mach/debug-macro.S | 21 - + arch/arm/mach-realview/include/mach/debug-macro.S | 29 -- + arch/arm/mach-rpc/include/mach/debug-macro.S | 23 - + arch/arm/mach-spear/include/mach/debug-macro.S | 36 -- + arch/arm/mach-spear/include/mach/spear.h | 2 - + arch/arm/mach-versatile/include/mach/debug-macro.S | 21 - + arch/arm/mm/cache-l2x0.c | 12 +- + arch/arm/mm/cache-v7.S | 4 +- + arch/arm/mm/context.c | 7 +- + arch/arm/mm/dma-mapping.c | 1 - + arch/arm/mm/hugetlbpage.c | 43 -- + arch/arm/mm/init.c | 5 +- + arch/arm/mm/mmu.c | 4 +- + arch/arm/mm/nommu.c | 2 +- + arch/arm/mm/proc-feroceon.S | 26 + + arch/arm/mm/proc-v7.S | 16 +- + arch/arm/mm/tlb-v7.S | 8 +- + arch/arm/vfp/vfphw.S | 5 + + arch/arm/vfp/vfpmodule.c | 69 ++- + include/linux/raid/pq.h | 5 + + lib/raid6/.gitignore | 1 + + lib/raid6/Makefile | 40 ++ + lib/raid6/algos.c | 6 + + lib/raid6/neon.c | 58 +++ + lib/raid6/neon.uc | 80 +++ + lib/raid6/test/Makefile | 26 +- + 103 files changed, 1590 insertions(+), 1343 deletions(-) + create mode 100644 Documentation/arm/kernel_mode_neon.txt + delete mode 100644 arch/arm/include/asm/hardware/debug-8250.S + create mode 100644 arch/arm/include/asm/neon.h + create mode 100644 arch/arm/include/asm/types.h + create mode 100644 arch/arm/include/debug/8250.S + delete mode 100644 arch/arm/include/debug/8250_32.S + delete mode 100644 arch/arm/include/debug/bcm2835.S + delete mode 100644 arch/arm/include/debug/cns3xxx.S + delete mode 100644 arch/arm/include/debug/highbank.S + delete mode 100644 arch/arm/include/debug/keystone.S + delete mode 100644 arch/arm/include/debug/mvebu.S + delete mode 100644 arch/arm/include/debug/mxs.S + delete mode 100644 arch/arm/include/debug/nomadik.S + delete mode 100644 arch/arm/include/debug/nspire.S + delete mode 100644 arch/arm/include/debug/picoxcell.S + rename arch/arm/include/{asm/hardware/debug-pl01x.S => debug/pl01x.S} (78%) + delete mode 100644 arch/arm/include/debug/pxa.S + delete mode 100644 arch/arm/include/debug/rockchip.S + delete mode 100644 arch/arm/include/debug/socfpga.S + delete mode 100644 arch/arm/include/debug/sunxi.S + delete mode 100644 arch/arm/include/debug/u300.S + create mode 100644 arch/arm/kernel/v7m.c + create mode 100644 arch/arm/lib/xor-neon.c + delete mode 100644 arch/arm/mach-davinci/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-dove/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-ebsa110/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-ep93xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-gemini/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-integrator/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-iop13xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-iop32x/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-iop33x/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-kirkwood/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-lpc32xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-orion5x/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-realview/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-rpc/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-spear/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-versatile/include/mach/debug-macro.S + create mode 100644 lib/raid6/neon.c + create mode 100644 lib/raid6/neon.uc +Merging arm-perf/for-next/perf (ad81f05 Linux 3.11-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +Already up-to-date. +Merging arm64/upstream (d50240a arm64: mm: permit use of tagged pointers at EL0) +$ git merge arm64/upstream +Merge made by the 'recursive' strategy. + Documentation/arm64/booting.txt | 16 ++++++++++--- + Documentation/arm64/tagged-pointers.txt | 34 +++++++++++++++++++++++++++ + arch/arm/include/asm/elf.h | 2 -- + arch/arm64/Kconfig | 3 +++ + arch/arm64/include/asm/elf.h | 3 --- + arch/arm64/include/asm/neon.h | 14 +++++++++++ + arch/arm64/include/asm/pgtable-2level-types.h | 2 ++ + arch/arm64/include/asm/pgtable-3level-types.h | 2 ++ + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/kernel/entry.S | 3 +++ + arch/arm64/kernel/fpsimd.c | 28 ++++++++++++++++++++++ + arch/arm64/kernel/head.S | 8 +++++++ + arch/arm64/kernel/perf_event.c | 7 ++++-- + arch/arm64/kernel/setup.c | 3 --- + arch/arm64/kernel/smp.c | 6 +---- + arch/arm64/kernel/vmlinux.lds.S | 3 +-- + arch/arm64/mm/mmu.c | 23 ++++++++++++++++-- + arch/arm64/mm/proc.S | 6 +---- + include/uapi/linux/elf-em.h | 2 ++ + 19 files changed, 139 insertions(+), 27 deletions(-) + create mode 100644 Documentation/arm64/tagged-pointers.txt + create mode 100644 arch/arm64/include/asm/neon.h +Merging blackfin/for-linus (eb043d3 smp: blackfin: fix check error, using atomic_ops to handle atomic_t type) +$ git merge blackfin/for-linus +Merge made by the 'recursive' strategy. +Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file) +$ git merge cris/for-next +Resolved 'arch/cris/arch-v32/drivers/Kconfig' using previous resolution. +Auto-merging arch/cris/include/asm/processor.h +Auto-merging arch/cris/arch-v32/drivers/Kconfig +CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig +Auto-merging arch/cris/arch-v10/drivers/Kconfig +Auto-merging arch/cris/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0218ca7] Merge remote-tracking branch 'cris/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/cris/Kconfig | 81 ------- + arch/cris/arch-v10/drivers/Kconfig | 70 ------ + arch/cris/arch-v10/drivers/Makefile | 2 - + arch/cris/arch-v32/drivers/Kconfig | 394 ---------------------------------- + arch/cris/arch-v32/mach-a3/Kconfig | 4 - + arch/cris/include/asm/processor.h | 1 - + arch/cris/include/uapi/asm/kvm_para.h | 1 + + 7 files changed, 1 insertion(+), 552 deletions(-) + create mode 100644 arch/cris/include/uapi/asm/kvm_para.h +Merging h8300-remove/h8300-remove (b307c32 fs/minix: Drop dependency on H8300) +$ git merge h8300-remove/h8300-remove +Auto-merging include/uapi/linux/elf-em.h +Removing drivers/net/ethernet/8390/ne-h8300.c +Auto-merging drivers/net/ethernet/8390/Kconfig +CONFLICT (content): Merge conflict in drivers/net/ethernet/8390/Kconfig +Removing drivers/ide/ide-h8300.c +Removing arch/h8300/platform/h8s/ptrace_h8s.c +Removing arch/h8300/platform/h8s/irq.c +Removing arch/h8300/platform/h8s/generic/crt0_rom.S +Removing arch/h8300/platform/h8s/generic/crt0_ram.S +Removing arch/h8300/platform/h8s/generic/Makefile +Removing arch/h8300/platform/h8s/edosk2674/crt0_rom.S +Removing arch/h8300/platform/h8s/edosk2674/crt0_ram.S +Removing arch/h8300/platform/h8s/edosk2674/Makefile +Removing arch/h8300/platform/h8s/Makefile +Removing arch/h8300/platform/h8300h/ptrace_h8300h.c +Removing arch/h8300/platform/h8300h/irq.c +Removing arch/h8300/platform/h8300h/h8max/crt0_ram.S +Removing arch/h8300/platform/h8300h/h8max/Makefile +Removing arch/h8300/platform/h8300h/generic/crt0_rom.S +Removing arch/h8300/platform/h8300h/generic/crt0_ram.S +Removing arch/h8300/platform/h8300h/generic/Makefile +Removing arch/h8300/platform/h8300h/aki3068net/crt0_ram.S +Removing arch/h8300/platform/h8300h/aki3068net/Makefile +Removing arch/h8300/platform/h8300h/Makefile +Removing arch/h8300/mm/memory.c +Removing arch/h8300/mm/kmap.c +Removing arch/h8300/mm/init.c +Removing arch/h8300/mm/fault.c +Removing arch/h8300/mm/Makefile +Removing arch/h8300/lib/romfs.S +Removing arch/h8300/lib/memset.S +Removing arch/h8300/lib/memcpy.S +Removing arch/h8300/lib/checksum.c +Removing arch/h8300/lib/ashrdi3.c +Removing arch/h8300/lib/abs.S +Removing arch/h8300/lib/Makefile +Removing arch/h8300/kernel/vmlinux.lds.S +Removing arch/h8300/kernel/traps.c +Removing arch/h8300/kernel/timer/tpu.c +Removing arch/h8300/kernel/timer/timer8.c +Removing arch/h8300/kernel/timer/timer16.c +Removing arch/h8300/kernel/timer/itu.c +Removing arch/h8300/kernel/timer/Makefile +Removing arch/h8300/kernel/time.c +Removing arch/h8300/kernel/syscalls.S +Removing arch/h8300/kernel/sys_h8300.c +Removing arch/h8300/kernel/signal.c +Removing arch/h8300/kernel/setup.c +Removing arch/h8300/kernel/ptrace.c +Removing arch/h8300/kernel/process.c +Removing arch/h8300/kernel/module.c +Removing arch/h8300/kernel/irq.c +Removing arch/h8300/kernel/h8300_ksyms.c +Removing arch/h8300/kernel/gpio.c +Removing arch/h8300/kernel/entry.S +Removing arch/h8300/kernel/asm-offsets.c +Removing arch/h8300/kernel/Makefile +Removing arch/h8300/include/uapi/asm/unistd.h +Removing arch/h8300/include/uapi/asm/types.h +Removing arch/h8300/include/uapi/asm/termios.h +Removing arch/h8300/include/uapi/asm/termbits.h +Removing arch/h8300/include/uapi/asm/swab.h +Removing arch/h8300/include/uapi/asm/statfs.h +Removing arch/h8300/include/uapi/asm/stat.h +Removing arch/h8300/include/uapi/asm/sockios.h +Removing arch/h8300/include/uapi/asm/socket.h +Removing arch/h8300/include/uapi/asm/signal.h +Removing arch/h8300/include/uapi/asm/siginfo.h +Removing arch/h8300/include/uapi/asm/sigcontext.h +Removing arch/h8300/include/uapi/asm/shmbuf.h +Removing arch/h8300/include/uapi/asm/setup.h +Removing arch/h8300/include/uapi/asm/sembuf.h +Removing arch/h8300/include/uapi/asm/resource.h +Removing arch/h8300/include/uapi/asm/ptrace.h +Removing arch/h8300/include/uapi/asm/posix_types.h +Removing arch/h8300/include/uapi/asm/poll.h +Removing arch/h8300/include/uapi/asm/param.h +Removing arch/h8300/include/uapi/asm/msgbuf.h +Removing arch/h8300/include/uapi/asm/mman.h +Removing arch/h8300/include/uapi/asm/kvm_para.h +Removing arch/h8300/include/uapi/asm/ipcbuf.h +Removing arch/h8300/include/uapi/asm/ioctls.h +Removing arch/h8300/include/uapi/asm/ioctl.h +Removing arch/h8300/include/uapi/asm/fcntl.h +Removing arch/h8300/include/uapi/asm/errno.h +Removing arch/h8300/include/uapi/asm/byteorder.h +Removing arch/h8300/include/uapi/asm/bitsperlong.h +Removing arch/h8300/include/uapi/asm/auxvec.h +Removing arch/h8300/include/uapi/asm/Kbuild +Removing arch/h8300/include/asm/virtconvert.h +Removing arch/h8300/include/asm/user.h +Removing arch/h8300/include/asm/unistd.h +Removing arch/h8300/include/asm/unaligned.h +Removing arch/h8300/include/asm/ucontext.h +Removing arch/h8300/inclResolved 'drivers/net/ethernet/8390/Kconfig' using previous resolution. +ude/asm/uaccess.h +Removing arch/h8300/include/asm/types.h +Removing arch/h8300/include/asm/traps.h +Removing arch/h8300/include/asm/topology.h +Removing arch/h8300/include/asm/tlbflush.h +Removing arch/h8300/include/asm/tlb.h +Removing arch/h8300/include/asm/timex.h +Removing arch/h8300/include/asm/timer.h +Removing arch/h8300/include/asm/thread_info.h +Removing arch/h8300/include/asm/termios.h +Removing arch/h8300/include/asm/target_time.h +Removing arch/h8300/include/asm/switch_to.h +Removing arch/h8300/include/asm/string.h +Removing arch/h8300/include/asm/spinlock.h +Removing arch/h8300/include/asm/smp.h +Removing arch/h8300/include/asm/signal.h +Removing arch/h8300/include/asm/shmparam.h +Removing arch/h8300/include/asm/shm.h +Removing arch/h8300/include/asm/sh_bios.h +Removing arch/h8300/include/asm/segment.h +Removing arch/h8300/include/asm/sections.h +Removing arch/h8300/include/asm/scatterlist.h +Removing arch/h8300/include/asm/regs306x.h +Removing arch/h8300/include/asm/regs267x.h +Removing arch/h8300/include/asm/ptrace.h +Removing arch/h8300/include/asm/processor.h +Removing arch/h8300/include/asm/pgtable.h +Removing arch/h8300/include/asm/pgalloc.h +Removing arch/h8300/include/asm/percpu.h +Removing arch/h8300/include/asm/pci.h +Removing arch/h8300/include/asm/param.h +Removing arch/h8300/include/asm/page_offset.h +Removing arch/h8300/include/asm/page.h +Removing arch/h8300/include/asm/mutex.h +Removing arch/h8300/include/asm/mmu_context.h +Removing arch/h8300/include/asm/mc146818rtc.h +Removing arch/h8300/include/asm/local64.h +Removing arch/h8300/include/asm/local.h +Removing arch/h8300/include/asm/kmap_types.h +Removing arch/h8300/include/asm/kdebug.h +Removing arch/h8300/include/asm/irqflags.h +Removing arch/h8300/include/asm/irq_regs.h +Removing arch/h8300/include/asm/irq.h +Removing arch/h8300/include/asm/io.h +Removing arch/h8300/include/asm/hw_irq.h +Removing arch/h8300/include/asm/hardirq.h +Removing arch/h8300/include/asm/gpio-internal.h +Removing arch/h8300/include/asm/futex.h +Removing arch/h8300/include/asm/ftrace.h +Removing arch/h8300/include/asm/fpu.h +Removing arch/h8300/include/asm/flat.h +Removing arch/h8300/include/asm/fb.h +Removing arch/h8300/include/asm/emergency-restart.h +Removing arch/h8300/include/asm/elf.h +Removing arch/h8300/include/asm/dma.h +Removing arch/h8300/include/asm/div64.h +Removing arch/h8300/include/asm/device.h +Removing arch/h8300/include/asm/delay.h +Removing arch/h8300/include/asm/dbg.h +Removing arch/h8300/include/asm/current.h +Removing arch/h8300/include/asm/cputime.h +Removing arch/h8300/include/asm/cmpxchg.h +Removing arch/h8300/include/asm/checksum.h +Removing arch/h8300/include/asm/cacheflush.h +Removing arch/h8300/include/asm/cachectl.h +Removing arch/h8300/include/asm/cache.h +Removing arch/h8300/include/asm/bugs.h +Removing arch/h8300/include/asm/bug.h +Removing arch/h8300/include/asm/bootinfo.h +Removing arch/h8300/include/asm/bitops.h +Removing arch/h8300/include/asm/barrier.h +Removing arch/h8300/include/asm/atomic.h +Removing arch/h8300/include/asm/asm-offsets.h +Removing arch/h8300/include/asm/Kbuild +Removing arch/h8300/defconfig +Removing arch/h8300/boot/compressed/vmlinux.scr +Removing arch/h8300/boot/compressed/vmlinux.lds +Removing arch/h8300/boot/compressed/misc.c +Removing arch/h8300/boot/compressed/head.S +Removing arch/h8300/boot/compressed/Makefile +Removing arch/h8300/boot/Makefile +Removing arch/h8300/README +Removing arch/h8300/Makefile +Removing arch/h8300/Kconfig.ide +Removing arch/h8300/Kconfig.debug +Removing arch/h8300/Kconfig.cpu +Removing arch/h8300/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a5df66c] Merge remote-tracking branch 'h8300-remove/h8300-remove' +$ git diff -M --stat --summary HEAD^.. + Documentation/scheduler/sched-arch.txt | 5 - + MAINTAINERS | 8 - + arch/h8300/Kconfig | 109 ---- + arch/h8300/Kconfig.cpu | 171 ------ + arch/h8300/Kconfig.debug | 68 --- + arch/h8300/Kconfig.ide | 44 -- + arch/h8300/Makefile | 71 --- + arch/h8300/README | 38 -- + arch/h8300/boot/Makefile | 22 - + arch/h8300/boot/compressed/Makefile | 37 -- + arch/h8300/boot/compressed/head.S | 47 -- + arch/h8300/boot/compressed/misc.c | 180 ------ + arch/h8300/boot/compressed/vmlinux.lds | 32 -- + arch/h8300/boot/compressed/vmlinux.scr | 9 - + arch/h8300/defconfig | 42 -- + arch/h8300/include/asm/Kbuild | 8 - + arch/h8300/include/asm/asm-offsets.h | 1 - + arch/h8300/include/asm/atomic.h | 146 ----- + arch/h8300/include/asm/barrier.h | 29 - + arch/h8300/include/asm/bitops.h | 211 ------- + arch/h8300/include/asm/bootinfo.h | 2 - + arch/h8300/include/asm/bug.h | 12 - + arch/h8300/include/asm/bugs.h | 16 - + arch/h8300/include/asm/cache.h | 13 - + arch/h8300/include/asm/cachectl.h | 14 - + arch/h8300/include/asm/cacheflush.h | 40 -- + arch/h8300/include/asm/checksum.h | 102 ---- + arch/h8300/include/asm/cmpxchg.h | 60 -- + arch/h8300/include/asm/cputime.h | 6 - + arch/h8300/include/asm/current.h | 25 - + arch/h8300/include/asm/dbg.h | 2 - + arch/h8300/include/asm/delay.h | 38 -- + arch/h8300/include/asm/device.h | 7 - + arch/h8300/include/asm/div64.h | 1 - + arch/h8300/include/asm/dma.h | 15 - + arch/h8300/include/asm/elf.h | 101 ---- + arch/h8300/include/asm/emergency-restart.h | 6 - + arch/h8300/include/asm/fb.h | 12 - + arch/h8300/include/asm/flat.h | 26 - + arch/h8300/include/asm/fpu.h | 1 - + arch/h8300/include/asm/ftrace.h | 1 - + arch/h8300/include/asm/futex.h | 6 - + arch/h8300/include/asm/gpio-internal.h | 52 -- + arch/h8300/include/asm/hardirq.h | 19 - + arch/h8300/include/asm/hw_irq.h | 1 - + arch/h8300/include/asm/io.h | 358 ------------ + arch/h8300/include/asm/irq.h | 49 -- + arch/h8300/include/asm/irq_regs.h | 1 - + arch/h8300/include/asm/irqflags.h | 43 -- + arch/h8300/include/asm/kdebug.h | 1 - + arch/h8300/include/asm/kmap_types.h | 6 - + arch/h8300/include/asm/local.h | 6 - + arch/h8300/include/asm/local64.h | 1 - + arch/h8300/include/asm/mc146818rtc.h | 9 - + arch/h8300/include/asm/mmu_context.h | 32 -- + arch/h8300/include/asm/mutex.h | 9 - + arch/h8300/include/asm/page.h | 78 --- + arch/h8300/include/asm/page_offset.h | 3 - + arch/h8300/include/asm/param.h | 9 - + arch/h8300/include/asm/pci.h | 19 - + arch/h8300/include/asm/percpu.h | 6 - + arch/h8300/include/asm/pgalloc.h | 8 - + arch/h8300/include/asm/pgtable.h | 73 --- + arch/h8300/include/asm/processor.h | 139 ----- + arch/h8300/include/asm/ptrace.h | 33 -- + arch/h8300/include/asm/regs267x.h | 336 ----------- + arch/h8300/include/asm/regs306x.h | 212 ------- + arch/h8300/include/asm/scatterlist.h | 6 - + arch/h8300/include/asm/sections.h | 6 - + arch/h8300/include/asm/segment.h | 49 -- + arch/h8300/include/asm/sh_bios.h | 29 - + arch/h8300/include/asm/shm.h | 31 - + arch/h8300/include/asm/shmparam.h | 6 - + arch/h8300/include/asm/signal.h | 24 - + arch/h8300/include/asm/smp.h | 1 - + arch/h8300/include/asm/spinlock.h | 6 - + arch/h8300/include/asm/string.h | 44 -- + arch/h8300/include/asm/switch_to.h | 50 -- + arch/h8300/include/asm/target_time.h | 4 - + arch/h8300/include/asm/termios.h | 50 -- + arch/h8300/include/asm/thread_info.h | 103 ---- + arch/h8300/include/asm/timer.h | 25 - + arch/h8300/include/asm/timex.h | 19 - + arch/h8300/include/asm/tlb.h | 8 - + arch/h8300/include/asm/tlbflush.h | 55 -- + arch/h8300/include/asm/topology.h | 6 - + arch/h8300/include/asm/traps.h | 37 -- + arch/h8300/include/asm/types.h | 9 - + arch/h8300/include/asm/uaccess.h | 163 ------ + arch/h8300/include/asm/ucontext.h | 12 - + arch/h8300/include/asm/unaligned.h | 11 - + arch/h8300/include/asm/unistd.h | 36 -- + arch/h8300/include/asm/user.h | 75 --- + arch/h8300/include/asm/virtconvert.h | 20 - + arch/h8300/include/uapi/asm/Kbuild | 34 -- + arch/h8300/include/uapi/asm/auxvec.h | 4 - + arch/h8300/include/uapi/asm/bitsperlong.h | 1 - + arch/h8300/include/uapi/asm/byteorder.h | 6 - + arch/h8300/include/uapi/asm/errno.h | 6 - + arch/h8300/include/uapi/asm/fcntl.h | 11 - + arch/h8300/include/uapi/asm/ioctl.h | 1 - + arch/h8300/include/uapi/asm/ioctls.h | 8 - + arch/h8300/include/uapi/asm/ipcbuf.h | 1 - + arch/h8300/include/uapi/asm/kvm_para.h | 1 - + arch/h8300/include/uapi/asm/mman.h | 1 - + arch/h8300/include/uapi/asm/msgbuf.h | 31 - + arch/h8300/include/uapi/asm/param.h | 16 - + arch/h8300/include/uapi/asm/poll.h | 11 - + arch/h8300/include/uapi/asm/posix_types.h | 26 - + arch/h8300/include/uapi/asm/ptrace.h | 44 -- + arch/h8300/include/uapi/asm/resource.h | 6 - + arch/h8300/include/uapi/asm/sembuf.h | 25 - + arch/h8300/include/uapi/asm/setup.h | 6 - + arch/h8300/include/uapi/asm/shmbuf.h | 42 -- + arch/h8300/include/uapi/asm/sigcontext.h | 18 - + arch/h8300/include/uapi/asm/siginfo.h | 6 - + arch/h8300/include/uapi/asm/signal.h | 115 ---- + arch/h8300/include/uapi/asm/socket.h | 79 --- + arch/h8300/include/uapi/asm/sockios.h | 13 - + arch/h8300/include/uapi/asm/stat.h | 78 --- + arch/h8300/include/uapi/asm/statfs.h | 6 - + arch/h8300/include/uapi/asm/swab.h | 10 - + arch/h8300/include/uapi/asm/termbits.h | 201 ------- + arch/h8300/include/uapi/asm/termios.h | 44 -- + arch/h8300/include/uapi/asm/types.h | 1 - + arch/h8300/include/uapi/asm/unistd.h | 330 ----------- + arch/h8300/kernel/Makefile | 12 - + arch/h8300/kernel/asm-offsets.c | 60 -- + arch/h8300/kernel/entry.S | 402 ------------- + arch/h8300/kernel/gpio.c | 178 ------ + arch/h8300/kernel/h8300_ksyms.c | 100 ---- + arch/h8300/kernel/irq.c | 165 ------ + arch/h8300/kernel/module.c | 75 --- + arch/h8300/kernel/process.c | 154 ----- + arch/h8300/kernel/ptrace.c | 168 ------ + arch/h8300/kernel/setup.c | 242 -------- + arch/h8300/kernel/signal.c | 444 --------------- + arch/h8300/kernel/sys_h8300.c | 48 -- + arch/h8300/kernel/syscalls.S | 338 ----------- + arch/h8300/kernel/time.c | 66 --- + arch/h8300/kernel/timer/Makefile | 6 - + arch/h8300/kernel/timer/itu.c | 82 --- + arch/h8300/kernel/timer/timer16.c | 77 --- + arch/h8300/kernel/timer/timer8.c | 102 ---- + arch/h8300/kernel/timer/tpu.c | 100 ---- + arch/h8300/kernel/traps.c | 166 ------ + arch/h8300/kernel/vmlinux.lds.S | 157 ------ + arch/h8300/lib/Makefile | 5 - + arch/h8300/lib/abs.S | 21 - + arch/h8300/lib/ashrdi3.c | 63 --- + arch/h8300/lib/checksum.c | 164 ------ + arch/h8300/lib/memcpy.S | 84 --- + arch/h8300/lib/memset.S | 61 -- + arch/h8300/lib/romfs.S | 57 -- + arch/h8300/mm/Makefile | 5 - + arch/h8300/mm/fault.c | 56 -- + arch/h8300/mm/init.c | 155 ----- + arch/h8300/mm/kmap.c | 58 -- + arch/h8300/mm/memory.c | 54 -- + arch/h8300/platform/h8300h/Makefile | 7 - + arch/h8300/platform/h8300h/aki3068net/Makefile | 5 - + arch/h8300/platform/h8300h/aki3068net/crt0_ram.S | 110 ---- + arch/h8300/platform/h8300h/generic/Makefile | 5 - + arch/h8300/platform/h8300h/generic/crt0_ram.S | 107 ---- + arch/h8300/platform/h8300h/generic/crt0_rom.S | 122 ---- + arch/h8300/platform/h8300h/h8max/Makefile | 5 - + arch/h8300/platform/h8300h/h8max/crt0_ram.S | 110 ---- + arch/h8300/platform/h8300h/irq.c | 82 --- + arch/h8300/platform/h8300h/ptrace_h8300h.c | 284 ---------- + arch/h8300/platform/h8s/Makefile | 7 - + arch/h8300/platform/h8s/edosk2674/Makefile | 5 - + arch/h8300/platform/h8s/edosk2674/crt0_ram.S | 130 ----- + arch/h8300/platform/h8s/edosk2674/crt0_rom.S | 186 ------ + arch/h8300/platform/h8s/generic/Makefile | 5 - + arch/h8300/platform/h8s/generic/crt0_ram.S | 127 ----- + arch/h8300/platform/h8s/generic/crt0_rom.S | 128 ----- + arch/h8300/platform/h8s/irq.c | 104 ---- + arch/h8300/platform/h8s/ptrace_h8s.c | 84 --- + drivers/ide/Kconfig | 7 - + drivers/ide/Makefile | 2 - + drivers/ide/ide-h8300.c | 109 ---- + drivers/net/Space.c | 3 +- + drivers/net/ethernet/8390/Kconfig | 7 - + drivers/net/ethernet/8390/Makefile | 1 - + drivers/net/ethernet/8390/ne-h8300.c | 684 ----------------------- + drivers/net/ethernet/smsc/smc9194.c | 24 - + drivers/watchdog/Kconfig | 2 - + drivers/watchdog/Makefile | 2 - + fs/minix/Kconfig | 2 +- + include/linux/serial_sci.h | 2 +- + include/uapi/linux/audit.h | 1 - + include/uapi/linux/elf-em.h | 1 - + tools/testing/ktest/examples/crosstests.conf | 6 - + 193 files changed, 3 insertions(+), 11742 deletions(-) + delete mode 100644 arch/h8300/Kconfig + delete mode 100644 arch/h8300/Kconfig.cpu + delete mode 100644 arch/h8300/Kconfig.debug + delete mode 100644 arch/h8300/Kconfig.ide + delete mode 100644 arch/h8300/Makefile + delete mode 100644 arch/h8300/README + delete mode 100644 arch/h8300/boot/Makefile + delete mode 100644 arch/h8300/boot/compressed/Makefile + delete mode 100644 arch/h8300/boot/compressed/head.S + delete mode 100644 arch/h8300/boot/compressed/misc.c + delete mode 100644 arch/h8300/boot/compressed/vmlinux.lds + delete mode 100644 arch/h8300/boot/compressed/vmlinux.scr + delete mode 100644 arch/h8300/defconfig + delete mode 100644 arch/h8300/include/asm/Kbuild + delete mode 100644 arch/h8300/include/asm/asm-offsets.h + delete mode 100644 arch/h8300/include/asm/atomic.h + delete mode 100644 arch/h8300/include/asm/barrier.h + delete mode 100644 arch/h8300/include/asm/bitops.h + delete mode 100644 arch/h8300/include/asm/bootinfo.h + delete mode 100644 arch/h8300/include/asm/bug.h + delete mode 100644 arch/h8300/include/asm/bugs.h + delete mode 100644 arch/h8300/include/asm/cache.h + delete mode 100644 arch/h8300/include/asm/cachectl.h + delete mode 100644 arch/h8300/include/asm/cacheflush.h + delete mode 100644 arch/h8300/include/asm/checksum.h + delete mode 100644 arch/h8300/include/asm/cmpxchg.h + delete mode 100644 arch/h8300/include/asm/cputime.h + delete mode 100644 arch/h8300/include/asm/current.h + delete mode 100644 arch/h8300/include/asm/dbg.h + delete mode 100644 arch/h8300/include/asm/delay.h + delete mode 100644 arch/h8300/include/asm/device.h + delete mode 100644 arch/h8300/include/asm/div64.h + delete mode 100644 arch/h8300/include/asm/dma.h + delete mode 100644 arch/h8300/include/asm/elf.h + delete mode 100644 arch/h8300/include/asm/emergency-restart.h + delete mode 100644 arch/h8300/include/asm/fb.h + delete mode 100644 arch/h8300/include/asm/flat.h + delete mode 100644 arch/h8300/include/asm/fpu.h + delete mode 100644 arch/h8300/include/asm/ftrace.h + delete mode 100644 arch/h8300/include/asm/futex.h + delete mode 100644 arch/h8300/include/asm/gpio-internal.h + delete mode 100644 arch/h8300/include/asm/hardirq.h + delete mode 100644 arch/h8300/include/asm/hw_irq.h + delete mode 100644 arch/h8300/include/asm/io.h + delete mode 100644 arch/h8300/include/asm/irq.h + delete mode 100644 arch/h8300/include/asm/irq_regs.h + delete mode 100644 arch/h8300/include/asm/irqflags.h + delete mode 100644 arch/h8300/include/asm/kdebug.h + delete mode 100644 arch/h8300/include/asm/kmap_types.h + delete mode 100644 arch/h8300/include/asm/local.h + delete mode 100644 arch/h8300/include/asm/local64.h + delete mode 100644 arch/h8300/include/asm/mc146818rtc.h + delete mode 100644 arch/h8300/include/asm/mmu_context.h + delete mode 100644 arch/h8300/include/asm/mutex.h + delete mode 100644 arch/h8300/include/asm/page.h + delete mode 100644 arch/h8300/include/asm/page_offset.h + delete mode 100644 arch/h8300/include/asm/param.h + delete mode 100644 arch/h8300/include/asm/pci.h + delete mode 100644 arch/h8300/include/asm/percpu.h + delete mode 100644 arch/h8300/include/asm/pgalloc.h + delete mode 100644 arch/h8300/include/asm/pgtable.h + delete mode 100644 arch/h8300/include/asm/processor.h + delete mode 100644 arch/h8300/include/asm/ptrace.h + delete mode 100644 arch/h8300/include/asm/regs267x.h + delete mode 100644 arch/h8300/include/asm/regs306x.h + delete mode 100644 arch/h8300/include/asm/scatterlist.h + delete mode 100644 arch/h8300/include/asm/sections.h + delete mode 100644 arch/h8300/include/asm/segment.h + delete mode 100644 arch/h8300/include/asm/sh_bios.h + delete mode 100644 arch/h8300/include/asm/shm.h + delete mode 100644 arch/h8300/include/asm/shmparam.h + delete mode 100644 arch/h8300/include/asm/signal.h + delete mode 100644 arch/h8300/include/asm/smp.h + delete mode 100644 arch/h8300/include/asm/spinlock.h + delete mode 100644 arch/h8300/include/asm/string.h + delete mode 100644 arch/h8300/include/asm/switch_to.h + delete mode 100644 arch/h8300/include/asm/target_time.h + delete mode 100644 arch/h8300/include/asm/termios.h + delete mode 100644 arch/h8300/include/asm/thread_info.h + delete mode 100644 arch/h8300/include/asm/timer.h + delete mode 100644 arch/h8300/include/asm/timex.h + delete mode 100644 arch/h8300/include/asm/tlb.h + delete mode 100644 arch/h8300/include/asm/tlbflush.h + delete mode 100644 arch/h8300/include/asm/topology.h + delete mode 100644 arch/h8300/include/asm/traps.h + delete mode 100644 arch/h8300/include/asm/types.h + delete mode 100644 arch/h8300/include/asm/uaccess.h + delete mode 100644 arch/h8300/include/asm/ucontext.h + delete mode 100644 arch/h8300/include/asm/unaligned.h + delete mode 100644 arch/h8300/include/asm/unistd.h + delete mode 100644 arch/h8300/include/asm/user.h + delete mode 100644 arch/h8300/include/asm/virtconvert.h + delete mode 100644 arch/h8300/include/uapi/asm/Kbuild + delete mode 100644 arch/h8300/include/uapi/asm/auxvec.h + delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/h8300/include/uapi/asm/byteorder.h + delete mode 100644 arch/h8300/include/uapi/asm/errno.h + delete mode 100644 arch/h8300/include/uapi/asm/fcntl.h + delete mode 100644 arch/h8300/include/uapi/asm/ioctl.h + delete mode 100644 arch/h8300/include/uapi/asm/ioctls.h + delete mode 100644 arch/h8300/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/h8300/include/uapi/asm/kvm_para.h + delete mode 100644 arch/h8300/include/uapi/asm/mman.h + delete mode 100644 arch/h8300/include/uapi/asm/msgbuf.h + delete mode 100644 arch/h8300/include/uapi/asm/param.h + delete mode 100644 arch/h8300/include/uapi/asm/poll.h + delete mode 100644 arch/h8300/include/uapi/asm/posix_types.h + delete mode 100644 arch/h8300/include/uapi/asm/ptrace.h + delete mode 100644 arch/h8300/include/uapi/asm/resource.h + delete mode 100644 arch/h8300/include/uapi/asm/sembuf.h + delete mode 100644 arch/h8300/include/uapi/asm/setup.h + delete mode 100644 arch/h8300/include/uapi/asm/shmbuf.h + delete mode 100644 arch/h8300/include/uapi/asm/sigcontext.h + delete mode 100644 arch/h8300/include/uapi/asm/siginfo.h + delete mode 100644 arch/h8300/include/uapi/asm/signal.h + delete mode 100644 arch/h8300/include/uapi/asm/socket.h + delete mode 100644 arch/h8300/include/uapi/asm/sockios.h + delete mode 100644 arch/h8300/include/uapi/asm/stat.h + delete mode 100644 arch/h8300/include/uapi/asm/statfs.h + delete mode 100644 arch/h8300/include/uapi/asm/swab.h + delete mode 100644 arch/h8300/include/uapi/asm/termbits.h + delete mode 100644 arch/h8300/include/uapi/asm/termios.h + delete mode 100644 arch/h8300/include/uapi/asm/types.h + delete mode 100644 arch/h8300/include/uapi/asm/unistd.h + delete mode 100644 arch/h8300/kernel/Makefile + delete mode 100644 arch/h8300/kernel/asm-offsets.c + delete mode 100644 arch/h8300/kernel/entry.S + delete mode 100644 arch/h8300/kernel/gpio.c + delete mode 100644 arch/h8300/kernel/h8300_ksyms.c + delete mode 100644 arch/h8300/kernel/irq.c + delete mode 100644 arch/h8300/kernel/module.c + delete mode 100644 arch/h8300/kernel/process.c + delete mode 100644 arch/h8300/kernel/ptrace.c + delete mode 100644 arch/h8300/kernel/setup.c + delete mode 100644 arch/h8300/kernel/signal.c + delete mode 100644 arch/h8300/kernel/sys_h8300.c + delete mode 100644 arch/h8300/kernel/syscalls.S + delete mode 100644 arch/h8300/kernel/time.c + delete mode 100644 arch/h8300/kernel/timer/Makefile + delete mode 100644 arch/h8300/kernel/timer/itu.c + delete mode 100644 arch/h8300/kernel/timer/timer16.c + delete mode 100644 arch/h8300/kernel/timer/timer8.c + delete mode 100644 arch/h8300/kernel/timer/tpu.c + delete mode 100644 arch/h8300/kernel/traps.c + delete mode 100644 arch/h8300/kernel/vmlinux.lds.S + delete mode 100644 arch/h8300/lib/Makefile + delete mode 100644 arch/h8300/lib/abs.S + delete mode 100644 arch/h8300/lib/ashrdi3.c + delete mode 100644 arch/h8300/lib/checksum.c + delete mode 100644 arch/h8300/lib/memcpy.S + delete mode 100644 arch/h8300/lib/memset.S + delete mode 100644 arch/h8300/lib/romfs.S + delete mode 100644 arch/h8300/mm/Makefile + delete mode 100644 arch/h8300/mm/fault.c + delete mode 100644 arch/h8300/mm/init.c + delete mode 100644 arch/h8300/mm/kmap.c + delete mode 100644 arch/h8300/mm/memory.c + delete mode 100644 arch/h8300/platform/h8300h/Makefile + delete mode 100644 arch/h8300/platform/h8300h/aki3068net/Makefile + delete mode 100644 arch/h8300/platform/h8300h/aki3068net/crt0_ram.S + delete mode 100644 arch/h8300/platform/h8300h/generic/Makefile + delete mode 100644 arch/h8300/platform/h8300h/generic/crt0_ram.S + delete mode 100644 arch/h8300/platform/h8300h/generic/crt0_rom.S + delete mode 100644 arch/h8300/platform/h8300h/h8max/Makefile + delete mode 100644 arch/h8300/platform/h8300h/h8max/crt0_ram.S + delete mode 100644 arch/h8300/platform/h8300h/irq.c + delete mode 100644 arch/h8300/platform/h8300h/ptrace_h8300h.c + delete mode 100644 arch/h8300/platform/h8s/Makefile + delete mode 100644 arch/h8300/platform/h8s/edosk2674/Makefile + delete mode 100644 arch/h8300/platform/h8s/edosk2674/crt0_ram.S + delete mode 100644 arch/h8300/platform/h8s/edosk2674/crt0_rom.S + delete mode 100644 arch/h8300/platform/h8s/generic/Makefile + delete mode 100644 arch/h8300/platform/h8s/generic/crt0_ram.S + delete mode 100644 arch/h8300/platform/h8s/generic/crt0_rom.S + delete mode 100644 arch/h8300/platform/h8s/irq.c + delete mode 100644 arch/h8300/platform/h8s/ptrace_h8s.c + delete mode 100644 drivers/ide/ide-h8300.c + delete mode 100644 drivers/net/ethernet/8390/ne-h8300.c +Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (174a9a0 Merge branch 'misc-3.12' into next) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/bitops.h | 8 +------- + arch/ia64/include/asm/dmi.h | 2 +- + 2 files changed, 2 insertions(+), 8 deletions(-) +Merging m68k/for-next (5549005 m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (c065edd m68k: remove 16 unused boards in Kconfig.machine) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig | 2 +- + arch/m68k/Kconfig.machine | 134 ------------------------------------ + arch/m68k/include/asm/io_no.h | 1 + + arch/m68k/include/asm/page.h | 3 + + arch/m68k/include/asm/page_mm.h | 3 - + arch/m68k/kernel/setup_no.c | 2 +- + arch/m68k/kernel/signal.c | 8 +++ + arch/m68k/platform/68000/m68328.c | 3 +- + arch/m68k/platform/68000/m68EZ328.c | 3 +- + arch/m68k/platform/68000/m68VZ328.c | 9 +-- + arch/m68k/platform/68360/commproc.c | 3 +- + arch/m68k/platform/68360/config.c | 3 +- + 12 files changed, 27 insertions(+), 147 deletions(-) +Merging metag/for-next (b6ef916 irq-imgpdc: add ImgTec PDC irqchip driver) +$ git merge metag/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/metag/pdc-intc.txt | 105 +++++ + MAINTAINERS | 1 + + arch/metag/Kconfig.soc | 2 + + arch/metag/boot/dts/tz1090.dtsi | 67 +++ + drivers/irqchip/Kconfig | 5 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-imgpdc.c | 499 +++++++++++++++++++++ + 7 files changed, 680 insertions(+) + create mode 100644 Documentation/devicetree/bindings/metag/pdc-intc.txt + create mode 100644 drivers/irqchip/irq-imgpdc.c +Merging microblaze/next (54ea21f microblaze: Show message when reset gpio is not present) +$ git merge microblaze/next +Removing arch/microblaze/kernel/selfmod.c +Removing arch/microblaze/include/asm/selfmod.h +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig | 1 + + arch/microblaze/Makefile | 3 +- + arch/microblaze/boot/Makefile | 7 +- + arch/microblaze/include/asm/selfmod.h | 24 ---- + arch/microblaze/kernel/Makefile | 2 - + arch/microblaze/kernel/cpu/cpuinfo.c | 2 + + arch/microblaze/kernel/intc.c | 85 ++++++-------- + arch/microblaze/kernel/irq.c | 10 +- + arch/microblaze/kernel/reset.c | 6 +- + arch/microblaze/kernel/selfmod.c | 81 ------------- + arch/microblaze/kernel/setup.c | 10 +- + arch/microblaze/kernel/timer.c | 186 ++++++++++++------------------ + arch/microblaze/pci/pci-common.c | 106 ++++++----------- + arch/microblaze/platform/Kconfig.platform | 22 ---- + 14 files changed, 178 insertions(+), 367 deletions(-) + delete mode 100644 arch/microblaze/include/asm/selfmod.h + delete mode 100644 arch/microblaze/kernel/selfmod.c +Merging mips/mips-for-linux-next (356948f Merge branch '3.11-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/include/uapi/asm/ipcbuf.h +Removing arch/mips/include/uapi/asm/auxvec.h +Removing arch/mips/include/asm/xor.h +Removing arch/mips/include/asm/ucontext.h +Removing arch/mips/include/asm/serial.h +Removing arch/mips/include/asm/segment.h +Removing arch/mips/include/asm/sections.h +Removing arch/mips/include/asm/scatterlist.h +Removing arch/mips/include/asm/percpu.h +Removing arch/mips/include/asm/parport.h +Removing arch/mips/include/asm/mutex.h +Removing arch/mips/include/asm/local64.h +Removing arch/mips/include/asm/emergency-restart.h +Removing arch/mips/include/asm/current.h +Removing arch/mips/include/asm/cputime.h +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/ralink,rt3883-pci.txt | 190 ++++++ + arch/mips/Kconfig | 19 +- + arch/mips/Makefile | 34 +- + arch/mips/ath79/clock.c | 258 +++++---- + arch/mips/ath79/common.h | 2 + + arch/mips/ath79/dev-common.c | 10 +- + arch/mips/ath79/setup.c | 23 +- + arch/mips/boot/.gitignore | 1 + + arch/mips/boot/Makefile | 15 + + arch/mips/boot/compressed/Makefile | 2 +- + arch/mips/boot/dts/include/dt-bindings | 1 + + arch/mips/cavium-octeon/octeon-irq.c | 2 +- + arch/mips/cavium-octeon/setup.c | 28 + + arch/mips/cavium-octeon/smp.c | 4 +- + arch/mips/configs/xway_defconfig | 159 ++++++ + arch/mips/dec/time.c | 5 +- + arch/mips/include/asm/Kbuild | 13 + + arch/mips/include/asm/bmips.h | 55 +- + arch/mips/include/asm/cpu.h | 6 +- + arch/mips/include/asm/cputime.h | 6 - + arch/mips/include/asm/current.h | 1 - + arch/mips/include/asm/emergency-restart.h | 6 - + arch/mips/include/asm/local64.h | 1 - + .../include/asm/mach-ath79/cpu-feature-overrides.h | 2 - + arch/mips/include/asm/mach-cavium-octeon/gpio.h | 21 + + .../asm/mach-lantiq/falcon/cpu-feature-overrides.h | 58 ++ + arch/mips/include/asm/mach-ralink/mt7620.h | 40 +- + .../asm/mach-ralink/mt7620/cpu-feature-overrides.h | 57 ++ + arch/mips/include/asm/mutex.h | 9 - + arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 4 + + arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 10 + + arch/mips/include/asm/netlogic/xlp-hal/pic.h | 5 +- + arch/mips/include/asm/netlogic/xlp-hal/sys.h | 31 + + arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 17 + + arch/mips/include/asm/netlogic/xlr/pic.h | 2 + + arch/mips/include/asm/octeon/octeon.h | 2 + + arch/mips/include/asm/parport.h | 1 - + arch/mips/include/asm/percpu.h | 6 - + arch/mips/include/asm/scatterlist.h | 6 - + arch/mips/include/asm/sections.h | 6 - + arch/mips/include/asm/segment.h | 6 - + arch/mips/include/asm/serial.h | 1 - + arch/mips/include/asm/ucontext.h | 1 - + arch/mips/include/asm/xor.h | 1 - + arch/mips/include/uapi/asm/Kbuild | 5 +- + arch/mips/include/uapi/asm/auxvec.h | 4 - + arch/mips/include/uapi/asm/ipcbuf.h | 1 - + arch/mips/kernel/cpu-probe.c | 12 + + arch/mips/kernel/csrc-ioasic.c | 6 +- + arch/mips/kernel/idle.c | 1 + + arch/mips/kernel/mcount.S | 2 +- + arch/mips/kernel/relocate_kernel.S | 6 + + arch/mips/kernel/setup.c | 99 ++-- + arch/mips/kernel/time.c | 10 +- + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/mips/lantiq/falcon/sysctrl.c | 5 +- + arch/mips/lantiq/xway/Makefile | 2 +- + arch/mips/lantiq/xway/dcdc.c | 63 ++ + arch/mips/lasat/image/Makefile | 6 +- + arch/mips/loongson/common/Makefile | 3 +- + arch/mips/math-emu/cp1emu.c | 27 - + arch/mips/mm/c-octeon.c | 14 + + arch/mips/mm/dma-default.c | 16 +- + arch/mips/mm/gup.c | 3 +- + arch/mips/mm/init.c | 1 + + arch/mips/mm/tlb-funcs.S | 2 + + arch/mips/mm/tlbex.c | 2 + + arch/mips/netlogic/Kconfig | 9 + + arch/mips/netlogic/common/smp.c | 4 +- + arch/mips/netlogic/common/time.c | 3 +- + arch/mips/netlogic/dts/Makefile | 1 + + arch/mips/netlogic/dts/xlp_evp.dts | 9 +- + arch/mips/netlogic/dts/xlp_fvp.dts | 118 ++++ + arch/mips/netlogic/dts/xlp_svp.dts | 9 +- + arch/mips/netlogic/xlp/Makefile | 1 + + arch/mips/netlogic/xlp/dt.c | 8 +- + arch/mips/netlogic/xlp/nlm_hal.c | 237 ++++++-- + arch/mips/netlogic/xlp/setup.c | 50 +- + arch/mips/netlogic/xlp/usb-init-xlp2.c | 218 +++++++ + arch/mips/netlogic/xlp/usb-init.c | 6 +- + arch/mips/netlogic/xlp/wakeup.c | 10 +- + arch/mips/pci/Makefile | 1 + + arch/mips/pci/pci-octeon.c | 9 +- + arch/mips/pci/pci-rt3883.c | 636 +++++++++++++++++++++ + arch/mips/powertv/Kconfig | 9 +- + arch/mips/powertv/asic/asic_devices.c | 12 +- + arch/mips/powertv/init.c | 4 - + arch/mips/powertv/reset.c | 12 - + arch/mips/ralink/Kconfig | 10 + + arch/mips/ralink/Makefile | 4 +- + arch/mips/ralink/Platform | 1 + + arch/mips/ralink/cevt-rt3352.c | 145 +++++ + arch/mips/ralink/clk.c | 1 + + arch/mips/ralink/common.h | 2 + + arch/mips/ralink/mt7620.c | 205 ++++++- + arch/mips/ralink/of.c | 3 + + arch/mips/ralink/reset.c | 62 ++ + arch/mips/ralink/timer.c | 185 ++++++ + arch/mips/txx9/generic/setup.c | 2 +- + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-octeon.c | 157 +++++ + scripts/package/buildtar | 21 + + 103 files changed, 3108 insertions(+), 483 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/ralink,rt3883-pci.txt + create mode 120000 arch/mips/boot/dts/include/dt-bindings + create mode 100644 arch/mips/configs/xway_defconfig + delete mode 100644 arch/mips/include/asm/cputime.h + delete mode 100644 arch/mips/include/asm/current.h + delete mode 100644 arch/mips/include/asm/emergency-restart.h + delete mode 100644 arch/mips/include/asm/local64.h + create mode 100644 arch/mips/include/asm/mach-cavium-octeon/gpio.h + create mode 100644 arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h + delete mode 100644 arch/mips/include/asm/mutex.h + delete mode 100644 arch/mips/include/asm/parport.h + delete mode 100644 arch/mips/include/asm/percpu.h + delete mode 100644 arch/mips/include/asm/scatterlist.h + delete mode 100644 arch/mips/include/asm/sections.h + delete mode 100644 arch/mips/include/asm/segment.h + delete mode 100644 arch/mips/include/asm/serial.h + delete mode 100644 arch/mips/include/asm/ucontext.h + delete mode 100644 arch/mips/include/asm/xor.h + delete mode 100644 arch/mips/include/uapi/asm/auxvec.h + delete mode 100644 arch/mips/include/uapi/asm/ipcbuf.h + create mode 100644 arch/mips/lantiq/xway/dcdc.c + create mode 100644 arch/mips/netlogic/dts/xlp_fvp.dts + create mode 100644 arch/mips/netlogic/xlp/usb-init-xlp2.c + create mode 100644 arch/mips/pci/pci-rt3883.c + create mode 100644 arch/mips/ralink/cevt-rt3352.c + create mode 100644 arch/mips/ralink/timer.c + create mode 100644 drivers/gpio/gpio-octeon.c +Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (9f0f4fb parisc: add generic 32- and 64-bit defconfigs) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/configs/generic-32bit_defconfig | 340 +++++++++++++++++++++++++++ + arch/parisc/configs/generic-64bit_defconfig | 350 ++++++++++++++++++++++++++++ + 2 files changed, 690 insertions(+) + create mode 100644 arch/parisc/configs/generic-32bit_defconfig + create mode 100644 arch/parisc/configs/generic-64bit_defconfig +Merging powerpc/next (83c93e2 powerpc/pseries: Move lparcfg.c to platforms/pseries) +$ git merge powerpc/next +Resolved 'arch/powerpc/kernel/prom.c' using previous resolution. +Auto-merging arch/powerpc/platforms/pseries/lparcfg.c +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging arch/powerpc/kvm/book3s_hv_rm_mmu.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/time.c +Removing arch/powerpc/kernel/softemu8xx.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/kernel/prom.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging arch/powerpc/include/asm/prom.h +Auto-merging arch/powerpc/include/asm/plpar_wrappers.h +Auto-merging arch/powerpc/configs/85xx/p1023_defconfig +Auto-merging arch/powerpc/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6afb120] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/crypto/fsl-sec6.txt | 157 +++++++++ + .../devicetree/bindings/powerpc/fsl/msi-pic.txt | 53 ++- + Documentation/powerpc/00-INDEX | 11 + + arch/powerpc/Kconfig | 20 ++ + arch/powerpc/Makefile | 18 +- + arch/powerpc/boot/.gitignore | 1 + + arch/powerpc/boot/dts/b4420qds.dts | 2 +- + arch/powerpc/boot/dts/b4860qds.dts | 2 +- + arch/powerpc/boot/dts/{b4qds.dts => b4qds.dtsi} | 0 + arch/powerpc/boot/dts/c293pcie.dts | 223 +++++++++++++ + arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/c293si-post.dtsi | 193 +++++++++++ + arch/powerpc/boot/dts/fsl/c293si-pre.dtsi | 63 ++++ + arch/powerpc/boot/dts/fsl/qoriq-mpic4.3.dtsi | 149 +++++++++ + arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi | 56 ++++ + arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 2 +- + arch/powerpc/boot/dts/p1020rdb-pd.dts | 280 ++++++++++++++++ + arch/powerpc/boot/dts/p1023rdb.dts | 234 +++++++++++++ + arch/powerpc/boot/ppc_asm.h | 3 + + arch/powerpc/boot/util.S | 10 +- + .../85xx/{p1023rds_defconfig => p1023_defconfig} | 25 +- + arch/powerpc/configs/corenet32_smp_defconfig | 1 + + arch/powerpc/configs/corenet64_smp_defconfig | 3 + + arch/powerpc/configs/mpc83xx_defconfig | 1 + + arch/powerpc/configs/mpc85xx_defconfig | 2 + + arch/powerpc/configs/mpc85xx_smp_defconfig | 2 + + arch/powerpc/include/asm/asm-compat.h | 9 + + arch/powerpc/include/asm/btext.h | 1 + + arch/powerpc/include/asm/cacheflush.h | 8 +- + arch/powerpc/include/asm/cputable.h | 9 +- + arch/powerpc/include/asm/emulated_ops.h | 2 - + arch/powerpc/include/asm/epapr_hcalls.h | 6 + + arch/powerpc/include/asm/exception-64s.h | 35 +- + arch/powerpc/include/asm/io.h | 33 +- + arch/powerpc/include/asm/irqflags.h | 7 +- + arch/powerpc/include/asm/lppaca.h | 68 ++-- + arch/powerpc/include/asm/mpc85xx.h | 92 +++++ + arch/powerpc/include/asm/mpic.h | 7 + + arch/powerpc/include/asm/opal.h | 27 ++ + arch/powerpc/include/asm/paca.h | 11 +- + arch/powerpc/include/asm/pci-bridge.h | 2 +- + arch/powerpc/include/asm/perf_event_fsl_emb.h | 2 +- + .../pseries => include/asm}/plpar_wrappers.h | 30 +- + arch/powerpc/include/asm/ppc-opcode.h | 47 +++ + arch/powerpc/include/asm/ppc_asm.h | 22 +- + arch/powerpc/include/asm/prom.h | 7 +- + arch/powerpc/include/asm/reg.h | 25 +- + arch/powerpc/include/asm/reg_booke.h | 8 +- + arch/powerpc/include/asm/reg_fsl_emb.h | 24 +- + arch/powerpc/include/asm/rtas.h | 8 +- + arch/powerpc/include/asm/smp.h | 3 + + arch/powerpc/include/asm/spinlock.h | 6 +- + arch/powerpc/include/asm/switch_to.h | 11 +- + arch/powerpc/include/asm/timex.h | 4 +- + arch/powerpc/include/asm/topology.h | 1 + + arch/powerpc/include/asm/udbg.h | 9 +- + arch/powerpc/include/uapi/asm/elf.h | 21 +- + arch/powerpc/kernel/Makefile | 5 +- + arch/powerpc/kernel/align.c | 14 + + arch/powerpc/kernel/btext.c | 254 +++++++------- + arch/powerpc/kernel/cacheinfo.c | 12 +- + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +- + arch/powerpc/kernel/cputable.c | 2 +- + arch/powerpc/kernel/entry_64.S | 46 +-- + arch/powerpc/kernel/epapr_paravirt.c | 28 +- + arch/powerpc/kernel/exceptions-64e.S | 4 +- + arch/powerpc/kernel/exceptions-64s.S | 39 ++- + arch/powerpc/kernel/head_40x.S | 8 - + arch/powerpc/kernel/head_44x.S | 10 - + arch/powerpc/kernel/head_64.S | 1 + + arch/powerpc/kernel/head_8xx.S | 4 - + arch/powerpc/kernel/head_fsl_booke.S | 10 - + arch/powerpc/kernel/io-workarounds.c | 19 +- + arch/powerpc/kernel/io.c | 3 + + arch/powerpc/kernel/legacy_serial.c | 62 ++-- + arch/powerpc/kernel/misc_32.S | 3 +- + arch/powerpc/kernel/misc_64.S | 50 ++- + arch/powerpc/kernel/paca.c | 10 +- + arch/powerpc/kernel/pci-common.c | 13 +- + arch/powerpc/kernel/pci_64.c | 4 +- + arch/powerpc/kernel/pci_dn.c | 20 +- + arch/powerpc/kernel/pci_of_scan.c | 23 +- + arch/powerpc/kernel/ppc_ksyms.c | 3 +- + arch/powerpc/kernel/process.c | 2 + + arch/powerpc/kernel/prom.c | 82 +++-- + arch/powerpc/kernel/prom_init.c | 269 +++++++++------ + arch/powerpc/kernel/prom_init_check.sh | 3 +- + arch/powerpc/kernel/prom_parse.c | 17 +- + arch/powerpc/kernel/rtas.c | 66 ++-- + arch/powerpc/kernel/setup-common.c | 13 +- + arch/powerpc/kernel/setup_32.c | 4 +- + arch/powerpc/kernel/setup_64.c | 36 +- + arch/powerpc/kernel/signal_32.c | 9 + + arch/powerpc/kernel/signal_64.c | 18 +- + arch/powerpc/kernel/smp.c | 156 ++++++--- + arch/powerpc/kernel/softemu8xx.c | 199 ----------- + arch/powerpc/kernel/swsusp_asm64.S | 45 ++- + arch/powerpc/kernel/swsusp_booke.S | 8 + + arch/powerpc/kernel/time.c | 18 +- + arch/powerpc/kernel/tm.S | 4 +- + arch/powerpc/kernel/traps.c | 111 +++---- + arch/powerpc/kernel/udbg_16550.c | 370 +++++++++------------ + arch/powerpc/kernel/vdso32/gettimeofday.S | 6 +- + arch/powerpc/kernel/vio.c | 33 +- + arch/powerpc/kvm/book3s_64_slb.S | 4 + + arch/powerpc/kvm/book3s_hv.c | 2 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 + + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 12 + + arch/powerpc/kvm/emulate.c | 45 +-- + arch/powerpc/lib/locks.c | 4 +- + arch/powerpc/lib/sstep.c | 8 +- + arch/powerpc/math-emu/Makefile | 24 +- + arch/powerpc/math-emu/math.c | 89 ++--- + arch/powerpc/mm/fault.c | 6 +- + arch/powerpc/mm/gup.c | 37 ++- + arch/powerpc/mm/hash_utils_64.c | 2 +- + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/mm/numa.c | 102 +++--- + arch/powerpc/mm/slb.c | 9 +- + arch/powerpc/mm/subpage-prot.c | 4 +- + arch/powerpc/oprofile/op_model_fsl_emb.c | 30 ++ + arch/powerpc/perf/Makefile | 2 +- + arch/powerpc/perf/core-book3s.c | 2 +- + arch/powerpc/perf/core-fsl-emb.c | 30 ++ + arch/powerpc/perf/e6500-pmu.c | 121 +++++++ + arch/powerpc/platforms/85xx/Kconfig | 10 +- + arch/powerpc/platforms/85xx/Makefile | 1 + + arch/powerpc/platforms/85xx/c293pcie.c | 75 +++++ + arch/powerpc/platforms/85xx/corenet_ds.c | 6 - + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 22 ++ + arch/powerpc/platforms/85xx/p1023_rds.c | 24 +- + arch/powerpc/platforms/85xx/smp.c | 26 ++ + arch/powerpc/platforms/Kconfig | 7 +- + arch/powerpc/platforms/Kconfig.cputype | 13 + + arch/powerpc/platforms/cell/iommu.c | 2 +- + arch/powerpc/platforms/cell/smp.c | 15 +- + arch/powerpc/platforms/powernv/Kconfig | 2 + + arch/powerpc/platforms/powernv/Makefile | 2 +- + arch/powerpc/platforms/powernv/eeh-ioda.c | 22 +- + arch/powerpc/platforms/powernv/opal-lpc.c | 203 +++++++++++ + arch/powerpc/platforms/powernv/opal-wrappers.S | 5 + + arch/powerpc/platforms/powernv/opal.c | 18 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 47 ++- + arch/powerpc/platforms/powernv/powernv.h | 2 + + arch/powerpc/platforms/powernv/setup.c | 17 + + arch/powerpc/platforms/powernv/smp.c | 18 +- + arch/powerpc/platforms/pseries/Makefile | 1 + + arch/powerpc/platforms/pseries/cmm.c | 3 +- + arch/powerpc/platforms/pseries/dlpar.c | 67 ++-- + arch/powerpc/platforms/pseries/dtl.c | 5 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 7 +- + arch/powerpc/platforms/pseries/hvconsole.c | 19 +- + arch/powerpc/platforms/pseries/iommu.c | 11 +- + arch/powerpc/platforms/pseries/kexec.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 12 +- + .../{kernel => platforms/pseries}/lparcfg.c | 14 +- + arch/powerpc/platforms/pseries/mobility.c | 45 ++- + arch/powerpc/platforms/pseries/processor_idle.c | 12 +- + arch/powerpc/platforms/pseries/pseries.h | 5 +- + arch/powerpc/platforms/pseries/pseries_energy.c | 4 +- + arch/powerpc/platforms/pseries/setup.c | 6 +- + arch/powerpc/platforms/pseries/smp.c | 20 +- + arch/powerpc/platforms/wsp/wsp.h | 1 - + arch/powerpc/sysdev/fsl_msi.c | 137 +++++--- + arch/powerpc/sysdev/fsl_msi.h | 10 +- + arch/powerpc/sysdev/fsl_pci.c | 184 ++++++++-- + arch/powerpc/sysdev/fsl_pci.h | 6 + + arch/powerpc/sysdev/xics/icp-native.c | 2 +- + arch/powerpc/sysdev/xics/xics-common.c | 10 +- + arch/powerpc/xmon/xmon.c | 7 + + drivers/macintosh/ams/ams-input.c | 6 +- + drivers/tty/hvc/hvc_vio.c | 4 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/powerpc/Makefile | 39 +++ + tools/testing/selftests/powerpc/harness.c | 105 ++++++ + tools/testing/selftests/powerpc/pmu/Makefile | 23 ++ + .../selftests/powerpc/pmu/count_instructions.c | 135 ++++++++ + tools/testing/selftests/powerpc/pmu/event.c | 105 ++++++ + tools/testing/selftests/powerpc/pmu/event.h | 39 +++ + tools/testing/selftests/powerpc/pmu/loop.S | 46 +++ + tools/testing/selftests/powerpc/subunit.h | 47 +++ + tools/testing/selftests/powerpc/utils.h | 34 ++ + 182 files changed, 4736 insertions(+), 1690 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec6.txt + rename arch/powerpc/boot/dts/{b4qds.dts => b4qds.dtsi} (100%) + create mode 100644 arch/powerpc/boot/dts/c293pcie.dts + create mode 100644 arch/powerpc/boot/dts/fsl/c293si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/c293si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-mpic4.3.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi + create mode 100644 arch/powerpc/boot/dts/p1020rdb-pd.dts + create mode 100644 arch/powerpc/boot/dts/p1023rdb.dts + rename arch/powerpc/configs/85xx/{p1023rds_defconfig => p1023_defconfig} (87%) + create mode 100644 arch/powerpc/include/asm/mpc85xx.h + rename arch/powerpc/{platforms/pseries => include/asm}/plpar_wrappers.h (90%) + delete mode 100644 arch/powerpc/kernel/softemu8xx.c + create mode 100644 arch/powerpc/perf/e6500-pmu.c + create mode 100644 arch/powerpc/platforms/85xx/c293pcie.c + create mode 100644 arch/powerpc/platforms/powernv/opal-lpc.c + rename arch/powerpc/{kernel => platforms/pseries}/lparcfg.c (98%) + create mode 100644 tools/testing/selftests/powerpc/Makefile + create mode 100644 tools/testing/selftests/powerpc/harness.c + create mode 100644 tools/testing/selftests/powerpc/pmu/Makefile + create mode 100644 tools/testing/selftests/powerpc/pmu/count_instructions.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event.c + create mode 100644 tools/testing/selftests/powerpc/pmu/event.h + create mode 100644 tools/testing/selftests/powerpc/pmu/loop.S + create mode 100644 tools/testing/selftests/powerpc/subunit.h + create mode 100644 tools/testing/selftests/powerpc/utils.h +Merging 4xx/next (2074b1d powerpc: Fix irq distribution) +$ git merge 4xx/next +Already up-to-date. +Merging mpc5xxx/next (f2110cb dts: mpc512x: prepare for preprocessor support) +$ git merge mpc5xxx/next +Auto-merging drivers/usb/host/fsl-mph-dr-of.c +Merge made by the 'recursive' strategy. + arch/powerpc/boot/dts/ac14xx.dts | 2 +- + arch/powerpc/boot/dts/include/dt-bindings | 1 + + arch/powerpc/boot/dts/mpc5121ads.dts | 2 +- + arch/powerpc/boot/dts/pdm360ng.dts | 2 +- + arch/powerpc/include/asm/mpc5121.h | 18 +----- + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 3 +- + drivers/media/platform/fsl-viu.c | 23 ++++---- + drivers/mtd/nand/mpc5121_nfc.c | 21 ++++--- + drivers/tty/serial/mpc52xx_uart.c | 98 +++++++++++++++++++++++++------ + drivers/usb/host/fsl-mph-dr-of.c | 16 ++--- + 10 files changed, 123 insertions(+), 63 deletions(-) + create mode 120000 arch/powerpc/boot/dts/include/dt-bindings +Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) +$ git merge galak/next +Already up-to-date. +Merging s390/features (82003c3 s390/irq: rework irq subclass handling) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/defconfig | 39 ++++++++++++++------ + arch/s390/include/asm/irq.h | 12 ++++-- + arch/s390/kernel/dumpstack.c | 20 +++++----- + arch/s390/kernel/irq.c | 79 ++++++++++++++-------------------------- + arch/s390/kernel/perf_cpum_cf.c | 4 +- + arch/s390/kernel/perf_event.c | 5 +-- + arch/s390/kernel/runtime_instr.c | 4 +- + arch/s390/mm/fault.c | 2 +- + arch/s390/net/bpf_jit_comp.c | 2 +- + arch/s390/oprofile/hwsampler.c | 6 +-- + drivers/s390/block/dasd_diag.c | 4 +- + drivers/s390/char/sclp.c | 6 +-- + drivers/s390/kvm/kvm_virtio.c | 2 +- + 13 files changed, 89 insertions(+), 96 deletions(-) +Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) +$ git merge sh/sh-latest +Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution. +Resolved 'drivers/tty/serial/sh-sci.c' using previous resolution. +Resolved 'include/linux/serial_sci.h' using previous resolution. +Auto-merging include/linux/serial_sci.h +CONFLICT (content): Merge conflict in include/linux/serial_sci.h +Auto-merging drivers/tty/serial/sh-sci.c +CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c +Auto-merging arch/sh/kernel/cpu/sh2a/Makefile +CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 043274b] Merge remote-tracking branch 'sh/sh-latest' +$ git diff -M --stat --summary HEAD^.. + .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++ + arch/sh/include/asm/hw_breakpoint.h | 12 +- + arch/sh/include/cpu-common/cpu/ubc.h | 17 +++ + arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++ + arch/sh/kernel/cpu/sh2a/Makefile | 1 + + arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++ + arch/sh/kernel/hw_breakpoint.c | 8 ++ + drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++- + include/linux/serial_sci.h | 4 + + 9 files changed, 375 insertions(+), 15 deletions(-) + create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt + create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h + create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h + create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c +Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (b40f451 tile PCI RC: make default consistent DMA mask 32-bit) +$ git merge tile/master +Resolved 'drivers/tty/serial/Makefile' using previous resolution. +Resolved 'include/uapi/linux/serial_core.h' using previous resolution. +Auto-merging include/uapi/linux/serial_core.h +CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h +Auto-merging drivers/tty/serial/Makefile +CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile +Auto-merging drivers/tty/serial/Kconfig +Removing arch/tile/lib/memcpy_tile64.c +Auto-merging arch/tile/kernel/time.c +Auto-merging arch/tile/kernel/smpboot.c +Auto-merging arch/tile/kernel/setup.c +Auto-merging arch/tile/kernel/pci_gx.c +Auto-merging arch/tile/kernel/irq.c +Removing arch/tile/kernel/hvglue.lds +Removing arch/tile/include/uapi/arch/chip_tile64.h +Auto-merging arch/tile/include/asm/kdebug.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c388e32] Merge remote-tracking branch 'tile/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 9 +- + arch/tile/Kconfig | 31 +- + arch/tile/Kconfig.debug | 14 +- + arch/tile/Makefile | 4 - + arch/tile/gxio/Kconfig | 5 + + arch/tile/gxio/Makefile | 1 + + arch/tile/gxio/iorpc_trio.c | 23 + + arch/tile/gxio/iorpc_uart.c | 77 ++ + arch/tile/gxio/uart.c | 87 ++ + arch/tile/include/arch/trio.h | 39 + + arch/tile/include/arch/uart.h | 300 +++++ + arch/tile/include/arch/uart_def.h | 120 ++ + arch/tile/include/asm/Kbuild | 3 +- + arch/tile/include/asm/atomic_32.h | 17 - + arch/tile/include/asm/barrier.h | 4 - + arch/tile/include/asm/bitops.h | 41 +- + arch/tile/include/asm/cache.h | 13 +- + arch/tile/include/asm/cacheflush.h | 44 +- + arch/tile/include/asm/cmpxchg.h | 6 + + arch/tile/include/asm/device.h | 5 +- + arch/tile/include/asm/dma-mapping.h | 27 +- + arch/tile/include/asm/elf.h | 10 +- + arch/tile/include/asm/fixmap.h | 8 - + arch/tile/include/asm/ftrace.h | 22 +- + arch/tile/include/asm/futex.h | 1 + + arch/tile/include/asm/homecache.h | 11 +- + arch/tile/include/asm/io.h | 132 ++- + arch/tile/include/asm/irqflags.h | 21 +- + arch/tile/include/asm/{hw_irq.h => kdebug.h} | 18 +- + arch/tile/include/asm/kgdb.h | 71 ++ + arch/tile/include/asm/kprobes.h | 79 ++ + arch/tile/include/asm/mmu.h | 1 + + arch/tile/include/asm/mmu_context.h | 2 +- + arch/tile/include/asm/mmzone.h | 2 +- + arch/tile/include/asm/page.h | 61 +- + arch/tile/include/asm/pci.h | 22 +- + arch/tile/include/asm/pgtable_32.h | 4 +- + arch/tile/include/asm/pgtable_64.h | 27 +- + arch/tile/include/asm/processor.h | 84 +- + arch/tile/include/asm/ptrace.h | 6 +- + arch/tile/include/asm/sections.h | 8 +- + arch/tile/include/asm/setup.h | 3 +- + arch/tile/include/asm/smp.h | 2 - + arch/tile/include/asm/spinlock_64.h | 4 +- + arch/tile/include/asm/string.h | 2 + + arch/tile/include/asm/thread_info.h | 6 + + arch/tile/include/asm/traps.h | 13 +- + arch/tile/include/asm/uaccess.h | 37 +- + arch/tile/include/asm/unaligned.h | 14 +- + arch/tile/include/asm/vdso.h | 49 + + arch/tile/include/gxio/iorpc_trio.h | 5 + + arch/tile/include/gxio/iorpc_uart.h | 40 + + arch/tile/include/gxio/uart.h | 105 ++ + arch/tile/include/hv/drv_trio_intf.h | 8 +- + arch/tile/include/hv/drv_uart_intf.h | 33 + + arch/tile/include/hv/hypervisor.h | 61 +- + arch/tile/include/uapi/arch/Kbuild | 1 - + arch/tile/include/uapi/arch/chip.h | 4 +- + arch/tile/include/uapi/arch/chip_tile64.h | 258 ----- + arch/tile/include/uapi/arch/opcode_tilegx.h | 1 + + arch/tile/include/uapi/arch/opcode_tilepro.h | 1 + + arch/tile/include/uapi/arch/spr_def_32.h | 2 - + arch/tile/include/uapi/asm/auxvec.h | 3 +- + arch/tile/include/uapi/asm/cachectl.h | 4 +- + arch/tile/kernel/Makefile | 16 +- + arch/tile/kernel/asm-offsets.c | 52 +- + arch/tile/kernel/compat_signal.c | 3 +- + arch/tile/kernel/early_printk.c | 47 +- + arch/tile/kernel/entry.S | 16 - + arch/tile/kernel/ftrace.c | 246 ++++ + arch/tile/kernel/hardwall.c | 28 +- + arch/tile/kernel/head_32.S | 17 +- + arch/tile/kernel/head_64.S | 46 +- + arch/tile/kernel/hvglue.S | 74 ++ + arch/tile/kernel/hvglue.lds | 59 - + arch/tile/kernel/hvglue_trace.c | 266 +++++ + arch/tile/kernel/intvec_32.S | 114 +- + arch/tile/kernel/intvec_64.S | 305 ++++- + arch/tile/kernel/irq.c | 8 +- + arch/tile/kernel/kgdb.c | 499 ++++++++ + arch/tile/kernel/kprobes.c | 528 +++++++++ + arch/tile/kernel/mcount_64.S | 224 ++++ + arch/tile/kernel/pci-dma.c | 74 +- + arch/tile/kernel/pci.c | 33 +- + arch/tile/kernel/pci_gx.c | 727 +++++++----- + arch/tile/kernel/proc.c | 2 - + arch/tile/kernel/process.c | 116 +- + arch/tile/kernel/ptrace.c | 19 +- + arch/tile/kernel/reboot.c | 2 - + arch/tile/kernel/regs_32.S | 4 +- + arch/tile/kernel/regs_64.S | 4 +- + arch/tile/kernel/relocate_kernel_32.S | 27 +- + arch/tile/kernel/relocate_kernel_64.S | 11 +- + arch/tile/kernel/setup.c | 162 ++- + arch/tile/kernel/signal.c | 3 +- + arch/tile/kernel/single_step.c | 118 +- + arch/tile/kernel/smp.c | 22 +- + arch/tile/kernel/smpboot.c | 8 +- + arch/tile/kernel/stack.c | 51 +- + arch/tile/kernel/sys.c | 4 +- + arch/tile/kernel/sysfs.c | 76 ++ + arch/tile/kernel/time.c | 37 +- + arch/tile/kernel/tlb.c | 8 +- + arch/tile/kernel/traps.c | 89 +- + arch/tile/kernel/unaligned.c | 1609 ++++++++++++++++++++++++++ + arch/tile/kernel/vdso.c | 212 ++++ + arch/tile/kernel/vdso/Makefile | 118 ++ + arch/tile/kernel/vdso/vdso.S | 28 + + arch/tile/kernel/vdso/vdso.lds.S | 87 ++ + arch/tile/kernel/vdso/vdso32.S | 28 + + arch/tile/kernel/vdso/vgettimeofday.c | 107 ++ + arch/tile/kernel/vdso/vrt_sigreturn.S | 30 + + arch/tile/kernel/vmlinux.lds.S | 31 +- + arch/tile/lib/Makefile | 16 +- + arch/tile/lib/atomic_32.c | 99 -- + arch/tile/lib/atomic_asm_32.S | 1 + + arch/tile/lib/cacheflush.c | 16 +- + arch/tile/lib/exports.c | 7 +- + arch/tile/lib/memchr_64.c | 2 +- + arch/tile/lib/memcpy_32.S | 63 +- + arch/tile/lib/memcpy_64.c | 264 +++-- + arch/tile/lib/memcpy_tile64.c | 276 ----- + arch/tile/lib/memcpy_user_64.c | 2 + + arch/tile/lib/memset_32.c | 110 +- + arch/tile/lib/memset_64.c | 9 +- + arch/tile/lib/strchr_32.c | 2 - + arch/tile/lib/strchr_64.c | 2 +- + arch/tile/lib/string-endian.h | 13 +- + arch/tile/lib/strlen_32.c | 2 - + arch/tile/lib/strnlen_32.c | 47 + + arch/tile/lib/strnlen_64.c | 48 + + arch/tile/lib/usercopy_32.S | 36 +- + arch/tile/lib/usercopy_64.S | 36 +- + arch/tile/mm/elf.c | 99 +- + arch/tile/mm/fault.c | 135 ++- + arch/tile/mm/highmem.c | 2 - + arch/tile/mm/homecache.c | 39 +- + arch/tile/mm/hugetlbpage.c | 38 +- + arch/tile/mm/init.c | 96 +- + arch/tile/mm/migrate_32.S | 4 +- + arch/tile/mm/migrate_64.S | 4 +- + arch/tile/mm/mmap.c | 24 +- + arch/tile/mm/pgtable.c | 76 +- + drivers/edac/tile_edac.c | 1 - + drivers/tty/hvc/hvc_tile.c | 149 ++- + drivers/tty/serial/Kconfig | 9 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/tilegx.c | 708 ++++++++++++ + include/uapi/linux/serial_core.h | 5 +- + samples/kprobes/kprobe_example.c | 9 + + scripts/recordmcount.pl | 4 + + 151 files changed, 8498 insertions(+), 2467 deletions(-) + create mode 100644 arch/tile/gxio/iorpc_uart.c + create mode 100644 arch/tile/gxio/uart.c + create mode 100644 arch/tile/include/arch/uart.h + create mode 100644 arch/tile/include/arch/uart_def.h + rename arch/tile/include/asm/{hw_irq.h => kdebug.h} (65%) + create mode 100644 arch/tile/include/asm/kgdb.h + create mode 100644 arch/tile/include/asm/kprobes.h + create mode 100644 arch/tile/include/asm/vdso.h + create mode 100644 arch/tile/include/gxio/iorpc_uart.h + create mode 100644 arch/tile/include/gxio/uart.h + create mode 100644 arch/tile/include/hv/drv_uart_intf.h + delete mode 100644 arch/tile/include/uapi/arch/chip_tile64.h + create mode 100644 arch/tile/kernel/ftrace.c + create mode 100644 arch/tile/kernel/hvglue.S + delete mode 100644 arch/tile/kernel/hvglue.lds + create mode 100644 arch/tile/kernel/hvglue_trace.c + create mode 100644 arch/tile/kernel/kgdb.c + create mode 100644 arch/tile/kernel/kprobes.c + create mode 100644 arch/tile/kernel/mcount_64.S + create mode 100644 arch/tile/kernel/unaligned.c + create mode 100644 arch/tile/kernel/vdso.c + create mode 100644 arch/tile/kernel/vdso/Makefile + create mode 100644 arch/tile/kernel/vdso/vdso.S + create mode 100644 arch/tile/kernel/vdso/vdso.lds.S + create mode 100644 arch/tile/kernel/vdso/vdso32.S + create mode 100644 arch/tile/kernel/vdso/vgettimeofday.c + create mode 100644 arch/tile/kernel/vdso/vrt_sigreturn.S + delete mode 100644 arch/tile/lib/memcpy_tile64.c + create mode 100644 arch/tile/lib/strnlen_32.c + create mode 100644 arch/tile/lib/strnlen_64.c + create mode 100644 drivers/tty/serial/tilegx.c +Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (3b2f64d Linux 3.11-rc2) +$ git merge xtensa/for_next +Already up-to-date. +Merging aio-direct/for-next (b080082 tmpfs: add support for read_iter and write_iter) +$ git merge aio-direct/for-next +Resolved 'fs/block_dev.c' using previous resolution. +Resolved 'fs/direct-io.c' using previous resolution. +Auto-merging mm/shmem.c +Auto-merging mm/filemap.c +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/fuse/cuse.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/indirect.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/direct-io.c +CONFLICT (content): Merge conflict in fs/direct-io.c +Auto-merging fs/cifs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/block_dev.c +CONFLICT (content): Merge conflict in fs/block_dev.c +Auto-merging drivers/usb/gadget/storage_common.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c6f4bf6] Merge remote-tracking branch 'aio-direct/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 6 +- + Documentation/filesystems/vfs.txt | 12 +- + drivers/block/loop.c | 148 ++++++++---- + drivers/char/raw.c | 4 +- + drivers/mtd/nand/nandsim.c | 4 +- + drivers/usb/gadget/storage_common.c | 4 +- + fs/9p/vfs_addr.c | 12 +- + fs/9p/vfs_file.c | 8 +- + fs/Makefile | 2 +- + fs/adfs/file.c | 4 +- + fs/affs/file.c | 4 +- + fs/afs/file.c | 4 +- + fs/afs/internal.h | 3 +- + fs/afs/write.c | 9 +- + fs/aio.c | 137 +++++++++++- + fs/bad_inode.c | 14 ++ + fs/bfs/file.c | 4 +- + fs/block_dev.c | 27 ++- + fs/btrfs/file.c | 42 ++-- + fs/btrfs/inode.c | 63 +++--- + fs/ceph/addr.c | 3 +- + fs/cifs/file.c | 4 +- + fs/direct-io.c | 223 +++++++++++++------ + fs/ecryptfs/file.c | 15 +- + fs/exofs/file.c | 4 +- + fs/ext2/file.c | 4 +- + fs/ext2/inode.c | 8 +- + fs/ext3/file.c | 4 +- + fs/ext3/inode.c | 15 +- + fs/ext4/ext4.h | 3 +- + fs/ext4/file.c | 34 +-- + fs/ext4/indirect.c | 16 +- + fs/ext4/inode.c | 23 +- + fs/f2fs/data.c | 4 +- + fs/f2fs/file.c | 4 +- + fs/fat/file.c | 4 +- + fs/fat/inode.c | 10 +- + fs/fuse/cuse.c | 10 +- + fs/fuse/file.c | 90 ++++---- + fs/fuse/fuse_i.h | 5 +- + fs/gfs2/aops.c | 7 +- + fs/gfs2/file.c | 21 +- + fs/hfs/inode.c | 11 +- + fs/hfsplus/inode.c | 10 +- + fs/hostfs/hostfs_kern.c | 4 +- + fs/hpfs/file.c | 4 +- + fs/internal.h | 4 + + fs/iov-iter.c | 411 ++++++++++++++++++++++++++++++++++ + fs/jffs2/file.c | 8 +- + fs/jfs/file.c | 4 +- + fs/jfs/inode.c | 7 +- + fs/logfs/file.c | 4 +- + fs/minix/file.c | 4 +- + fs/nfs/direct.c | 302 ++++++++++++++++--------- + fs/nfs/file.c | 33 ++- + fs/nfs/internal.h | 4 +- + fs/nfs/nfs4file.c | 4 +- + fs/nilfs2/file.c | 4 +- + fs/nilfs2/inode.c | 8 +- + fs/ocfs2/aops.c | 8 +- + fs/ocfs2/aops.h | 2 +- + fs/ocfs2/file.c | 55 ++--- + fs/ocfs2/ocfs2_trace.h | 6 +- + fs/omfs/file.c | 4 +- + fs/ramfs/file-mmu.c | 4 +- + fs/ramfs/file-nommu.c | 4 +- + fs/read_write.c | 78 +++++-- + fs/reiserfs/file.c | 4 +- + fs/reiserfs/inode.c | 7 +- + fs/romfs/mmap-nommu.c | 2 +- + fs/sysv/file.c | 4 +- + fs/ubifs/file.c | 12 +- + fs/udf/file.c | 13 +- + fs/udf/inode.c | 10 +- + fs/ufs/file.c | 4 +- + fs/xfs/xfs_aops.c | 13 +- + fs/xfs/xfs_file.c | 51 ++--- + include/linux/aio.h | 18 +- + include/linux/bio.h | 8 + + include/linux/blk_types.h | 2 - + include/linux/fs.h | 165 ++++++++++++-- + include/linux/nfs_fs.h | 13 +- + include/uapi/linux/aio_abi.h | 2 + + include/uapi/linux/loop.h | 1 + + mm/filemap.c | 433 ++++++++++++++---------------------- + mm/page_io.c | 15 +- + mm/shmem.c | 61 ++--- + 87 files changed, 1845 insertions(+), 1002 deletions(-) + create mode 100644 fs/iov-iter.c +Merging btrfs/next (d7396f0 Btrfs: optimize key searches in btrfs_search_slot) +$ git merge btrfs/next +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/dev-replace.c +Merge made by the 'recursive' strategy. + fs/btrfs/Kconfig | 9 + + fs/btrfs/Makefile | 5 +- + fs/btrfs/backref.c | 93 +++-- + fs/btrfs/backref.h | 2 + + fs/btrfs/btrfs_inode.h | 21 ++ + fs/btrfs/check-integrity.c | 422 +++++++++------------ + fs/btrfs/compression.c | 11 +- + fs/btrfs/ctree.c | 289 ++++++++------- + fs/btrfs/ctree.h | 161 ++++++-- + fs/btrfs/delayed-inode.c | 46 +-- + fs/btrfs/delayed-ref.c | 8 +- + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/disk-io.c | 174 ++++++--- + fs/btrfs/extent-tree.c | 184 ++++++---- + fs/btrfs/extent_io.c | 664 +++++++++++++++++++-------------- + fs/btrfs/extent_io.h | 35 +- + fs/btrfs/file-item.c | 85 +++-- + fs/btrfs/file.c | 11 +- + fs/btrfs/free-space-cache.c | 525 ++++----------------------- + fs/btrfs/free-space-cache.h | 11 +- + fs/btrfs/inode.c | 615 ++++++++++++++----------------- + fs/btrfs/ioctl.c | 745 +++++++++++++++++++++++++++++--------- + fs/btrfs/lzo.c | 4 +- + fs/btrfs/ordered-data.c | 28 +- + fs/btrfs/ordered-data.h | 7 + + fs/btrfs/print-tree.c | 107 +++--- + fs/btrfs/qgroup.c | 69 ++-- + fs/btrfs/raid56.c | 14 +- + fs/btrfs/relocation.c | 43 ++- + fs/btrfs/root-tree.c | 21 +- + fs/btrfs/scrub.c | 42 +-- + fs/btrfs/send.c | 240 +++++++++--- + fs/btrfs/super.c | 145 ++++++-- + fs/btrfs/tests/btrfs-tests.h | 34 ++ + fs/btrfs/tests/free-space-tests.c | 395 ++++++++++++++++++++ + fs/btrfs/transaction.c | 34 +- + fs/btrfs/transaction.h | 2 - + fs/btrfs/tree-log.c | 19 +- + fs/btrfs/uuid-tree.c | 358 ++++++++++++++++++ + fs/btrfs/volumes.c | 613 +++++++++++++++++++++++-------- + fs/btrfs/volumes.h | 12 + + include/trace/events/btrfs.h | 60 ++- + include/uapi/linux/btrfs.h | 30 +- + 43 files changed, 4045 insertions(+), 2352 deletions(-) + create mode 100644 fs/btrfs/tests/btrfs-tests.h + create mode 100644 fs/btrfs/tests/free-space-tests.c + create mode 100644 fs/btrfs/uuid-tree.c +Merging ceph/master (ea1eb16 ceph: use d_invalidate() to invalidate aliases) +$ git merge ceph/master +Auto-merging net/ceph/messenger.c +Auto-merging fs/ceph/addr.c +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/caching/backend-api.txt | 9 + + Documentation/filesystems/caching/netfs-api.txt | 35 +- + drivers/block/rbd.c | 36 +- + fs/cachefiles/interface.c | 26 ++ + fs/cachefiles/internal.h | 1 + + fs/cachefiles/xattr.c | 36 ++ + fs/ceph/Kconfig | 9 + + fs/ceph/Makefile | 1 + + fs/ceph/addr.c | 116 ++++--- + fs/ceph/cache.c | 400 ++++++++++++++++++++++ + fs/ceph/cache.h | 157 +++++++++ + fs/ceph/caps.c | 87 ++++- + fs/ceph/dir.c | 2 + + fs/ceph/file.c | 299 +++++++++++++--- + fs/ceph/inode.c | 46 ++- + fs/ceph/ioctl.c | 12 +- + fs/ceph/mds_client.c | 34 ++ + fs/ceph/super.c | 35 +- + fs/ceph/super.h | 17 + + fs/fscache/cookie.c | 69 ++++ + fs/fscache/internal.h | 6 + + fs/fscache/page.c | 71 ++-- + include/linux/fscache-cache.h | 4 + + include/linux/fscache.h | 42 +++ + net/ceph/messenger.c | 2 +- + net/ceph/osd_client.c | 27 +- + net/ceph/osdmap.c | 2 +- + 27 files changed, 1393 insertions(+), 188 deletions(-) + create mode 100644 fs/ceph/cache.c + create mode 100644 fs/ceph/cache.h +Merging cifs/for-next (de09ae6 cifs: Move and expand MAX_SERVER_SIZE definition) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/AUTHORS | 1 + + fs/cifs/cifsfs.c | 15 +++++ + fs/cifs/cifsglob.h | 11 ++-- + fs/cifs/cifspdu.h | 11 ++-- + fs/cifs/cifsproto.h | 10 +--- + fs/cifs/cifssmb.c | 110 ++++++++++++++++------------------- + fs/cifs/connect.c | 12 ++-- + fs/cifs/inode.c | 4 ++ + fs/cifs/link.c | 24 ++------ + fs/cifs/readdir.c | 3 + + fs/cifs/sess.c | 10 ++-- + fs/cifs/smb1ops.c | 32 ++++++++++ + fs/cifs/smb2file.c | 2 +- + fs/cifs/smb2inode.c | 9 +-- + fs/cifs/smb2misc.c | 4 ++ + fs/cifs/smb2ops.c | 60 ++++++++++++++++++- + fs/cifs/smb2pdu.c | 6 +- + fs/cifs/smb2pdu.h | 14 +++++ + fs/cifs/smb2proto.h | 3 +- + include/uapi/linux/cifs/cifs_mount.h | 27 +++++++++ + 20 files changed, 251 insertions(+), 117 deletions(-) + create mode 100644 include/uapi/linux/cifs/cifs_mount.h +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 (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (97a2847 Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeffm/linux-reiserfs into for_next_testing) +$ git merge ext3/for_next +Auto-merging fs/reiserfs/super.c +Auto-merging fs/reiserfs/inode.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/ext3.txt | 7 +- + fs/ext3/super.c | 43 +++++ + fs/isofs/inode.c | 16 +- + fs/jbd/commit.c | 2 +- + fs/jbd/journal.c | 18 ++ + fs/reiserfs/bitmap.c | 22 ++- + fs/reiserfs/dir.c | 7 +- + fs/reiserfs/fix_node.c | 26 +-- + fs/reiserfs/inode.c | 114 ++++++------- + fs/reiserfs/ioctl.c | 7 +- + fs/reiserfs/journal.c | 104 +++++------ + fs/reiserfs/lock.c | 43 ++--- + fs/reiserfs/namei.c | 24 +-- + fs/reiserfs/prints.c | 5 +- + fs/reiserfs/reiserfs.h | 36 ++-- + fs/reiserfs/resize.c | 10 +- + fs/reiserfs/stree.c | 74 ++++---- + fs/reiserfs/super.c | 75 ++++---- + fs/reiserfs/xattr.c | 46 ++--- + fs/reiserfs/xattr_acl.c | 16 +- + fs/udf/super.c | 342 ++++++++++++++++++++++--------------- + include/linux/jbd.h | 17 +- + 22 files changed, 609 insertions(+), 445 deletions(-) +Merging ext4/dev (ad4eec6 ext4: allow specifying external journal by pathname mount option) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (a26b7c8 f2fs: optimize gc for better performance) +$ git merge f2fs/dev +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 26 +++ + Documentation/filesystems/f2fs.txt | 75 ++++++++- + fs/f2fs/checkpoint.c | 24 ++- + fs/f2fs/data.c | 28 ++-- + fs/f2fs/debug.c | 34 ++-- + fs/f2fs/dir.c | 19 ++- + fs/f2fs/f2fs.h | 106 +++++++++--- + fs/f2fs/file.c | 25 ++- + fs/f2fs/gc.c | 58 ++++--- + fs/f2fs/gc.h | 38 +++-- + fs/f2fs/inode.c | 15 +- + fs/f2fs/namei.c | 33 ++-- + fs/f2fs/node.c | 100 +++++++---- + fs/f2fs/node.h | 44 +++-- + fs/f2fs/recovery.c | 29 ++-- + fs/f2fs/segment.c | 41 +++-- + fs/f2fs/segment.h | 6 +- + fs/f2fs/super.c | 209 ++++++++++++++++++++++- + fs/f2fs/xattr.c | 289 ++++++++++++++++++++------------ + fs/f2fs/xattr.h | 15 +- + include/linux/f2fs_fs.h | 20 ++- + 21 files changed, 890 insertions(+), 344 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-fs-f2fs +Merging fscache/fscache (7258cdd CacheFiles: Implement interface to check cache consistency) +$ git merge fscache/fscache +Auto-merging fs/cifs/file.c +Auto-merging Documentation/filesystems/caching/netfs-api.txt +Merge made by the 'recursive' strategy. + Documentation/filesystems/caching/netfs-api.txt | 2 +- + fs/cifs/file.c | 8 ++++++++ + fs/cifs/fscache.c | 7 +++++++ + fs/cifs/fscache.h | 13 +++++++++++++ + 4 files changed, 29 insertions(+), 1 deletion(-) +Merging fuse/for-next (05726ac fuse: use list_for_each_entry() for list traversing) +$ git merge fuse/for-next +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 6 ++---- + fs/fuse/dir.c | 15 ++++++++++++++- + fs/fuse/file.c | 11 +++++++++-- + fs/fuse/fuse_i.h | 2 ++ + fs/fuse/inode.c | 3 ++- + 5 files changed, 29 insertions(+), 8 deletions(-) +Merging gfs2/master (0c90180 GFS2: dirty inode correctly in gfs2_write_end) +$ git merge gfs2/master +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/aops.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 44 +++++++++++-------------------------------- + fs/gfs2/file.c | 4 +++- + fs/gfs2/glock.c | 13 +++++-------- + fs/gfs2/lops.c | 18 ++++++++++++++++++ + fs/gfs2/meta_io.c | 18 ------------------ + fs/gfs2/meta_io.h | 26 +++++++++++--------------- + fs/gfs2/ops_fstype.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++-- + 7 files changed, 99 insertions(+), 77 deletions(-) +Merging jfs/jfs-next (4451244 jfs: fix readdir cookie incompatibility with NFSv4) +$ git merge jfs/jfs-next +Already up-to-date. +Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (2a0af4a NFSv4: use mach cred for SECINFO_NO_NAME w/ integrity) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/clnt.c +Auto-merging include/linux/sunrpc/sched.h +Auto-merging include/linux/nfs_fs.h +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/file.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 12 + + fs/nfs/Makefile | 9 +- + fs/nfs/callback_proc.c | 11 +- + fs/nfs/client.c | 6 +- + fs/nfs/delegation.c | 3 + + fs/nfs/dir.c | 81 ++- + fs/nfs/file.c | 20 +- + fs/nfs/idmap.c | 195 ++---- + fs/nfs/inode.c | 32 +- + fs/nfs/internal.h | 27 +- + fs/nfs/nfs3proc.c | 10 +- + fs/nfs/nfs4_fs.h | 96 ++- + fs/nfs/nfs4client.c | 104 +++- + fs/nfs/nfs4filelayout.c | 4 + + fs/nfs/nfs4proc.c | 772 +++++++++++++++++------ + fs/nfs/nfs4session.c | 86 ++- + fs/nfs/nfs4session.h | 37 +- + fs/nfs/nfs4state.c | 174 +++--- + fs/nfs/nfs4trace.c | 17 + + fs/nfs/nfs4trace.h | 1148 +++++++++++++++++++++++++++++++++++ + fs/nfs/nfs4xdr.c | 214 ++++--- + fs/nfs/nfstrace.c | 9 + + fs/nfs/nfstrace.h | 729 ++++++++++++++++++++++ + fs/nfs/pnfs.c | 3 + + fs/nfs/proc.c | 6 +- + fs/nfs/read.c | 7 +- + fs/nfs/super.c | 20 + + fs/nfs/unlink.c | 38 +- + fs/nfs/write.c | 57 +- + include/linux/nfs_fs.h | 1 + + include/linux/nfs_fs_sb.h | 12 + + include/linux/nfs_xdr.h | 25 +- + include/linux/sunrpc/auth.h | 28 +- + include/linux/sunrpc/clnt.h | 6 +- + include/linux/sunrpc/rpc_pipe_fs.h | 39 +- + include/linux/sunrpc/sched.h | 2 +- + include/trace/events/sunrpc.h | 181 +++++- + net/sunrpc/auth.c | 27 +- + net/sunrpc/auth_generic.c | 82 +++ + net/sunrpc/auth_gss/auth_gss.c | 442 ++++++++++---- + net/sunrpc/auth_null.c | 6 +- + net/sunrpc/auth_unix.c | 6 +- + net/sunrpc/clnt.c | 157 ++--- + net/sunrpc/rpc_pipe.c | 193 +++++- + net/sunrpc/sched.c | 2 +- + net/sunrpc/stats.c | 2 +- + net/sunrpc/xprtsock.c | 13 +- + 47 files changed, 4238 insertions(+), 913 deletions(-) + create mode 100644 fs/nfs/nfs4trace.c + create mode 100644 fs/nfs/nfs4trace.h + create mode 100644 fs/nfs/nfstrace.c + create mode 100644 fs/nfs/nfstrace.h +Merging nfsd/nfsd-next (11d2a16 svcrpc: remove unused rq_resused) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4recover.c | 2 -- + fs/nfsd/nfs4state.c | 33 +++++++++++++++++++++------------ + include/linux/sunrpc/cache.h | 22 ++++++++++++++++++++-- + include/linux/sunrpc/svc.h | 1 - + 4 files changed, 41 insertions(+), 17 deletions(-) +Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/ocfs2/cluster/heartbeat.c +Merge made by the 'recursive' strategy. + fs/ocfs2/cluster/heartbeat.c | 40 +++++++++------------------------------- + fs/ocfs2/cluster/masklog.h | 3 ++- + fs/ocfs2/dlm/dlmmaster.c | 8 +++++++- + fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ + 4 files changed, 25 insertions(+), 33 deletions(-) +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (28d7b56 Squashfs: sanity check information from disk) +$ git merge squashfs/master +Merge made by the 'recursive' strategy. + fs/squashfs/namei.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging v9fs/for-next (50192ab fs/9p: avoid accessing utsname after namespace has been torn down) +$ git merge v9fs/for-next +Auto-merging net/9p/client.c +Auto-merging fs/9p/vfs_file.c +Merge made by the 'recursive' strategy. + fs/9p/vfs_file.c | 4 ++-- + fs/9p/vfs_inode.c | 4 ++-- + include/net/9p/client.h | 5 +++++ + net/9p/client.c | 5 +++++ + net/9p/trans_virtio.c | 5 +++++ + 5 files changed, 19 insertions(+), 4 deletions(-) +Merging ubifs/linux-next (c23e9b7 UBIFS: remove invalid warn msg with tst_recovery enabled) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + fs/ubifs/debug.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging xfs/for-next (1d03c6f xfs: XFS_MOUNT_QUOTA_ALL needed by userspace) +$ git merge xfs/for-next +Resolved 'fs/xfs/xfs_inode.c' using previous resolution. +Resolved 'fs/xfs/xfs_log_recover.c' using previous resolution. +Auto-merging init/Kconfig +Removing fs/xfs/xfs_vnodeops.h +Removing fs/xfs/xfs_vnodeops.c +Removing fs/xfs/xfs_utils.h +Removing fs/xfs/xfs_utils.c +Removing fs/xfs/xfs_rename.c +Auto-merging fs/xfs/xfs_log_recover.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_log_recover.c +Auto-merging fs/xfs/xfs_inode.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c +Auto-merging fs/xfs/xfs_file.c +Removing fs/xfs/xfs_dfrag.h +Removing fs/xfs/xfs_dfrag.c +Auto-merging fs/xfs/xfs_aops.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3e26027] Merge remote-tracking branch 'xfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/platforms/cell/spufs/inode.c | 8 +- + fs/quota/quota.c | 29 + + fs/xfs/Makefile | 20 +- + fs/xfs/xfs_acl.c | 24 +- + fs/xfs/xfs_ag.h | 53 - + fs/xfs/xfs_alloc.c | 6 +- + fs/xfs/xfs_aops.c | 23 +- + fs/xfs/xfs_attr.c | 427 +--- + fs/xfs/xfs_attr.h | 9 + + fs/xfs/xfs_attr_inactive.c | 453 ++++ + fs/xfs/xfs_attr_leaf.c | 657 +---- + fs/xfs/xfs_attr_leaf.h | 2 + + fs/xfs/xfs_attr_list.c | 655 +++++ + fs/xfs/xfs_attr_remote.c | 18 +- + fs/xfs/xfs_bmap.c | 823 +------ + fs/xfs/xfs_bmap.h | 56 +- + fs/xfs/xfs_bmap_btree.c | 6 +- + fs/xfs/xfs_bmap_util.c | 2026 +++++++++++++++ + fs/xfs/xfs_bmap_util.h | 110 + + fs/xfs/xfs_btree.c | 7 +- + fs/xfs/xfs_btree.h | 2 - + fs/xfs/xfs_buf.c | 5 +- + fs/xfs/xfs_buf_item.c | 58 +- + fs/xfs/xfs_buf_item.h | 100 +- + fs/xfs/xfs_da_btree.c | 8 +- + fs/xfs/xfs_da_btree.h | 12 +- + fs/xfs/xfs_dfrag.c | 459 ---- + fs/xfs/xfs_dfrag.h | 53 - + fs/xfs/xfs_dir2.c | 58 +- + fs/xfs/xfs_dir2.h | 46 + + fs/xfs/xfs_dir2_block.c | 122 +- + fs/xfs/xfs_dir2_data.c | 25 +- + fs/xfs/xfs_dir2_format.h | 186 +- + fs/xfs/xfs_dir2_leaf.c | 404 +-- + fs/xfs/xfs_dir2_node.c | 14 +- + fs/xfs/xfs_dir2_priv.h | 49 +- + fs/xfs/xfs_dir2_readdir.c | 695 ++++++ + fs/xfs/xfs_dir2_sf.c | 240 +- + fs/xfs/xfs_discard.c | 5 +- + fs/xfs/xfs_dquot.c | 8 +- + fs/xfs/xfs_dquot_item.c | 23 +- + fs/xfs/xfs_error.c | 1 - + fs/xfs/xfs_export.c | 5 +- + fs/xfs/xfs_extent_busy.c | 2 +- + fs/xfs/xfs_extfree_item.c | 50 +- + fs/xfs/xfs_extfree_item.h | 88 +- + fs/xfs/xfs_file.c | 3 +- + fs/xfs/xfs_filestream.c | 8 +- + fs/xfs/xfs_filestream.h | 4 - + fs/xfs/xfs_format.h | 169 ++ + fs/xfs/xfs_fs.h | 38 +- + fs/xfs/xfs_fsops.c | 8 +- + fs/xfs/xfs_ialloc.c | 7 +- + fs/xfs/xfs_icache.c | 15 +- + fs/xfs/xfs_icache.h | 50 + + fs/xfs/xfs_icreate_item.c | 21 +- + fs/xfs/xfs_icreate_item.h | 18 - + fs/xfs/xfs_inode.c | 3833 ++++++++++++----------------- + fs/xfs/xfs_inode.h | 312 +-- + fs/xfs/xfs_inode_buf.c | 483 ++++ + fs/xfs/xfs_inode_buf.h | 53 + + fs/xfs/xfs_inode_fork.c | 1920 +++++++++++++++ + fs/xfs/xfs_inode_fork.h | 171 ++ + fs/xfs/xfs_inode_item.c | 53 +- + fs/xfs/xfs_inode_item.h | 115 +- + fs/xfs/xfs_ioctl.c | 148 +- + fs/xfs/xfs_ioctl.h | 10 + + fs/xfs/xfs_ioctl32.c | 4 +- + fs/xfs/xfs_iomap.c | 21 +- + fs/xfs/xfs_iops.c | 78 +- + fs/xfs/xfs_iops.h | 13 + + fs/xfs/xfs_linux.h | 60 +- + fs/xfs/xfs_log.c | 113 +- + fs/xfs/xfs_log.h | 90 +- + fs/xfs/xfs_log_cil.c | 371 +-- + fs/xfs/xfs_log_format.h | 852 +++++++ + fs/xfs/xfs_log_priv.h | 155 +- + fs/xfs/xfs_log_recover.c | 407 ++- + fs/xfs/xfs_log_rlimit.c | 147 ++ + fs/xfs/xfs_mount.c | 755 +----- + fs/xfs/xfs_mount.h | 113 +- + fs/xfs/xfs_qm.c | 95 +- + fs/xfs/xfs_qm.h | 2 + + fs/xfs/xfs_qm_bhv.c | 1 + + fs/xfs/xfs_qm_syscalls.c | 126 +- + fs/xfs/xfs_quota.h | 278 +-- + fs/xfs/xfs_quota_defs.h | 157 ++ + fs/xfs/xfs_quotaops.c | 17 +- + fs/xfs/xfs_rename.c | 346 --- + fs/xfs/xfs_rtalloc.c | 28 +- + fs/xfs/xfs_rtalloc.h | 53 +- + fs/xfs/xfs_sb.c | 834 +++++++ + fs/xfs/xfs_sb.h | 72 +- + fs/xfs/xfs_super.c | 31 +- + fs/xfs/xfs_symlink.c | 196 +- + fs/xfs/xfs_symlink.h | 41 +- + fs/xfs/xfs_symlink_remote.c | 200 ++ + fs/xfs/xfs_trace.c | 1 + + fs/xfs/xfs_trans.c | 732 +----- + fs/xfs/xfs_trans.h | 301 +-- + fs/xfs/xfs_trans_ail.c | 18 +- + fs/xfs/xfs_trans_buf.c | 2 +- + fs/xfs/xfs_trans_dquot.c | 1 + + fs/xfs/xfs_trans_priv.h | 15 + + fs/xfs/xfs_trans_resv.c | 803 ++++++ + fs/xfs/xfs_trans_resv.h | 116 + + fs/xfs/xfs_types.h | 60 +- + fs/xfs/xfs_utils.c | 314 --- + fs/xfs/xfs_utils.h | 27 - + fs/xfs/xfs_vnodeops.c | 1870 -------------- + fs/xfs/xfs_vnodeops.h | 55 - + fs/xfs/xfs_xattr.c | 2 +- + include/linux/quota.h | 1 + + include/uapi/linux/dqblk_xfs.h | 47 + + init/Kconfig | 13 - + kernel/capability.c | 1 + + 116 files changed, 13653 insertions(+), 11951 deletions(-) + create mode 100644 fs/xfs/xfs_attr_inactive.c + create mode 100644 fs/xfs/xfs_attr_list.c + create mode 100644 fs/xfs/xfs_bmap_util.c + create mode 100644 fs/xfs/xfs_bmap_util.h + delete mode 100644 fs/xfs/xfs_dfrag.c + delete mode 100644 fs/xfs/xfs_dfrag.h + create mode 100644 fs/xfs/xfs_dir2_readdir.c + create mode 100644 fs/xfs/xfs_format.h + create mode 100644 fs/xfs/xfs_inode_buf.c + create mode 100644 fs/xfs/xfs_inode_buf.h + create mode 100644 fs/xfs/xfs_inode_fork.c + create mode 100644 fs/xfs/xfs_inode_fork.h + create mode 100644 fs/xfs/xfs_log_format.h + create mode 100644 fs/xfs/xfs_log_rlimit.c + create mode 100644 fs/xfs/xfs_quota_defs.h + delete mode 100644 fs/xfs/xfs_rename.c + create mode 100644 fs/xfs/xfs_sb.c + create mode 100644 fs/xfs/xfs_symlink_remote.c + create mode 100644 fs/xfs/xfs_trans_resv.c + create mode 100644 fs/xfs/xfs_trans_resv.h + delete mode 100644 fs/xfs/xfs_utils.c + delete mode 100644 fs/xfs/xfs_utils.h + delete mode 100644 fs/xfs/xfs_vnodeops.c + delete mode 100644 fs/xfs/xfs_vnodeops.h +Merging vfs/for-next (02afc27 direct-io: Handle O_(D)SYNC AIO) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (a923874 Merge tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (2f39579 Merge branch 'for-3.12/upstream' into for-next) +$ git merge hid/for-next +Auto-merging net/bluetooth/hidp/core.c +Auto-merging drivers/hid/hid-roccat-kovaplus.c +Auto-merging drivers/hid/hid-roccat-konepure.c +Auto-merging drivers/hid/hid-roccat-koneplus.c +Auto-merging drivers/hid/hid-roccat-kone.c +Auto-merging drivers/hid/hid-roccat-isku.c +Auto-merging drivers/hid/hid-roccat-arvo.c +Auto-merging drivers/hid/hid-core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hid/hid-over-i2c.txt | 28 ++ + Documentation/hid/uhid.txt | 4 +- + Documentation/input/gamepad.txt | 156 ++++++++ + MAINTAINERS | 8 + + drivers/hid/Kconfig | 8 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-a4tech.c | 21 +- + drivers/hid/hid-apple.c | 16 +- + drivers/hid/hid-core.c | 159 ++++++--- + drivers/hid/hid-holtekff.c | 2 +- + drivers/hid/hid-ids.h | 12 +- + drivers/hid/hid-input.c | 92 ++++- + drivers/hid/hid-kye.c | 45 ++- + drivers/hid/hid-logitech-dj.c | 22 +- + drivers/hid/hid-magicmouse.c | 19 +- + drivers/hid/hid-multitouch.c | 107 +++--- + drivers/hid/hid-ntrig.c | 15 +- + drivers/hid/hid-picolcd_cir.c | 3 +- + drivers/hid/hid-picolcd_core.c | 2 +- + drivers/hid/hid-picolcd_debugfs.c | 23 +- + drivers/hid/hid-picolcd_fb.c | 6 +- + drivers/hid/hid-pl.c | 10 +- + drivers/hid/hid-roccat-arvo.c | 6 +- + drivers/hid/hid-roccat-isku.c | 2 +- + drivers/hid/hid-roccat-kone.c | 4 +- + drivers/hid/hid-roccat-koneplus.c | 2 +- + drivers/hid/hid-roccat-konepure.c | 3 +- + drivers/hid/hid-roccat-kovaplus.c | 2 +- + drivers/hid/hid-sensor-hub.c | 58 ++- + drivers/hid/hid-sony.c | 9 +- + drivers/hid/hid-speedlink.c | 11 +- + drivers/hid/hid-wiimote-core.c | 41 ++- + drivers/hid/hid-wiimote-modules.c | 392 +++++++++++++++++++++ + drivers/hid/hid-wiimote.h | 3 + + drivers/hid/hid-xinmo.c | 61 ++++ + drivers/hid/hid-zydacron.c | 19 +- + drivers/hid/hidraw.c | 80 ++--- + drivers/hid/i2c-hid/i2c-hid.c | 77 ++-- + drivers/hid/uhid.c | 26 +- + drivers/hid/usbhid/hid-core.c | 83 +---- + drivers/hid/usbhid/hid-quirks.c | 2 + + drivers/hid/usbhid/usbhid.h | 3 - + drivers/input/mouse/bcm5974.c | 6 +- + include/linux/hid-sensor-hub.h | 2 +- + include/linux/hid-sensor-ids.h | 2 +- + include/linux/hid.h | 16 +- + include/linux/hidraw.h | 1 + + include/linux/i2c/i2c-hid.h | 3 +- + include/linux/mod_devicetable.h | 2 +- + include/uapi/linux/input.h | 25 +- + include/uapi/linux/uhid.h | 4 +- + net/bluetooth/hidp/core.c | 15 +- + samples/hidraw/.gitignore | 1 + + samples/uhid/uhid-example.c | 123 +++++-- + 54 files changed, 1351 insertions(+), 492 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hid/hid-over-i2c.txt + create mode 100644 Documentation/input/gamepad.txt + create mode 100644 drivers/hid/hid-xinmo.c + create mode 100644 samples/hidraw/.gitignore +Merging i2c/i2c/for-next (b720423 i2c: rcar: add rcar-H2 support) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (8384216 hwmon: (emc6w201) Do not declare enum variable) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + Documentation/hwmon/w83791d | 2 +- + Documentation/hwmon/w83792d | 3 +-- + drivers/hwmon/emc6w201.c | 2 +- + drivers/hwmon/w83792d.c | 4 ++-- + 4 files changed, 5 insertions(+), 6 deletions(-) +Merging hwmon-staging/hwmon-next (f060c65 hwmon: (htu21) Add Measurement Specialties HTU21D support) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (d6cd75e Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Recorded preimage for 'drivers/media/platform/s5p-mfc/s5p_mfc_dec.c' +Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +CONFLICT (content): Merge conflict in drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/media/platform/s5p-mfc/s5p_mfc_dec.c'. +[master 6283db1] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. +Merging kbuild/for-next (b020bae Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging init/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig.txt | 8 +-- + Makefile | 7 ++- + init/Kconfig | 1 + + scripts/checkkconfigsymbols.sh | 4 +- + scripts/coccinelle/misc/boolreturn.cocci | 58 ++++++++++++++++++++ + scripts/config | 44 ++++++++++++++- + scripts/diffconfig | 33 ++++++----- + scripts/kconfig/confdata.c | 11 +++- + scripts/kconfig/mconf.c | 4 +- + scripts/kconfig/nconf.c | 4 +- + scripts/kconfig/symbol.c | 68 ++++++++++------------- + scripts/package/builddeb | 94 ++++++++++++++++++++++++++------ + scripts/package/mkspec | 46 ++++++++++++++-- + scripts/sortextable.c | 8 --- + 14 files changed, 288 insertions(+), 102 deletions(-) + create mode 100644 scripts/coccinelle/misc/boolreturn.cocci +Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (062728a Merge branch 'for-3.12' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) +$ git merge pstore/master +Already up-to-date. +Merging pm/linux-next (cee905f Merge branch 'pm-cpufreq-next' into linux-next) +$ git merge pm/linux-next +Auto-merging kernel/power/hibernate.c +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_lpss.c | 3 ++- + drivers/acpi/scan.c | 15 +++++------ + drivers/cpufreq/cpufreq.c | 64 +++++++++++++++++++++++++++++++++++++++++------ + drivers/cpuidle/driver.c | 3 ++- + include/linux/cpufreq.h | 1 + + kernel/power/hibernate.c | 45 +++++++++++++++++---------------- + kernel/power/user.c | 24 ++++++++++-------- + mm/memory_hotplug.c | 4 --- + 8 files changed, 105 insertions(+), 54 deletions(-) +Merging idle/next (5c99726b Merge branch 'fspin' into next) +$ git merge idle/next +Merge made by the 'recursive' strategy. + tools/power/fspin/Makefile | 21 +++ + tools/power/fspin/fspin.1 | 68 +++++++ + tools/power/fspin/fspin.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 532 insertions(+) + create mode 100644 tools/power/fspin/Makefile + create mode 100644 tools/power/fspin/fspin.1 + create mode 100644 tools/power/fspin/fspin.c +Merging apm/for-next (fb9d78a 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 cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (f61d5b4d Merge branch 'fixes' of .git into next) +$ git merge thermal/next +Removing include/linux/platform_data/exynos_thermal.h +Removing drivers/thermal/exynos_thermal.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/exynos-thermal.txt | 55 + + .../devicetree/bindings/thermal/imx-thermal.txt | 17 + + Documentation/thermal/exynos_thermal | 43 +- + drivers/thermal/Kconfig | 24 +- + drivers/thermal/Makefile | 3 +- + drivers/thermal/cpu_cooling.c | 2 + + drivers/thermal/exynos_thermal.c | 1059 -------------------- + drivers/thermal/imx_thermal.c | 541 ++++++++++ + drivers/thermal/samsung/Kconfig | 18 + + drivers/thermal/samsung/Makefile | 7 + + drivers/thermal/samsung/exynos_thermal_common.c | 432 ++++++++ + drivers/thermal/samsung/exynos_thermal_common.h | 107 ++ + drivers/thermal/samsung/exynos_tmu.c | 768 ++++++++++++++ + drivers/thermal/samsung/exynos_tmu.h | 311 ++++++ + drivers/thermal/samsung/exynos_tmu_data.c | 250 +++++ + drivers/thermal/samsung/exynos_tmu_data.h | 155 +++ + drivers/thermal/step_wise.c | 32 +- + include/linux/platform_data/exynos_thermal.h | 119 --- + 18 files changed, 2736 insertions(+), 1207 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/exynos-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/imx-thermal.txt + delete mode 100644 drivers/thermal/exynos_thermal.c + create mode 100644 drivers/thermal/imx_thermal.c + create mode 100644 drivers/thermal/samsung/Kconfig + create mode 100644 drivers/thermal/samsung/Makefile + create mode 100644 drivers/thermal/samsung/exynos_thermal_common.c + create mode 100644 drivers/thermal/samsung/exynos_thermal_common.h + create mode 100644 drivers/thermal/samsung/exynos_tmu.c + create mode 100644 drivers/thermal/samsung/exynos_tmu.h + create mode 100644 drivers/thermal/samsung/exynos_tmu_data.c + create mode 100644 drivers/thermal/samsung/exynos_tmu_data.h + delete mode 100644 include/linux/platform_data/exynos_thermal.h +Merging ieee1394/for-next (db9ae8f firewire: ohci: Fix deadlock at bus reset) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/core-cdev.c | 2 +- + drivers/firewire/core-transaction.c | 3 +-- + drivers/firewire/ohci.c | 50 +++++++++++++++++++++++++------------ + 3 files changed, 36 insertions(+), 19 deletions(-) +Merging ubi/linux-next (8930fa5 UBI: Fix invalidate_fastmap()) +$ git merge ubi/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/fastmap.c | 5 +---- + drivers/mtd/ubi/wl.c | 3 +++ + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging dlm/next (c6ca7bc dlm: remove signal blocking) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (71af442 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Resolved 'drivers/dma/Makefile' using previous resolution. +Removing include/linux/fsl/mxs-dma.h +Auto-merging drivers/dma/sh/shdmac.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/Makefile +CONFLICT (content): Merge conflict in drivers/dma/Makefile +Auto-merging drivers/dma/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-model/devres.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 044eca6] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 7 +- + Documentation/devicetree/bindings/dma/k3dma.txt | 46 ++ + Documentation/devicetree/bindings/dma/shdma.txt | 61 +- + Documentation/driver-model/devres.txt | 3 + + MAINTAINERS | 1 + + arch/arm/common/edma.c | 17 + + arch/arm/mach-imx/mm-imx25.c | 17 - + arch/arm/mach-imx/mm-imx5.c | 14 - + drivers/dma/Kconfig | 9 + + drivers/dma/Makefile | 1 + + drivers/dma/acpi-dma.c | 4 +- + drivers/dma/amba-pl08x.c | 501 ++++++++---- + drivers/dma/dmaengine.c | 28 +- + drivers/dma/dw/core.c | 39 +- + drivers/dma/dw/platform.c | 1 + + drivers/dma/edma.c | 164 +++- + drivers/dma/ep93xx_dma.c | 10 +- + drivers/dma/fsldma.c | 10 +- + drivers/dma/imx-dma.c | 6 +- + drivers/dma/imx-sdma.c | 179 +++-- + drivers/dma/iop-adma.c | 6 +- + drivers/dma/ipu/ipu_idmac.c | 6 +- + drivers/dma/k3dma.c | 837 +++++++++++++++++++++ + drivers/dma/mmp_pdma.c | 320 ++++++-- + drivers/dma/mmp_tdma.c | 6 +- + drivers/dma/mpc512x_dma.c | 10 +- + drivers/dma/mv_xor.c | 4 +- + drivers/dma/mxs-dma.c | 27 +- + drivers/dma/of-dma.c | 3 +- + drivers/dma/pch_dma.c | 10 +- + drivers/dma/pl330.c | 179 ++--- + drivers/dma/sh/Kconfig | 10 + + drivers/dma/sh/Makefile | 6 + + drivers/dma/sh/rcar-hpbdma.c | 655 ++++++++++++++++ + drivers/dma/sh/shdma-arm.h | 51 ++ + drivers/dma/sh/shdma-base.c | 26 +- + drivers/dma/sh/shdma-of.c | 5 +- + drivers/dma/sh/shdma-r8a73a4.c | 77 ++ + drivers/dma/sh/shdma.h | 16 +- + drivers/dma/sh/{shdma.c => shdmac.c} | 160 ++-- + drivers/dma/sh/sudmac.c | 22 +- + drivers/dma/sirf-dma.c | 134 +++- + drivers/dma/ste_dma40.c | 23 +- + drivers/dma/tegra20-apb-dma.c | 8 +- + drivers/dma/timb_dma.c | 2 +- + drivers/dma/txx9dmac.c | 22 +- + include/linux/amba/pl080.h | 1 + + include/linux/dma/mmp-pdma.h | 15 + + include/linux/dmaengine.h | 37 + + include/linux/fsl/mxs-dma.h | 20 - + include/linux/platform_data/dma-rcar-hpbdma.h | 103 +++ + include/linux/platform_data/edma.h | 2 + + include/linux/sh_dma.h | 55 +- + include/linux/shdma-base.h | 3 +- + 54 files changed, 3241 insertions(+), 738 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/k3dma.txt + create mode 100644 drivers/dma/k3dma.c + create mode 100644 drivers/dma/sh/rcar-hpbdma.c + create mode 100644 drivers/dma/sh/shdma-arm.h + create mode 100644 drivers/dma/sh/shdma-r8a73a4.c + rename drivers/dma/sh/{shdma.c => shdmac.c} (88%) + create mode 100644 include/linux/dma/mmp-pdma.h + delete mode 100644 include/linux/fsl/mxs-dma.h + create mode 100644 include/linux/platform_data/dma-rcar-hpbdma.h +Merging dmaengine/next (e6a5fa6 ioatdma: silence GCC warnings) +$ git merge dmaengine/next +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/dma/mv_xor.c +Auto-merging drivers/dma/dmaengine.c +Merge made by the 'recursive' strategy. + Documentation/dmatest.txt | 15 ++-- + drivers/dma/dmaengine.c | 55 +++++++------- + drivers/dma/dmatest.c | 182 ++++++++-------------------------------------- + drivers/dma/ioat/dma_v3.c | 26 +------ + drivers/dma/mv_xor.c | 47 +++++++----- + drivers/dma/mv_xor.h | 28 ++++++- + include/linux/dmaengine.h | 5 +- + 7 files changed, 125 insertions(+), 233 deletions(-) +Merging net-next/master (0d40f75 openvswitch: Fix alignment of struct sw_flow_key.) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (aba8269 {ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback) +$ git merge ipsec-next/master +Resolved 'include/net/xfrm.h' using previous resolution. +Auto-merging net/xfrm/xfrm_state.c +Auto-merging include/net/xfrm.h +CONFLICT (content): Merge conflict in include/net/xfrm.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a44604a] Merge remote-tracking branch 'ipsec-next/master' +$ git diff -M --stat --summary HEAD^.. + include/net/xfrm.h | 10 +++++-- + net/ipv4/ip_vti.c | 67 +------------------------------------------- + net/ipv4/xfrm4_mode_tunnel.c | 16 +++++------ + net/xfrm/xfrm_state.c | 2 +- + 4 files changed, 18 insertions(+), 77 deletions(-) +Merging wireless-next/master (f212781 net: ipv6: mld: document force_mld_version in ip-sysctl.txt) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (5a30d1f Bluetooth: Use devname:vhci module alias for virtual HCI driver) +$ git merge bluetooth/master +Auto-merging net/bluetooth/hci_core.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/hci_vhci.c | 1 + + include/net/bluetooth/hci.h | 2 + + net/bluetooth/hci_core.c | 43 ++++++++- + net/bluetooth/hci_sock.c | 204 +++++++++++++++++++++++++++++++++---------- + net/bluetooth/mgmt.c | 9 ++ + 5 files changed, 211 insertions(+), 48 deletions(-) +Merging infiniband/for-next (82af24a Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (6c3b889 mtd: chips: Add support for PMC SPI Flash chips in m25p80.c) +$ git merge mtd/master +Auto-merging drivers/mtd/tests/torturetest.c +Auto-merging drivers/mtd/tests/subpagetest.c +Auto-merging drivers/mtd/tests/stresstest.c +Auto-merging drivers/mtd/tests/speedtest.c +Auto-merging drivers/mtd/tests/readtest.c +Auto-merging drivers/mtd/tests/pagetest.c +Auto-merging drivers/mtd/tests/oobtest.c +Auto-merging drivers/mtd/tests/nandbiterrs.c +Auto-merging drivers/mtd/nand/nandsim.c +Removing drivers/mtd/nand/alauda.c +Removing drivers/mtd/maps/vmax301.c +Removing drivers/mtd/maps/octagon-5066.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-mtd | 17 +- + Documentation/DocBook/mtdnand.tmpl | 2 - + .../devicetree/bindings/mtd/atmel-nand.txt | 28 + + .../devicetree/bindings/mtd/fsmc-nand.txt | 25 +- + .../devicetree/bindings/mtd/partition.txt | 1 + + arch/avr32/mach-at32ap/at32ap700x.c | 3 + + arch/mips/bcm63xx/nvram.c | 11 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 + + drivers/mtd/bcm63xxpart.c | 9 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 4 +- + drivers/mtd/chips/gen_probe.c | 4 +- + drivers/mtd/chips/jedec_probe.c | 13 +- + drivers/mtd/devices/Kconfig | 55 -- + drivers/mtd/devices/bcm47xxsflash.c | 275 +++++- + drivers/mtd/devices/bcm47xxsflash.h | 2 + + drivers/mtd/devices/block2mtd.c | 58 +- + drivers/mtd/devices/elm.c | 129 ++- + drivers/mtd/devices/m25p80.c | 81 +- + drivers/mtd/devices/mtd_dataflash.c | 10 +- + drivers/mtd/devices/spear_smi.c | 19 +- + drivers/mtd/devices/sst25l.c | 8 +- + drivers/mtd/maps/Kconfig | 18 - + drivers/mtd/maps/Makefile | 2 - + drivers/mtd/maps/bfin-async-flash.c | 2 +- + drivers/mtd/maps/cfi_flagadm.c | 10 +- + drivers/mtd/maps/gpio-addr-flash.c | 2 +- + drivers/mtd/maps/impa7.c | 10 +- + drivers/mtd/maps/ixp4xx.c | 6 +- + drivers/mtd/maps/latch-addr-flash.c | 5 +- + drivers/mtd/maps/octagon-5066.c | 246 ------ + drivers/mtd/maps/physmap.c | 7 +- + drivers/mtd/maps/plat-ram.c | 6 +- + drivers/mtd/maps/pxa2xx-flash.c | 4 +- + drivers/mtd/maps/rbtx4939-flash.c | 5 +- + drivers/mtd/maps/sa1100-flash.c | 5 +- + drivers/mtd/maps/vmax301.c | 196 ----- + drivers/mtd/mtdcore.c | 11 + + drivers/mtd/mtdpart.c | 1 + + drivers/mtd/mtdswap.c | 2 +- + drivers/mtd/nand/Kconfig | 12 +- + drivers/mtd/nand/Makefile | 1 - + drivers/mtd/nand/alauda.c | 723 ---------------- + drivers/mtd/nand/ams-delta.c | 1 - + drivers/mtd/nand/atmel_nand.c | 923 ++++++++++++++++----- + drivers/mtd/nand/atmel_nand_nfc.h | 98 +++ + drivers/mtd/nand/au1550nd.c | 2 +- + drivers/mtd/nand/bf5xx_nand.c | 5 +- + drivers/mtd/nand/cs553x_nand.c | 6 +- + drivers/mtd/nand/davinci_nand.c | 19 +- + drivers/mtd/nand/denali.c | 2 +- + drivers/mtd/nand/diskonchip.c | 4 +- + drivers/mtd/nand/docg4.c | 8 - + drivers/mtd/nand/fsl_ifc_nand.c | 3 +- + drivers/mtd/nand/fsmc_nand.c | 38 +- + drivers/mtd/nand/gpio.c | 231 ++---- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 268 ++++-- + drivers/mtd/nand/jz4740_nand.c | 6 +- + drivers/mtd/nand/lpc32xx_mlc.c | 4 +- + drivers/mtd/nand/lpc32xx_slc.c | 4 +- + drivers/mtd/nand/mxc_nand.c | 12 +- + drivers/mtd/nand/nand_base.c | 296 +++++-- + drivers/mtd/nand/nand_bbt.c | 194 +++-- + drivers/mtd/nand/nand_ids.c | 8 +- + drivers/mtd/nand/nandsim.c | 39 +- + drivers/mtd/nand/nuc900_nand.c | 2 - + drivers/mtd/nand/omap2.c | 5 +- + drivers/mtd/nand/orion_nand.c | 6 +- + drivers/mtd/nand/plat_nand.c | 5 +- + drivers/mtd/nand/pxa3xx_nand.c | 384 +++++---- + drivers/mtd/nand/r852.c | 49 +- + drivers/mtd/nand/s3c2410.c | 4 +- + drivers/mtd/nand/sh_flctl.c | 4 +- + drivers/mtd/nand/sharpsl.c | 5 +- + drivers/mtd/nand/sm_common.c | 9 +- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/mtd/nand/txx9ndfmc.c | 13 +- + drivers/mtd/ofpart.c | 18 +- + drivers/mtd/onenand/generic.c | 4 +- + drivers/mtd/onenand/omap2.c | 3 +- + drivers/mtd/onenand/onenand_bbt.c | 1 - + drivers/mtd/onenand/samsung.c | 3 +- + drivers/mtd/sm_ftl.c | 26 +- + drivers/mtd/tests/Makefile | 9 + + drivers/mtd/tests/mtd_test.c | 114 +++ + drivers/mtd/tests/mtd_test.h | 11 + + .../mtd/tests/{mtd_nandbiterrs.c => nandbiterrs.c} | 41 +- + drivers/mtd/tests/{mtd_oobtest.c => oobtest.c} | 102 +-- + drivers/mtd/tests/{mtd_pagetest.c => pagetest.c} | 271 ++---- + drivers/mtd/tests/{mtd_readtest.c => readtest.c} | 61 +- + drivers/mtd/tests/{mtd_speedtest.c => speedtest.c} | 210 +---- + .../mtd/tests/{mtd_stresstest.c => stresstest.c} | 101 +-- + .../mtd/tests/{mtd_subpagetest.c => subpagetest.c} | 97 +-- + .../mtd/tests/{mtd_torturetest.c => torturetest.c} | 66 +- + include/linux/mtd/bbm.h | 2 - + include/linux/mtd/fsmc.h | 1 + + include/linux/mtd/mtd.h | 3 + + include/linux/mtd/nand.h | 83 +- + include/linux/platform_data/atmel.h | 4 + + include/linux/platform_data/mtd-nand-pxa3xx.h | 13 - + 99 files changed, 2732 insertions(+), 3201 deletions(-) + delete mode 100644 drivers/mtd/maps/octagon-5066.c + delete mode 100644 drivers/mtd/maps/vmax301.c + delete mode 100644 drivers/mtd/nand/alauda.c + create mode 100644 drivers/mtd/nand/atmel_nand_nfc.h + create mode 100644 drivers/mtd/tests/mtd_test.c + create mode 100644 drivers/mtd/tests/mtd_test.h + rename drivers/mtd/tests/{mtd_nandbiterrs.c => nandbiterrs.c} (93%) + rename drivers/mtd/tests/{mtd_oobtest.c => oobtest.c} (90%) + rename drivers/mtd/tests/{mtd_pagetest.c => pagetest.c} (63%) + rename drivers/mtd/tests/{mtd_readtest.c => readtest.c} (83%) + rename drivers/mtd/tests/{mtd_speedtest.c => speedtest.c} (69%) + rename drivers/mtd/tests/{mtd_stresstest.c => stresstest.c} (74%) + rename drivers/mtd/tests/{mtd_subpagetest.c => subpagetest.c} (86%) + rename drivers/mtd/tests/{mtd_torturetest.c => torturetest.c} (90%) +Merging l2-mtd/master (f3b3914 of_mtd: Add no-op stubs to support CONFIG_OF=n) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 8 ++++---- + drivers/mtd/nand/pxa3xx_nand.c | 7 ------- + include/linux/of_mtd.h | 21 ++++++++++++++++++++- + 3 files changed, 24 insertions(+), 12 deletions(-) +Merging crypto/master (ff6f83f hwrng: via - Add MODULE_DEVICE_TABLE) +$ git merge crypto/master +Auto-merging drivers/crypto/caam/caamhash.c +Auto-merging drivers/char/hw_random/Kconfig +Auto-merging crypto/testmgr.c +Auto-merging arch/arm/mach-omap2/devices.c +Merge made by the 'recursive' strategy. + arch/arm/mach-omap2/devices.c | 2 +- + arch/x86/crypto/camellia_glue.c | 64 ++-- + arch/x86/include/asm/xor_avx.h | 4 +- + crypto/aes_generic.c | 8 +- + crypto/camellia_generic.c | 48 +-- + crypto/cast_common.c | 8 +- + crypto/fcrypt.c | 2 +- + crypto/scatterwalk.c | 22 ++ + crypto/testmgr.c | 2 +- + drivers/char/hw_random/Kconfig | 6 +- + drivers/char/hw_random/mxc-rnga.c | 4 +- + drivers/char/hw_random/omap-rng.c | 386 ++++++++++++++++++---- + drivers/char/hw_random/picoxcell-rng.c | 2 +- + drivers/char/hw_random/tx4939-rng.c | 4 +- + drivers/char/hw_random/via-rng.c | 7 + + drivers/crypto/Kconfig | 13 +- + drivers/crypto/amcc/crypto4xx_alg.c | 15 +- + drivers/crypto/caam/Kconfig | 8 + + drivers/crypto/caam/Makefile | 3 + + drivers/crypto/caam/caamalg.c | 80 +++-- + drivers/crypto/caam/caamhash.c | 70 ++-- + drivers/crypto/caam/ctrl.c | 77 ++--- + drivers/crypto/caam/desc_constr.h | 1 + + drivers/crypto/caam/intern.h | 5 - + drivers/crypto/caam/jr.c | 67 ---- + drivers/crypto/caam/jr.h | 2 - + drivers/crypto/caam/key_gen.c | 6 +- + drivers/crypto/caam/regs.h | 12 +- + drivers/crypto/nx/nx-aes-cbc.c | 57 ++-- + drivers/crypto/nx/nx-aes-ccm.c | 283 ++++++++++++---- + drivers/crypto/nx/nx-aes-ctr.c | 52 ++- + drivers/crypto/nx/nx-aes-ecb.c | 50 ++- + drivers/crypto/nx/nx-aes-gcm.c | 296 +++++++++++++---- + drivers/crypto/nx/nx-aes-xcbc.c | 205 +++++++++--- + drivers/crypto/nx/nx-sha256.c | 124 ++++--- + drivers/crypto/nx/nx-sha512.c | 131 +++++--- + drivers/crypto/nx/nx.c | 35 +- + drivers/crypto/nx/nx.h | 3 +- + drivers/crypto/omap-aes.c | 468 ++++++++++++++------------ + drivers/crypto/omap-sham.c | 382 ++++++++++++++++----- + drivers/crypto/sahara.c | 4 +- + drivers/crypto/tegra-aes.c | 6 +- + drivers/crypto/ux500/hash/hash_core.c | 586 ++++++++++++++++----------------- + include/crypto/scatterwalk.h | 2 + + kernel/padata.c | 32 +- + 45 files changed, 2323 insertions(+), 1321 deletions(-) +Merging drm/drm-next (86a7e12 Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-intel/for-linux-next (f327a134 drm/i915: Confine page flips to BCS on Valleyview) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + arch/x86/kernel/early-quirks.c | 154 +++++++++++++++++++++ + drivers/gpu/drm/i915/i915_debugfs.c | 11 +- + drivers/gpu/drm/i915/i915_dma.c | 9 +- + drivers/gpu/drm/i915/i915_drv.c | 164 +++++----------------- + drivers/gpu/drm/i915/i915_drv.h | 7 + + drivers/gpu/drm/i915/i915_gem.c | 48 +++++-- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 41 +++--- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 + + drivers/gpu/drm/i915/i915_gem_stolen.c | 3 + + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 23 +++- + drivers/gpu/drm/i915/i915_reg.h | 34 +++-- + drivers/gpu/drm/i915/i915_sysfs.c | 36 ++++- + drivers/gpu/drm/i915/intel_crt.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 78 +++++++++-- + drivers/gpu/drm/i915/intel_drv.h | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/intel_panel.c | 14 +- + drivers/gpu/drm/i915/intel_pm.c | 14 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 99 ++++---------- + drivers/gpu/drm/i915/intel_ringbuffer.h | 6 +- + drivers/gpu/drm/i915/intel_sdvo.c | 17 +-- + drivers/gpu/drm/i915/intel_sprite.c | 7 +- + drivers/gpu/drm/i915/intel_uncore.c | 9 +- + drivers/gpu/vga/vgaarb.c | 51 +++---- + include/drm/i915_drm.h | 34 +++++ + include/drm/i915_pciids.h | 211 +++++++++++++++++++++++++++++ + include/linux/vgaarb.h | 7 + + 28 files changed, 761 insertions(+), 333 deletions(-) + create mode 100644 include/drm/i915_pciids.h +Merging drm-tegra/drm/for-next (03da0e7 drm/tegra: Parse device tree earlier) +$ git merge drm-tegra/drm/for-next +Already up-to-date. +Merging sound/for-next (b054087 ALSA: hda - Re-setup HDMI pin and audio infoframe on stream switches) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (84c89a9 Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/soc/atmel/atmel_ssc_dai.c | 2 +- + sound/soc/fsl/imx-audmux.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging modules/modules-next (942e443 module: Fix mod->mkobj.kobj potentially freed too early) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (aa96a3c lguest: fix GPF in guest when using gdb.) +$ git merge virtio/virtio-next +Merge made by the 'recursive' strategy. + arch/x86/lguest/boot.c | 10 ++++++++-- + drivers/char/virtio_console.c | 27 ++++++++++++++++----------- + drivers/lguest/interrupts_and_traps.c | 10 ++++++++++ + drivers/lguest/page_tables.c | 4 +++- + tools/lguest/lguest.c | 6 ++++++ + tools/virtio/.gitignore | 3 +++ + 6 files changed, 46 insertions(+), 14 deletions(-) + create mode 100644 tools/virtio/.gitignore +Merging input/next (52764fe Input: add SYN_MAX and SYN_CNT constants) +$ git merge input/next +Auto-merging include/uapi/linux/input.h +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/input/touchscreen/cyttsp4_core.c +Auto-merging drivers/input/tablet/wacom_wac.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/input-reset.txt | 33 ++ + .../bindings/input/touchscreen/egalax-ts.txt | 2 +- + MAINTAINERS | 11 +- + drivers/input/joystick/as5011.c | 3 +- + drivers/input/joystick/maplecontrol.c | 4 +- + drivers/input/keyboard/imx_keypad.c | 7 +- + drivers/input/keyboard/max7359_keypad.c | 2 +- + drivers/input/keyboard/nspire-keypad.c | 7 +- + drivers/input/keyboard/omap4-keypad.c | 95 ++++-- + drivers/input/keyboard/qt1070.c | 27 ++ + drivers/input/keyboard/spear-keyboard.c | 7 +- + drivers/input/keyboard/tegra-kbc.c | 7 +- + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ideapad_slidebar.c | 358 +++++++++++++++++++++ + drivers/input/misc/pwm-beeper.c | 2 +- + drivers/input/misc/twl6040-vibra.c | 41 +-- + drivers/input/misc/wistron_btns.c | 6 +- + drivers/input/mouse/lifebook.c | 2 +- + drivers/input/mouse/synaptics.c | 4 +- + drivers/input/serio/arc_ps2.c | 7 +- + drivers/input/serio/i8042.h | 24 -- + drivers/input/serio/olpc_apsp.c | 3 - + drivers/input/tablet/wacom_sys.c | 87 +++-- + drivers/input/tablet/wacom_wac.c | 19 +- + drivers/input/touchscreen/cy8ctmg110_ts.c | 6 +- + drivers/input/touchscreen/cyttsp4_core.c | 203 ++++++------ + drivers/input/touchscreen/eeti_ts.c | 6 +- + drivers/input/touchscreen/htcpen.c | 2 +- + drivers/input/touchscreen/max11801_ts.c | 37 +-- + drivers/tty/sysrq.c | 42 +++ + include/linux/i8042.h | 24 ++ + include/uapi/linux/input.h | 2 + + 33 files changed, 770 insertions(+), 321 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/input-reset.txt + create mode 100644 drivers/input/misc/ideapad_slidebar.c +Merging input-mt/for-next (ad81f05 Linux 3.11-rc1) +$ git merge input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (66c144c Merge branch 'for-3.11-fixes' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. +Merging block/for-next (3fe9649 Merge branch 'for-3.11/drivers' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (3e690e1 dm thin: always return -ENOSPC if no_free_space is set) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/cache.txt | 6 +- + Documentation/device-mapper/statistics.txt | 186 +++++ + Documentation/device-mapper/thin-provisioning.txt | 15 +- + drivers/md/Makefile | 2 +- + drivers/md/dm-cache-target.c | 59 +- + drivers/md/dm-crypt.c | 10 +- + drivers/md/dm-ioctl.c | 60 +- + drivers/md/dm-kcopyd.c | 3 +- + drivers/md/dm-raid1.c | 3 +- + drivers/md/dm-stats.c | 968 ++++++++++++++++++++++ + drivers/md/dm-stats.h | 40 + + drivers/md/dm-table.c | 20 +- + drivers/md/dm-target.c | 9 +- + drivers/md/dm-thin.c | 122 ++- + drivers/md/dm.c | 70 +- + drivers/md/dm.h | 27 + + drivers/md/persistent-data/dm-block-manager.c | 5 + + drivers/md/persistent-data/dm-block-manager.h | 5 + + drivers/md/persistent-data/dm-btree.c | 28 +- + drivers/md/persistent-data/dm-space-map-common.c | 77 +- + include/linux/device-mapper.h | 9 + + include/linux/math64.h | 13 + + include/uapi/linux/dm-ioctl.h | 4 +- + lib/div64.c | 40 + + 24 files changed, 1619 insertions(+), 162 deletions(-) + create mode 100644 Documentation/device-mapper/statistics.txt + create mode 100644 drivers/md/dm-stats.c + create mode 100644 drivers/md/dm-stats.h +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 +Already up-to-date. +Merging mmc/mmc-next (490104a mmc: esdhc: add support to get voltage from device-tree) +$ git merge mmc/mmc-next +Auto-merging drivers/mmc/host/sdhci.c +Auto-merging drivers/mmc/host/dw_mmc.c +Auto-merging drivers/mmc/core/core.c +Auto-merging arch/sh/boards/mach-ecovec24/setup.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-esdhc.txt | 4 + + arch/arm/mach-ep93xx/vision_ep9307.c | 57 ++------------ + arch/sh/boards/mach-ecovec24/setup.c | 89 ++-------------------- + drivers/mmc/card/block.c | 47 +++++++++++- + drivers/mmc/card/mmc_test.c | 14 +--- + drivers/mmc/core/core.c | 44 +++++++++++ + drivers/mmc/core/host.c | 2 +- + drivers/mmc/core/mmc_ops.c | 1 + + drivers/mmc/core/sd.c | 13 ++-- + drivers/mmc/core/slot-gpio.c | 14 +++- + drivers/mmc/host/Kconfig | 8 +- + drivers/mmc/host/Makefile | 2 - + drivers/mmc/host/atmel-mci.c | 34 +++++++-- + drivers/mmc/host/dw_mmc-exynos.c | 9 ++- + drivers/mmc/host/dw_mmc-pci.c | 4 +- + drivers/mmc/host/dw_mmc-pltfm.c | 1 + + drivers/mmc/host/dw_mmc.c | 21 +++-- + drivers/mmc/host/jz4740_mmc.c | 7 +- + drivers/mmc/host/mmc_spi.c | 49 ++++++------ + drivers/mmc/host/mvsdio.c | 3 +- + drivers/mmc/host/mxs-mmc.c | 22 ++++-- + drivers/mmc/host/of_mmc_spi.c | 46 +++-------- + drivers/mmc/host/omap_hsmmc.c | 3 +- + drivers/mmc/host/sdhci-bcm2835.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- + drivers/mmc/host/sdhci-of-esdhc.c | 1 + + drivers/mmc/host/sdhci-pxav3.c | 3 +- + drivers/mmc/host/sdhci-sirf.c | 2 +- + drivers/mmc/host/sdhci.c | 7 +- + drivers/mmc/host/sh_mmcif.c | 63 ++++++++++----- + drivers/mmc/host/sh_mobile_sdhi.c | 23 ++---- + drivers/mmc/host/tmio_mmc.h | 1 - + drivers/mmc/host/tmio_mmc_dma.c | 4 +- + drivers/mmc/host/tmio_mmc_pio.c | 31 ++------ + drivers/mmc/host/vub300.c | 2 +- + include/linux/mfd/tmio.h | 2 - + include/linux/mmc/core.h | 2 + + include/linux/mmc/sdhci.h | 1 + + include/linux/mmc/sh_mmcif.h | 6 +- + include/linux/mmc/sh_mobile_sdhi.h | 2 - + include/linux/mmc/slot-gpio.h | 3 +- + include/linux/spi/mmc_spi.h | 19 +++-- + 42 files changed, 329 insertions(+), 341 deletions(-) +Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (9de1bc8 mm, slab_common: add 'unlikely' to size check of kmalloc_slab()) +$ git merge slab/for-next +Auto-merging mm/slub.c +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + init/Kconfig | 2 +- + mm/slab_common.c | 2 +- + mm/slub.c | 101 ++++++++++++++++++++++++++++++++----------------------- + 3 files changed, 60 insertions(+), 45 deletions(-) +Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (bfc90cb raid5: only wakeup necessary threads) +$ git merge md/for-next +Resolved 'lib/raid6/Makefile' using previous resolution. +Resolved 'lib/raid6/test/Makefile' using previous resolution. +Auto-merging lib/raid6/test/Makefile +CONFLICT (content): Merge conflict in lib/raid6/test/Makefile +Auto-merging lib/raid6/algos.c +Auto-merging lib/raid6/Makefile +CONFLICT (content): Merge conflict in lib/raid6/Makefile +Auto-merging include/linux/raid/pq.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1c9d55b] Merge remote-tracking branch 'md/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/md/md.c | 54 +++++--- + drivers/md/md.h | 8 +- + drivers/md/raid5.c | 362 +++++++++++++++++++++++++++++++++++++++++++++--- + drivers/md/raid5.h | 22 +++ + include/linux/raid/pq.h | 1 + + lib/raid6/Makefile | 5 + + lib/raid6/algos.c | 3 + + lib/raid6/test/Makefile | 9 +- + lib/raid6/tilegx.uc | 86 ++++++++++++ + 9 files changed, 509 insertions(+), 41 deletions(-) + create mode 100644 lib/raid6/tilegx.uc +Merging mfd/master (9c31e88 Merge tag 'mfd-lee-3.12-2' of git://git.linaro.org/people/ljones/mfd) +$ git merge mfd/master +Auto-merging include/linux/mfd/ti_am335x_tscadc.h +Auto-merging include/linux/mfd/samsung/s2mps11.h +Auto-merging include/linux/mfd/palmas.h +Auto-merging drivers/mfd/rts5227.c +Auto-merging drivers/mfd/db8500-prcmu.c +Auto-merging Documentation/devicetree/bindings/regulator/palmas-pmic.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/palmas.txt | 2 + + Documentation/devicetree/bindings/mfd/s2mps11.txt | 109 +++ + .../devicetree/bindings/regulator/palmas-pmic.txt | 5 + + drivers/memstick/host/rtsx_pci_ms.c | 3 +- + drivers/mfd/88pm800.c | 12 +- + drivers/mfd/88pm805.c | 4 +- + drivers/mfd/88pm860x-core.c | 2 +- + drivers/mfd/Kconfig | 14 +- + drivers/mfd/Makefile | 3 + + drivers/mfd/aat2870-core.c | 2 +- + drivers/mfd/ab3100-core.c | 2 +- + drivers/mfd/ab8500-debugfs.c | 14 +- + drivers/mfd/ab8500-gpadc.c | 4 + + drivers/mfd/adp5520.c | 2 +- + drivers/mfd/arizona-core.c | 2 +- + drivers/mfd/as3711.c | 2 +- + drivers/mfd/asic3.c | 2 +- + drivers/mfd/da903x.c | 2 +- + drivers/mfd/da9052-core.c | 2 +- + drivers/mfd/da9055-core.c | 7 +- + drivers/mfd/da9055-i2c.c | 2 +- + drivers/mfd/da9063-core.c | 185 ++++ + drivers/mfd/da9063-i2c.c | 182 ++++ + drivers/mfd/da9063-irq.c | 193 ++++ + drivers/mfd/davinci_voicecodec.c | 23 +- + drivers/mfd/db8500-prcmu.c | 4 +- + drivers/mfd/dm355evm_msp.c | 4 +- + drivers/mfd/ezx-pcap.c | 6 +- + drivers/mfd/htc-egpio.c | 2 +- + drivers/mfd/htc-i2cpld.c | 10 +- + drivers/mfd/htc-pasic3.c | 2 +- + drivers/mfd/intel_msic.c | 4 +- + drivers/mfd/kempld-core.c | 30 +- + drivers/mfd/lm3533-core.c | 8 +- + drivers/mfd/lp8788.c | 2 +- + drivers/mfd/lpc_ich.c | 2 +- + drivers/mfd/max77686.c | 2 +- + drivers/mfd/max77693.c | 2 +- + drivers/mfd/max8925-i2c.c | 2 +- + drivers/mfd/max8997.c | 18 +- + drivers/mfd/max8998.c | 7 +- + drivers/mfd/mcp-sa11x0.c | 2 +- + drivers/mfd/menelaus.c | 22 +- + drivers/mfd/mfd-core.c | 2 + + drivers/mfd/omap-usb-host.c | 6 +- + drivers/mfd/palmas.c | 130 ++- + drivers/mfd/pcf50633-adc.c | 3 +- + drivers/mfd/pcf50633-core.c | 2 +- + drivers/mfd/pm8921-core.c | 14 +- + drivers/mfd/rc5t583.c | 2 +- + drivers/mfd/rtl8411.c | 94 +- + drivers/mfd/rts5209.c | 63 +- + drivers/mfd/rts5227.c | 115 ++- + drivers/mfd/rts5229.c | 53 +- + drivers/mfd/rts5249.c | 110 ++- + drivers/mfd/rtsx_pcr.c | 76 +- + drivers/mfd/rtsx_pcr.h | 32 +- + drivers/mfd/sec-core.c | 40 +- + drivers/mfd/si476x-i2c.c | 2 +- + drivers/mfd/sm501.c | 6 +- + drivers/mfd/sta2x11-mfd.c | 4 +- + drivers/mfd/stmpe.c | 3 +- + drivers/mfd/syscon.c | 8 +- + drivers/mfd/t7l66xb.c | 8 +- + drivers/mfd/tc3589x.c | 2 +- + drivers/mfd/tc6387xb.c | 6 +- + drivers/mfd/tc6393xb.c | 8 +- + drivers/mfd/ti-ssp.c | 2 +- + drivers/mfd/ti_am335x_tscadc.c | 32 +- + drivers/mfd/timberdale.c | 34 +- + drivers/mfd/tps6105x.c | 2 +- + drivers/mfd/tps65010.c | 24 +- + drivers/mfd/tps65090.c | 2 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/mfd/tps65912-core.c | 2 +- + drivers/mfd/tps80031.c | 2 +- + drivers/mfd/twl-core.c | 2 +- + drivers/mfd/twl4030-audio.c | 2 +- + drivers/mfd/twl4030-madc.c | 2 +- + drivers/mfd/twl4030-power.c | 8 +- + drivers/mfd/twl6030-irq.c | 377 +++---- + drivers/mfd/twl6040.c | 133 ++- + drivers/mfd/ucb1400_core.c | 2 +- + drivers/mfd/ucb1x00-core.c | 34 +- + drivers/mfd/wl1273-core.c | 8 +- + drivers/mfd/wm5110-tables.c | 18 + + drivers/mfd/wm831x-core.c | 2 +- + drivers/mfd/wm831x-irq.c | 2 +- + drivers/mfd/wm831x-spi.c | 1 - + drivers/mfd/wm8350-i2c.c | 3 +- + drivers/mfd/wm8400-core.c | 2 +- + drivers/mfd/wm8994-core.c | 44 +- + drivers/mfd/wm8994-irq.c | 2 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 70 +- + include/linux/mfd/da9063/core.h | 93 ++ + include/linux/mfd/da9063/pdata.h | 111 +++ + include/linux/mfd/da9063/registers.h | 1028 ++++++++++++++++++++ + include/linux/mfd/davinci_voicecodec.h | 3 + + include/linux/mfd/mcp.h | 2 + + include/linux/mfd/palmas.h | 50 + + include/linux/mfd/rtsx_common.h | 3 +- + include/linux/mfd/rtsx_pci.h | 66 +- + include/linux/mfd/samsung/s2mps11.h | 6 +- + include/linux/mfd/ti_am335x_tscadc.h | 1 - + include/linux/mfd/twl6040.h | 2 +- + include/linux/mfd/ucb1x00.h | 1 + + 106 files changed, 3222 insertions(+), 656 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/s2mps11.txt + create mode 100644 drivers/mfd/da9063-core.c + create mode 100644 drivers/mfd/da9063-i2c.c + create mode 100644 drivers/mfd/da9063-irq.c + create mode 100644 include/linux/mfd/da9063/core.h + create mode 100644 include/linux/mfd/da9063/pdata.h + create mode 100644 include/linux/mfd/da9063/registers.h +Merging mfd-lj/for-mfd-next (02a0bf6 mfd: ucb1x00-core: Rewrite ucb1x00_add_dev()) +$ git merge mfd-lj/for-mfd-next +Already up-to-date. +Merging battery/master (db15e63 rx51_battery: Fix channel number when reading adc value) +$ git merge battery/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/power_supply/msm-poweroff.txt | 17 + + MAINTAINERS | 8 + + drivers/power/Kconfig | 15 +- + drivers/power/Makefile | 2 + + drivers/power/ab8500_charger.c | 1 + + drivers/power/bq24190_charger.c | 1549 ++++++++++++++++++++ + drivers/power/collie_battery.c | 2 +- + drivers/power/max8925_power.c | 1 + + drivers/power/power_supply_core.c | 38 +- + drivers/power/power_supply_sysfs.c | 2 +- + drivers/power/reset/Kconfig | 15 +- + drivers/power/reset/Makefile | 2 + + drivers/power/reset/msm-poweroff.c | 73 + + drivers/power/reset/xgene-reboot.c | 103 ++ + drivers/power/rx51_battery.c | 14 +- + drivers/power/tosa_battery.c | 2 +- + drivers/power/twl4030_charger.c | 7 +- + drivers/power/twl4030_madc_battery.c | 245 ++++ + include/linux/power/bq24190_charger.h | 16 + + include/linux/power/twl4030_madc_battery.h | 39 + + include/linux/power_supply.h | 3 + + 21 files changed, 2137 insertions(+), 17 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power_supply/msm-poweroff.txt + create mode 100644 drivers/power/bq24190_charger.c + create mode 100644 drivers/power/reset/msm-poweroff.c + create mode 100644 drivers/power/reset/xgene-reboot.c + create mode 100644 drivers/power/twl4030_madc_battery.c + create mode 100644 include/linux/power/bq24190_charger.h + create mode 100644 include/linux/power/twl4030_madc_battery.h +Merging fbdev/for-next (5e8be02 video: atmel_lcdfb: add device tree suport) +$ git merge fbdev/for-next +Auto-merging drivers/video/atmel_lcdfb.c +Auto-merging drivers/video/Kconfig +Auto-merging arch/avr32/mach-at32ap/at32ap700x.c +Auto-merging arch/avr32/boards/atngw100/mrmt.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/video/atmel,lcdc.txt | 75 +++++ + arch/arm/mach-at91/at91sam9261_devices.c | 6 +- + arch/arm/mach-at91/at91sam9263_devices.c | 6 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 6 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 6 +- + arch/arm/mach-at91/board-sam9261ek.c | 10 +- + arch/arm/mach-at91/board-sam9263ek.c | 6 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 4 +- + arch/arm/mach-at91/board-sam9rlek.c | 6 +- + arch/arm/mach-at91/board.h | 4 +- + arch/avr32/boards/atngw100/evklcd10x.c | 8 +- + arch/avr32/boards/atngw100/mrmt.c | 4 +- + arch/avr32/boards/atstk1000/atstk1000.h | 2 +- + arch/avr32/boards/atstk1000/setup.c | 2 +- + arch/avr32/boards/favr-32/setup.c | 2 +- + arch/avr32/boards/hammerhead/setup.c | 2 +- + arch/avr32/boards/merisc/display.c | 2 +- + arch/avr32/boards/mimc200/setup.c | 4 +- + arch/avr32/mach-at32ap/at32ap700x.c | 8 +- + arch/avr32/mach-at32ap/include/mach/board.h | 4 +- + drivers/video/Kconfig | 2 + + drivers/video/atmel_lcdfb.c | 343 +++++++++++++++++---- + include/video/atmel_lcdc.h | 25 +- + 23 files changed, 402 insertions(+), 135 deletions(-) + create mode 100644 Documentation/devicetree/bindings/video/atmel,lcdc.txt +Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (6f001cc Merge branch '3.12/dss-legacy-removal' into for-next) +$ git merge omap_dss2/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging regulator/for-next (0f42823 Merge remote-tracking branch 'regulator/fix/palmas' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/palmas-regulator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging security/next (7320336 Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel into ra-next) +$ git merge security/next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/apparmor/lsm.c +Merge made by the 'recursive' strategy. + fs/ocfs2/xattr.h | 2 +- + include/linux/security.h | 8 +- + include/linux/xattr.h | 2 +- + include/uapi/linux/reiserfs_xattr.h | 2 +- + security/apparmor/Kconfig | 12 + + security/apparmor/Makefile | 7 +- + security/apparmor/apparmorfs.c | 636 +++++++++++++++++++++++++++++- + security/apparmor/capability.c | 5 + + security/apparmor/context.c | 16 +- + security/apparmor/crypto.c | 97 +++++ + security/apparmor/domain.c | 24 +- + security/apparmor/include/apparmor.h | 6 + + security/apparmor/include/apparmorfs.h | 40 ++ + security/apparmor/include/audit.h | 1 - + security/apparmor/include/capability.h | 4 + + security/apparmor/include/context.h | 15 +- + security/apparmor/include/crypto.h | 36 ++ + security/apparmor/include/policy.h | 218 +++++++--- + security/apparmor/include/policy_unpack.h | 21 +- + security/apparmor/lib.c | 5 - + security/apparmor/lsm.c | 22 +- + security/apparmor/policy.c | 609 ++++++++++++++++------------ + security/apparmor/policy_unpack.c | 135 +++++-- + security/apparmor/procattr.c | 2 +- + security/capability.c | 2 +- + security/integrity/evm/evm_main.c | 2 +- + security/security.c | 8 +- + security/selinux/hooks.c | 17 +- + security/smack/smack.h | 13 +- + security/smack/smack_access.c | 29 +- + security/smack/smack_lsm.c | 51 ++- + security/smack/smackfs.c | 180 ++++----- + 32 files changed, 1673 insertions(+), 554 deletions(-) + create mode 100644 security/apparmor/crypto.c + create mode 100644 security/apparmor/include/crypto.h +Merging selinux/master (0b4bdb3 Revert "SELinux: do not handle seclabel as a special flag") +$ git merge selinux/master +Resolved 'security/selinux/hooks.c' using previous resolution. +Auto-merging security/selinux/ss/policydb.c +Auto-merging security/selinux/include/xfrm.h +Auto-merging security/selinux/include/security.h +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/capability.c +Auto-merging include/linux/security.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ce5e7e6] Merge remote-tracking branch 'selinux/master' +$ git diff -M --stat --summary HEAD^.. + include/linux/security.h | 26 ++- + security/capability.c | 15 +- + security/security.c | 13 +- + security/selinux/hooks.c | 146 +++++++----- + security/selinux/include/objsec.h | 4 +- + security/selinux/include/security.h | 13 +- + security/selinux/include/xfrm.h | 45 ++-- + security/selinux/netnode.c | 2 + + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/ebitmap.c | 20 +- + security/selinux/ss/ebitmap.h | 10 +- + security/selinux/ss/mls.c | 22 +- + security/selinux/ss/mls_types.h | 2 +- + security/selinux/ss/policydb.c | 3 +- + security/selinux/ss/services.c | 66 ++++-- + security/selinux/xfrm.c | 453 ++++++++++++++++-------------------- + 16 files changed, 448 insertions(+), 396 deletions(-) +Merging lblnet/master (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/master (f9a67f3 watchdog: s3c2410_wdt: simplify use of devm_ioremap_resource) +$ git merge watchdog/master +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'recursive' strategy. + drivers/watchdog/Kconfig | 10 ++ + drivers/watchdog/Makefile | 1 + + drivers/watchdog/ar7_wdt.c | 5 - + drivers/watchdog/hpwdt.c | 7 ++ + drivers/watchdog/nuc900_wdt.c | 5 - + drivers/watchdog/s3c2410_wdt.c | 228 ++++++++++++++++++++++----------------- + drivers/watchdog/sunxi_wdt.c | 237 +++++++++++++++++++++++++++++++++++++++++ + drivers/watchdog/ts72xx_wdt.c | 10 -- + 8 files changed, 384 insertions(+), 119 deletions(-) + create mode 100644 drivers/watchdog/sunxi_wdt.c +Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (f098cc4 Merge branches 'arm/exynos', 'ppc/pamu', 'arm/smmu', 'x86/amd' and 'iommu/fixes' into next) +$ git merge iommu/next +Auto-merging arch/powerpc/sysdev/fsl_pci.h +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/device.h | 3 + + arch/powerpc/include/asm/fsl_pamu_stash.h | 39 + + arch/powerpc/sysdev/fsl_pci.h | 5 + + drivers/iommu/Kconfig | 10 + + drivers/iommu/Makefile | 1 + + drivers/iommu/amd_iommu.c | 4 +- + drivers/iommu/amd_iommu_init.c | 2 +- + drivers/iommu/arm-smmu.c | 93 +- + drivers/iommu/exynos-iommu.c | 44 - + drivers/iommu/fsl_pamu.c | 1309 +++++++++++++++++++++++++++++ + drivers/iommu/fsl_pamu.h | 410 +++++++++ + drivers/iommu/fsl_pamu_domain.c | 1172 ++++++++++++++++++++++++++ + drivers/iommu/fsl_pamu_domain.h | 85 ++ + drivers/iommu/intel-iommu.c | 72 +- + include/linux/iommu.h | 16 + + 15 files changed, 3145 insertions(+), 120 deletions(-) + create mode 100644 arch/powerpc/include/asm/fsl_pamu_stash.h + create mode 100644 drivers/iommu/fsl_pamu.c + create mode 100644 drivers/iommu/fsl_pamu.h + create mode 100644 drivers/iommu/fsl_pamu_domain.c + create mode 100644 drivers/iommu/fsl_pamu_domain.h +Merging vfio/next (dac09b5 vfio: fix documentation) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + Documentation/vfio.txt | 8 +- + drivers/vfio/pci/vfio_pci.c | 286 ++++++++++++++++++++++++++++++++++++- + drivers/vfio/pci/vfio_pci_config.c | 11 +- + drivers/vfio/pci/vfio_pci_intrs.c | 35 +++-- + drivers/vfio/vfio.c | 64 ++++++++- + include/linux/vfio.h | 7 + + include/uapi/linux/vfio.h | 38 +++++ + 7 files changed, 421 insertions(+), 28 deletions(-) +Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) +$ git merge osd/linux-next +Already up-to-date. +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 (f8ea61e6 doc: Documentation/cputopology.txt fix typo) +$ git merge trivial/for-next +Resolved 'Documentation/driver-model/devres.txt' using previous resolution. +Resolved 'drivers/crypto/ux500/hash/hash_core.c' using previous resolution. +Resolved 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/mvm/time-event.c' using previous resolution. +Resolved 'kernel/workqueue.c' using previous resolution. +Auto-merging mm/memory-failure.c +Auto-merging kernel/workqueue.c +CONFLICT (content): Merge conflict in kernel/workqueue.c +Auto-merging fs/ext4/super.c +Auto-merging fs/btrfs/send.c +Auto-merging drivers/spi/spi-bitbang.c +Auto-merging drivers/scsi/qla2xxx/qla_mr.c +Auto-merging drivers/scsi/qla2xxx/qla_bsg.c +Auto-merging drivers/scsi/lpfc/lpfc_bsg.c +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/time-event.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/mvm/time-event.c +Auto-merging drivers/net/ethernet/sis/sis900.c +Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/crypto/ux500/hash/hash_core.c +CONFLICT (content): Merge conflict in drivers/crypto/ux500/hash/hash_core.c +Auto-merging arch/parisc/kernel/signal.c +Auto-merging Documentation/printk-formats.txt +Auto-merging Documentation/memory-hotplug.txt +Auto-merging Documentation/filesystems/ext4.txt +Auto-merging Documentation/driver-model/devres.txt +CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt +Auto-merging Documentation/acpi/enumeration.txt +Auto-merging CREDITS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 19450b5] Merge remote-tracking branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 11 +-- + Documentation/00-INDEX | 2 +- + Documentation/ABI/testing/sysfs-block-zram | 9 +- + Documentation/DocBook/media/v4l/vidioc-g-parm.xml | 4 +- + Documentation/IRQ-affinity.txt | 4 +- + Documentation/SubmittingPatches | 10 ++ + Documentation/acpi/enumeration.txt | 2 +- + Documentation/arm/OMAP/omap_pm | 2 +- + Documentation/block/cfq-iosched.txt | 2 +- + Documentation/cachetlb.txt | 6 +- + Documentation/cputopology.txt | 2 +- + Documentation/development-process/2.Process | 4 +- + Documentation/devicetree/bindings/arm/ste-u300.txt | 2 +- + .../devicetree/bindings/arm/vexpress-sysreg.txt | 4 +- + Documentation/devicetree/bindings/c6x/dscr.txt | 2 +- + .../devicetree/bindings/clock/clk-exynos-audss.txt | 2 +- + .../devicetree/bindings/clock/st,nomadik.txt | 2 +- + .../devicetree/bindings/dma/atmel-dma.txt | 4 +- + .../devicetree/bindings/dma/fsl-imx-dma.txt | 2 +- + .../devicetree/bindings/dma/ste-dma40.txt | 4 +- + Documentation/devicetree/bindings/mfd/cros-ec.txt | 2 +- + .../devicetree/bindings/net/can/atmel-can.txt | 2 +- + .../bindings/pinctrl/atmel,at91-pinctrl.txt | 2 +- + Documentation/devicetree/bindings/serial/rs485.txt | 2 +- + Documentation/dma-buf-sharing.txt | 2 +- + Documentation/early-userspace/README | 3 +- + Documentation/fb/fbcon.txt | 2 +- + Documentation/fb/viafb.modes | 2 +- + Documentation/fb/viafb.txt | 2 +- + Documentation/filesystems/btrfs.txt | 2 +- + Documentation/filesystems/ext4.txt | 2 +- + Documentation/filesystems/nfs/Exporting | 2 +- + Documentation/filesystems/nfs/pnfs.txt | 2 +- + Documentation/filesystems/qnx6.txt | 2 +- + Documentation/filesystems/relay.txt | 2 +- + Documentation/filesystems/sysfs-tagging.txt | 2 +- + Documentation/filesystems/xfs.txt | 2 +- + Documentation/fmc/carrier.txt | 2 +- + Documentation/hwmon/abituguru-datasheet | 2 +- + Documentation/hwmon/submitting-patches | 2 +- + Documentation/hwspinlock.txt | 2 +- + Documentation/i2c/upgrading-clients | 4 +- + Documentation/kmemcheck.txt | 6 +- + Documentation/leds/leds-lm3556.txt | 2 +- + Documentation/leds/leds-lp3944.txt | 2 +- + Documentation/memory-hotplug.txt | 2 +- + Documentation/mtd/nand_ecc.txt | 2 +- + Documentation/power/basic-pm-debugging.txt | 10 +- + Documentation/power/swsusp.txt | 15 ++- + Documentation/printk-formats.txt | 6 +- + Documentation/rapidio/rapidio.txt | 2 +- + Documentation/scsi/hptiop.txt | 2 +- + Documentation/sound/alsa/README.maya44 | 2 +- + Documentation/sound/alsa/compress_offload.txt | 4 +- + Documentation/sysfs-rules.txt | 2 +- + Documentation/target/tcm_mod_builder.py | 2 +- + Documentation/trace/ftrace.txt | 4 +- + Documentation/trace/tracepoints.txt | 19 +++- + Documentation/virtual/kvm/api.txt | 2 +- + Documentation/x86/boot.txt | 2 +- + Documentation/zh_CN/SubmittingPatches | 2 +- + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/mm/init_32.c | 2 +- + crypto/api.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/clocksource/acpi_pm.c | 4 +- + drivers/gpu/drm/radeon/r300.c | 2 +- + drivers/infiniband/hw/ehca/ipz_pt_fn.c | 3 +- + drivers/media/usb/gspca/vicam.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- + drivers/net/ethernet/sis/sis900.c | 2 +- + drivers/net/wireless/cw1200/wsm.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/time-event.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8188ee/fw.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723ae/fw.c | 4 +- + drivers/power/88pm860x_charger.c | 4 +- + drivers/power/pm2301_charger.c | 2 +- + drivers/scsi/bfa/bfad_im.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.h | 8 +- + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 8 +- + drivers/scsi/lpfc/lpfc_bsg.c | 2 +- + drivers/scsi/megaraid/megaraid_mbox.c | 10 +- + drivers/scsi/megaraid/megaraid_mm.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 2 +- + drivers/scsi/qla2xxx/qla_bsg.c | 2 +- + drivers/scsi/qla2xxx/qla_mr.c | 2 +- + drivers/spi/spi-bitbang.c | 2 +- + drivers/tty/serial/kgdboc.c | 2 +- + fs/btrfs/send.c | 2 +- + fs/ext4/super.c | 4 +- + fs/gfs2/dir.c | 2 +- + include/linux/coda.h | 1 - + include/linux/ktime.h | 28 +++--- + kernel/workqueue.c | 107 +++++++++++++-------- + mm/memory-failure.c | 2 +- + mm/page_alloc.c | 2 +- + mm/page_isolation.c | 8 +- + net/sched/sch_choke.c | 3 +- + sound/pci/ens1370.c | 2 +- + sound/pci/via82xx.c | 2 +- + 105 files changed, 268 insertions(+), 203 deletions(-) +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge audit/for-next +Already up-to-date. +Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (109b623 of: Feed entire flattened device tree into the random pool) +$ git merge devicetree/devicetree/next +Resolved 'include/linux/of.h' using previous resolution. +Auto-merging include/linux/of.h +CONFLICT (content): Merge conflict in include/linux/of.h +Auto-merging drivers/of/base.c +Auto-merging arch/powerpc/kernel/prom.c +Auto-merging arch/arm64/kernel/setup.c +Auto-merging arch/arm/mm/init.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a7e315d] Merge remote-tracking branch 'devicetree/devicetree/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/can/sja1000.txt | 2 +- + arch/arc/kernel/devtree.c | 6 - + arch/arc/mm/init.c | 5 +- + arch/arm/mm/init.c | 2 +- + arch/arm64/kernel/setup.c | 5 - + arch/arm64/mm/init.c | 3 +- + arch/c6x/kernel/devicetree.c | 8 +- + arch/metag/mm/init.c | 5 +- + arch/microblaze/kernel/prom.c | 8 +- + arch/mips/kernel/prom.c | 3 +- + arch/openrisc/kernel/prom.c | 8 +- + arch/powerpc/kernel/prom.c | 8 +- + arch/x86/kernel/devicetree.c | 3 +- + arch/xtensa/kernel/setup.c | 3 +- + drivers/gpio/gpiolib-of.c | 4 +- + drivers/of/base.c | 200 +++++--- + drivers/of/fdt.c | 98 ++-- + drivers/of/of_net.c | 2 +- + drivers/of/platform.c | 2 +- + include/dt-bindings/input/input.h | 525 +++++++++++++++++++++ + include/linux/of.h | 49 +- + include/linux/of_fdt.h | 3 +- + include/linux/of_net.h | 4 +- + 23 files changed, 770 insertions(+), 186 deletions(-) + create mode 100644 include/dt-bindings/input/input.h +Merging dt-rh/for-next (8851b9f include: dt-binding: input: create a DT header defining key codes.) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/for-next (75c501e Merge remote-tracking branch 'spi/fix/pxa' into spi-linus) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-pxa2xx.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) +Merging tip/auto-latest (6eeb541 Merge branch 'x86/spinlocks') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/include/asm/jump_label.h | 9 +++-- + arch/x86/kernel/i8259.c | 3 +- + arch/x86/kernel/jump_label.c | 70 ++++++++++++++++++++++++++++++++++++--- + 3 files changed, 74 insertions(+), 8 deletions(-) +Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (75a9551 cpc925_edac: Use proper array termination) +$ git merge edac-amd/for-next +Already up-to-date. +Merging ftrace/for-next (fc30f13 Merge branch 'trace/ftrace/core-tpstring' into trace/for-next) +$ git merge ftrace/for-next +Merge made by the 'recursive' strategy. + kernel/trace/trace_events.c | 207 +++++------------------------------------- + kernel/trace/trace_syscalls.c | 10 +- + 2 files changed, 27 insertions(+), 190 deletions(-) +Merging rcu/rcu/next (25f27ce Merge branches 'doc.2013.08.19a', 'fixes.2013.08.20a', 'sysidle.2013.08.31a' and 'torture.2013.08.20a' into HEAD) +$ 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 (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (6b9e4fa Merge tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm into queue) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/kvm-arm-next (8bd4ffd ARM: kvm: don't include drivers/virtio/Kconfig) +$ git merge kvm-arm/kvm-arm-next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (bf550fc Merge remote-tracking branch 'origin/next' into kvm-ppc-next) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (f722406 Linux 3.10-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen-tip/linux-next (32d70ed4 Merge branch 'stable/for-linus-3.12' into linux-next) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/arm/xen/enlighten.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging percpu/for-next (abec1a8 percpu: Make __verify_pcu_ptr handle per cpu pointers to arrays) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (1fb9107 workqueue: fix ordered workqueues in NUMA setups) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) +Merging drivers-x86/linux-next (5c07eae platform/x86: panasonic-laptop: reuse module_acpi_driver) +$ git merge drivers-x86/linux-next +Auto-merging drivers/platform/x86/samsung-q10.c +Merge made by the 'recursive' strategy. + drivers/platform/x86/Kconfig | 3 +- + drivers/platform/x86/amilo-rfkill.c | 7 ++++ + drivers/platform/x86/classmate-laptop.c | 2 +- + drivers/platform/x86/compal-laptop.c | 7 ++-- + drivers/platform/x86/hp-wmi.c | 16 ++++---- + drivers/platform/x86/intel-rst.c | 13 +------ + drivers/platform/x86/intel-smartconnect.c | 13 +------ + drivers/platform/x86/intel_mid_powerbtn.c | 1 - + drivers/platform/x86/intel_mid_thermal.c | 1 - + drivers/platform/x86/panasonic-laptop.c | 25 +----------- + drivers/platform/x86/samsung-q10.c | 65 ++++++++++--------------------- + drivers/platform/x86/thinkpad_acpi.c | 23 ++++++++--- + drivers/platform/x86/wmi.c | 4 +- + 13 files changed, 66 insertions(+), 114 deletions(-) +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (365c9ee Merge remote-tracking branch 'regmap/topic/sparse' into regmap-next) +$ git merge regmap/for-next +Already up-to-date. +Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (61abeba leds: wm831x-status: Request a REG resource) +$ git merge leds/for-next +Auto-merging include/linux/platform_data/leds-pca963x.h +Removing drivers/leds/leds-pca9633.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-lp55xx.txt | 72 +++- + Documentation/devicetree/bindings/leds/pca963x.txt | 47 +++ + Documentation/leds/leds-lp5521.txt | 20 +- + Documentation/leds/leds-lp5523.txt | 21 +- + Documentation/leds/leds-lp55xx.txt | 30 +- + drivers/leds/Kconfig | 34 +- + drivers/leds/Makefile | 3 +- + drivers/leds/leds-88pm860x.c | 2 +- + drivers/leds/leds-adp5520.c | 6 +- + drivers/leds/leds-asic3.c | 4 +- + drivers/leds/leds-atmel-pwm.c | 4 +- + drivers/leds/leds-bd2802.c | 2 +- + drivers/leds/leds-clevo-mail.c | 2 +- + drivers/leds/leds-da903x.c | 2 +- + drivers/leds/leds-da9052.c | 4 +- + drivers/leds/leds-gpio.c | 2 +- + drivers/leds/leds-lm3530.c | 2 +- + drivers/leds/leds-lm3533.c | 2 +- + drivers/leds/leds-lm355x.c | 2 +- + drivers/leds/leds-lm3642.c | 2 +- + drivers/leds/leds-lp3944.c | 7 +- + drivers/leds/leds-lp5521.c | 118 +++++- + drivers/leds/leds-lp5523.c | 325 ++++++++++++++- + drivers/leds/leds-lp5562.c | 8 +- + drivers/leds/leds-lp55xx-common.c | 3 + + drivers/leds/leds-lp55xx-common.h | 66 +++ + drivers/leds/leds-lp8501.c | 410 ++++++++++++++++++ + drivers/leds/leds-lt3593.c | 4 +- + drivers/leds/leds-netxbig.c | 6 +- + drivers/leds/leds-ns2.c | 2 +- + drivers/leds/leds-pca9532.c | 3 +- + drivers/leds/leds-pca955x.c | 2 +- + drivers/leds/leds-pca9633.c | 194 --------- + drivers/leds/leds-pca963x.c | 461 +++++++++++++++++++++ + drivers/leds/leds-pwm.c | 2 +- + drivers/leds/leds-regulator.c | 3 +- + drivers/leds/leds-renesas-tpu.c | 12 +- + drivers/leds/leds-s3c24xx.c | 2 +- + drivers/leds/leds-ss4200.c | 4 +- + drivers/leds/leds-tca6507.c | 2 +- + drivers/leds/leds-wm831x-status.c | 8 +- + drivers/leds/leds-wm8350.c | 2 +- + drivers/leds/trigger/ledtrig-backlight.c | 30 +- + include/linux/platform_data/leds-lp55xx.h | 10 + + .../{leds-pca9633.h => leds-pca963x.h} | 25 +- + 45 files changed, 1651 insertions(+), 321 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/pca963x.txt + create mode 100644 drivers/leds/leds-lp8501.c + delete mode 100644 drivers/leds/leds-pca9633.c + create mode 100644 drivers/leds/leds-pca963x.c + rename include/linux/platform_data/{leds-pca9633.h => leds-pca963x.h} (66%) +Merging driver-core/driver-core-next (816434e Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (2d1d3f3 hvc_xen: Remove unnecessary __GFP_ZERO from kzalloc) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (b9a1048 usbcore: fix incorrect type in assignment in descriptors_changed()) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (0f2aa8c usb: musb: ux500: Add check for NULL board data) +$ git merge usb-gadget/next +Already up-to-date. +Merging staging/staging-next (91121c1 staging: dwc2: make dwc2_core_params documentation more complete) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (3cc1f95 drivers: uio: Kconfig: add MMU dependancy for UIO) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging scsi/for-next (1f962eb [SCSI] sg: push file descriptor list locking down to per-device locking) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (62b62d6 target: remove unused including <linux/version.h>) +$ git merge target-updates/for-next +Auto-merging lib/Makefile +Auto-merging include/scsi/scsi.h +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/target/target_core_spc.c +Auto-merging drivers/target/iscsi/iscsi_target_login.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/isert/ib_isert.c | 746 +++++++++++----- + drivers/infiniband/ulp/isert/ib_isert.h | 26 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 52 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 1 + + drivers/target/Makefile | 3 +- + drivers/target/iscsi/iscsi_target.c | 77 +- + drivers/target/iscsi/iscsi_target.h | 7 +- + drivers/target/iscsi/iscsi_target_configfs.c | 10 +- + drivers/target/iscsi/iscsi_target_core.h | 15 +- + drivers/target/iscsi/iscsi_target_login.c | 180 ++-- + drivers/target/iscsi/iscsi_target_login.h | 3 + + drivers/target/iscsi/iscsi_target_nego.c | 237 +++++- + drivers/target/iscsi/iscsi_target_parameters.c | 2 +- + drivers/target/iscsi/iscsi_target_stat.c | 8 +- + drivers/target/iscsi/iscsi_target_tpg.c | 23 +- + drivers/target/iscsi/iscsi_target_tpg.h | 4 +- + drivers/target/iscsi/iscsi_target_util.c | 41 +- + drivers/target/target_core_alua.c | 35 +- + drivers/target/target_core_configfs.c | 58 +- + drivers/target/target_core_device.c | 42 + + drivers/target/target_core_fabric_configfs.c | 16 +- + drivers/target/target_core_file.c | 10 +- + drivers/target/target_core_iblock.c | 10 +- + drivers/target/target_core_internal.h | 2 + + drivers/target/target_core_pscsi.c | 5 +- + drivers/target/target_core_rd.c | 6 +- + drivers/target/target_core_sbc.c | 248 +++++- + drivers/target/target_core_spc.c | 25 +- + drivers/target/target_core_transport.c | 167 +++- + drivers/target/target_core_xcopy.c | 1081 ++++++++++++++++++++++++ + drivers/target/target_core_xcopy.h | 62 ++ + drivers/target/tcm_fc/tfc_conf.c | 6 +- + drivers/vhost/scsi.c | 132 ++- + include/linux/percpu_ida.h | 60 ++ + include/scsi/scsi.h | 1 + + include/target/iscsi/iscsi_transport.h | 8 +- + include/target/target_core_backend.h | 7 +- + include/target/target_core_base.h | 24 +- + include/target/target_core_fabric.h | 30 + + lib/Makefile | 5 +- + lib/percpu_ida.c | 335 ++++++++ + 41 files changed, 3232 insertions(+), 578 deletions(-) + create mode 100644 drivers/target/target_core_xcopy.c + create mode 100644 drivers/target/target_core_xcopy.h + create mode 100644 include/linux/percpu_ida.h + create mode 100644 lib/percpu_ida.c +Merging target-merge/for-next-merge (d4e4ab8 Linux 3.11-rc5) +$ 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 (6734092 isci: add a couple __iomem annotations) +$ git merge isci/all +Already up-to-date. +Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation) +$ git merge bcon/master +Resolved 'drivers/block/Kconfig' using previous resolution. +Auto-merging kernel/printk/printk.c +Auto-merging init/do_mounts.c +Auto-merging include/linux/mount.h +Auto-merging include/linux/console.h +Auto-merging drivers/net/netconsole.c +Auto-merging drivers/block/Makefile +Auto-merging drivers/block/Kconfig +CONFLICT (content): Merge conflict in drivers/block/Kconfig +Auto-merging block/partitions/check.h +Auto-merging block/partitions/check.c +Auto-merging block/partitions/Makefile +Auto-merging Documentation/networking/netconsole.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d6e8fa1] Merge remote-tracking branch 'bcon/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/blockconsole.txt | 94 ++++ + Documentation/block/blockconsole/bcon_tail | 82 ++++ + Documentation/block/blockconsole/mkblockconsole | 29 ++ + Documentation/networking/netconsole.txt | 16 +- + block/partitions/Makefile | 1 + + block/partitions/blockconsole.c | 22 + + block/partitions/check.c | 3 + + block/partitions/check.h | 3 + + drivers/block/Kconfig | 6 + + drivers/block/Makefile | 1 + + drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++ + drivers/net/netconsole.c | 2 +- + include/linux/blockconsole.h | 7 + + include/linux/console.h | 1 + + include/linux/mount.h | 2 +- + init/do_mounts.c | 2 +- + kernel/printk/printk.c | 5 +- + 17 files changed, 885 insertions(+), 9 deletions(-) + create mode 100644 Documentation/block/blockconsole.txt + create mode 100755 Documentation/block/blockconsole/bcon_tail + create mode 100755 Documentation/block/blockconsole/mkblockconsole + create mode 100644 block/partitions/blockconsole.c + create mode 100644 drivers/block/blockconsole.c + create mode 100644 include/linux/blockconsole.h +Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) +$ git merge tmem/linux-next +Already up-to-date. +Merging writeback/writeback-for-next (8bb495e Linux 3.10) +$ git merge writeback/writeback-for-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 (c9e3b2d pinctrl: sunxi: Fix off-by-one for valid offset range checking) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (8c325ee vhost: wake up worker outside spin_lock) +$ git merge vhost/linux-next +Auto-merging drivers/vhost/vhost.c +Merge made by the 'recursive' strategy. + drivers/vhost/vhost.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (be1a4b1 gpio: improve error path in gpiolib) +$ git merge gpio/for-next +Auto-merging drivers/gpio/gpiolib-of.c +Auto-merging drivers/gpio/gpio-msm-v2.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-mcp23s08.txt | 26 +- + .../devicetree/bindings/gpio/gpio-palmas.txt | 27 + + .../devicetree/bindings/gpio/gpio-tz1090-pdc.txt | 45 ++ + .../devicetree/bindings/gpio/gpio-tz1090.txt | 88 +++ + .../devicetree/bindings/gpio/mrvl-gpio.txt | 7 +- + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 8 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 1 - + drivers/gpio/Kconfig | 37 + + drivers/gpio/Makefile | 4 + + drivers/gpio/gpio-74x164.c | 2 +- + drivers/gpio/gpio-adnp.c | 6 +- + drivers/gpio/gpio-adp5520.c | 2 +- + drivers/gpio/gpio-adp5588.c | 9 +- + drivers/gpio/gpio-arizona.c | 2 +- + drivers/gpio/gpio-da9052.c | 2 +- + drivers/gpio/gpio-da9055.c | 2 +- + drivers/gpio/gpio-em.c | 27 +- + drivers/gpio/gpio-f7188x.c | 469 +++++++++++ + drivers/gpio/gpio-ich.c | 2 +- + drivers/gpio/gpio-janz-ttl.c | 2 +- + drivers/gpio/gpio-kempld.c | 219 ++++++ + drivers/gpio/gpio-lynxpoint.c | 1 + + drivers/gpio/gpio-max7301.c | 3 +- + drivers/gpio/gpio-max730x.c | 2 +- + drivers/gpio/gpio-max732x.c | 8 +- + drivers/gpio/gpio-mc33880.c | 2 +- + drivers/gpio/gpio-mcp23s08.c | 52 +- + drivers/gpio/gpio-msic.c | 2 +- + drivers/gpio/gpio-msm-v2.c | 2 +- + drivers/gpio/gpio-mvebu.c | 7 +- + drivers/gpio/gpio-mxc.c | 41 +- + drivers/gpio/gpio-omap.c | 4 +- + drivers/gpio/gpio-palmas.c | 29 +- + drivers/gpio/gpio-pca953x.c | 6 +- + drivers/gpio/gpio-pcf857x.c | 17 +- + drivers/gpio/gpio-pl061.c | 2 +- + drivers/gpio/gpio-pxa.c | 13 +- + drivers/gpio/gpio-rcar.c | 2 +- + drivers/gpio/gpio-rdc321x.c | 2 +- + drivers/gpio/gpio-samsung.c | 871 --------------------- + drivers/gpio/gpio-spear-spics.c | 7 +- + drivers/gpio/gpio-sta2x11.c | 2 +- + drivers/gpio/gpio-sx150x.c | 2 +- + drivers/gpio/gpio-timberdale.c | 4 +- + drivers/gpio/gpio-tps65912.c | 2 +- + drivers/gpio/gpio-ts5500.c | 2 +- + drivers/gpio/gpio-twl4030.c | 6 +- + drivers/gpio/gpio-twl6040.c | 6 +- + drivers/gpio/gpio-tz1090-pdc.c | 243 ++++++ + drivers/gpio/gpio-tz1090.c | 606 ++++++++++++++ + drivers/gpio/gpio-ucb1400.c | 2 +- + drivers/gpio/gpio-wm831x.c | 2 +- + drivers/gpio/gpio-wm8350.c | 2 +- + drivers/gpio/gpio-wm8994.c | 2 +- + drivers/gpio/gpiolib-of.c | 3 +- + drivers/gpio/gpiolib.c | 49 +- + include/linux/platform_data/gpio-em.h | 1 + + 58 files changed, 1964 insertions(+), 1031 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-palmas.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-tz1090-pdc.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-tz1090.txt + create mode 100644 drivers/gpio/gpio-f7188x.c + create mode 100644 drivers/gpio/gpio-kempld.c + create mode 100644 drivers/gpio/gpio-tz1090-pdc.c + create mode 100644 drivers/gpio/gpio-tz1090.c +Merging arm-soc/for-next (ca59147 ARM: next: added back arm-soc-for-next-contents.txt) +$ git merge arm-soc/for-next +Removing include/linux/platform_data/leds-renesas-tpu.h +Auto-merging include/linux/pci.h +Auto-merging drivers/tty/serial/altera_uart.c +Auto-merging drivers/tty/serial/altera_jtaguart.c +Auto-merging drivers/spi/spi-altera.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/host/pci-mvebu.c +Auto-merging drivers/pci/host/Makefile +CONFLICT (content): Merge conflict in drivers/pci/host/Makefile +Auto-merging drivers/pci/host/Kconfig +Auto-merging drivers/mfd/syscon.c +CONFLICT (modify/delete): drivers/leds/leds-renesas-tpu.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/leds/leds-renesas-tpu.c left in tree. +Auto-merging drivers/leds/Makefile +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/irqchip/irq-mmp.c +Auto-merging drivers/irqchip/Makefile +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/dma/amba-pl08x.c +Auto-merging drivers/cpuidle/Makefile +CONFLICT (content): Merge conflict in drivers/cpuidle/Makefile +Auto-merging drivers/cpuidle/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/Kconfig +Auto-merging arch/sh/boards/mach-ecovec24/setup.c +Auto-merging arch/s390/include/asm/pci.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/ia64/Kconfig +Removing arch/arm/plat-samsung/samsung-time.c +Removing arch/arm/plat-samsung/pwm-clock.c +Removing arch/arm/plat-samsung/irq-vic-timer.c +Removing arch/arm/plat-samsung/include/plat/regs-timer.h +Removing arch/arm/plat-samsung/include/plat/pwm-clock.h +Removing arch/arm/plat-samsung/include/plat/irq-vic-timer.h +Auto-merging arch/arm/mm/init.c +Removing arch/arm/mach-ux500/pins-db8500.h +Auto-merging arch/arm/mach-tegra/tegra.c +Removing arch/arm/mach-tegra/pcie.c +Removing arch/arm/mach-tegra/board-harmony-pcie.c +Removing arch/arm/mach-sunxi/Makefile.boot +Auto-merging arch/arm/mach-shmobile/setup-r8a7779.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7779.c +Auto-merging arch/arm/mach-shmobile/setup-r8a7778.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7778.c +Removing arch/arm/mach-shmobile/intc-r8a7779.c +Removing arch/arm/mach-shmobile/intc-r8a7740.c +Auto-merging arch/arm/mach-shmobile/include/mach/r8a7779.h +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7779.h +Auto-merging arch/arm/mach-shmobile/include/mach/r8a7778.h +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7778.h +Removing arch/arm/mach-shmobile/include/mach/hardware.h +Removing arch/arm/mach-shmobile/include/mach/dma.h +Auto-merging arch/arm/mach-shmobile/board-marzen.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-marzen.c +Removing arch/arm/mach-shmobile/board-kota2.c +Auto-merging arch/arm/mach-shmobile/board-bockw.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c +Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c +Removing arch/arm/mach-shmobile/board-ag5evm.c +Auto-merging arch/arm/mach-pxa/zeus.c +Removing arch/arm/mach-omap2/prm-regbits-54xx.h +Auto-merging arch/arm/mach-omap2/devices.c +Auto-merging arch/arm/mach-omap2/board-am3517evm.c +Auto-merging arch/arm/mach-mvebu/platsmp.c +CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/platsmp.c +Removing arch/arm/mach-msm/include/mach/uncompress.h +Removing arch/arm/mach-msm/include/mach/msm_iomap-8x60.h +Removing arch/arm/mach-msm/include/mach/msm_iomap-8960.h +Removing arch/arm/mach-msm/include/mach/board.h +Auto-merging arch/arm/mach-msm/devices-qsd8x50.c +Auto-merging arch/arm/mach-msm/devices-msm7x30.c +Removing arch/arm/mach-msm/devices-iommu.c +Removing arch/arm/mach-mmp/include/mach/entry-macro.S +Removing arch/arm/mach-kirkwood/sheevaplug-setup.c +Removing arch/arm/mach-kirkwood/netspace_v2-setup.c +Removing arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c +Removing arch/arm/mach-kirkwood/guruplug-setup.c +Removing arch/arm/mach-kirkwood/dockstar-setup.c +Auto-merging arch/arm/mach-kirkwood/common.c +Removing arch/arm/mach-kirkwood/board-usi_topkick.c +Removing arch/arm/mach-kirkwood/board-ts219.c +RemoviResolved 'arch/arm/Kconfig.debug' using previous resolution. +Resolved 'arch/arm/mach-mvebu/platsmp.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/board-bockw.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/board-marzen.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/include/mach/r8a7778.h' using previous resolution. +Resolved 'arch/arm/mach-shmobile/include/mach/r8a7779.h' using previous resolution. +Resolved 'arch/arm/mach-shmobile/setup-r8a7778.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/setup-r8a7779.c' using previous resolution. +Resolved 'drivers/cpuidle/Makefile' using previous resolution. +Resolved 'drivers/pci/host/Makefile' using previous resolution. +ng arch/arm/mach-kirkwood/board-sheevaplug.c +Removing arch/arm/mach-kirkwood/board-readynas.c +Removing arch/arm/mach-kirkwood/board-openblocks_a6.c +Removing arch/arm/mach-kirkwood/board-ns2.c +Removing arch/arm/mach-kirkwood/board-mplcec4.c +Removing arch/arm/mach-kirkwood/board-lsxl.c +Removing arch/arm/mach-kirkwood/board-km_kirkwood.c +Removing arch/arm/mach-kirkwood/board-iomega_ix2_200.c +Removing arch/arm/mach-kirkwood/board-iconnect.c +Removing arch/arm/mach-kirkwood/board-ib62x0.c +Removing arch/arm/mach-kirkwood/board-guruplug.c +Removing arch/arm/mach-kirkwood/board-goflexnet.c +Removing arch/arm/mach-kirkwood/board-dreamplug.c +Removing arch/arm/mach-kirkwood/board-dockstar.c +Removing arch/arm/mach-kirkwood/board-dnskw.c +Removing arch/arm/mach-kirkwood/board-db88f628x-bp.c +Auto-merging arch/arm/mach-imx/mm-imx5.c +Auto-merging arch/arm/mach-imx/mach-imx6q.c +Auto-merging arch/arm/mach-ep93xx/vision_ep9307.c +Auto-merging arch/arm/mach-dove/common.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Removing arch/arm/mach-clps711x/board-fortunet.c +Auto-merging arch/arm/mach-bcm/board_bcm281xx.c +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/kernel/bios32.c +Auto-merging arch/arm/include/debug/msm.S +Auto-merging arch/arm/include/asm/mach/arch.h +Removing arch/arm/include/asm/localtimer.h +Auto-merging arch/arm/configs/tegra_defconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/marzen_defconfig +Auto-merging arch/arm/configs/lager_defconfig +Removing arch/arm/configs/exynos4_defconfig +Removing arch/arm/configs/ag5evm_defconfig +Removing arch/arm/boot/dts/u9540.dts +Auto-merging arch/arm/boot/dts/tegra20.dtsi +Auto-merging arch/arm/boot/dts/tegra20-whistler.dts +Auto-merging arch/arm/boot/dts/tegra20-trimslice.dts +Auto-merging arch/arm/boot/dts/tegra20-seaboard.dts +Removing arch/arm/boot/dts/tegra114-pluto.dts +Auto-merging arch/arm/boot/dts/ste-snowball.dts +Auto-merging arch/arm/boot/dts/ste-hrefv60plus.dts +Auto-merging arch/arm/boot/dts/ste-hrefprev60.dts +Auto-merging arch/arm/boot/dts/ste-href.dtsi +Auto-merging arch/arm/boot/dts/ste-dbx5x0.dtsi +Auto-merging arch/arm/boot/dts/ste-ccu9540.dts +Auto-merging arch/arm/boot/dts/exynos5440.dtsi +Auto-merging arch/arm/boot/dts/exynos5250.dtsi +Removing arch/arm/boot/dts/ccu8540.dts +Auto-merging arch/arm/Kconfig.debug +CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/mmc/kona-sdhci.txt +Auto-merging Documentation/devicetree/bindings/media/s5p-mfc.txt +Auto-merging Documentation/devicetree/bindings/arm/bcm/kona-timer.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/leds/leds-renesas-tpu.c +drivers/leds/leds-renesas-tpu.c: needs merge +rm 'drivers/leds/leds-renesas-tpu.c' +$ git commit -v -a +[master c04277d] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/bcm/bcm11351.txt | 3 +- + .../arm/bcm/{bcm,kona-timer.txt => kona-timer.txt} | 5 +- + .../devicetree/bindings/arm/bcm/kona-wdt.txt | 15 + + .../devicetree/bindings/arm/omap/omap.txt | 3 + + .../devicetree/bindings/arm/vexpress-scc.txt | 33 + + Documentation/devicetree/bindings/bus/imx-weim.txt | 17 +- + .../devicetree/bindings/bus/mvebu-mbus.txt | 276 ++ + .../devicetree/bindings/clock/imx5-clock.txt | 1 + + .../devicetree/bindings/clock/imx6q-clock.txt | 6 + + .../devicetree/bindings/media/s5p-mfc.txt | 10 +- + Documentation/devicetree/bindings/misc/smc.txt | 5 +- + .../mmc/{bcm,kona-sdhci.txt => kona-sdhci.txt} | 5 +- + .../devicetree/bindings/pci/mvebu-pci.txt | 145 +- + .../bindings/pci/nvidia,tegra20-pcie.txt | 163 ++ + .../bindings/pinctrl/nvidia,tegra114-pinmux.txt | 11 + + .../bindings/pinctrl/nvidia,tegra20-pinmux.txt | 11 + + .../bindings/pinctrl/nvidia,tegra30-pinmux.txt | 12 + + .../devicetree/bindings/pinctrl/ste,nomadik.txt | 6 +- + Documentation/devicetree/bindings/rtc/dw-apb.txt | 34 +- + .../devicetree/bindings/serial/altera_jtaguart.txt | 3 +- + .../devicetree/bindings/serial/altera_uart.txt | 3 +- + .../devicetree/bindings/serio/altera_ps2.txt | 3 +- + .../devicetree/bindings/spi/spi_altera.txt | 3 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + .../watchdog/{sun4i-wdt.txt => sunxi-wdt.txt} | 5 +- + MAINTAINERS | 16 + + arch/arm/Kconfig | 28 +- + arch/arm/Kconfig.debug | 9 +- + arch/arm/Makefile | 1 + + arch/arm/arm-soc-for-next-contents.txt | 230 ++ + arch/arm/boot/compressed/head-shmobile.S | 43 +- + arch/arm/boot/dts/Makefile | 43 +- + arch/arm/boot/dts/armada-370-db.dts | 5 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 37 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 179 ++ + arch/arm/boot/dts/armada-370-rd.dts | 37 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 113 +- + arch/arm/boot/dts/armada-370.dtsi | 123 +- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++ + arch/arm/boot/dts/armada-xp-db.dts | 131 +- + arch/arm/boot/dts/armada-xp-gp.dts | 107 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 228 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 269 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 417 +-- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 88 +- + arch/arm/boot/dts/armada-xp.dtsi | 11 +- + arch/arm/boot/dts/at91rm9200.dtsi | 1 + + arch/arm/boot/dts/at91rm9200_pqfp.dtsi | 17 + + arch/arm/boot/dts/at91sam9260.dtsi | 1 + + arch/arm/boot/dts/at91sam9n12.dtsi | 20 + + arch/arm/boot/dts/at91sam9n12ek.dts | 18 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 3 + + arch/arm/boot/dts/at91sam9x5ek.dtsi | 24 + + arch/arm/boot/dts/bcm11351-brt.dts | 8 +- + arch/arm/boot/dts/bcm11351.dtsi | 33 +- + arch/arm/boot/dts/bcm28155-ap.dts | 45 + + arch/arm/boot/dts/ccu8540.dts | 41 - + arch/arm/boot/dts/da850-evm.dts | 11 + + arch/arm/boot/dts/da850.dtsi | 46 +- + arch/arm/boot/dts/dove-cubox.dts | 37 +- + arch/arm/boot/dts/dove-d2plug.dts | 69 + + arch/arm/boot/dts/dove.dtsi | 285 +- + arch/arm/boot/dts/emev2-kzm9d-reference.dts | 57 + + arch/arm/boot/dts/emev2-kzm9d.dts | 2 +- + arch/arm/boot/dts/emev2.dtsi | 65 + + arch/arm/boot/dts/exynos4.dtsi | 122 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 23 + + arch/arm/boot/dts/exynos4210-trats.dts | 100 +- + arch/arm/boot/dts/exynos4210.dtsi | 32 +- + arch/arm/boot/dts/exynos4412-origen.dts | 5 + + arch/arm/boot/dts/exynos4412-trats2.dts | 579 +++++ + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 61 +- + arch/arm/boot/dts/exynos4x12.dtsi | 105 +- + arch/arm/boot/dts/exynos5.dtsi | 21 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 105 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 32 +- + arch/arm/boot/dts/exynos5250-snow.dts | 4 - + arch/arm/boot/dts/exynos5250.dtsi | 66 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 7 + + arch/arm/boot/dts/exynos5420-smdk5420.dts | 31 + + arch/arm/boot/dts/exynos5420.dtsi | 94 +- + arch/arm/boot/dts/exynos5440.dtsi | 29 +- + arch/arm/boot/dts/imx23-evk.dts | 15 + + arch/arm/boot/dts/imx23-olinuxino.dts | 4 + + arch/arm/boot/dts/imx23.dtsi | 17 +- + arch/arm/boot/dts/imx25.dtsi | 35 +- + arch/arm/boot/dts/imx27-apf27dev.dts | 5 + + arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 93 + + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 44 + + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 13 + + arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 125 +- + arch/arm/boot/dts/imx27.dtsi | 120 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 7 +- + arch/arm/boot/dts/imx28-cfa10037.dts | 19 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 73 +- + arch/arm/boot/dts/imx28-cfa10055.dts | 38 +- + arch/arm/boot/dts/imx28-cfa10056.dts | 119 + + arch/arm/boot/dts/imx28-cfa10057.dts | 23 +- + arch/arm/boot/dts/imx28-cfa10058.dts | 141 + + arch/arm/boot/dts/imx28-m28evk.dts | 13 + + arch/arm/boot/dts/imx28.dtsi | 143 +- + arch/arm/boot/dts/imx31.dtsi | 17 + + arch/arm/boot/dts/imx51-apf51.dts | 4 - + arch/arm/boot/dts/imx51-babbage.dts | 5 + + arch/arm/boot/dts/imx51.dtsi | 632 +++-- + arch/arm/boot/dts/imx53-qsb.dts | 18 +- + arch/arm/boot/dts/imx53.dtsi | 56 +- + arch/arm/boot/dts/imx6dl-pinfunc.h | 2138 +++++++-------- + arch/arm/boot/dts/imx6dl-sabreauto.dts | 22 - + arch/arm/boot/dts/imx6dl-sabresd.dts | 19 - + arch/arm/boot/dts/imx6dl-wandboard.dts | 24 +- + arch/arm/boot/dts/imx6dl.dtsi | 254 +- + arch/arm/boot/dts/imx6q-arm2.dts | 14 +- + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 112 +- + arch/arm/boot/dts/imx6q-pinfunc.h | 2050 +++++++-------- + arch/arm/boot/dts/imx6q-sabreauto.dts | 22 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 22 +- + arch/arm/boot/dts/imx6q-sabresd.dts | 19 +- + arch/arm/boot/dts/imx6q-wandboard.dts | 26 + + arch/arm/boot/dts/imx6q.dtsi | 393 +-- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 22 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 92 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 137 + + arch/arm/boot/dts/imx6qdl.dtsi | 770 +++++- + arch/arm/boot/dts/imx6sl.dtsi | 35 +- + arch/arm/boot/dts/keystone.dts | 29 +- + arch/arm/boot/dts/kirkwood-6281.dtsi | 66 +- + arch/arm/boot/dts/kirkwood-6282.dtsi | 102 +- + arch/arm/boot/dts/kirkwood-cloudbox.dts | 20 +- + arch/arm/boot/dts/kirkwood-db-88f6281.dts | 7 +- + arch/arm/boot/dts/kirkwood-db-88f6282.dts | 7 +- + arch/arm/boot/dts/kirkwood-db.dtsi | 22 +- + arch/arm/boot/dts/kirkwood-dns320.dts | 2 +- + arch/arm/boot/dts/kirkwood-dns325.dts | 2 +- + arch/arm/boot/dts/kirkwood-dnskw.dtsi | 20 +- + arch/arm/boot/dts/kirkwood-dockstar.dts | 21 +- + arch/arm/boot/dts/kirkwood-dreamplug.dts | 32 +- + arch/arm/boot/dts/kirkwood-goflexnet.dts | 20 +- + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 34 +- + arch/arm/boot/dts/kirkwood-ib62x0.dts | 20 +- + arch/arm/boot/dts/kirkwood-iconnect.dts | 39 +- + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 28 +- + arch/arm/boot/dts/kirkwood-is2.dts | 4 +- + arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 20 +- + arch/arm/boot/dts/kirkwood-lschlv2.dts | 2 +- + arch/arm/boot/dts/kirkwood-lsxhl.dts | 2 +- + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 32 +- + arch/arm/boot/dts/kirkwood-mplcec4.dts | 50 +- + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 125 + + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 59 +- + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 20 +- + arch/arm/boot/dts/kirkwood-ns2.dts | 4 +- + arch/arm/boot/dts/kirkwood-ns2lite.dts | 4 +- + arch/arm/boot/dts/kirkwood-ns2max.dts | 4 +- + arch/arm/boot/dts/kirkwood-ns2mini.dts | 4 +- + arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 107 + + arch/arm/boot/dts/kirkwood-nsa310.dts | 111 +- + arch/arm/boot/dts/kirkwood-nsa310a.dts | 165 ++ + arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 20 +- + arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 20 +- + arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 2 +- + arch/arm/boot/dts/kirkwood-sheevaplug.dts | 2 +- + arch/arm/boot/dts/kirkwood-topkick.dts | 20 +- + arch/arm/boot/dts/kirkwood-ts219-6281.dts | 10 +- + arch/arm/boot/dts/kirkwood-ts219-6282.dts | 29 +- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 31 +- + arch/arm/boot/dts/kirkwood.dtsi | 102 +- + .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 17 + + arch/arm/boot/dts/orion5x.dtsi | 34 +- + arch/arm/boot/dts/pxa3xx.dtsi | 11 + + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 65 + + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 24 +- + arch/arm/boot/dts/r8a73a4.dtsi | 133 + + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 36 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7740.dtsi | 20 + + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 32 + + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7778.dtsi | 66 + + arch/arm/boot/dts/r8a7779-marzen-reference.dts | 51 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 27 + + arch/arm/boot/dts/r8a7779.dtsi | 98 +- + arch/arm/boot/dts/r8a7790-lager-reference.dts | 45 + + arch/arm/boot/dts/r8a7790-lager.dts | 2 +- + arch/arm/boot/dts/r8a7790.dtsi | 132 + + arch/arm/boot/dts/sama5d3.dtsi | 24 +- + arch/arm/boot/dts/sama5d3xcm.dtsi | 2 - + arch/arm/boot/dts/sh7372.dtsi | 8 + + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 92 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/boot/dts/sh73a0.dtsi | 14 + + arch/arm/boot/dts/skeleton64.dtsi | 2 +- + arch/arm/boot/dts/socfpga.dtsi | 8 +- + arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | 196 ++ + arch/arm/boot/dts/ste-ccu8540.dts | 86 + + arch/arm/boot/dts/{ccu9540.dts => ste-ccu9540.dts} | 2 +- + arch/arm/boot/dts/{dbx5x0.dtsi => ste-dbx5x0.dtsi} | 30 +- + arch/arm/boot/dts/{href.dtsi => ste-href.dtsi} | 2 +- + .../dts/{hrefprev60.dts => ste-hrefprev60.dts} | 6 +- + .../dts/{hrefv60plus.dts => ste-hrefv60plus.dts} | 6 +- + arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 95 + + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 42 +- + .../boot/dts/{snowball.dts => ste-snowball.dts} | 44 +- + arch/arm/boot/dts/{stuib.dtsi => ste-stuib.dtsi} | 0 + arch/arm/boot/dts/sun4i-a10-a1000.dts | 101 + + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 2 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 3 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 27 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 93 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 3 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 32 + + arch/arm/boot/dts/sun6i-a31.dtsi | 299 +++ + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 53 + + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 61 + + arch/arm/boot/dts/sun7i-a20.dtsi | 311 +++ + arch/arm/boot/dts/tegra114-dalmore.dts | 237 +- + arch/arm/boot/dts/tegra114-pluto.dts | 33 - + arch/arm/boot/dts/tegra114.dtsi | 62 + + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +- + arch/arm/boot/dts/tegra20-harmony.dts | 22 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 4 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 19 +- + arch/arm/boot/dts/tegra20-tec.dts | 8 + + arch/arm/boot/dts/tegra20-trimslice.dts | 32 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + arch/arm/boot/dts/tegra20-whistler.dts | 2 +- + arch/arm/boot/dts/tegra20.dtsi | 55 + + arch/arm/boot/dts/tegra30-beaver.dts | 64 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 64 +- + arch/arm/boot/dts/tegra30.dtsi | 156 ++ + arch/arm/boot/dts/u9540.dts | 72 - + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 31 + + arch/arm/boot/dts/vf610-twr.dts | 7 + + arch/arm/boot/dts/zynq-7000.dtsi | 4 +- + arch/arm/configs/ag5evm_defconfig | 83 - + arch/arm/configs/ape6evm_defconfig | 6 +- + arch/arm/configs/at91_dt_defconfig | 4 +- + arch/arm/configs/bcm_defconfig | 13 +- + arch/arm/configs/dove_defconfig | 4 + + arch/arm/configs/exynos4_defconfig | 68 - + arch/arm/configs/imx_v4_v5_defconfig | 19 +- + arch/arm/configs/imx_v6_v7_defconfig | 51 +- + arch/arm/configs/kirkwood_defconfig | 51 +- + .../configs/{kota2_defconfig => lager_defconfig} | 111 +- + arch/arm/configs/marzen_defconfig | 1 + + arch/arm/configs/mvebu_defconfig | 2 + + arch/arm/configs/mxs_defconfig | 19 +- + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/configs/tegra_defconfig | 9 +- + arch/arm/include/asm/localtimer.h | 34 - + arch/arm/include/asm/mach/arch.h | 2 +- + arch/arm/include/asm/mach/pci.h | 4 + + arch/arm/include/asm/outercache.h | 4 +- + .../mach/debug-macro.S => include/debug/msm.S} | 32 +- + arch/arm/kernel/bios32.c | 16 + + arch/arm/kernel/smp.c | 87 - + arch/arm/kernel/smp_twd.c | 64 +- + arch/arm/mach-at91/board-dt-sama5.c | 17 +- + arch/arm/mach-at91/board-snapper9260.c | 2 +- + arch/arm/mach-at91/include/mach/hardware.h | 1 + + arch/arm/mach-at91/include/mach/sama5d3.h | 8 + + arch/arm/mach-at91/include/mach/uncompress.h | 13 + + arch/arm/mach-bcm/Kconfig | 1 + + arch/arm/mach-bcm/Makefile | 4 +- + arch/arm/mach-bcm/bcm_kona_smc.c | 12 +- + arch/arm/mach-bcm/bcm_kona_smc.h | 2 +- + .../arm/mach-bcm/{board_bcm.c => board_bcm281xx.c} | 30 +- + arch/arm/mach-bcm/kona.c | 65 + + arch/arm/mach-bcm/kona.h | 17 + + arch/arm/mach-clps711x/Kconfig | 3 - + arch/arm/mach-clps711x/Makefile | 1 - + arch/arm/mach-clps711x/board-autcpu12.c | 6 +- + arch/arm/mach-clps711x/board-edb7211.c | 17 +- + arch/arm/mach-clps711x/board-fortunet.c | 85 - + arch/arm/mach-clps711x/devices.c | 2 +- + arch/arm/mach-davinci/board-da830-evm.c | 6 +- + arch/arm/mach-davinci/board-da850-evm.c | 8 +- + arch/arm/mach-davinci/board-dm355-evm.c | 6 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 6 +- + arch/arm/mach-davinci/board-dm365-evm.c | 6 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 6 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 6 +- + arch/arm/mach-davinci/board-mityomapl138.c | 6 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 6 +- + arch/arm/mach-davinci/board-omapl138-hawk.c | 6 +- + arch/arm/mach-davinci/board-sffsdr.c | 6 +- + arch/arm/mach-davinci/da830.c | 8 +- + arch/arm/mach-davinci/da850.c | 8 +- + arch/arm/mach-davinci/da8xx-dt.c | 14 +- + arch/arm/mach-davinci/davinci.h | 5 + + arch/arm/mach-davinci/devices-da8xx.c | 59 +- + arch/arm/mach-davinci/devices-tnetv107x.c | 39 +- + arch/arm/mach-davinci/dm355.c | 51 +- + arch/arm/mach-davinci/dm365.c | 40 +- + arch/arm/mach-davinci/dm644x.c | 54 +- + arch/arm/mach-davinci/dm646x.c | 54 +- + arch/arm/mach-davinci/include/mach/common.h | 1 - + arch/arm/mach-davinci/include/mach/da8xx.h | 2 +- + arch/arm/mach-davinci/include/mach/serial.h | 10 +- + arch/arm/mach-davinci/include/mach/tnetv107x.h | 3 +- + arch/arm/mach-davinci/serial.c | 54 +- + arch/arm/mach-davinci/tnetv107x.c | 8 +- + arch/arm/mach-dove/Kconfig | 2 + + arch/arm/mach-dove/Makefile | 4 +- + arch/arm/mach-dove/board-dt.c | 30 +- + arch/arm/mach-dove/common.c | 68 +- + arch/arm/mach-dove/mpp.c | 2 +- + arch/arm/mach-ep93xx/vision_ep9307.c | 2 +- + arch/arm/mach-exynos/Kconfig | 7 + + arch/arm/mach-exynos/common.h | 43 - + arch/arm/mach-exynos/cpuidle.c | 3 + + arch/arm/mach-highbank/Kconfig | 8 +- + arch/arm/mach-highbank/highbank.c | 20 +- + arch/arm/mach-imx/Kconfig | 5 +- + arch/arm/mach-imx/Makefile | 3 +- + arch/arm/mach-imx/anatop.c | 4 +- + arch/arm/mach-imx/clk-fixup-div.c | 129 + + arch/arm/mach-imx/clk-fixup-mux.c | 107 + + arch/arm/mach-imx/clk-imx51-imx53.c | 3 +- + arch/arm/mach-imx/clk-imx6q.c | 57 +- + arch/arm/mach-imx/clk-imx6sl.c | 20 +- + arch/arm/mach-imx/clk-pllv3.c | 15 +- + arch/arm/mach-imx/clk.c | 26 + + arch/arm/mach-imx/clk.h | 10 + + arch/arm/mach-imx/common.h | 13 +- + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- + arch/arm/mach-imx/mach-imx6q.c | 171 +- + arch/arm/mach-imx/mach-imx6sl.c | 3 +- + arch/arm/mach-imx/mach-mxt_td60.c | 2 +- + arch/arm/mach-imx/mm-imx5.c | 4 +- + arch/arm/mach-imx/pm-imx5.c | 7 +- + arch/arm/mach-imx/system.c | 33 + + arch/arm/mach-keystone/Kconfig | 1 - + arch/arm/mach-keystone/platsmp.c | 1 - + arch/arm/mach-keystone/smc.S | 5 +- + arch/arm/mach-kirkwood/Kconfig | 243 +- + arch/arm/mach-kirkwood/Makefile | 36 +- + arch/arm/mach-kirkwood/board-db88f628x-bp.c | 24 - + arch/arm/mach-kirkwood/board-dnskw.c | 43 - + arch/arm/mach-kirkwood/board-dockstar.c | 32 - + arch/arm/mach-kirkwood/board-dreamplug.c | 35 - + arch/arm/mach-kirkwood/board-dt.c | 118 +- + arch/arm/mach-kirkwood/board-goflexnet.c | 34 - + arch/arm/mach-kirkwood/board-guruplug.c | 33 - + arch/arm/mach-kirkwood/board-ib62x0.c | 29 - + arch/arm/mach-kirkwood/board-iconnect.c | 24 - + arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 34 - + arch/arm/mach-kirkwood/board-km_kirkwood.c | 44 - + arch/arm/mach-kirkwood/board-lsxl.c | 36 - + arch/arm/mach-kirkwood/board-mplcec4.c | 35 - + arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c | 50 + + arch/arm/mach-kirkwood/board-ns2.c | 35 - + arch/arm/mach-kirkwood/board-openblocks_a6.c | 26 - + arch/arm/mach-kirkwood/board-readynas.c | 27 - + arch/arm/mach-kirkwood/board-sheevaplug.c | 27 - + arch/arm/mach-kirkwood/board-ts219.c | 40 - + arch/arm/mach-kirkwood/board-usi_topkick.c | 29 - + arch/arm/mach-kirkwood/common.c | 26 +- + arch/arm/mach-kirkwood/common.h | 115 +- + arch/arm/mach-kirkwood/dockstar-setup.c | 111 - + arch/arm/mach-kirkwood/guruplug-setup.c | 133 - + arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 172 -- + arch/arm/mach-kirkwood/netspace_v2-setup.c | 293 --- + arch/arm/mach-kirkwood/openrd-setup.c | 3 +- + arch/arm/mach-kirkwood/pcie.c | 40 +- + arch/arm/mach-kirkwood/rd88f6281-setup.c | 4 +- + arch/arm/mach-kirkwood/sheevaplug-setup.c | 161 -- + arch/arm/mach-ks8695/board-acs5k.c | 2 +- + arch/arm/mach-mmp/Makefile | 2 +- + arch/arm/mach-mmp/common.h | 1 - + arch/arm/mach-mmp/include/mach/entry-macro.S | 26 - + arch/arm/mach-mmp/include/mach/pxa168.h | 1 + + arch/arm/mach-mmp/include/mach/pxa910.h | 1 + + arch/arm/mach-mmp/mmp-dt.c | 8 +- + arch/arm/mach-mmp/mmp2-dt.c | 8 +- + arch/arm/mach-mmp/mmp2.c | 6 + + arch/arm/mach-mmp/pxa910.c | 7 + + arch/arm/mach-mmp/ttc_dkb.c | 2 +- + arch/arm/mach-msm/Makefile | 9 +- + arch/arm/mach-msm/board-dt-8660.c | 4 +- + arch/arm/mach-msm/board-dt-8960.c | 3 +- + arch/arm/mach-msm/board-halibut.c | 1 - + arch/arm/mach-msm/board-mahimahi.c | 2 +- + arch/arm/mach-msm/board-msm7x30.c | 1 - + arch/arm/mach-msm/board-qsd8x50.c | 1 - + arch/arm/mach-msm/board-sapphire.c | 2 +- + arch/arm/mach-msm/board-trout.c | 1 - + arch/arm/mach-msm/board-trout.h | 2 +- + arch/arm/mach-msm/common.h | 18 +- + arch/arm/mach-msm/devices-iommu.c | 912 ------- + arch/arm/mach-msm/devices-msm7x30.c | 2 +- + arch/arm/mach-msm/devices-qsd8x50.c | 2 +- + arch/arm/mach-msm/include/mach/board.h | 38 - + arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 46 - + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 53 - + arch/arm/mach-msm/include/mach/msm_iomap.h | 17 - + arch/arm/mach-msm/include/mach/uncompress.h | 63 - + arch/arm/mach-msm/io.c | 67 +- + arch/arm/mach-msm/timer.c | 141 +- + arch/arm/mach-mv78xx0/pcie.c | 23 +- + arch/arm/mach-mvebu/armada-370-xp.c | 34 +- + arch/arm/mach-mvebu/platsmp.c | 44 +- + arch/arm/mach-mxs/mach-mxs.c | 62 +- + arch/arm/mach-mxs/pm.c | 1 + + arch/arm/mach-nomadik/Kconfig | 1 + + arch/arm/mach-omap1/include/mach/soc.h | 1 + + arch/arm/mach-omap2/Kconfig | 17 +- + arch/arm/mach-omap2/Makefile | 10 + + arch/arm/mach-omap2/am33xx-restart.c | 4 +- + arch/arm/mach-omap2/board-am3517crane.c | 2 - + arch/arm/mach-omap2/board-am3517evm.c | 2 +- + arch/arm/mach-omap2/board-generic.c | 19 + + arch/arm/mach-omap2/cclock33xx_data.c | 5 + + arch/arm/mach-omap2/cclock44xx_data.c | 20 +- + arch/arm/mach-omap2/clockdomain.h | 1 + + arch/arm/mach-omap2/clockdomains7xx_data.c | 740 ++++++ + arch/arm/mach-omap2/cm-regbits-24xx.h | 318 --- + arch/arm/mach-omap2/cm-regbits-33xx.h | 749 ------ + arch/arm/mach-omap2/cm-regbits-34xx.h | 632 ----- + arch/arm/mach-omap2/cm-regbits-44xx.h | 1558 ----------- + arch/arm/mach-omap2/cm-regbits-54xx.h | 1633 ------------ + arch/arm/mach-omap2/cm-regbits-7xx.h | 51 + + arch/arm/mach-omap2/cm1_7xx.h | 324 +++ + arch/arm/mach-omap2/cm2_7xx.h | 513 ++++ + arch/arm/mach-omap2/common.h | 1 + + arch/arm/mach-omap2/devices.c | 40 - + arch/arm/mach-omap2/gpmc.c | 2 +- + arch/arm/mach-omap2/id.c | 4 +- + arch/arm/mach-omap2/io.c | 25 +- + arch/arm/mach-omap2/omap54xx.h | 4 + + arch/arm/mach-omap2/omap_hwmod.c | 6 +- + arch/arm/mach-omap2/omap_hwmod.h | 1 + + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 69 +- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 43 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2724 ++++++++++++++++++++ + arch/arm/mach-omap2/powerdomain.h | 1 + + arch/arm/mach-omap2/powerdomains3xxx_data.c | 8 + + arch/arm/mach-omap2/powerdomains54xx_data.c | 1 - + arch/arm/mach-omap2/powerdomains7xx_data.c | 454 ++++ + arch/arm/mach-omap2/prcm-common.h | 1 + + arch/arm/mach-omap2/prcm44xx.h | 5 + + arch/arm/mach-omap2/prcm_mpu7xx.h | 78 + + arch/arm/mach-omap2/prm-regbits-24xx.h | 247 -- + arch/arm/mach-omap2/prm-regbits-33xx.h | 307 +-- + arch/arm/mach-omap2/prm-regbits-34xx.h | 481 ---- + arch/arm/mach-omap2/prm-regbits-44xx.h | 2226 ---------------- + arch/arm/mach-omap2/prm-regbits-54xx.h | 2701 ------------------- + arch/arm/mach-omap2/prm44xx.c | 12 +- + arch/arm/mach-omap2/prm7xx.h | 678 +++++ + arch/arm/mach-omap2/prminst44xx.c | 20 +- + arch/arm/mach-omap2/soc.h | 17 + + arch/arm/mach-omap2/timer.c | 11 +- + arch/arm/mach-orion5x/common.c | 36 +- + arch/arm/mach-orion5x/common.h | 17 + + arch/arm/mach-orion5x/d2net-setup.c | 6 +- + arch/arm/mach-orion5x/db88f5281-setup.c | 24 +- + arch/arm/mach-orion5x/dns323-setup.c | 6 +- + arch/arm/mach-orion5x/edmini_v2-setup.c | 17 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 12 +- + arch/arm/mach-orion5x/ls-chl-setup.c | 6 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 6 +- + arch/arm/mach-orion5x/lsmini-setup.c | 6 +- + arch/arm/mach-orion5x/mss2-setup.c | 6 +- + arch/arm/mach-orion5x/mv2120-setup.c | 6 +- + arch/arm/mach-orion5x/net2big-setup.c | 6 +- + arch/arm/mach-orion5x/pci.c | 9 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 6 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 6 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 13 +- + arch/arm/mach-orion5x/terastation_pro2-setup.c | 6 +- + arch/arm/mach-orion5x/ts209-setup.c | 6 +- + arch/arm/mach-orion5x/ts409-setup.c | 6 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 6 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 6 +- + arch/arm/mach-prima2/pm.c | 21 +- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- + arch/arm/mach-pxa/pxa-dt.c | 2 +- + arch/arm/mach-pxa/spitz.c | 2 +- + arch/arm/mach-pxa/zeus.c | 2 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 2 +- + arch/arm/mach-realview/Kconfig | 8 +- + arch/arm/mach-s3c24xx/Kconfig | 6 - + arch/arm/mach-s3c24xx/clock-s3c2410.c | 1 - + arch/arm/mach-s3c24xx/clock-s3c2412.c | 1 - + arch/arm/mach-s3c24xx/clock-s3c2416.c | 2 - + arch/arm/mach-s3c24xx/clock-s3c2443.c | 2 - + arch/arm/mach-s3c24xx/common.c | 27 + + arch/arm/mach-s3c24xx/include/mach/map.h | 2 + + arch/arm/mach-s3c24xx/mach-h1940.c | 4 +- + arch/arm/mach-s3c24xx/mach-rx1950.c | 5 +- + arch/arm/mach-s3c64xx/Kconfig | 2 - + arch/arm/mach-s3c64xx/clock.c | 2 - + arch/arm/mach-s3c64xx/common.c | 32 +- + arch/arm/mach-s3c64xx/include/mach/irqs.h | 8 - + arch/arm/mach-s3c64xx/include/mach/map.h | 1 + + arch/arm/mach-s3c64xx/irq-pm.c | 2 - + arch/arm/mach-s3c64xx/mach-crag6410.c | 6 +- + arch/arm/mach-s3c64xx/mach-hmt.c | 4 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 4 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 5 +- + arch/arm/mach-s5p64x0/Kconfig | 2 - + arch/arm/mach-s5p64x0/clock-s5p6440.c | 2 - + arch/arm/mach-s5p64x0/clock-s5p6450.c | 2 - + arch/arm/mach-s5p64x0/common.c | 27 + + arch/arm/mach-s5p64x0/include/mach/irqs.h | 2 - + arch/arm/mach-s5p64x0/include/mach/map.h | 1 + + arch/arm/mach-s5p64x0/mach-smdk6440.c | 5 +- + arch/arm/mach-s5p64x0/mach-smdk6450.c | 5 +- + arch/arm/mach-s5p64x0/pm.c | 3 - + arch/arm/mach-s5pc100/Kconfig | 1 - + arch/arm/mach-s5pc100/clock.c | 2 - + arch/arm/mach-s5pc100/common.c | 28 + + arch/arm/mach-s5pc100/include/mach/irqs.h | 2 - + arch/arm/mach-s5pc100/include/mach/map.h | 1 + + arch/arm/mach-s5pc100/mach-smdkc100.c | 5 +- + arch/arm/mach-s5pv210/Kconfig | 1 - + arch/arm/mach-s5pv210/clock.c | 1 - + arch/arm/mach-s5pv210/common.c | 28 + + arch/arm/mach-s5pv210/include/mach/irqs.h | 2 - + arch/arm/mach-s5pv210/include/mach/map.h | 1 + + arch/arm/mach-s5pv210/mach-smdkv210.c | 5 +- + arch/arm/mach-s5pv210/pm.c | 10 - + arch/arm/mach-shmobile/Kconfig | 119 +- + arch/arm/mach-shmobile/Makefile | 53 +- + arch/arm/mach-shmobile/Makefile.boot | 6 +- + arch/arm/mach-shmobile/board-ag5evm.c | 672 ----- + arch/arm/mach-shmobile/board-ape6evm-reference.c | 63 + + arch/arm/mach-shmobile/board-ape6evm.c | 149 +- + .../board-armadillo800eva-reference.c | 23 +- + arch/arm/mach-shmobile/board-armadillo800eva.c | 67 +- + arch/arm/mach-shmobile/board-bockw-reference.c | 61 + + arch/arm/mach-shmobile/board-bockw.c | 49 +- + arch/arm/mach-shmobile/board-kota2.c | 553 ---- + arch/arm/mach-shmobile/board-kzm9d-reference.c | 47 + + arch/arm/mach-shmobile/board-kzm9d.c | 4 +- + arch/arm/mach-shmobile/board-kzm9g-reference.c | 50 - + arch/arm/mach-shmobile/board-kzm9g.c | 16 +- + arch/arm/mach-shmobile/board-lager-reference.c | 45 + + arch/arm/mach-shmobile/board-lager.c | 62 +- + arch/arm/mach-shmobile/board-mackerel.c | 34 +- + arch/arm/mach-shmobile/board-marzen-reference.c | 29 - + arch/arm/mach-shmobile/board-marzen.c | 36 +- + arch/arm/mach-shmobile/clock-emev2.c | 20 +- + arch/arm/mach-shmobile/clock-r8a73a4.c | 199 +- + arch/arm/mach-shmobile/clock-r8a7740.c | 3 +- + arch/arm/mach-shmobile/clock-r8a7790.c | 27 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 12 +- + arch/arm/mach-shmobile/headsmp-scu.S | 4 +- + arch/arm/mach-shmobile/headsmp.S | 55 +- + arch/arm/mach-shmobile/include/mach/common.h | 10 +- + arch/arm/mach-shmobile/include/mach/dma.h | 1 - + arch/arm/mach-shmobile/include/mach/emev2.h | 4 +- + arch/arm/mach-shmobile/include/mach/hardware.h | 4 - + arch/arm/mach-shmobile/include/mach/r8a73a4.h | 2 + + arch/arm/mach-shmobile/include/mach/r8a7740.h | 3 +- + arch/arm/mach-shmobile/include/mach/r8a7778.h | 10 +- + arch/arm/mach-shmobile/include/mach/r8a7779.h | 3 - + arch/arm/mach-shmobile/include/mach/r8a7790.h | 5 + + arch/arm/mach-shmobile/include/mach/sh73a0.h | 373 --- + arch/arm/mach-shmobile/include/mach/zboot.h | 2 - + arch/arm/mach-shmobile/intc-r8a7740.c | 68 - + arch/arm/mach-shmobile/intc-r8a7779.c | 131 - + arch/arm/mach-shmobile/platsmp-scu.c | 81 + + arch/arm/mach-shmobile/platsmp.c | 18 + + arch/arm/mach-shmobile/setup-emev2.c | 382 +-- + arch/arm/mach-shmobile/setup-r8a73a4.c | 42 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 59 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 141 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 109 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 121 +- + arch/arm/mach-shmobile/setup-sh7372.c | 8 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 35 +- + arch/arm/mach-shmobile/sleep-sh7372.S | 2 + + arch/arm/mach-shmobile/smp-emev2.c | 37 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 70 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 72 +- + arch/arm/mach-shmobile/timer.c | 4 - + arch/arm/mach-spear/Kconfig | 2 +- + arch/arm/mach-sunxi/Kconfig | 2 + + arch/arm/mach-sunxi/Makefile.boot | 1 - + arch/arm/mach-sunxi/sunxi.c | 45 +- + arch/arm/mach-tegra/Kconfig | 30 +- + arch/arm/mach-tegra/Makefile | 6 +- + arch/arm/mach-tegra/board-harmony-pcie.c | 89 - + arch/arm/mach-tegra/board.h | 8 - + arch/arm/mach-tegra/common.h | 1 - + arch/arm/mach-tegra/cpuidle-tegra114.c | 51 +- + arch/arm/mach-tegra/cpuidle-tegra20.c | 12 + + arch/arm/mach-tegra/cpuidle.c | 10 + + arch/arm/mach-tegra/cpuidle.h | 1 + + arch/arm/mach-tegra/flowctrl.c | 2 + + arch/arm/mach-tegra/flowctrl.h | 9 + + arch/arm/mach-tegra/headsmp.S | 3 +- + arch/arm/mach-tegra/hotplug.c | 13 +- + arch/arm/mach-tegra/iomap.h | 11 +- + arch/arm/mach-tegra/irq.c | 40 + + arch/arm/mach-tegra/pcie.c | 886 ------- + arch/arm/mach-tegra/platsmp.c | 1 - + arch/arm/mach-tegra/pm-tegra20.c | 34 + + arch/arm/mach-tegra/pm-tegra30.c | 34 + + arch/arm/mach-tegra/pm.c | 148 +- + arch/arm/mach-tegra/pm.h | 12 + + arch/arm/mach-tegra/pmc.c | 53 +- + arch/arm/mach-tegra/pmc.h | 3 + + arch/arm/mach-tegra/reset-handler.S | 21 +- + arch/arm/mach-tegra/reset.c | 2 + + arch/arm/mach-tegra/reset.h | 4 + + arch/arm/mach-tegra/sleep-tegra20.S | 297 +++ + arch/arm/mach-tegra/sleep-tegra30.S | 616 ++++- + arch/arm/mach-tegra/sleep.S | 37 +- + arch/arm/mach-tegra/sleep.h | 14 +- + arch/arm/mach-tegra/tegra.c | 24 - + arch/arm/mach-ux500/Kconfig | 2 +- + arch/arm/mach-ux500/board-mop500-audio.c | 1 - + arch/arm/mach-ux500/board-mop500-pins.c | 1 - + arch/arm/mach-ux500/board-mop500.c | 38 +- + arch/arm/mach-ux500/cpu-db8500.c | 13 +- + arch/arm/mach-ux500/cpu.c | 8 + + arch/arm/mach-ux500/devices-db8500.c | 1 + + arch/arm/mach-ux500/headsmp.S | 2 - + arch/arm/mach-ux500/pins-db8500.h | 746 ------ + arch/arm/mach-ux500/setup.h | 3 + + arch/arm/mach-vexpress/Kconfig | 10 +- + arch/arm/mach-vexpress/Makefile | 1 + + arch/arm/mach-vexpress/dcscb.c | 66 +- + arch/arm/mach-vexpress/spc.c | 180 ++ + arch/arm/mach-vexpress/spc.h | 24 + + arch/arm/mach-vexpress/tc2_pm.c | 354 +++ + arch/arm/mach-zynq/Kconfig | 2 +- + arch/arm/mach-zynq/hotplug.c | 55 +- + arch/arm/mach-zynq/slcr.c | 45 +- + arch/arm/mm/init.c | 2 +- + arch/arm/plat-omap/Kconfig | 2 +- + arch/arm/plat-omap/dma.c | 1 + + arch/arm/plat-orion/irq.c | 2 +- + arch/arm/plat-samsung/Kconfig | 14 - + arch/arm/plat-samsung/Makefile | 3 - + arch/arm/plat-samsung/dev-backlight.c | 61 +- + arch/arm/plat-samsung/devs.c | 42 +- + arch/arm/plat-samsung/include/plat/clock.h | 4 - + arch/arm/plat-samsung/include/plat/devs.h | 1 + + arch/arm/plat-samsung/include/plat/irq-vic-timer.h | 13 - + arch/arm/plat-samsung/include/plat/irqs.h | 9 - + arch/arm/plat-samsung/include/plat/pwm-clock.h | 81 - + arch/arm/plat-samsung/include/plat/pwm-core.h | 22 + + arch/arm/plat-samsung/include/plat/regs-timer.h | 124 - + arch/arm/plat-samsung/include/plat/samsung-time.h | 23 - + arch/arm/plat-samsung/include/plat/sdhci.h | 38 - + arch/arm/plat-samsung/irq-vic-timer.c | 98 - + arch/arm/plat-samsung/pwm-clock.c | 474 ---- + arch/arm/plat-samsung/s5p-irq.c | 4 - + arch/arm/plat-samsung/samsung-time.c | 394 --- + arch/ia64/Kconfig | 1 - + arch/mips/Kconfig | 2 - + arch/mips/include/asm/pci.h | 5 - + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/pci.h | 5 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/pci.h | 4 - + arch/sh/boards/mach-ecovec24/setup.c | 37 +- + arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 48 - + arch/sh/boards/mach-kfr2r09/setup.c | 19 +- + arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | 2 - + arch/sparc/Kconfig | 1 - + arch/tile/Kconfig | 1 - + arch/x86/Kconfig | 1 - + arch/x86/include/asm/pci.h | 30 - + arch/x86/kernel/x86_init.c | 24 + + arch/x86/platform/mrst/mrst.c | 2 +- + drivers/bus/Kconfig | 3 +- + drivers/bus/imx-weim.c | 129 +- + drivers/bus/mvebu-mbus.c | 441 ++-- + drivers/clk/tegra/clk-tegra114.c | 38 + + drivers/clocksource/Kconfig | 1 - + drivers/clocksource/bcm_kona_timer.c | 8 +- + drivers/clocksource/exynos_mct.c | 58 +- + drivers/clocksource/samsung_pwm_timer.c | 108 +- + drivers/clocksource/time-armada-370-xp.c | 92 +- + drivers/clocksource/timer-marco.c | 98 +- + drivers/cpuidle/Kconfig | 10 + + drivers/cpuidle/Makefile | 1 + + drivers/cpuidle/cpuidle-big_little.c | 209 ++ + drivers/dma/amba-pl08x.c | 23 +- + drivers/gpio/gpio-pca953x.c | 2 +- + drivers/input/serio/altera_ps2.c | 1 + + drivers/iommu/msm_iommu.c | 4 +- + .../mach/iommu.h => drivers/iommu/msm_iommu.h | 0 + drivers/iommu/msm_iommu_dev.c | 4 +- + .../iommu/msm_iommu_hw-8xxx.h | 0 + drivers/iommu/tegra-smmu.c | 2 - + drivers/irqchip/Makefile | 1 + + drivers/irqchip/exynos-combiner.c | 44 +- + drivers/irqchip/irq-gic.c | 6 + + .../mach-mmp/irq.c => drivers/irqchip/irq-mmp.c | 338 +-- + drivers/leds/Kconfig | 12 - + drivers/leds/Makefile | 1 - + drivers/leds/leds-renesas-tpu.c | 337 --- + drivers/memory/mvebu-devbus.c | 72 +- + drivers/memory/tegra20-mc.c | 2 - + drivers/memory/tegra30-mc.c | 2 - + drivers/mfd/syscon.c | 3 - + drivers/mmc/host/sdhci-bcm-kona.c | 18 +- + drivers/of/of_pci.c | 45 + + drivers/pci/Kconfig | 4 - + drivers/pci/host/Kconfig | 4 + + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-mvebu.c | 115 +- + drivers/pci/host/pci-tegra.c | 1691 ++++++++++++ + drivers/pci/msi.c | 85 +- + drivers/pci/probe.c | 1 + + drivers/pwm/pwm-samsung.c | 709 +++-- + drivers/spi/spi-altera.c | 1 + + drivers/tty/serial/altera_jtaguart.c | 1 + + drivers/tty/serial/altera_uart.c | 1 + + drivers/video/backlight/Kconfig | 19 + + drivers/video/backlight/Makefile | 3 + + drivers/video/backlight/bd6107.c | 213 ++ + drivers/video/backlight/gpio_backlight.c | 133 + + drivers/video/backlight/lv5207lp.c | 171 ++ + drivers/video/msm/msm_fb.c | 1 - + include/clocksource/samsung_pwm.h | 7 + + include/dt-bindings/pinctrl/nomadik.h | 36 + + include/linux/irqchip/arm-gic.h | 1 + + include/linux/irqchip/mmp.h | 6 + + include/linux/mbus.h | 16 +- + include/linux/micrel_phy.h | 6 + + include/linux/msi.h | 21 +- + include/linux/of_pci.h | 12 + + include/linux/pci.h | 1 + + include/linux/platform_data/bd6107.h | 19 + + include/linux/platform_data/gpio_backlight.h | 21 + + include/linux/platform_data/leds-renesas-tpu.h | 14 - + include/linux/platform_data/lv5207lp.h | 19 + + include/linux/{i2c => platform_data}/pca953x.h | 0 + include/linux/tegra-cpuidle.h | 25 + + include/linux/time-armada-370-xp.h | 4 +- + 742 files changed, 28682 insertions(+), 27919 deletions(-) + rename Documentation/devicetree/bindings/arm/bcm/{bcm,kona-timer.txt => kona-timer.txt} (80%) + create mode 100644 Documentation/devicetree/bindings/arm/bcm/kona-wdt.txt + create mode 100644 Documentation/devicetree/bindings/arm/vexpress-scc.txt + create mode 100644 Documentation/devicetree/bindings/bus/mvebu-mbus.txt + rename Documentation/devicetree/bindings/mmc/{bcm,kona-sdhci.txt => kona-sdhci.txt} (67%) + create mode 100644 Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt + rename Documentation/devicetree/bindings/watchdog/{sun4i-wdt.txt => sunxi-wdt.txt} (56%) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/armada-370-netgear-rn102.dts + create mode 100644 arch/arm/boot/dts/armada-xp-axpwifiap.dts + create mode 100644 arch/arm/boot/dts/at91rm9200_pqfp.dtsi + create mode 100644 arch/arm/boot/dts/bcm28155-ap.dts + delete mode 100644 arch/arm/boot/dts/ccu8540.dts + create mode 100644 arch/arm/boot/dts/dove-d2plug.dts + create mode 100644 arch/arm/boot/dts/emev2-kzm9d-reference.dts + create mode 100644 arch/arm/boot/dts/exynos4412-trats2.dts + create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts + create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts + create mode 100644 arch/arm/boot/dts/imx28-cfa10056.dts + create mode 100644 arch/arm/boot/dts/imx28-cfa10058.dts + create mode 100644 arch/arm/boot/dts/imx6q-wandboard.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-wandboard.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts + create mode 100644 arch/arm/boot/dts/kirkwood-nsa310-common.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-nsa310a.dts + create mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts + create mode 100644 arch/arm/boot/dts/r8a7778-bockw-reference.dts + create mode 100644 arch/arm/boot/dts/r8a7779-marzen.dts + create mode 100644 arch/arm/boot/dts/r8a7790-lager-reference.dts + create mode 100644 arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/ste-ccu8540.dts + rename arch/arm/boot/dts/{ccu9540.dts => ste-ccu9540.dts} (98%) + rename arch/arm/boot/dts/{dbx5x0.dtsi => ste-dbx5x0.dtsi} (96%) + rename arch/arm/boot/dts/{href.dtsi => ste-href.dtsi} (99%) + rename arch/arm/boot/dts/{hrefprev60.dts => ste-hrefprev60.dts} (92%) + rename arch/arm/boot/dts/{hrefv60plus.dts => ste-hrefv60plus.dts} (98%) + create mode 100644 arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi + rename arch/arm/boot/dts/{snowball.dts => ste-snowball.dts} (93%) + rename arch/arm/boot/dts/{stuib.dtsi => ste-stuib.dtsi} (100%) + create mode 100644 arch/arm/boot/dts/sun4i-a10-a1000.dts + create mode 100644 arch/arm/boot/dts/sun6i-a31-colombus.dts + create mode 100644 arch/arm/boot/dts/sun6i-a31.dtsi + create mode 100644 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20.dtsi + delete mode 100644 arch/arm/boot/dts/tegra114-pluto.dts + delete mode 100644 arch/arm/boot/dts/u9540.dts + delete mode 100644 arch/arm/configs/ag5evm_defconfig + delete mode 100644 arch/arm/configs/exynos4_defconfig + rename arch/arm/configs/{kota2_defconfig => lager_defconfig} (55%) + delete mode 100644 arch/arm/include/asm/localtimer.h + rename arch/arm/{mach-msm/include/mach/debug-macro.S => include/debug/msm.S} (61%) + rename arch/arm/mach-bcm/{board_bcm.c => board_bcm281xx.c} (68%) + create mode 100644 arch/arm/mach-bcm/kona.c + create mode 100644 arch/arm/mach-bcm/kona.h + delete mode 100644 arch/arm/mach-clps711x/board-fortunet.c + create mode 100644 arch/arm/mach-imx/clk-fixup-div.c + create mode 100644 arch/arm/mach-imx/clk-fixup-mux.c + delete mode 100644 arch/arm/mach-kirkwood/board-db88f628x-bp.c + delete mode 100644 arch/arm/mach-kirkwood/board-dnskw.c + delete mode 100644 arch/arm/mach-kirkwood/board-dockstar.c + delete mode 100644 arch/arm/mach-kirkwood/board-dreamplug.c + delete mode 100644 arch/arm/mach-kirkwood/board-goflexnet.c + delete mode 100644 arch/arm/mach-kirkwood/board-guruplug.c + delete mode 100644 arch/arm/mach-kirkwood/board-ib62x0.c + delete mode 100644 arch/arm/mach-kirkwood/board-iconnect.c + delete mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c + delete mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c + delete mode 100644 arch/arm/mach-kirkwood/board-lsxl.c + delete mode 100644 arch/arm/mach-kirkwood/board-mplcec4.c + create mode 100644 arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c + delete mode 100644 arch/arm/mach-kirkwood/board-ns2.c + delete mode 100644 arch/arm/mach-kirkwood/board-openblocks_a6.c + delete mode 100644 arch/arm/mach-kirkwood/board-readynas.c + delete mode 100644 arch/arm/mach-kirkwood/board-sheevaplug.c + delete mode 100644 arch/arm/mach-kirkwood/board-ts219.c + delete mode 100644 arch/arm/mach-kirkwood/board-usi_topkick.c + delete mode 100644 arch/arm/mach-kirkwood/dockstar-setup.c + delete mode 100644 arch/arm/mach-kirkwood/guruplug-setup.c + delete mode 100644 arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c + delete mode 100644 arch/arm/mach-kirkwood/netspace_v2-setup.c + delete mode 100644 arch/arm/mach-kirkwood/sheevaplug-setup.c + delete mode 100644 arch/arm/mach-mmp/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-msm/devices-iommu.c + delete mode 100644 arch/arm/mach-msm/include/mach/board.h + delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8960.h + delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h + delete mode 100644 arch/arm/mach-msm/include/mach/uncompress.h + create mode 100644 arch/arm/mach-omap2/clockdomains7xx_data.c + create mode 100644 arch/arm/mach-omap2/cm-regbits-7xx.h + create mode 100644 arch/arm/mach-omap2/cm1_7xx.h + create mode 100644 arch/arm/mach-omap2/cm2_7xx.h + create mode 100644 arch/arm/mach-omap2/omap_hwmod_7xx_data.c + create mode 100644 arch/arm/mach-omap2/powerdomains7xx_data.c + create mode 100644 arch/arm/mach-omap2/prcm_mpu7xx.h + delete mode 100644 arch/arm/mach-omap2/prm-regbits-54xx.h + create mode 100644 arch/arm/mach-omap2/prm7xx.h + delete mode 100644 arch/arm/mach-shmobile/board-ag5evm.c + create mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c + create mode 100644 arch/arm/mach-shmobile/board-bockw-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-kota2.c + create mode 100644 arch/arm/mach-shmobile/board-kzm9d-reference.c + create mode 100644 arch/arm/mach-shmobile/board-lager-reference.c + delete mode 100644 arch/arm/mach-shmobile/include/mach/dma.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/hardware.h + delete mode 100644 arch/arm/mach-shmobile/intc-r8a7740.c + delete mode 100644 arch/arm/mach-shmobile/intc-r8a7779.c + create mode 100644 arch/arm/mach-shmobile/platsmp-scu.c + delete mode 100644 arch/arm/mach-sunxi/Makefile.boot + delete mode 100644 arch/arm/mach-tegra/board-harmony-pcie.c + delete mode 100644 arch/arm/mach-tegra/pcie.c + create mode 100644 arch/arm/mach-tegra/pm-tegra20.c + create mode 100644 arch/arm/mach-tegra/pm-tegra30.c + delete mode 100644 arch/arm/mach-ux500/pins-db8500.h + create mode 100644 arch/arm/mach-vexpress/spc.c + create mode 100644 arch/arm/mach-vexpress/spc.h + create mode 100644 arch/arm/mach-vexpress/tc2_pm.c + delete mode 100644 arch/arm/plat-samsung/include/plat/irq-vic-timer.h + delete mode 100644 arch/arm/plat-samsung/include/plat/pwm-clock.h + create mode 100644 arch/arm/plat-samsung/include/plat/pwm-core.h + delete mode 100644 arch/arm/plat-samsung/include/plat/regs-timer.h + delete mode 100644 arch/arm/plat-samsung/irq-vic-timer.c + delete mode 100644 arch/arm/plat-samsung/pwm-clock.c + delete mode 100644 arch/arm/plat-samsung/samsung-time.c + create mode 100644 drivers/cpuidle/cpuidle-big_little.c + rename arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h (100%) + rename arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h => drivers/iommu/msm_iommu_hw-8xxx.h (100%) + rename arch/arm/mach-mmp/irq.c => drivers/irqchip/irq-mmp.c (63%) + delete mode 100644 drivers/leds/leds-renesas-tpu.c + create mode 100644 drivers/pci/host/pci-tegra.c + create mode 100644 drivers/video/backlight/bd6107.c + create mode 100644 drivers/video/backlight/gpio_backlight.c + create mode 100644 drivers/video/backlight/lv5207lp.c + create mode 100644 include/dt-bindings/pinctrl/nomadik.h + create mode 100644 include/linux/irqchip/mmp.h + create mode 100644 include/linux/platform_data/bd6107.h + create mode 100644 include/linux/platform_data/gpio_backlight.h + delete mode 100644 include/linux/platform_data/leds-renesas-tpu.h + create mode 100644 include/linux/platform_data/lv5207lp.h + rename include/linux/{i2c => platform_data}/pca953x.h (100%) + create mode 100644 include/linux/tegra-cpuidle.h +Merging bcm2835/for-next (7d13205 Linux 3.10-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function) +$ git merge cortex/for-next +Merge made by the 'recursive' strategy. +Merging ep93xx/ep93xx-for-next (6868a89 Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Auto-merging arch/arm/mach-ep93xx/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/mach-ep93xx/Kconfig | 1 + + arch/arm/mach-ep93xx/core.c | 110 ++++++++++++++++++++++++++- + arch/arm/mach-ep93xx/include/mach/platform.h | 3 +- + 3 files changed, 111 insertions(+), 3 deletions(-) +Merging imx-mxs/for-next (9445012 Merge branches 'imx/fixes-3.12', 'imx/soc-3.13' and 'imx/dt-3.13' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/imx28-evk.dts +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/imx6q-clock.txt | 1 + + arch/arm/boot/dts/imx27.dtsi | 6 +- + arch/arm/boot/dts/imx28-evk.dts | 2 + + arch/arm/boot/dts/imx28.dtsi | 10 ++ + arch/arm/boot/dts/imx51-babbage.dts | 4 +- + arch/arm/boot/dts/imx51.dtsi | 23 +++++ + arch/arm/boot/dts/imx53-qsb.dts | 3 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 103 +++++++++++++-------- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 21 +++++ + arch/arm/boot/dts/imx6qdl.dtsi | 21 +++++ + arch/arm/boot/dts/imx6sl-evk.dts | 3 + + arch/arm/boot/dts/imx6sl.dtsi | 8 +- + arch/arm/boot/dts/vf610-twr.dts | 17 ++++ + arch/arm/boot/dts/vf610.dtsi | 12 +++ + arch/arm/mach-imx/clk-imx6q.c | 9 +- + arch/arm/mach-imx/mach-imx6sl.c | 21 +++++ + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 5 + + 17 files changed, 219 insertions(+), 50 deletions(-) +Merging ixp4xx/next (19f949f Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging msm/for-next (8fb0bf1 Merge branch 'for-3.12/msm-cleanup2' into for-next) +$ git merge msm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (e3cd46e Merge branch 'mvebu/dove_pcie-mbus-dt' into for-next) +$ git merge mvebu/for-next +Resolved 'drivers/pci/host/Kconfig' using previous resolution. +Resolved 'drivers/pci/host/pci-mvebu.c' using previous resolution. +Auto-merging drivers/pci/host/pci-mvebu.c +CONFLICT (content): Merge conflict in drivers/pci/host/pci-mvebu.c +Auto-merging drivers/pci/host/Kconfig +CONFLICT (content): Merge conflict in drivers/pci/host/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aed0b97] Merge remote-tracking branch 'mvebu/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/armada-370-xp-mpic.txt | 3 + + .../devicetree/bindings/pci/mvebu-pci.txt | 10 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-370-xp.dtsi | 1 + + arch/arm/boot/dts/armada-370.dtsi | 1 + + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 1 + + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 + + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 + + arch/arm/boot/dts/armada-xp.dtsi | 11 + + arch/arm/boot/dts/dove-cm-a510.dts | 2 +- + arch/arm/boot/dts/dove-cubox.dts | 2 +- + arch/arm/boot/dts/dove-d2plug.dts | 2 +- + arch/arm/boot/dts/dove-d3plug.dts | 103 ++ + arch/arm/boot/dts/dove-dove-db.dts | 2 +- + arch/arm/boot/dts/dove.dtsi | 1009 +++++++++++--------- + arch/arm/mach-dove/board-dt.c | 39 +- + arch/arm/mach-mvebu/coherency.c | 8 +- + arch/arm/mach-mvebu/pmsu.c | 1 + + arch/arm/mach-mvebu/system-controller.c | 1 + + drivers/bus/mvebu-mbus.c | 6 +- + drivers/irqchip/irq-armada-370-xp.c | 202 +++- + drivers/pci/host/Kconfig | 2 +- + drivers/pci/host/pci-mvebu.c | 121 ++- + 23 files changed, 976 insertions(+), 554 deletions(-) + create mode 100644 arch/arm/boot/dts/dove-d3plug.dts +Merging renesas/next (63c9972 Merge branch 'clocksource-fixes-for-v3.12' into next) +$ git merge renesas/next +Resolved 'arch/arm/boot/dts/r8a73a4.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/r8a7790.dtsi' using previous resolution. +Auto-merging arch/arm/mach-shmobile/setup-r8a7779.c +Auto-merging arch/arm/boot/dts/r8a7790.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7790.dtsi +Auto-merging arch/arm/boot/dts/r8a73a4.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a73a4.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d12de5a] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- + drivers/clocksource/em_sti.c | 51 ++++++++++------------------------ + drivers/clocksource/sh_cmt.c | 50 +++++++++++++++++++++++---------- + 3 files changed, 52 insertions(+), 51 deletions(-) +Merging samsung/for-next (84b6f2e Merge branch 'v3.11-samsung-fixes-2' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/mach-exynos/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/mach-exynos/Kconfig | 2 +- + arch/arm/plat-samsung/include/plat/uncompress.h | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging tegra/for-next (d8dfad3 Linux 3.11-rc7) +$ git merge tegra/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (10bcdfb ARM: init: add support for reserved memory defined by device tree) +$ git merge dma-mapping/dma-mapping-next +Resolved 'drivers/base/dma-contiguous.c' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging include/linux/of_fdt.h +Auto-merging include/linux/device.h +Removing include/asm-generic/dma-contiguous.h +Auto-merging drivers/of/platform.c +Auto-merging drivers/of/fdt.c +Auto-merging drivers/of/Makefile +Auto-merging drivers/of/Kconfig +Auto-merging drivers/base/dma-contiguous.c +CONFLICT (content): Merge conflict in drivers/base/dma-contiguous.c +Auto-merging arch/arm/mm/init.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6ab3ce3] Merge remote-tracking branch 'dma-mapping/dma-mapping-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/memory.txt | 168 +++++++++++++++++++++++++ + arch/arm/include/asm/dma-contiguous.h | 1 - + arch/arm/mm/init.c | 3 + + arch/x86/include/asm/dma-contiguous.h | 1 - + drivers/base/dma-contiguous.c | 119 +++++++----------- + drivers/of/Kconfig | 6 + + drivers/of/Makefile | 1 + + drivers/of/fdt.c | 76 ++++++++++++ + drivers/of/of_reserved_mem.c | 175 +++++++++++++++++++++++++++ + drivers/of/platform.c | 4 + + include/asm-generic/dma-contiguous.h | 28 ----- + include/linux/device.h | 2 +- + include/linux/dma-contiguous.h | 62 +++++++++- + include/linux/of_fdt.h | 3 + + include/linux/of_reserved_mem.h | 14 +++ + 15 files changed, 555 insertions(+), 108 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory.txt + create mode 100644 drivers/of/of_reserved_mem.c + delete mode 100644 include/asm-generic/dma-contiguous.h + create mode 100644 include/linux/of_reserved_mem.h +Merging pwm/for-next (1e185c7 pwm: pxa: Use module_platform_driver) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (6e46645 Linux 3.11) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (c7b96ac userns: Kill nsown_capable it makes the wrong thing easy) +$ git merge userns/for-next +Auto-merging net/core/scm.c +Auto-merging net/core/net-sysfs.c +Auto-merging lib/kobject.c +Auto-merging kernel/user_namespace.c +Auto-merging kernel/pid_namespace.c +Auto-merging kernel/nsproxy.c +Auto-merging kernel/fork.c +Auto-merging kernel/capability.c +Auto-merging include/linux/user_namespace.h +Auto-merging include/linux/mount.h +Auto-merging include/linux/fs.h +Auto-merging fs/sysfs/mount.c +Auto-merging fs/proc/root.c +Auto-merging fs/open.c +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/namespace.c | 121 ++++++++++++++++++++++++++++++++--------- + fs/open.c | 2 +- + fs/pnode.h | 5 +- + fs/proc/root.c | 6 +- + fs/sysfs/mount.c | 11 +++- + include/linux/capability.h | 1 - + include/linux/fs.h | 1 + + include/linux/kobject_ns.h | 2 + + include/linux/mount.h | 1 + + include/linux/user_namespace.h | 4 -- + ipc/namespace.c | 2 +- + kernel/capability.c | 12 ---- + kernel/fork.c | 5 -- + kernel/groups.c | 2 +- + kernel/nsproxy.c | 36 ++++-------- + kernel/pid.c | 1 + + kernel/pid_namespace.c | 2 +- + kernel/sys.c | 20 +++---- + kernel/uid16.c | 2 +- + kernel/user.c | 2 - + kernel/user_namespace.c | 2 - + kernel/utsname.c | 2 +- + lib/kobject.c | 15 +++++ + net/core/net-sysfs.c | 8 +++ + net/core/net_namespace.c | 2 +- + net/core/scm.c | 4 +- + security/commoncap.c | 10 ++-- + 27 files changed, 177 insertions(+), 104 deletions(-) +Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (b05c683 clk: Move symbol export to proper location) +$ git merge clk/clk-next +Resolved 'drivers/clk/zynq/clkc.c' using previous resolution. +Auto-merging drivers/clk/zynq/clkc.c +CONFLICT (content): Merge conflict in drivers/clk/zynq/clkc.c +Auto-merging drivers/clk/tegra/clk-tegra114.c +Auto-merging drivers/clk/samsung/clk-exynos4.c +Auto-merging arch/arm/mach-imx/clk.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b9682bd] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/clk.txt | 46 +- + .../devicetree/bindings/clock/exynos4-clock.txt | 1 + + .../devicetree/bindings/clock/exynos5250-clock.txt | 14 +- + .../devicetree/bindings/clock/exynos5420-clock.txt | 12 + + .../bindings/clock/samsung,s3c64xx-clock.txt | 77 ++++ + Documentation/devicetree/bindings/clock/sunxi.txt | 12 + + .../bindings/clock/sunxi/sun5i-a10s-gates.txt | 75 ++++ + .../bindings/clock/sunxi/sun6i-a31-gates.txt | 83 ++++ + .../bindings/clock/sunxi/sun7i-a20-gates.txt | 98 +++++ + .../devicetree/bindings/gpu/samsung-g2d.txt | 7 +- + arch/arm/mach-imx/clk.h | 5 +- + drivers/clk/Kconfig | 8 +- + drivers/clk/Makefile | 1 + + drivers/clk/clk-bcm2835.c | 2 +- + drivers/clk/clk-divider.c | 8 +- + drivers/clk/clk-fixed-factor.c | 2 + + drivers/clk/clk-fixed-rate.c | 1 + + drivers/clk/clk-gate.c | 7 +- + drivers/clk/clk-mux.c | 19 +- + drivers/clk/clk-nomadik.c | 4 +- + drivers/clk/clk-prima2.c | 2 +- + drivers/clk/clk-s2mps11.c | 273 ++++++++++++ + drivers/clk/clk-u300.c | 4 +- + drivers/clk/clk-wm831x.c | 16 +- + drivers/clk/clk.c | 448 +++++++++++-------- + drivers/clk/mmp/clk-mmp2.c | 39 +- + drivers/clk/mmp/clk-pxa168.c | 40 +- + drivers/clk/mmp/clk-pxa910.c | 31 +- + drivers/clk/mvebu/armada-370.c | 14 +- + drivers/clk/mvebu/armada-xp.c | 12 +- + drivers/clk/mvebu/clk-cpu.c | 4 +- + drivers/clk/mvebu/common.c | 18 +- + drivers/clk/mvebu/dove.c | 12 +- + drivers/clk/mvebu/kirkwood.c | 14 +- + drivers/clk/mxs/clk-imx23.c | 1 + + drivers/clk/mxs/clk.h | 4 +- + drivers/clk/samsung/Makefile | 3 + + drivers/clk/samsung/clk-exynos-audss.c | 8 +- + drivers/clk/samsung/clk-exynos4.c | 94 ++-- + drivers/clk/samsung/clk-exynos5250.c | 137 ++++-- + drivers/clk/samsung/clk-exynos5420.c | 123 ++++-- + drivers/clk/samsung/clk-exynos5440.c | 16 +- + drivers/clk/samsung/clk-pll.c | 416 ++++++++++++++---- + drivers/clk/samsung/clk-pll.h | 40 +- + drivers/clk/samsung/clk-s3c64xx.c | 473 +++++++++++++++++++++ + drivers/clk/samsung/clk.h | 55 ++- + drivers/clk/spear/spear1310_clock.c | 179 ++++---- + drivers/clk/spear/spear1340_clock.c | 97 +++-- + drivers/clk/spear/spear3xx_clock.c | 57 ++- + drivers/clk/spear/spear6xx_clock.c | 35 +- + drivers/clk/sunxi/clk-sunxi.c | 270 +++++++++--- + drivers/clk/tegra/clk-tegra114.c | 38 +- + drivers/clk/tegra/clk-tegra20.c | 8 +- + drivers/clk/tegra/clk-tegra30.c | 37 +- + drivers/clk/versatile/clk-vexpress.c | 4 +- + drivers/clk/zynq/clkc.c | 84 ++-- + drivers/clk/zynq/pll.c | 19 +- + include/dt-bindings/clock/samsung,s3c64xx-clock.h | 178 ++++++++ + include/linux/clk-private.h | 3 + + include/linux/clk-provider.h | 31 ++ + 60 files changed, 3020 insertions(+), 799 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c64xx-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun5i-a10s-gates.txt + create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun6i-a31-gates.txt + create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun7i-a20-gates.txt + create mode 100644 drivers/clk/clk-s2mps11.c + create mode 100644 drivers/clk/samsung/clk-s3c64xx.c + create mode 100644 include/dt-bindings/clock/samsung,s3c64xx-clock.h +Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging arm64-hugepages/for-next/hugepages (af07484 ARM64: mm: THP support.) +$ git merge arm64-hugepages/for-next/hugepages +Already up-to-date. +Merging ptr-ret/PTR_RET (ad151d5 GFS2: Replace PTR_RET with PTR_ERR_OR_ZERO) +$ git merge ptr-ret/PTR_RET +Already up-to-date. +Merging aio/master (77d30b1 aio: fix rcu sparse warnings introduced by ioctx table lookup patch) +$ git merge aio/master +Resolved 'fs/block_dev.c' using previous resolution. +Resolved 'fs/nfs/direct.c' using previous resolution. +Auto-merging net/socket.c +Auto-merging mm/page_io.c +Auto-merging kernel/fork.c +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/aio.h +Auto-merging fs/udf/file.c +Auto-merging fs/read_write.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/nfs/direct.c +CONFLICT (content): Merge conflict in fs/nfs/direct.c +Auto-merging fs/block_dev.c +CONFLICT (content): Merge conflict in fs/block_dev.c +Auto-merging fs/aio.c +Auto-merging drivers/usb/gadget/inode.c +Auto-merging drivers/staging/lustre/lustre/llite/file.c +Auto-merging drivers/staging/android/logger.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 45fd136] Merge remote-tracking branch 'aio/master' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/android/logger.c | 2 +- + drivers/staging/lustre/lustre/llite/file.c | 4 +- + drivers/usb/gadget/inode.c | 9 +- + fs/aio.c | 713 ++++++++++++++++++----------- + fs/anon_inodes.c | 66 +++ + fs/block_dev.c | 2 +- + fs/ocfs2/file.c | 6 +- + fs/read_write.c | 3 - + fs/udf/file.c | 2 +- + include/linux/aio.h | 21 +- + include/linux/anon_inodes.h | 3 + + include/linux/migrate.h | 3 + + include/linux/mm_types.h | 5 +- + kernel/fork.c | 2 +- + mm/migrate.c | 2 +- + mm/page_io.c | 1 - + net/socket.c | 15 +- + 17 files changed, 547 insertions(+), 312 deletions(-) +$ git am -3 ../patches/0001-aio-semantic-fixup.patch +Applying: aio: semantic fixup +$ git reset HEAD^ +Unstaged changes after reset: +M fs/aio.c +$ git add -A . +$ git commit -v -a --amend +[master 04c6102] Merge remote-tracking branch 'aio/master' +$ git am -3 ../patches/aio_another_semantic_merge_fix.patch +Applying: aio: another semantic merge fix +$ git reset HEAD^ +Unstaged changes after reset: +M fs/aio.c +M include/linux/aio.h +$ git add -A . +$ git commit -v -a --amend +[master 1e8e5d8] Merge remote-tracking branch 'aio/master' +Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) +Merging akpm-current/current (ea8adca mm-page-writebackc-add-strictlimit-feature-fix) +$ git merge --no-ff akpm-current/current +Auto-merging scripts/sortextable.c +Auto-merging scripts/mod/modpost.c +Auto-merging net/sunrpc/clnt.c +Auto-merging net/socket.c +Auto-merging net/mac80211/main.c +Auto-merging net/mac80211/key.c +Auto-merging net/mac80211/driver-ops.h +Auto-merging mm/slub.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_isolation.c +Auto-merging mm/page_alloc.c +Auto-merging mm/migrate.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/filemap.c +Auto-merging mm/backing-dev.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/watchdog.c +Auto-merging kernel/smp.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/nsproxy.c +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging ipc/namespace.c +Auto-merging ipc/msg.c +Auto-merging init/do_mounts.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/migrate.h +Auto-merging include/linux/compat.h +Auto-merging include/linux/buffer_head.h +Auto-merging fs/xfs/xfs_mount.c +Auto-merging fs/ocfs2/ocfs2_trace.h +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/ocfs2/cluster/heartbeat.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/nfs/nfs4state.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/namespace.c +Auto-merging fs/inode.c +Auto-merging fs/hfsplus/inode.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/fscache/page.c +Auto-merging fs/file_table.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/eventpoll.c +Auto-merging fs/dcache.c +Auto-merging fs/block_dev.c +Auto-merging fs/anon_inodes.c +Auto-merging fs/affs/file.c +Auto-merging drivers/watchdog/hpwdt.c +Auto-merging drivers/w1/w1.c +Auto-merging drivers/video/atmel_lcdfb.c +Auto-merging drivers/usb/core/urb.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging drivers/staging/lustre/lustre/ptlrpc/sec_gc.c +Auto-merging drivers/staging/lustre/lustre/ptlrpc/sec_config.c +Auto-merging drivers/staging/lustre/lustre/ptlrpc/sec.c +Auto-merging drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c +Auto-merging drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c +Auto-merging drivers/staging/lustre/lustre/ptlrpc/client.c +Auto-merging drivers/staging/lustre/lustre/osc/osc_page.c +Auto-merging drivers/staging/lustre/lustre/osc/osc_lock.c +Auto-merging drivers/staging/lustre/lustre/obdclass/cl_page.c +Auto-merging drivers/staging/lustre/lustre/obdclass/cl_object.c +Auto-merging drivers/staging/lustre/lustre/obdclass/cl_lock.c +Auto-merging drivers/staging/lustre/lustre/llite/remote_perm.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/iov.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-trans.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-op-mode.h +Auto-merging drivers/net/wireless/b43legacy/dma.c +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/wireless/b43/dma.c +Auto-merging drivers/net/wireless/ath/wil6210/wmi.c +Auto-merging drivers/net/ethernet/sfc/falcon.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Auto-merging drivers/mmc/core/core.c +Auto-merging drivers/misc/ti-st/st_core.c +Auto-merging drivers/memstick/host/rtsx_pci_ms.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/isdn/mISDN/core.c +Auto-merging drivers/iommu/msm_iommu_dev.c +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Auto-merging drivers/infiniband/hw/cxgb3/iwch_cm.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_acpi.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/block/rbd.c +Auto-merging drivers/base/dma-buf.c +Auto-merging drivers/atm/Resolved 'kernel/fork.c' using previous resolution. +he.c +Auto-merging block/partitions/check.c +Auto-merging block/partitions/Makefile +Auto-merging block/blk-core.c +Auto-merging block/blk-cgroup.c +Auto-merging arch/x86/lib/csum-wrappers_64.c +Auto-merging arch/x86/kernel/e820.c +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/include/asm/e820.h +Auto-merging arch/x86/include/asm/checksum_32.h +Auto-merging arch/tile/mm/hugetlbpage.c +Auto-merging arch/tile/mm/highmem.c +Auto-merging arch/s390/mm/hugetlbpage.c +Auto-merging arch/s390/kernel/kprobes.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/kernel/rtas.c +Auto-merging arch/arm/mm/hugetlbpage.c +Auto-merging arch/arm/mach-omap2/omap_hwmod.c +Auto-merging Makefile +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8a4fd5f] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/cmdline-partition.txt | 40 + + .../devicetree/bindings/rtc/moxa,moxart-rtc.txt | 17 + + Documentation/devicetree/bindings/rtc/rtc-omap.txt | 6 +- + .../devicetree/bindings/rtc/rtc-palmas.txt | 33 + + Documentation/filesystems/proc.txt | 19 +- + .../filesystems/ramfs-rootfs-initramfs.txt | 4 + + Documentation/sysctl/kernel.txt | 1 + + Documentation/sysctl/vm.txt | 30 +- + Documentation/vm/hugetlbpage.txt | 25 +- + Documentation/vm/soft-dirty.txt | 7 + + MAINTAINERS | 125 +- + Makefile | 6 + + arch/alpha/lib/csum_partial_copy.c | 5 + + arch/arm/common/mcpm_entry.c | 1 + + arch/arm/mach-omap2/omap_hwmod.c | 1 + + arch/arm/mm/highmem.c | 1 + + arch/arm/mm/hugetlbpage.c | 5 + + arch/arm64/mm/hugetlbpage.c | 5 + + arch/blackfin/kernel/bfin_gpio.c | 1 + + arch/frv/mm/highmem.c | 1 + + arch/ia64/mm/hugetlbpage.c | 5 + + arch/m32r/include/asm/uaccess.h | 1 + + arch/metag/mm/hugetlbpage.c | 5 + + arch/microblaze/include/asm/highmem.h | 1 + + arch/mips/mm/hugetlbpage.c | 5 + + arch/mn10300/include/asm/uaccess.h | 1 + + arch/parisc/include/asm/cacheflush.h | 1 + + arch/powerpc/include/asm/highmem.h | 1 + + arch/powerpc/kernel/rtas.c | 1 + + arch/powerpc/lib/checksum_wrappers_64.c | 1 + + arch/powerpc/lib/usercopy_64.c | 1 + + arch/powerpc/mm/hugetlbpage.c | 10 + + arch/s390/Kconfig | 3 +- + arch/s390/include/asm/kprobes.h | 4 +- + arch/s390/include/asm/sclp.h | 1 + + arch/s390/kernel/crash_dump.c | 219 +- + arch/s390/kernel/kprobes.c | 144 +- + arch/s390/mm/hugetlbpage.c | 5 + + arch/sh/kernel/process_64.c | 4 +- + arch/sh/mm/hugetlbpage.c | 5 + + arch/sparc/kernel/sys_sparc32.c | 12 +- + arch/sparc/mm/hugetlbpage.c | 5 + + arch/tile/mm/highmem.c | 1 + + arch/tile/mm/hugetlbpage.c | 5 + + arch/x86/include/asm/checksum_32.h | 1 + + arch/x86/include/asm/e820.h | 2 + + arch/x86/include/asm/pgtable-2level.h | 82 +- + arch/x86/include/asm/pgtable.h | 34 +- + arch/x86/include/asm/pgtable_types.h | 3 + + arch/x86/include/asm/tlbflush.h | 37 +- + arch/x86/include/asm/uaccess.h | 1 + + arch/x86/include/asm/uaccess_64.h | 24 +- + arch/x86/kernel/cpu/mtrr/generic.c | 2 + + arch/x86/kernel/e820.c | 72 +- + arch/x86/lib/csum-wrappers_64.c | 1 + + arch/x86/mm/highmem_32.c | 1 + + arch/x86/mm/hugetlbpage.c | 8 + + arch/x86/mm/mmio-mod.c | 1 + + arch/x86/mm/tlb.c | 14 +- + arch/x86/platform/efi/efi.c | 15 +- + block/Kconfig | 6 + + block/Makefile | 1 + + block/blk-cgroup.c | 1 + + block/blk-core.c | 1 + + block/blk-ioc.c | 2 +- + block/blk-sysfs.c | 2 +- + block/cmdline-parser.c | 250 ++ + block/compat_ioctl.c | 2 +- + block/genhd.c | 3 +- + block/partitions/Kconfig | 7 + + block/partitions/Makefile | 1 + + block/partitions/check.c | 4 + + block/partitions/cmdline.c | 99 + + block/partitions/cmdline.h | 2 + + drivers/atm/he.c | 13 +- + drivers/base/dma-buf.c | 1 + + drivers/block/aoe/aoe.h | 4 +- + drivers/block/aoe/aoeblk.c | 101 +- + drivers/block/aoe/aoecmd.c | 4 - + drivers/block/aoe/aoedev.c | 10 +- + drivers/block/cciss.c | 7 + + drivers/block/mg_disk.c | 2 +- + drivers/block/osdblk.c | 2 +- + drivers/block/pktcdvd.c | 278 +-- + drivers/block/rbd.c | 2 +- + drivers/block/rsxx/dev.c | 1 + + drivers/block/swim.c | 2 - + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/dma/ipu/ipu_irq.c | 1 + + drivers/firmware/dmi_scan.c | 73 +- + drivers/firmware/google/gsmi.c | 2 +- + drivers/gpio/gpiolib.c | 1 + + drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 8 + + drivers/gpu/drm/nouveau/nouveau_acpi.c | 5 + + drivers/ide/ide-io.c | 1 + + drivers/infiniband/core/cm.c | 5 +- + drivers/infiniband/hw/amso1100/c2_cq.c | 1 + + drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 + + drivers/infiniband/hw/cxgb4/cm.c | 1 + + drivers/iommu/msm_iommu_dev.c | 2 - + drivers/iommu/omap-iommu.c | 2 - + drivers/isdn/hisax/amd7930_fn.c | 4 +- + drivers/isdn/hisax/avm_pci.c | 4 +- + drivers/isdn/hisax/config.c | 2 +- + drivers/isdn/hisax/diva.c | 4 +- + drivers/isdn/hisax/elsa.c | 2 +- + drivers/isdn/hisax/elsa_ser.c | 2 +- + drivers/isdn/hisax/hfc_pci.c | 2 +- + drivers/isdn/hisax/hfc_sx.c | 2 +- + drivers/isdn/hisax/hscx_irq.c | 4 +- + drivers/isdn/hisax/icc.c | 4 +- + drivers/isdn/hisax/ipacx.c | 8 +- + drivers/isdn/hisax/isac.c | 4 +- + drivers/isdn/hisax/isar.c | 6 +- + drivers/isdn/hisax/jade.c | 18 +- + drivers/isdn/hisax/jade_irq.c | 4 +- + drivers/isdn/hisax/l3_1tr6.c | 50 +- + drivers/isdn/hisax/netjet.c | 2 +- + drivers/isdn/hisax/q931.c | 6 +- + drivers/isdn/hisax/w6692.c | 8 +- + drivers/isdn/mISDN/core.c | 6 + + drivers/isdn/mISDN/core.h | 1 + + drivers/isdn/mISDN/socket.c | 9 + + drivers/md/dm.c | 1 + + drivers/md/raid5.c | 1 + + drivers/memstick/core/Kconfig | 12 + + drivers/memstick/core/Makefile | 2 +- + drivers/memstick/core/ms_block.c | 2385 ++++++++++++++++++++ + drivers/memstick/core/ms_block.h | 290 +++ + drivers/memstick/host/rtsx_pci_ms.c | 2 - + drivers/misc/ti-st/st_core.c | 2 +- + drivers/mmc/core/core.c | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 1 + + drivers/net/ethernet/ibm/ehea/ehea_main.c | 14 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 1 + + drivers/net/ethernet/intel/igbvf/netdev.c | 1 + + drivers/net/ethernet/sfc/falcon.c | 1 + + drivers/net/ieee802154/at86rf230.c | 1 + + drivers/net/ieee802154/fakelb.c | 1 + + drivers/net/irda/donauboe.c | 15 +- + drivers/net/wireless/ath/carl9170/usb.c | 1 + + drivers/net/wireless/ath/wil6210/wmi.c | 1 + + drivers/net/wireless/b43/dma.c | 1 + + drivers/net/wireless/b43/main.c | 1 + + drivers/net/wireless/b43/phy_a.c | 1 + + drivers/net/wireless/b43/phy_g.c | 1 + + drivers/net/wireless/b43legacy/dma.c | 1 + + drivers/net/wireless/b43legacy/radio.c | 1 + + drivers/net/wireless/cw1200/cw1200_spi.c | 1 + + drivers/net/wireless/iwlwifi/dvm/sta.c | 1 + + drivers/net/wireless/iwlwifi/iwl-op-mode.h | 1 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 1 + + drivers/net/wireless/libertas_tf/cmd.c | 1 + + drivers/pci/iov.c | 1 + + drivers/pci/pci.c | 1 + + drivers/pcmcia/pd6729.c | 13 +- + drivers/pcmcia/yenta_socket.c | 16 +- + drivers/platform/olpc/olpc-ec.c | 1 + + drivers/pps/clients/pps-gpio.c | 1 - + drivers/rtc/Kconfig | 9 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-hid-sensor-time.c | 29 +- + drivers/rtc/rtc-max77686.c | 4 +- + drivers/rtc/rtc-moxart.c | 330 +++ + drivers/rtc/rtc-nuc900.c | 2 +- + drivers/rtc/rtc-omap.c | 60 +- + drivers/rtc/rtc-palmas.c | 35 + + drivers/rtc/rtc-pcf2127.c | 6 - + drivers/s390/char/zcore.c | 6 +- + drivers/scsi/a100u2w.c | 12 +- + drivers/scsi/dc395x.c | 24 +- + drivers/scsi/dmx3191d.c | 13 +- + drivers/scsi/initio.c | 13 +- + drivers/scsi/mvumi.c | 20 +- + drivers/ssb/driver_pcicore.c | 1 + + drivers/staging/lustre/lustre/llite/remote_perm.c | 1 + + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 1 + + drivers/staging/lustre/lustre/obdclass/cl_object.c | 1 + + drivers/staging/lustre/lustre/obdclass/cl_page.c | 1 + + drivers/staging/lustre/lustre/osc/osc_lock.c | 1 + + drivers/staging/lustre/lustre/osc/osc_page.c | 1 + + drivers/staging/lustre/lustre/ptlrpc/client.c | 1 + + .../lustre/lustre/ptlrpc/gss/gss_cli_upcall.c | 1 + + .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c | 1 + + drivers/staging/lustre/lustre/ptlrpc/sec.c | 1 + + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 1 + + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 1 + + drivers/usb/core/hcd.c | 1 + + drivers/usb/core/urb.c | 1 + + drivers/video/acornfb.c | 266 +-- + drivers/video/acornfb.h | 29 - + drivers/video/atmel_lcdfb.c | 1 + + drivers/video/cyber2000fb.c | 3 + + drivers/w1/masters/mxc_w1.c | 2 - + drivers/w1/w1.c | 12 +- + drivers/watchdog/hpwdt.c | 6 +- + fs/affs/file.c | 2 +- + fs/anon_inodes.c | 10 +- + fs/autofs4/autofs_i.h | 4 +- + fs/autofs4/dev-ioctl.c | 16 +- + fs/autofs4/inode.c | 33 +- + fs/autofs4/waitq.c | 16 +- + fs/binfmt_elf.c | 21 +- + fs/bio-integrity.c | 9 +- + fs/block_dev.c | 1 + + fs/buffer.c | 1 + + fs/coredump.c | 5 + + fs/dcache.c | 1 + + fs/eventpoll.c | 36 +- + fs/exec.c | 122 +- + fs/ext3/inode.c | 1 + + fs/ext4/ext4_jbd2.c | 1 + + fs/ext4/inode.c | 1 + + fs/ext4/mballoc.c | 1 + + fs/fat/file.c | 108 +- + fs/fat/inode.c | 54 + + fs/file_table.c | 4 +- + fs/fs-writeback.c | 8 +- + fs/fscache/page.c | 2 +- + fs/fuse/inode.c | 2 +- + fs/hfsplus/Kconfig | 18 + + fs/hfsplus/Makefile | 2 + + fs/hfsplus/acl.h | 30 + + fs/hfsplus/dir.c | 4 + + fs/hfsplus/hfsplus_fs.h | 1 + + fs/hfsplus/inode.c | 11 + + fs/hfsplus/posix_acl.c | 274 +++ + fs/hfsplus/xattr.c | 62 +- + fs/hfsplus/xattr.h | 33 +- + fs/hfsplus/xattr_security.c | 13 + + fs/inode.c | 1 + + fs/jbd/revoke.c | 1 + + fs/jbd2/revoke.c | 1 + + fs/locks.c | 1 + + fs/namespace.c | 2 +- + fs/nfs/nfs4filelayoutdev.c | 1 + + fs/nfs/nfs4proc.c | 1 + + fs/nfs/nfs4state.c | 1 + + fs/nilfs2/the_nilfs.c | 1 + + fs/ocfs2/acl.c | 4 - + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 32 +- + fs/ocfs2/cluster/tcp.c | 60 +- + fs/ocfs2/dlm/dlmast.c | 8 +- + fs/ocfs2/dlm/dlmcommon.h | 4 +- + fs/ocfs2/dlm/dlmconvert.c | 18 +- + fs/ocfs2/dlm/dlmdebug.c | 15 +- + fs/ocfs2/dlm/dlmdomain.c | 35 +- + fs/ocfs2/dlm/dlmlock.c | 9 +- + fs/ocfs2/dlm/dlmmaster.c | 18 +- + fs/ocfs2/dlm/dlmrecovery.c | 13 +- + fs/ocfs2/dlm/dlmthread.c | 19 +- + fs/ocfs2/dlm/dlmunlock.c | 4 +- + fs/ocfs2/dlmfs/dlmfs.c | 3 - + fs/ocfs2/extent_map.c | 10 +- + fs/ocfs2/file.c | 67 +- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/journal.c | 43 +- + fs/ocfs2/journal.h | 11 + + fs/ocfs2/localalloc.c | 4 +- + fs/ocfs2/move_extents.c | 3 +- + fs/ocfs2/namei.c | 12 +- + fs/ocfs2/ocfs2_trace.h | 2 + + fs/ocfs2/quota_global.c | 6 +- + fs/ocfs2/quota_local.c | 12 +- + fs/ocfs2/refcounttree.c | 10 +- + fs/ocfs2/xattr.c | 11 +- + fs/proc/task_mmu.c | 50 +- + fs/proc/vmcore.c | 154 +- + fs/ramfs/inode.c | 26 +- + fs/xfs/xfs_mount.c | 1 + + include/asm-generic/gpio.h | 1 + + include/linux/backing-dev.h | 3 + + include/linux/binfmts.h | 2 +- + include/linux/buffer_head.h | 1 + + include/linux/clk.h | 1 + + include/linux/cmdline-parser.h | 43 + + include/linux/compat.h | 5 +- + include/linux/crash_dump.h | 9 + + include/linux/crc64_ecma.h | 56 + + include/linux/genalloc.h | 4 +- + include/linux/gpio.h | 1 + + include/linux/highmem.h | 1 + + include/linux/hugetlb.h | 25 + + include/linux/init.h | 1 + + include/linux/interrupt.h | 23 +- + include/linux/ipc_namespace.h | 2 +- + include/linux/irqreturn.h | 2 +- + include/linux/kprobes.h | 34 +- + include/linux/lz4.h | 8 +- + include/linux/memblock.h | 2 + + include/linux/mempolicy.h | 11 +- + include/linux/migrate.h | 5 - + include/linux/mm.h | 20 +- + include/linux/mm_inline.h | 1 + + include/linux/mmzone.h | 2 +- + include/linux/page-flags.h | 4 +- + include/linux/pagemap.h | 2 + + include/linux/radix-tree.h | 1 + + include/linux/ramfs.h | 2 +- + include/linux/rbtree.h | 22 + + include/linux/sched.h | 8 +- + include/linux/smp.h | 85 +- + include/linux/swap.h | 52 +- + include/linux/syscalls.h | 5 +- + include/linux/vm_event_item.h | 6 + + include/linux/vmstat.h | 4 +- + include/linux/writeback.h | 2 - + include/trace/events/kmem.h | 10 +- + init/do_mounts.c | 45 + + ipc/msg.c | 25 +- + ipc/namespace.c | 7 +- + ipc/sem.c | 24 +- + ipc/shm.c | 255 ++- + ipc/util.c | 82 +- + ipc/util.h | 14 +- + kernel/extable.c | 2 +- + kernel/fork.c | 34 +- + kernel/freezer.c | 1 + + kernel/hrtimer.c | 2 + + kernel/irq/chip.c | 1 + + kernel/kexec.c | 5 +- + kernel/kprobes.c | 95 +- + kernel/modsign_pubkey.c | 6 +- + kernel/nsproxy.c | 1 + + kernel/panic.c | 8 +- + kernel/power/snapshot.c | 12 +- + kernel/printk/printk.c | 1 + + kernel/ptrace.c | 2 +- + kernel/sched/core.c | 3 +- + kernel/signal.c | 4 +- + kernel/smp.c | 17 +- + kernel/spinlock.c | 14 + + kernel/sysctl.c | 2 +- + kernel/task_work.c | 40 +- + kernel/time/sched_clock.c | 2 +- + kernel/up.c | 58 +- + kernel/watchdog.c | 70 +- + lib/Kconfig | 7 + + lib/Kconfig.debug | 2 +- + lib/Makefile | 1 + + lib/crc32.c | 17 +- + lib/crc64_ecma.c | 341 +++ + lib/decompress_inflate.c | 2 +- + lib/genalloc.c | 20 +- + lib/lz4/lz4_decompress.c | 8 +- + lib/radix-tree.c | 41 +- + lib/rbtree.c | 40 + + lib/rbtree_test.c | 12 + + mm/backing-dev.c | 2 +- + mm/compaction.c | 3 + + mm/filemap.c | 4 +- + mm/huge_memory.c | 10 +- + mm/hugetlb.c | 448 ++-- + mm/hwpoison-inject.c | 4 +- + mm/internal.h | 2 + + mm/kmemleak.c | 2 +- + mm/ksm.c | 6 +- + mm/madvise.c | 33 +- + mm/memblock.c | 18 + + mm/memcontrol.c | 9 +- + mm/memory-failure.c | 174 +- + mm/memory.c | 42 +- + mm/memory_hotplug.c | 112 +- + mm/mempolicy.c | 114 +- + mm/migrate.c | 63 +- + mm/mlock.c | 337 ++- + mm/mmap.c | 59 +- + mm/mremap.c | 5 +- + mm/page-writeback.c | 269 ++- + mm/page_alloc.c | 308 ++- + mm/page_isolation.c | 14 + + mm/pgtable-generic.c | 24 + + mm/readahead.c | 8 +- + mm/rmap.c | 1 + + mm/shmem.c | 6 +- + mm/slub.c | 8 +- + mm/sparse.c | 140 +- + mm/swap.c | 77 +- + mm/swap_state.c | 67 +- + mm/swapfile.c | 596 +++-- + mm/util.c | 5 +- + mm/vmalloc.c | 29 +- + mm/vmscan.c | 80 +- + mm/vmstat.c | 95 +- + mm/zbud.c | 4 +- + mm/zswap.c | 18 +- + net/caif/cfcnfg.c | 1 + + net/mac80211/driver-ops.h | 1 + + net/mac80211/key.c | 1 + + net/mac80211/main.c | 1 + + net/mac80211/sta_info.c | 1 + + net/phonet/pep.c | 1 + + net/socket.c | 50 +- + net/sunrpc/clnt.c | 1 + + net/wimax/op-msg.c | 1 + + net/wimax/op-reset.c | 1 + + net/wimax/op-rfkill.c | 1 + + net/wireless/wext-proc.c | 1 + + scripts/checkpatch.pl | 298 ++- + scripts/mod/modpost.c | 15 +- + scripts/sortextable.c | 24 + + scripts/sortextable.h | 26 +- + sound/core/info.c | 1 + + virt/kvm/async_pf.c | 1 + + 410 files changed, 9829 insertions(+), 2988 deletions(-) + create mode 100644 Documentation/block/cmdline-partition.txt + create mode 100644 Documentation/devicetree/bindings/rtc/moxa,moxart-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-palmas.txt + create mode 100644 block/cmdline-parser.c + create mode 100644 block/partitions/cmdline.c + create mode 100644 block/partitions/cmdline.h + create mode 100644 drivers/memstick/core/ms_block.c + create mode 100644 drivers/memstick/core/ms_block.h + create mode 100644 drivers/rtc/rtc-moxart.c + create mode 100644 fs/hfsplus/acl.h + create mode 100644 fs/hfsplus/posix_acl.c + create mode 100644 include/linux/cmdline-parser.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git am -3 ../patches/0001-fat-fix-up-for-lockref-changes.patch +Applying: fat: fix up for lockref changes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/fat/file.c +$ git add -A . +$ git commit -v -a --amend +[master ad8ed03] Merge branch 'akpm-current/current' +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: memcg: remove redundant code in mem_cgroup_force_empty_write() +Applying: memcg, vmscan: integrate soft reclaim tighter with zone shrinking code +Applying: memcg: get rid of soft-limit tree infrastructure +Applying: vmscan, memcg: do softlimit reclaim also for targeted reclaim +Applying: memcg: enhance memcg iterator to support predicates +Applying: mm: fix memcg-less page reclaim +Applying: memcg: track children in soft limit excess to improve soft limit +Applying: memcg, vmscan: do not attempt soft limit reclaim if it would not scan anything +Applying: memcg: track all children over limit in the root +Applying: memcg, vmscan: do not fall into reclaim-all pass too quickly +Applying: memcg: trivial cleanups +Applying: arch: mm: remove obsolete init OOM protection +Applying: arch: mm: do not invoke OOM killer on kernel fault OOM +Applying: arch: mm: pass userspace fault flag to generic fault handler +Applying: x86: finish user fault error path with fatal signal +Applying: mm: memcg: enable memcg OOM killer only for user faults +Applying: mm: memcg: rework and document OOM waiting and wakeup +Applying: mm: memcg: do not trap chargers with full callstack on OOM +Applying: memcg: correct RESOURCE_MAX to ULLONG_MAX +Applying: memcg: rename RESOURCE_MAX to RES_COUNTER_MAX +Applying: memcg: avoid overflow caused by PAGE_ALIGN +Applying: memcg: reduce function dereference +Applying: memcg: remove MEMCG_NR_FILE_MAPPED +Applying: memcg: check for proper lock held in mem_cgroup_update_page_stat +Applying: memcg: add per cgroup writeback pages accounting +Applying: memcg: document cgroup dirty/writeback memory statistics +Applying: mm: make lru_add_drain_all() selective +Applying: truncate: drop 'oldsize' truncate_pagecache() parameter +Applying: mm: drop actor argument of do_generic_file_read() +Applying: mm-drop-actor-argument-of-do_generic_file_read-fix +Applying: thp: account anon transparent huge pages into NR_ANON_PAGES +Applying: mm: cleanup add_to_page_cache_locked() +Applying: thp: move maybe_pmd_mkwrite() out of mk_huge_pmd() +Applying: thp: do_huge_pmd_anonymous_page() cleanup +Applying: thp: consolidate code between handle_mm_fault() and do_huge_pmd_anonymous_page() +Applying: mm, thp: count thp_fault_fallback anytime thp fault fails +Applying: kernel: replace strict_strto*() with kstrto*() +Applying: fs: bump inode and dentry counters to long +Applying: super: fix calculation of shrinkable objects for small numbers +Applying: dcache: convert dentry_stat.nr_unused to per-cpu counters +Applying: dentry: move to per-sb LRU locks +Applying: dcache: remove dentries from LRU before putting on dispose list +Applying: mm: new shrinker API +Applying: shrinker: convert superblock shrinkers to new API +Applying: shrinker-convert-superblock-shrinkers-to-new-api-fix +Applying: list: add a new LRU list type +Applying: inode: convert inode lru list to generic lru list code. +Applying: inode: move inode to a different list inside lock +Applying: dcache: convert to use new lru list infrastructure +Applying: list_lru: per-node list infrastructure +Applying: list_lru: per-node list infrastructure fix +Applying: list_lru: fix broken LRU_RETRY behaviour +Applying: list_lru: per-node API +Applying: list_lru: remove special case function list_lru_dispose_all. +Applying: shrinker: add node awareness +Applying: vmscan: per-node deferred work +Applying: fs: convert inode and dentry shrinking to be node aware +Applying: xfs: convert buftarg LRU to generic code +Applying: xfs-convert-buftarg-lru-to-generic-code-fix +Applying: xfs: rework buffer dispose list tracking +Applying: xfs: convert dquot cache lru to list_lru +Applying: xfs-convert-dquot-cache-lru-to-list_lru-fix +Applying: xfs: fix dquot isolation hang +Applying: fs: convert fs shrinkers to new scan/count API +Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix +Applying: UBIFS: signedness bug in ubifs_shrink_count() +Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix-fix-2 +Applying: drivers: convert shrinkers to new count/scan API +Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix +Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix-2 +Applying: i915: bail out earlier when shrinker cannot acquire mutex +Applying: shrinker: convert remaining shrinkers to count/scan API +Applying: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix +Applying: hugepage: convert huge zero page shrinker to new shrinker API +Applying: hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix +Applying: shrinker: Kill old ->shrink API. +Applying: shrinker-kill-old-shrink-api-fix +Applying: list_lru: dynamically adjust node arrays +Applying: super: fix for destroy lrus +Applying: staging/lustre/ldlm: convert to shrinkers to count/scan API +Applying: staging/lustre/obdclass: convert lu_object shrinker to count/scan API +Applying: staging/lustre/ptlrpc: convert to new shrinker API +Applying: staging/lustre/libcfs: cleanup linux-mem.h +Applying: mm/Kconfig: add MMU dependency for MIGRATION. +Applying: dcache: fix up for lockref changes +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 88394e0...9ef0ec1 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (9ef0ec1 dcache: fix up for lockref changes) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/cgroups/memory.txt | 2 + + arch/alpha/mm/fault.c | 7 +- + arch/arc/mm/fault.c | 11 +- + arch/arm/mm/fault.c | 23 +- + arch/arm64/mm/fault.c | 31 +- + arch/avr32/mm/fault.c | 4 +- + arch/cris/mm/fault.c | 6 +- + arch/frv/mm/fault.c | 10 +- + arch/hexagon/mm/vm_fault.c | 6 +- + arch/ia64/mm/fault.c | 6 +- + arch/m32r/mm/fault.c | 10 +- + arch/m68k/mm/fault.c | 2 + + arch/metag/mm/fault.c | 6 +- + arch/microblaze/mm/fault.c | 7 +- + arch/mips/mm/fault.c | 8 +- + arch/mn10300/mm/fault.c | 2 + + arch/openrisc/mm/fault.c | 1 + + arch/parisc/mm/fault.c | 7 +- + arch/powerpc/mm/fault.c | 7 +- + arch/s390/mm/fault.c | 2 + + arch/score/mm/fault.c | 13 +- + arch/sh/mm/fault.c | 9 +- + arch/sparc/mm/fault_32.c | 12 +- + arch/sparc/mm/fault_64.c | 6 +- + arch/tile/mm/fault.c | 13 +- + arch/um/kernel/trap.c | 22 +- + arch/unicore32/mm/fault.c | 22 +- + arch/x86/kvm/mmu.c | 25 +- + arch/x86/mm/fault.c | 43 +- + arch/xtensa/mm/fault.c | 2 + + drivers/base/node.c | 6 - + drivers/gpu/drm/i915/i915_dma.c | 4 +- + drivers/gpu/drm/i915/i915_gem.c | 82 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 44 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 51 +- + drivers/md/bcache/btree.c | 43 +- + drivers/md/bcache/sysfs.c | 2 +- + drivers/md/dm-bufio.c | 64 +- + drivers/staging/android/ashmem.c | 44 +- + drivers/staging/android/lowmemorykiller.c | 43 +- + .../lustre/include/linux/libcfs/linux/linux-mem.h | 38 - + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 148 ++-- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 98 +-- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 76 +- + fs/adfs/inode.c | 2 +- + fs/affs/file.c | 2 +- + fs/bfs/file.c | 2 +- + fs/btrfs/free-space-cache.c | 4 +- + fs/btrfs/inode.c | 2 +- + fs/cifs/inode.c | 5 +- + fs/dcache.c | 279 ++++--- + fs/drop_caches.c | 1 + + fs/exofs/inode.c | 2 +- + fs/ext2/inode.c | 2 +- + fs/ext4/extents_status.c | 33 +- + fs/ext4/inode.c | 3 +- + fs/fat/inode.c | 2 +- + fs/fuse/dir.c | 2 +- + fs/fuse/inode.c | 2 +- + fs/gfs2/bmap.c | 4 +- + fs/gfs2/glock.c | 30 +- + fs/gfs2/main.c | 3 +- + fs/gfs2/quota.c | 18 +- + fs/gfs2/quota.h | 6 +- + fs/hfs/inode.c | 2 +- + fs/hfsplus/inode.c | 2 +- + fs/hpfs/file.c | 2 +- + fs/inode.c | 193 ++--- + fs/internal.h | 6 +- + fs/jfs/inode.c | 2 +- + fs/mbcache.c | 49 +- + fs/minix/inode.c | 2 +- + fs/nfs/dir.c | 16 +- + fs/nfs/inode.c | 4 +- + fs/nfs/internal.h | 6 +- + fs/nfs/super.c | 3 +- + fs/nfsd/nfscache.c | 32 +- + fs/nilfs2/inode.c | 2 +- + fs/ntfs/file.c | 2 +- + fs/omfs/file.c | 2 +- + fs/proc/meminfo.c | 6 - + fs/quota/dquot.c | 34 +- + fs/super.c | 111 ++- + fs/sysv/itree.c | 2 +- + fs/ubifs/shrinker.c | 29 +- + fs/ubifs/super.c | 3 +- + fs/ubifs/ubifs.h | 5 +- + fs/udf/inode.c | 2 +- + fs/ufs/inode.c | 2 +- + fs/xfs/xfs_aops.c | 4 +- + fs/xfs/xfs_buf.c | 253 +++--- + fs/xfs/xfs_buf.h | 17 +- + fs/xfs/xfs_dquot.c | 7 +- + fs/xfs/xfs_icache.c | 4 +- + fs/xfs/xfs_icache.h | 2 +- + fs/xfs/xfs_qm.c | 287 +++---- + fs/xfs/xfs_qm.h | 4 +- + fs/xfs/xfs_super.c | 12 +- + include/linux/dcache.h | 14 +- + include/linux/fs.h | 25 +- + include/linux/huge_mm.h | 3 - + include/linux/list_lru.h | 131 ++++ + include/linux/memcontrol.h | 148 +++- + include/linux/mm.h | 6 +- + include/linux/res_counter.h | 2 +- + include/linux/sched.h | 7 + + include/linux/shrinker.h | 54 +- + include/linux/swap.h | 2 +- + include/trace/events/vmscan.h | 4 +- + include/uapi/linux/fs.h | 6 +- + kernel/gcov/fs.c | 2 +- + kernel/ksysfs.c | 2 +- + kernel/params.c | 14 +- + kernel/res_counter.c | 25 +- + kernel/sysctl.c | 6 +- + mm/Kconfig | 4 +- + mm/Makefile | 2 +- + mm/filemap.c | 69 +- + mm/huge_memory.c | 146 ++-- + mm/list_lru.c | 139 ++++ + mm/memcontrol.c | 871 ++++++++------------- + mm/memory-failure.c | 2 + + mm/memory.c | 52 +- + mm/oom_kill.c | 7 +- + mm/page-writeback.c | 15 + + mm/rmap.c | 22 +- + mm/swap.c | 44 +- + mm/truncate.c | 9 +- + mm/vmscan.c | 324 ++++---- + net/ipv4/tcp_memcontrol.c | 10 +- + net/sunrpc/auth.c | 41 +- + 131 files changed, 2733 insertions(+), 2056 deletions(-) + create mode 100644 include/linux/list_lru.h + create mode 100644 mm/list_lru.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..e870fb2fb0a0 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 248d296d6d9df384996c2ed95676b367d876d48c +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..8cf4c4692cff --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20130906 |