diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-01 17:50:50 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-01 17:50:50 +1000 |
| commit | 40adc096af6735308cad690fc095a47a95384327 (patch) | |
| tree | 76189ae072292084451e2cd7b3da18c6bcd903ad | |
| parent | 446a5ad42dde05f94a412579e0d336c9810f47f9 (diff) | |
Add linux-next specific files for 20130701next-20130701
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 230 | ||||
| -rw-r--r-- | Next/Trees | 232 | ||||
| -rw-r--r-- | Next/merge.log | 13281 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 13748 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..fce76c9a2d7f --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,230 @@ +Name SHA1 +---- ---- +origin 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 +fixes 8177a9d79c0e942dcac3312f15585d0344d505a5 +kbuild-current 42a0940d9d582214a8d0f8ba41f2b4fe987e21b0 +arc-current baadb8fd0c62540f2ffb2d0f12b8a47c7975562b +arm-current 3e0a07f8c401bb43e0f964c5f1285b2cb2028645 +m68k-current 7d132055814ef17a6c7b69f342244c410a5e000f +powerpc-merge ea461abf61753b4b79e625a7c20650105b990f21 +sparc c0691143dfe1d42ec9bd89de5921ccb6a27ea1b3 +net 98b6ed0f2bf4abfb759206aa70690636372bdee7 +ipsec 01cb71d2d47b78354358e4bb938bb06323e17498 +sound-current 1c6770a38a6652777b9d1592b66e0d8e7dfb6160 +pci-current 65694c5aaddfedd9da082e4e150cafc6b3fc8a6a +wireless 57bf74407bd501b0599568a3112fc16395b575d9 +driver-core.current 9e895ace5d82df8929b16f58e9f515f6d54ab82d +tty.current 9e895ace5d82df8929b16f58e9f515f6d54ab82d +usb.current 9e895ace5d82df8929b16f58e9f515f6d54ab82d +staging.current 7d132055814ef17a6c7b69f342244c410a5e000f +char-misc.current 7d132055814ef17a6c7b69f342244c410a5e000f +input-current 22381288ba7fcb4d84cfba828dbca71c60d4ef79 +md-current 32f9f570d04461a41bdcd5c1d93b41ebc5ce182a +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current 939e17799619e31331d2433041196529515a86a6 +ide bf6b4388c61cf88c6faa19cc45390fd36be8fb66 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +irqdomain-current d94ea3f6d21e8b4398285516cc307c81d7374ec9 +devicetree-current 706b78f37fbed8d81b6061359f28a315fb9b1d73 +spi-current 0d2d0cc5216db678070efc911ef47f4cb53b4aad +gpio-current 397eada946712b90e0620c378b366bcc6c98c9f6 +rr-fixes 6407d75afd08545f2252bb39806ffd3f10c7faac +mfd-fixes 5649d8f9e335f2b093751fcc2bdd5953f79f66ef +vfio-fixes 7d132055814ef17a6c7b69f342244c410a5e000f +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 723e2b801d803035ec7a7c0fe162a6c9fc118164 +arm df5607786da6e7f209f325837ffaf628e867111f +arm-perf 642bd4e2f0eb6e3c342f937c8ac4b2e7e534e975 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +xilinx 64e3fd3c96fe3416879c8ea985e606f80a28dea5 +arm64 ee877b5321c4dfee9dc9f2a12b19ddcd33149f6a +blackfin 5ae89ee043ce96e3790e6c75f3807c8e37d98634 +c6x f934af05cb1bf20558542185299394a69060b829 +cris 32ade6a282a36aae1803b190bae452f1e46f6b6c +hexagon de44443a45e36b7467af2518d3bf7ec6ec909549 +ia64 27d7181ebd55f8adc9265948a77f73ad8270d22c +m68k 767bcb4e8fe89c72ce513b743d100a201038e78e +m68knommu e4aa937ec75df0eea0bee03bffa3303ad36c986b +metag 5a88130a2aac2bf02d3c50abc7e65ebac11a4fd4 +microblaze c421cee4e897c50688e04639189b4f5f4c8e57c6 +mips dc9f03cc7e1bab381b1e96e0472e95ddb80eb0a0 +openrisc 6af609515d788bd4c94116344f00601b058f75a6 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd c0691143dfe1d42ec9bd89de5921ccb6a27ea1b3 +powerpc 090b9284d72561644d17a6e568d29c9e472c9865 +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx dd0120dea601de654a5a6d959da3a632a02200f0 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 2ab14619249cff5835aa66f2c06bfbb0204a30bf +sh 37284bd93103ae36b5ea274a985d688fb16f7a38 +sparc-next f8ce1faf55955de62e0a12e330c6d9a526071f65 +tile 317ddd256b9c24b0d78fa8018f80f1e495481a10 +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa 0756a12cc1e129cf1d141a2e0b95e85811c5b246 +btrfs 667e7d94a1683661cff5fe9a0fa0d7f8fdd2c007 +ceph 60fc6ea8e686f0fca6e315239e8c045352c00718 +cifs 7ac0febb81259fb9e0c447e0b90d0f05f409a02b +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 0df5ed65c14e2c36ed842fcff58118662009f1a1 +ext3 7ea2177978df8835171dc5355d0a3c49eb4053fe +ext4 ab7c8b678242d69b65ac080f7d0bd87c75513ca1 +f2fs 7201ddbdcf4cd9e61f00e88be51f8ae475b2450f +fscache bbd645c7a7b56f170940e81335ba4549f50aae95 +fuse e5c5f05dca0cf90f0f3bb1aea85dcf658baff185 +gfs2 a01aedfe21637c965a7046271fedfdd681eba646 +jfs eb8630d7d2fd13589e6a7a3ae2fe1f75f867fbed +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 959d921f5eb8878ea16049a7f6e9bcbb6dfbcb88 +nfsd 1a9357f443d64aa41e9b0dc414953663a6fcca19 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs 59b3e32fefe5fba43800248f5b83678a29d3ca4f +ubifs c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +xfs 83e782e1a1cc0159888e58e14dfc8f3289663338 +vfs d405be48a4c3f37f7a8e5648a5db204738272c61 +pci a0f75f9d495b3905b4c658c1d813a127f558a350 +hid ce07632eab4607b3633633bb0f40c9bd3fa7c198 +i2c 4c730a06c19bb83d2fa4308ee4cbb23abc84c9ca +jdelvare-hwmon 1aaf6d3d3d1e95f4be07e32dd84aa1c93855fbbd +hwmon-staging a50d9a4d9ad3c71341788099d733e4151b8a511b +v4l-dvb 17a69612be4db709027766bcadedd57537b4cfe2 +kbuild 8641c8f07a3ac4b38f10056ade2d3118dcda9aa5 +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata 930ed52c88da2229040caabe975fc5f2e4350d22 +pstore bd08ec33b5c23833581e5a36b2a69ccae6b39a28 +pm 2c843bd92ec276ecb68504b3b5ffa7066183f032 +idle 5c99726b5faaf1ba4ca80c39d319f419c227f803 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +cpuidle 817c876374a090391e7f2873a8b6076537f42253 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 9d1968fdabc69981ea98ea82082de1cc12a60385 +ieee1394 bcabcfd2e09ceb8599a33001e812e7cbad00fc4d +ubi 584d4623357db8f79029db76ec2b4953418018f0 +dlm cfa805f6f19639b37ee877085770a396b70f2da1 +swiotlb af51a9f1848ff50079a10def56a2c064f326af22 +slave-dma 469fd0df8438505e98a6743ed1f4084579ec9304 +dmaengine 41ef2d5678d83af030125550329b6ae8b74618fa +net-next 008aebde9be37e7e1248332b1983976e354327ea +ipsec-next 02890946481bef50f60782c79efb4451c26c1d50 +wireless-next 0f817ed52d07873cd39c9d3f6d87fae962dc742f +bluetooth 2237c822215cb1a6bcf40c26e9ae16209da5ae9d +infiniband 71e199083e033e37b8cbceae079297420532e449 +mtd a637b0d45947df686979b85361ad5bfa9d19fdd3 +l2-mtd 449e74c867be28b4965a27d46dbbbc3b5b8f521a +crypto 02c0241b600e4ab8a732c89749e252165145d60c +drm d482e5fa299c2cfbb4700143dd766273730e2357 +drm-intel b110d88135c7aa43022c8f083079ba0e15737cc8 +drm-tegra ebae30b1fbcc2cc991ce705cc82e16d1e5ddbf51 +sound 066624c6a1733a72a67f1d06d35a2153e7d9082b +sound-asoc 370887f105025ed52acc9cbb0a15b6567d1550ff +modules 06df44ee41442d83be061c5fd1b1de4f5fc6fbbf +virtio b3087e48ce20be784fae1dbabc2e42e2ad0f21bc +input 20c3da9f9fc6cdedca887953bbded72f7f025492 +input-mt 257867dc8d893690c175c1f717f91c3b6d44a63d +cgroup 9109d44da26e424e6e2b261a155e58b8940e7a0b +block bf5c717797868b4ed9fdb0e06b873d4b58ddca5f +device-mapper 597fd4c7ab1ffb5354b634d03ba99695c489a3c5 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 058f4266c105df59b036625f9afbe96d3fc3ec1d +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab c55d72856dbb042a689fad3f29206117ab993fd8 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 25e3903cfd32aecec0725647e15c0fd3279c339f +mfd 55b5940df9cefcd5cf1ba4b4f538b303b725b546 +battery 5a6c2208455f25b3e6f939adc2da59aa00d4806e +fbdev 19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 e72b7536e4e1e44e56dba50205d5a5092bf1d3c0 +regulator 1b3b96863b520e25bb1feb810af27ae84a9de95d +security 572e5b018ba68d634f30aef71cf04d85c884aa05 +selinux c2d7b247f0c028d325a5da5b9611b60ba160f237 +lblnet 5bfd3795a3744cd8b5f8cf7cbc8aaa0da3f56588 +watchdog 5a942501c2f2d8bcce9ef34808a295f56c4c8123 +dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351 +iommu 01ce784acfa69a171afe6ec3f85a959546f2d18a +vfio 6d6768c61b39a2184bc11bb0342e4f7f35642bcc +osd 861d66601acda6d7a2038fb3c95f68009128003a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 83a35e360433b58791bc9c4e288cace466d62e3a +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +edac de4772c621487fd4cadb4138f2481297c8e0cb0d +edac-amd aad19e51769d761ffc0608b381313e18f0bd82b3 +devicetree ba166e900b502b74b9425881caa94f94891b0a1f +dt-rh d683b96b072dc4680fc74964eca77e6a23d1fa6e +spi 00ab5392cbc3f87ddfeada311e22f55dfb0bc5c6 +spi-mb ed893559c9799df3b32051871c22017151394d82 +tip be82cd9aed78e2c090576a4fc2f3bb557fda6719 +ftrace 52d85d763086594f139bf7d3a5641abeb91d9f57 +rcu be77f87c001b770f13fe742becb08b847d9542f1 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 96f7edf9a54ca834f030ddf30f91750b3d737a03 +kvm-arm 8bd4ffd6b3a98f00267051dc095076ea2ff06ea8 +kvm-ppc a3ff5fbc94a829680d4aa005cd17add1c1a1fb5b +oprofile f722406faae2d073cc1d01063d1123c35425939e +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495 +xen-two 21f3c042131b67e159ae441522c8f9f1ff8546f2 +xen-arm e4aa937ec75df0eea0bee03bffa3303ad36c986b +percpu a4244454df1296e90cc961c1b636b1176ef0d9a0 +workqueues bbe2a23b3b6f559b7b3d6803bc2b8f4675f6f2f8 +drivers-x86 a1ec56ed9f42fb5374cd2add373811c9527c0995 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 7bc8c4c37aea74332b16ffb5412a8ad355d508ce +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 73e1ab41a80d36207e8ea7cc2c9897afdeeef387 +driver-core bfd63cd24df69120585c22e09fda78723772ee2a +tty 828c6a102b1f2b8583fadc0e779c46b31d448f0b +usb 3a0ddc714a1b8fcbff24c135a1332a28b4668d78 +usb-gadget b1fd6cb5ee2f97a553d1c4b8a88914bd970daf37 +staging 0ad1ea69545b1965be4c93ee03fdc685c6beb23d +char-misc 380672698b8e64f0b5e418412b1ed370bd366428 +scsi 082af1ed37fce07107db5152e3eb64a0dfe0f326 +target-updates 634d1e2b4a120d04a6363c06cddef20bb1f319c0 +target-merge 317ddd256b9c24b0d78fa8018f80f1e495481a10 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +bcon e284f3493206d4268267db4557c7ee6f89ed2314 +tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 +writeback ed84825b785ceb932af7dd5aa08614801721320b +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 5b81d55c4ccf23b9de398f819571dfc8941c7b04 +vhost f722406faae2d073cc1d01063d1123c35425939e +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc b9777859ec015a78dae1476e317d04f851bfdd0d +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +irqdomain 798f0fd188be3656991c8745104b5ee045769a5f +gpio 644c8df2fb276e6cdfab18d60e9e0bf7a5b65b9a +gpio-lw 038f0babc98a16211959010d7cd48b4a14f108cc +arm-soc abc04d5af7e33da8968b3edba067e0597d74dea2 +bcm2835 7d132055814ef17a6c7b69f342244c410a5e000f +cortex 3ad87ac5ac98d951bc51d1c815c533b65e072f45 +ep93xx 7ec44295ef66efcac08433298661a18008883885 +imx-mxs 20b0129cc0f8900ae9214388b082c39cfe81fb39 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm d701eda5ef391ffa071617de1f7f3558c6841250 +mvebu 04864c6813219e906a90a2b3cb27accfebcfaf10 +renesas 5841e87ab265fb2f393513b005346930b6087c59 +samsung 65ef7e0b4dec89744dc6f40c024c508754f9e685 +tegra 7d132055814ef17a6c7b69f342244c410a5e000f +dma-mapping 5b91a98c61abe914e6a80d7dc15e435c47ea0004 +pwm b388f15fd14c3ae62deb9a059464aa99b524ea4a +dma-buf 844ce9f2044723a9da0f4bce588cca410e774d24 +userns 78008c404acd8e731d1e06618cc5995961e847a6 +ktest df5f7c66013c46cec9aa8156af257bc5eb29b5c5 +signal 20b4fb485227404329e41ad15588afad3df23050 +clk 45e3ec3784aec0d194740b75b547bfabca448ff3 +random b980955236922ae6106774511c5c05003d3ad225 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages af07484863e0c20796081e57093886c22dc16705 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm-current 4194f6e64a386a26f9b10f59f61bbb696c1f349a +akpm cbbc4a736dfca9a1ade0b13219d98d12601c1c06 +cpuinit 6274495d74c74d5234e03f2f2b88fde938ef3b07 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..23ed04a3b84a --- /dev/null +++ b/Next/Trees @@ -0,0 +1,232 @@ +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 +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 +irqdomain-current git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/merge +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +gpio-current git git://git.secretlab.ca/git/linux-2.6#gpio/merge +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 +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 +xilinx git git://git.xilinx.com/linux-xlnx.git#arm-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git#upstream +blackfin git git://github.com/realmz/blackfin-linux.git#blackfin-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon 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 +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 +cpuidle git git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-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 quilt http://people.redhat.com/agk/patches/linux/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +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 +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://gitorious.org/linux-omap-dss2/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog-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 +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 +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.secretlab.ca/git/linux-2.6#spi/next +spi-mb 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 +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 git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-arm git git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen.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 +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +irqdomain git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next +gpio-lw 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/users/jcooper/linux.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 +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/ +cpuinit cpuinit git://git.kernel.org/pub/scm/linux/kernel/git/paulg/cpuinit-delete.git diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..32f283558609 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,13281 @@ +$ date +Monday 1 July 10:44:06 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 98b6ed0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net +Merging origin/master (8bb495e Linux 3.10) +$ git merge --no-ff origin/master +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + Makefile | 2 +- + arch/arm/kernel/devtree.c | 5 +-- + arch/mn10300/include/asm/uaccess.h | 2 +- + arch/mn10300/kernel/setup.c | 54 ++++++++++++------------------ + arch/powerpc/kernel/pci-common.c | 17 +++++++--- + arch/powerpc/platforms/pseries/eeh_cache.c | 4 +-- + arch/powerpc/platforms/pseries/eeh_pe.c | 3 +- + crypto/algboss.c | 15 +++++---- + crypto/api.c | 6 ---- + crypto/internal.h | 6 ++++ + drivers/block/rbd.c | 6 +++- + drivers/gpu/drm/qxl/qxl_ioctl.c | 5 +++ + drivers/scsi/fcoe/fcoe_ctlr.c | 15 +++------ + drivers/scsi/ipr.c | 16 --------- + drivers/scsi/ipr.h | 6 ++-- + drivers/scsi/libfc/fc_exch.c | 37 +++++++++++++------- + drivers/scsi/libfc/fc_rport.c | 2 +- + drivers/scsi/qla2xxx/qla_inline.h | 11 ++++++ + drivers/scsi/qla2xxx/qla_isr.c | 27 +++------------ + drivers/scsi/qla2xxx/qla_mbx.c | 2 -- + drivers/scsi/qla2xxx/qla_mr.c | 10 ++---- + drivers/scsi/qla2xxx/qla_nx.c | 26 ++++++-------- + fs/exec.c | 16 +++++---- + fs/ubifs/dir.c | 54 +++++++++++++++++++++--------- + kernel/ptrace.c | 20 ++++++----- + kernel/time/tick-broadcast.c | 7 ++-- + 27 files changed, 191 insertions(+), 185 deletions(-) +Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n) +$ git merge --no-ff fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) +$ git merge --no-ff kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (baadb8f ARC: warn on improper stack unwind FDE entries) +$ git merge --no-ff arc-current/for-curr +Removing arch/arc/include/asm/defines.h +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 8 +- + arch/arc/Makefile | 28 +- + arch/arc/configs/fpga_defconfig | 2 +- + arch/arc/configs/nsimosci_defconfig | 2 +- + arch/arc/configs/tb10x_defconfig | 2 +- + arch/arc/include/asm/arcregs.h | 127 +-------- + arch/arc/include/asm/bug.h | 5 +- + arch/arc/include/asm/cache.h | 26 +- + arch/arc/include/asm/cacheflush.h | 13 +- + arch/arc/include/asm/defines.h | 56 ---- + arch/arc/include/asm/entry.h | 521 +++++++++++++++--------------------- + arch/arc/include/asm/irq.h | 2 +- + arch/arc/include/asm/irqflags.h | 20 ++ + arch/arc/include/asm/kgdb.h | 4 +- + arch/arc/include/asm/kprobes.h | 6 +- + arch/arc/include/asm/mmu.h | 44 +++ + arch/arc/include/asm/page.h | 7 +- + arch/arc/include/asm/pgtable.h | 6 + + arch/arc/include/asm/processor.h | 17 +- + arch/arc/include/asm/ptrace.h | 47 ++-- + arch/arc/include/asm/syscall.h | 5 +- + arch/arc/include/asm/tlb-mmu1.h | 4 +- + arch/arc/include/asm/tlb.h | 26 -- + arch/arc/include/asm/unaligned.h | 4 +- + arch/arc/include/uapi/asm/ptrace.h | 15 +- + arch/arc/kernel/asm-offsets.c | 7 +- + arch/arc/kernel/ctx_sw.c | 14 +- + arch/arc/kernel/entry.S | 103 +++---- + arch/arc/kernel/head.S | 2 + + arch/arc/kernel/irq.c | 16 +- + arch/arc/kernel/kgdb.c | 4 +- + arch/arc/kernel/kprobes.c | 5 +- + arch/arc/kernel/process.c | 9 +- + arch/arc/kernel/ptrace.c | 14 +- + arch/arc/kernel/setup.c | 18 +- + arch/arc/kernel/smp.c | 4 +- + arch/arc/kernel/stacktrace.c | 2 +- + arch/arc/kernel/time.c | 17 +- + arch/arc/kernel/traps.c | 52 ++-- + arch/arc/kernel/troubleshoot.c | 31 +-- + arch/arc/kernel/unaligned.c | 2 +- + arch/arc/kernel/unwind.c | 2 + + arch/arc/kernel/vmlinux.lds.S | 24 +- + arch/arc/mm/cache_arc700.c | 126 +++++---- + arch/arc/mm/fault.c | 12 +- + arch/arc/mm/tlb.c | 38 ++- + arch/arc/mm/tlbex.S | 35 +-- + arch/arc/plat-arcfpga/platform.c | 12 +- + 48 files changed, 670 insertions(+), 876 deletions(-) + delete mode 100644 arch/arc/include/asm/defines.h +Merging arm-current/fixes (3e0a07f ARM: 7773/1: PJ4B: Add support for errata 4742) +$ git merge --no-ff arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (7d13205 Linux 3.10-rc6) +$ git merge --no-ff m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge (ea461ab powerpc/eeh: Fix fetching bus for single-dev-PE) +$ git merge --no-ff powerpc-merge/merge +Already up-to-date. +Merging sparc/master (c069114 mn10300: Fix include dependency in irqflags.h et al.) +$ git merge --no-ff sparc/master +Already up-to-date. +Merging net/master (98b6ed0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge --no-ff net/master +Already up-to-date. +Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling) +$ git merge --no-ff ipsec/master +Already up-to-date. +Merging sound-current/for-linus (1c6770a Merge tag 'asoc-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge --no-ff sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/wm8962.c | 35 ++++++++++++++++++++++++----------- + sound/soc/codecs/wm_adsp.c | 2 +- + sound/soc/soc-dapm.c | 2 ++ + 4 files changed, 28 insertions(+), 13 deletions(-) +Merging pci-current/for-linus (65694c5 x86/PCI: Map PCI setup data with ioremap() so it can be in highmem) +$ git merge --no-ff pci-current/for-linus +Already up-to-date. +Merging wireless/master (57bf744 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge --no-ff wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (9e895ac Linux 3.10-rc7) +$ git merge --no-ff driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (9e895ac Linux 3.10-rc7) +$ git merge --no-ff tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (9e895ac Linux 3.10-rc7) +$ git merge --no-ff usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (7d13205 Linux 3.10-rc6) +$ git merge --no-ff staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (7d13205 Linux 3.10-rc6) +$ git merge --no-ff char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (2238128 Input: tps6507x-ts - remove vref from platform data) +$ git merge --no-ff input-current/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/samsung-keypad.txt | 24 +++------- + drivers/input/keyboard/samsung-keypad.c | 52 +--------------------- + drivers/input/touchscreen/tps6507x-ts.c | 44 +++++------------- + include/linux/input/tps6507x-ts.h | 1 - + 4 files changed, 19 insertions(+), 102 deletions(-) +Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array) +$ git merge --no-ff 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 --no-ff audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (939e177 crypto: algboss - Hold ref count on larval) +$ git merge --no-ff crypto-current/master +Already up-to-date. +Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) +$ git merge --no-ff ide/master +Merge made by the 'recursive' strategy. + drivers/ide/gayle.c | 15 +-------------- + drivers/ide/tx4938ide.c | 13 +------------ + drivers/ide/tx4939ide.c | 13 +------------ + 3 files changed, 3 insertions(+), 38 deletions(-) +Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) +$ git merge --no-ff dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) +$ git merge --no-ff sh-current/sh-fixes-for-linus +Already up-to-date. +Merging irqdomain-current/irqdomain/merge (d94ea3f irqchip: Return -EPERM for reserved IRQs) +$ git merge --no-ff irqdomain-current/irqdomain/merge +Already up-to-date. +Merging devicetree-current/devicetree/merge (706b78f dtc: ensure #line directives don't consume data from the next line) +$ git merge --no-ff devicetree-current/devicetree/merge +Already up-to-date. +Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) +$ git merge --no-ff spi-current/spi/merge +Already up-to-date. +Merging gpio-current/gpio/merge (397eada gpio/omap: don't use linear domain mapping for OMAP1) +$ git merge --no-ff gpio-current/gpio/merge +Already up-to-date. +Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header) +$ git merge --no-ff rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) +$ git merge --no-ff mfd-fixes/master +Already up-to-date. +Merging vfio-fixes/for-linus (7d13205 Linux 3.10-rc6) +$ git merge --no-ff vfio-fixes/for-linus +Already up-to-date. +Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) +$ git merge --no-ff asm-generic/master +Already up-to-date. +Merging arc/for-next (723e2b8 ARC: [TB10x] Updates for irqchip driver) +$ git merge --no-ff arc/for-next +Auto-merging arch/arc/configs/fpga_defconfig +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/abilis_tb100.dtsi | 32 +++++++++++++---------------- + arch/arc/boot/dts/abilis_tb101.dtsi | 32 +++++++++++++---------------- + arch/arc/boot/dts/abilis_tb10x.dtsi | 32 +++++++++++++---------------- + arch/arc/boot/dts/angel4.dts | 16 +++++++++++++++ + arch/arc/configs/fpga_defconfig | 3 +++ + arch/arc/plat-arcfpga/include/plat/irq.h | 2 -- + arch/arc/plat-arcfpga/include/plat/memmap.h | 2 -- + arch/arc/plat-tb10x/Kconfig | 1 + + 8 files changed, 62 insertions(+), 58 deletions(-) +Merging arm/for-next (df56077 Merge branch 'devel-stable' into for-next) +$ git merge --no-ff arm/for-next +Removing arch/arm/mach-virt/platsmp.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/l2cc.txt | 3 + + arch/arm/Kconfig | 19 +- + arch/arm/Kconfig-nommu | 14 +- + arch/arm/Kconfig.debug | 10 +- + arch/arm/Makefile | 1 + + arch/arm/boot/compressed/atags_to_fdt.c | 44 +++- + arch/arm/boot/compressed/head.S | 40 +++- + arch/arm/boot/dts/bcm11351.dtsi | 8 +- + arch/arm/common/mcpm_head.S | 4 +- + arch/arm/common/mcpm_platsmp.c | 5 - + arch/arm/include/asm/arch_timer.h | 9 - + arch/arm/include/asm/assembler.h | 17 +- + arch/arm/include/asm/cp15.h | 5 + + arch/arm/include/asm/cputype.h | 45 ++++- + arch/arm/include/asm/div64.h | 2 +- + arch/arm/include/asm/glue-cache.h | 27 +++ + arch/arm/include/asm/glue-df.h | 8 + + arch/arm/include/asm/glue-proc.h | 9 + + arch/arm/include/asm/hugetlb-3level.h | 71 +++++++ + arch/arm/include/asm/hugetlb.h | 84 ++++++++ + arch/arm/include/asm/io.h | 8 +- + arch/arm/include/asm/irqflags.h | 22 +- + arch/arm/include/asm/mach/arch.h | 5 + + arch/arm/include/asm/memory.h | 18 +- + arch/arm/include/asm/mmu_context.h | 23 ++- + arch/arm/include/asm/mpu.h | 76 +++++++ + arch/arm/include/asm/page.h | 2 +- + arch/arm/include/asm/pgtable-3level-hwdef.h | 24 +++ + arch/arm/include/asm/pgtable-3level.h | 96 ++++++++- + arch/arm/include/asm/pgtable.h | 3 + + arch/arm/include/asm/proc-fns.h | 30 ++- + arch/arm/include/asm/psci.h | 9 + + arch/arm/include/asm/ptrace.h | 4 + + arch/arm/include/asm/smp.h | 5 +- + arch/arm/include/asm/smp_plat.h | 22 ++ + arch/arm/include/asm/spinlock.h | 25 ++- + arch/arm/include/asm/suspend.h | 5 + + arch/arm/include/asm/system_info.h | 1 + + arch/arm/include/asm/thread_info.h | 2 +- + arch/arm/include/asm/tlb.h | 6 + + arch/arm/include/asm/tlbflush.h | 27 ++- + arch/arm/include/asm/tls.h | 40 ++-- + arch/arm/include/asm/v7m.h | 44 ++++ + arch/arm/include/debug/vexpress.S | 10 + + arch/arm/include/uapi/asm/hwcap.h | 2 +- + arch/arm/include/uapi/asm/ptrace.h | 35 +++- + arch/arm/kernel/Makefile | 18 +- + arch/arm/kernel/asm-offsets.c | 6 + + arch/arm/kernel/entry-armv.S | 5 +- + arch/arm/kernel/entry-common.S | 46 +++-- + arch/arm/kernel/entry-header.S | 124 ++++++++++++ + arch/arm/kernel/entry-v7m.S | 143 +++++++++++++ + arch/arm/kernel/head-nommu.S | 170 +++++++++++++++- + arch/arm/kernel/head.S | 10 +- + arch/arm/kernel/hyp-stub.S | 7 + + arch/arm/kernel/perf_event.c | 1 + + arch/arm/kernel/process.c | 4 +- + arch/arm/kernel/psci.c | 7 +- + arch/arm/kernel/psci_smp.c | 84 ++++++++ + arch/arm/kernel/ptrace.c | 2 +- + arch/arm/kernel/setup.c | 108 +++++++++- + arch/arm/kernel/signal.c | 9 +- + arch/arm/kernel/sleep.S | 97 +++++++-- + arch/arm/kernel/smp.c | 21 +- + arch/arm/kernel/smp_tlb.c | 18 +- + arch/arm/kernel/suspend.c | 76 ++++--- + arch/arm/kernel/traps.c | 12 +- + arch/arm/kvm/interrupts_head.S | 4 + + arch/arm/mach-ebsa110/core.c | 2 +- + arch/arm/mach-exynos/Kconfig | 2 +- + arch/arm/mach-imx/mm-imx3.c | 2 +- + arch/arm/mach-iop13xx/io.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-msm/common.h | 2 +- + arch/arm/mach-msm/io.c | 2 +- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-shmobile/Kconfig | 4 +- + arch/arm/mach-tegra/Kconfig | 2 +- + arch/arm/mach-virt/Kconfig | 2 +- + arch/arm/mach-virt/Makefile | 1 - + arch/arm/mach-virt/platsmp.c | 50 ----- + arch/arm/mach-virt/virt.c | 3 - + arch/arm/mm/Kconfig | 24 ++- + arch/arm/mm/Makefile | 3 + + arch/arm/mm/cache-l2x0.c | 158 +++++++++++++++ + arch/arm/mm/cache-nop.S | 50 +++++ + arch/arm/mm/context.c | 64 ++++-- + arch/arm/mm/dma-mapping.c | 22 +- + arch/arm/mm/flush.c | 27 ++- + arch/arm/mm/fsr-3level.c | 4 +- + arch/arm/mm/hugetlbpage.c | 101 +++++++++ + arch/arm/mm/init.c | 19 +- + arch/arm/mm/ioremap.c | 10 +- + arch/arm/mm/mmu.c | 49 ++--- + arch/arm/mm/nommu.c | 270 ++++++++++++++++++++++++- + arch/arm/mm/proc-v6.S | 6 +- + arch/arm/mm/proc-v7-3level.S | 53 ++--- + arch/arm/mm/proc-v7.S | 27 ++- + arch/arm/mm/proc-v7m.S | 157 ++++++++++++++ + arch/arm/plat-versatile/headsmp.S | 2 - + arch/arm64/include/asm/arch_timer.h | 10 - + drivers/clocksource/arm_arch_timer.c | 23 +-- + drivers/mmc/host/mmci.c | 165 +++++++++++---- + drivers/mmc/host/mmci.h | 4 + + include/clocksource/arm_arch_timer.h | 2 +- + 105 files changed, 2798 insertions(+), 470 deletions(-) + create mode 100644 arch/arm/include/asm/hugetlb-3level.h + create mode 100644 arch/arm/include/asm/hugetlb.h + create mode 100644 arch/arm/include/asm/mpu.h + create mode 100644 arch/arm/include/asm/v7m.h + create mode 100644 arch/arm/kernel/entry-v7m.S + create mode 100644 arch/arm/kernel/psci_smp.c + delete mode 100644 arch/arm/mach-virt/platsmp.c + create mode 100644 arch/arm/mm/cache-nop.S + create mode 100644 arch/arm/mm/hugetlbpage.c + create mode 100644 arch/arm/mm/proc-v7m.S +Merging arm-perf/for-next/perf (642bd4e perf: ARM: Record the user-mode PC in the call chain.) +$ git merge --no-ff arm-perf/for-next/perf +Merge made by the 'recursive' strategy. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge --no-ff davinci/davinci-next +Already up-to-date. +Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu) +$ git merge --no-ff xilinx/arm-next +Resolved 'arch/arm/mach-highbank/highbank.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mach-imx6q.c' using previous resolution. +Resolved 'arch/arm/mach-spear/spear13xx.c' using previous resolution. +Resolved 'arch/arm/mach-vexpress/v2m.c' using previous resolution. +Resolved 'arch/arm/mach-zynq/platsmp.c' using previous resolution. +Resolved 'drivers/clocksource/Makefile' using previous resolution. +Resolved 'drivers/clocksource/tegra20_timer.c' using previous resolution. +Auto-merging drivers/clocksource/tegra20_timer.c +CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c +Auto-merging drivers/clocksource/Makefile +CONFLICT (content): Merge conflict in drivers/clocksource/Makefile +Auto-merging arch/arm/mach-zynq/platsmp.c +CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c +Auto-merging arch/arm/mach-vexpress/v2m.c +CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c +Auto-merging arch/arm/mach-spear/spear13xx.c +CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c +Auto-merging arch/arm/mach-imx/mach-imx6q.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c +Auto-merging arch/arm/mach-highbank/highbank.c +CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dfb909a] Merge remote-tracking branch 'xilinx/arm-next' +$ git diff -M --stat --summary HEAD^.. +Merging arm64/upstream (ee877b5 arm64: Add initial DTS for APM X-Gene Storm SOC and APM Mustang board) +$ git merge --no-ff arm64/upstream +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da970f7] Merge remote-tracking branch 'arm64/upstream' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm64/memory.txt | 7 + + Documentation/virtual/kvm/api.txt | 58 +- + MAINTAINERS | 16 + + arch/arm/include/asm/xen/page.h | 3 +- + arch/arm/kvm/arch_timer.c | 1 + + arch/arm64/Kconfig | 18 + + arch/arm64/Makefile | 6 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/apm-mustang.dts | 26 + + arch/arm64/boot/dts/apm-storm.dtsi | 116 ++++ + arch/arm64/configs/defconfig | 4 + + arch/arm64/include/asm/cacheflush.h | 3 - + arch/arm64/include/asm/cputype.h | 3 + + arch/arm64/include/asm/debug-monitors.h | 9 + + arch/arm64/include/asm/device.h | 3 + + arch/arm64/include/asm/dma-mapping.h | 17 +- + arch/arm64/include/asm/hypervisor.h | 6 + + arch/arm64/include/asm/io.h | 2 + + arch/arm64/include/asm/kvm_arm.h | 245 ++++++++ + arch/arm64/include/asm/kvm_asm.h | 104 +++ + arch/arm64/include/asm/kvm_coproc.h | 56 ++ + arch/arm64/include/asm/kvm_emulate.h | 180 ++++++ + arch/arm64/include/asm/kvm_host.h | 202 ++++++ + arch/arm64/include/asm/kvm_mmio.h | 59 ++ + arch/arm64/include/asm/kvm_mmu.h | 135 ++++ + arch/arm64/include/asm/kvm_psci.h | 23 + + arch/arm64/include/asm/memory.h | 6 + + arch/arm64/include/asm/mmu_context.h | 6 - + arch/arm64/include/asm/pgtable-hwdef.h | 19 + + arch/arm64/include/asm/pgtable.h | 16 +- + arch/arm64/include/asm/ptrace.h | 2 - + arch/arm64/include/asm/spinlock.h | 3 +- + arch/arm64/include/asm/sync_bitops.h | 26 + + arch/arm64/include/asm/timex.h | 6 +- + arch/arm64/include/asm/xen/events.h | 21 + + arch/arm64/include/asm/xen/hypercall.h | 1 + + arch/arm64/include/asm/xen/hypervisor.h | 1 + + arch/arm64/include/asm/xen/interface.h | 1 + + arch/arm64/include/asm/xen/page.h | 1 + + arch/arm64/include/uapi/asm/kvm.h | 168 +++++ + arch/arm64/kernel/asm-offsets.c | 33 + + arch/arm64/kernel/debug-monitors.c | 66 +- + arch/arm64/kernel/ptrace.c | 59 -- + arch/arm64/kernel/time.c | 6 - + arch/arm64/kernel/traps.c | 5 +- + arch/arm64/kernel/vmlinux.lds.S | 30 +- + arch/arm64/kvm/Makefile | 23 + + arch/arm64/kvm/emulate.c | 158 +++++ + arch/arm64/kvm/guest.c | 265 ++++++++ + arch/arm64/kvm/handle_exit.c | 124 ++++ + arch/arm64/kvm/hyp-init.S | 107 ++++ + arch/arm64/kvm/hyp.S | 831 ++++++++++++++++++++++++ + arch/arm64/kvm/inject_fault.c | 203 ++++++ + arch/arm64/kvm/regmap.c | 168 +++++ + arch/arm64/kvm/reset.c | 112 ++++ + arch/arm64/kvm/sys_regs.c | 1050 +++++++++++++++++++++++++++++++ + arch/arm64/kvm/sys_regs.h | 138 ++++ + arch/arm64/kvm/sys_regs_generic_v8.c | 95 +++ + arch/arm64/mm/flush.c | 37 +- + arch/arm64/mm/mm.h | 1 - + arch/arm64/mm/mmu.c | 1 - + arch/arm64/xen/Makefile | 2 + + arch/arm64/xen/hypercall.S | 92 +++ + include/uapi/linux/kvm.h | 2 + + include/xen/interface/io/protocols.h | 2 +- + scripts/sortextable.c | 5 + + 66 files changed, 5040 insertions(+), 155 deletions(-) + create mode 100644 arch/arm64/boot/dts/apm-mustang.dts + create mode 100644 arch/arm64/boot/dts/apm-storm.dtsi + create mode 100644 arch/arm64/include/asm/hypervisor.h + create mode 100644 arch/arm64/include/asm/kvm_arm.h + create mode 100644 arch/arm64/include/asm/kvm_asm.h + create mode 100644 arch/arm64/include/asm/kvm_coproc.h + create mode 100644 arch/arm64/include/asm/kvm_emulate.h + create mode 100644 arch/arm64/include/asm/kvm_host.h + create mode 100644 arch/arm64/include/asm/kvm_mmio.h + create mode 100644 arch/arm64/include/asm/kvm_mmu.h + create mode 100644 arch/arm64/include/asm/kvm_psci.h + create mode 100644 arch/arm64/include/asm/sync_bitops.h + create mode 100644 arch/arm64/include/asm/xen/events.h + create mode 100644 arch/arm64/include/asm/xen/hypercall.h + create mode 100644 arch/arm64/include/asm/xen/hypervisor.h + create mode 100644 arch/arm64/include/asm/xen/interface.h + create mode 100644 arch/arm64/include/asm/xen/page.h + create mode 100644 arch/arm64/include/uapi/asm/kvm.h + create mode 100644 arch/arm64/kvm/Makefile + create mode 100644 arch/arm64/kvm/emulate.c + create mode 100644 arch/arm64/kvm/guest.c + create mode 100644 arch/arm64/kvm/handle_exit.c + create mode 100644 arch/arm64/kvm/hyp-init.S + create mode 100644 arch/arm64/kvm/hyp.S + create mode 100644 arch/arm64/kvm/inject_fault.c + create mode 100644 arch/arm64/kvm/regmap.c + create mode 100644 arch/arm64/kvm/reset.c + create mode 100644 arch/arm64/kvm/sys_regs.c + create mode 100644 arch/arm64/kvm/sys_regs.h + create mode 100644 arch/arm64/kvm/sys_regs_generic_v8.c + create mode 100644 arch/arm64/xen/Makefile + create mode 100644 arch/arm64/xen/hypercall.S +Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcplb map for BF60x) +$ git merge --no-ff blackfin/blackfin-linus +Already up-to-date. +Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore) +$ git merge --no-ff c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file) +$ git merge --no-ff cris/for-next +Auto-merging arch/cris/include/asm/processor.h +Auto-merging arch/cris/arch-v32/drivers/Kconfig +Auto-merging arch/cris/Kconfig +Merge made by the 'recursive' strategy. + 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 hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) +$ git merge --no-ff hexagon/linux-next +Already up-to-date. +Merging ia64/next (27d7181 Merge branch 'pstore' into next) +$ git merge --no-ff ia64/next +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 2 + + arch/ia64/hp/sim/simscsi.c | 4 +- + arch/ia64/include/asm/pci.h | 10 +- + arch/ia64/kernel/acpi.c | 4 +- + arch/ia64/kernel/err_inject.c | 8 +- + arch/ia64/kernel/mca.c | 12 +- + arch/ia64/kernel/numa.c | 4 +- + arch/ia64/kernel/palinfo.c | 4 +- + arch/ia64/kernel/pci-dma.c | 9 -- + arch/ia64/kernel/perfmon.c | 20 +-- + arch/ia64/kernel/salinfo.c | 4 +- + arch/ia64/kernel/setup.c | 10 +- + arch/ia64/kernel/smpboot.c | 8 +- + arch/ia64/kernel/topology.c | 18 +-- + arch/ia64/kernel/traps.c | 2 +- + arch/ia64/mm/contig.c | 3 +- + arch/ia64/mm/discontig.c | 2 +- + arch/ia64/mm/numa.c | 2 +- + arch/ia64/pci/pci.c | 239 +++++++++++++++++++++---------- + arch/ia64/sn/kernel/io_init.c | 109 ++++---------- + arch/ia64/sn/kernel/setup.c | 8 +- + arch/ia64/xen/hypervisor.c | 2 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 43 +++--- + drivers/acpi/apei/erst.c | 20 ++- + drivers/firmware/efi/efi-pstore.c | 9 +- + fs/pstore/inode.c | 2 + + fs/pstore/platform.c | 11 +- + fs/pstore/ram.c | 2 - + fs/pstore/ram_core.c | 54 ++++++- + 29 files changed, 352 insertions(+), 273 deletions(-) +Merging m68k/for-next (767bcb4 Merge branch 'exotic-arch-fixes' into for-next) +$ git merge --no-ff m68k/for-next +Resolved 'arch/cris/arch-v32/drivers/Kconfig' using previous resolution. +Auto-merging lib/fonts/fonts.c +Removing arch/score/include/asm/dma-mapping.h +Removing arch/m68k/lib/string.c +Removing arch/h8300/include/asm/linkage.h +Removing arch/cris/include/asm/linkage.h +Auto-merging arch/cris/arch-v32/drivers/Kconfig +CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig +Auto-merging arch/cris/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b477815] Merge remote-tracking branch 'm68k/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/device-drivers.tmpl | 4 +- + arch/arm/boot/compressed/Makefile | 2 +- + arch/avr32/mach-at32ap/at32ap700x.c | 2 + + arch/c6x/include/asm/Kbuild | 1 + + arch/cris/Kconfig | 32 +- + arch/cris/arch-v10/kernel/kgdb.c | 870 +++++++-------------- + arch/cris/arch-v32/drivers/Kconfig | 7 - + arch/cris/include/asm/Kbuild | 4 + + arch/cris/include/asm/io.h | 3 + + arch/cris/include/asm/linkage.h | 6 - + arch/frv/kernel/head.S | 5 - + arch/h8300/Kconfig | 118 +-- + arch/h8300/Kconfig.cpu | 4 + + arch/h8300/boot/compressed/Makefile | 2 +- + arch/h8300/include/asm/Kbuild | 2 + + arch/h8300/include/asm/barrier.h | 2 + + arch/h8300/include/asm/linkage.h | 6 - + arch/h8300/include/asm/tlb.h | 15 - + arch/h8300/kernel/entry.S | 118 +-- + arch/h8300/kernel/syscalls.S | 648 +++++++-------- + arch/h8300/lib/abs.S | 4 +- + arch/h8300/lib/memcpy.S | 4 +- + arch/h8300/lib/memset.S | 4 +- + arch/h8300/platform/h8300h/aki3068net/crt0_ram.S | 16 +- + arch/h8300/platform/h8300h/generic/crt0_ram.S | 14 +- + arch/h8300/platform/h8300h/generic/crt0_rom.S | 14 +- + arch/h8300/platform/h8300h/h8max/crt0_ram.S | 16 +- + arch/h8300/platform/h8s/edosk2674/crt0_ram.S | 16 +- + arch/h8300/platform/h8s/edosk2674/crt0_rom.S | 14 +- + arch/h8300/platform/h8s/generic/crt0_ram.S | 16 +- + arch/h8300/platform/h8s/generic/crt0_rom.S | 12 +- + arch/m68k/Kconfig.debug | 3 +- + arch/m68k/configs/multi_defconfig | 2 + + arch/m68k/configs/q40_defconfig | 6 + + arch/m68k/include/asm/parport.h | 2 + + arch/m68k/include/asm/string.h | 32 - + arch/m68k/include/asm/uaccess_mm.h | 8 +- + arch/m68k/kernel/asm-offsets.c | 2 +- + arch/m68k/kernel/ints.c | 2 +- + arch/m68k/lib/Makefile | 2 +- + arch/m68k/lib/string.c | 22 - + arch/m68k/lib/uaccess.c | 6 +- + arch/m68k/math-emu/fp_arith.c | 2 +- + arch/m68k/sun3/sun3dvma.c | 2 +- + arch/openrisc/include/asm/Kbuild | 1 + + arch/score/include/asm/Kbuild | 1 + + arch/score/include/asm/dma-mapping.h | 6 - + arch/unicore32/boot/compressed/Makefile | 2 +- + drivers/block/swim.c | 2 +- + drivers/input/keyboard/cros_ec_keyb.c | 54 +- + drivers/media/platform/Kconfig | 2 +- + drivers/parport/Kconfig | 4 +- + drivers/scsi/a3000.c | 13 +- + drivers/scsi/a4000t.c | 15 +- + drivers/staging/media/solo6x10/Kconfig | 3 +- + drivers/usb/misc/sisusbvga/Kconfig | 1 + + drivers/video/console/Kconfig | 116 +-- + drivers/video/console/Makefile | 32 +- + lib/Kconfig | 2 + + lib/Makefile | 2 + + lib/fonts/Kconfig | 117 +++ + lib/fonts/Makefile | 18 + + {drivers/video/console => lib/fonts}/font_10x18.c | 0 + {drivers/video/console => lib/fonts}/font_6x11.c | 0 + {drivers/video/console => lib/fonts}/font_7x14.c | 0 + {drivers/video/console => lib/fonts}/font_8x16.c | 0 + {drivers/video/console => lib/fonts}/font_8x8.c | 0 + .../video/console => lib/fonts}/font_acorn_8x8.c | 0 + .../video/console => lib/fonts}/font_mini_4x6.c | 0 + .../video/console => lib/fonts}/font_pearl_8x8.c | 0 + .../video/console => lib/fonts}/font_sun12x22.c | 0 + .../video/console => lib/fonts}/font_sun8x16.c | 0 + {drivers/video/console => lib/fonts}/fonts.c | 2 +- + 73 files changed, 952 insertions(+), 1513 deletions(-) + delete mode 100644 arch/cris/include/asm/linkage.h + delete mode 100644 arch/h8300/include/asm/linkage.h + delete mode 100644 arch/m68k/lib/string.c + delete mode 100644 arch/score/include/asm/dma-mapping.h + create mode 100644 lib/fonts/Kconfig + create mode 100644 lib/fonts/Makefile + rename {drivers/video/console => lib/fonts}/font_10x18.c (100%) + rename {drivers/video/console => lib/fonts}/font_6x11.c (100%) + rename {drivers/video/console => lib/fonts}/font_7x14.c (100%) + rename {drivers/video/console => lib/fonts}/font_8x16.c (100%) + rename {drivers/video/console => lib/fonts}/font_8x8.c (100%) + rename {drivers/video/console => lib/fonts}/font_acorn_8x8.c (100%) + rename {drivers/video/console => lib/fonts}/font_mini_4x6.c (100%) + rename {drivers/video/console => lib/fonts}/font_pearl_8x8.c (100%) + rename {drivers/video/console => lib/fonts}/font_sun12x22.c (100%) + rename {drivers/video/console => lib/fonts}/font_sun8x16.c (100%) + rename {drivers/video/console => lib/fonts}/fonts.c (98%) +Merging m68knommu/for-next (e4aa937 Linux 3.10-rc3) +$ git merge --no-ff m68knommu/for-next +Already up-to-date. +Merging metag/for-next (5a88130 metag: tz1090: select and instantiate pinctrl-tz1090-pdc) +$ git merge --no-ff metag/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/metag/meta.txt | 30 +++++++++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/metag/Kconfig.soc | 12 +++++ + arch/metag/Makefile | 2 +- + arch/metag/boot/.gitignore | 2 +- + arch/metag/boot/dts/Makefile | 2 + + arch/metag/boot/dts/include/dt-bindings | 1 + + arch/metag/boot/dts/skeleton.dts | 2 +- + arch/metag/boot/dts/tz1090.dtsi | 41 +++++++++++++++ + arch/metag/boot/dts/tz1090_generic.dts | 10 ++++ + arch/metag/configs/tz1090_defconfig | 42 +++++++++++++++ + arch/metag/include/asm/bug.h | 4 +- + arch/metag/include/asm/clock.h | 8 +++ + arch/metag/include/asm/irq.h | 1 + + arch/metag/include/asm/processor.h | 2 + + arch/metag/kernel/cachepart.c | 13 ++--- + arch/metag/kernel/clock.c | 59 +++++++++++++++++++++- + arch/metag/kernel/irq.c | 2 +- + arch/metag/kernel/setup.c | 16 +++--- + arch/metag/kernel/smp.c | 6 --- + arch/metag/kernel/time.c | 14 ++++- + arch/metag/kernel/traps.c | 5 +- + arch/metag/mm/cache.c | 2 +- + drivers/clocksource/metag_generic.c | 2 + + 24 files changed, 249 insertions(+), 30 deletions(-) + create mode 100644 Documentation/devicetree/bindings/metag/meta.txt + create mode 120000 arch/metag/boot/dts/include/dt-bindings + create mode 100644 arch/metag/boot/dts/tz1090.dtsi + create mode 100644 arch/metag/boot/dts/tz1090_generic.dts + create mode 100644 arch/metag/configs/tz1090_defconfig +Merging microblaze/next (c421cee microblaze: Enable KGDB in defconfig) +$ git merge --no-ff microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/configs/mmu_defconfig | 4 +++- + arch/microblaze/kernel/kgdb.c | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging mips/mips-for-linux-next (dc9f03c Merge branch '3.10-fixes' into mips-for-linux-next) +$ git merge --no-ff mips/mips-for-linux-next +Auto-merging include/uapi/linux/Kbuild +Removing arch/mips/wrppmc/time.c +Removing arch/mips/wrppmc/setup.c +Removing arch/mips/wrppmc/serial.c +Removing arch/mips/wrppmc/reset.c +Removing arch/mips/wrppmc/pci.c +Removing arch/mips/wrppmc/irq.c +Removing arch/mips/wrppmc/Platform +Removing arch/mips/wrppmc/Makefile +Auto-merging arch/mips/sibyte/common/bus_watcher.c +Removing arch/mips/pmcs-msp71xx/gpio_extended.c +Removing arch/mips/pmcs-msp71xx/gpio.c +Removing arch/mips/pci/fixup-wrppmc.c +Removing arch/mips/include/asm/mach-wrppmc/war.h +Removing arch/mips/include/asm/mach-wrppmc/mach-gt64120.h +Removing arch/mips/include/asm/mach-pmcs-msp71xx/gpio.h +Removing arch/mips/include/asm/kspd.h +Removing arch/mips/dec/promcon.c +Removing arch/mips/configs/wrppmc_defconfig +Removing arch/mips/cavium-octeon/serial.c +Merge made by the 'recursive' strategy. + arch/mips/Kbuild.platforms | 1 - + arch/mips/Kconfig | 74 +++--- + arch/mips/Makefile | 4 + + arch/mips/ath79/mach-ap136.c | 2 +- + arch/mips/bcm63xx/Kconfig | 9 +- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 53 +++- + arch/mips/bcm63xx/clk.c | 18 +- + arch/mips/bcm63xx/cpu.c | 28 ++- + arch/mips/bcm63xx/dev-flash.c | 1 + + arch/mips/bcm63xx/dev-spi.c | 6 +- + arch/mips/bcm63xx/dev-uart.c | 3 +- + arch/mips/bcm63xx/irq.c | 23 ++ + arch/mips/bcm63xx/nvram.c | 10 + + arch/mips/bcm63xx/prom.c | 49 +++- + arch/mips/bcm63xx/reset.c | 29 ++- + arch/mips/bcm63xx/setup.c | 3 + + arch/mips/boot/compressed/uart-16550.c | 22 +- + arch/mips/cavium-octeon/Kconfig | 17 +- + arch/mips/cavium-octeon/Makefile | 5 +- + arch/mips/cavium-octeon/Platform | 8 +- + .../cavium-octeon/executive/cvmx-helper-board.c | 13 + + arch/mips/cavium-octeon/octeon-platform.c | 9 +- + arch/mips/cavium-octeon/serial.c | 109 --------- + arch/mips/cavium-octeon/setup.c | 32 +-- + arch/mips/configs/cavium_octeon_defconfig | 6 +- + arch/mips/configs/wrppmc_defconfig | 97 -------- + arch/mips/dec/Makefile | 1 - + arch/mips/dec/promcon.c | 54 ----- + arch/mips/fw/cfe/cfe_api.c | 4 +- + arch/mips/include/asm/cop2.h | 29 +++ + arch/mips/include/asm/cpu-features.h | 49 ++-- + arch/mips/include/asm/cpu.h | 23 +- + arch/mips/include/asm/fw/cfe/cfe_api.h | 4 +- + arch/mips/include/asm/gic.h | 2 +- + arch/mips/include/asm/io.h | 10 + + arch/mips/include/asm/kspd.h | 32 --- + arch/mips/include/asm/mach-ar7/spaces.h | 7 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 112 +++++++++ + arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 1 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 52 +++- + .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 6 + + arch/mips/include/asm/mach-bcm63xx/ioremap.h | 4 + + .../include/asm/mach-cavium-octeon/dma-coherence.h | 7 + + .../asm/mach-cavium-octeon/kernel-entry-init.h | 7 +- + arch/mips/include/asm/mach-cavium-octeon/spaces.h | 24 ++ + arch/mips/include/asm/mach-generic/dma-coherence.h | 12 + + .../include/asm/mach-generic/kernel-entry-init.h | 4 +- + .../mips/include/asm/mach-ip27/kernel-entry-init.h | 47 ++++ + arch/mips/include/asm/mach-ip28/spaces.h | 9 +- + arch/mips/include/asm/mach-pmcs-msp71xx/gpio.h | 46 ---- + arch/mips/include/asm/mach-wrppmc/mach-gt64120.h | 83 ------- + arch/mips/include/asm/mach-wrppmc/war.h | 24 -- + arch/mips/include/asm/mips-boards/generic.h | 6 - + arch/mips/include/asm/mipsregs.h | 2 +- + arch/mips/include/asm/mmu_context.h | 6 +- + arch/mips/include/asm/netlogic/common.h | 21 +- + arch/mips/include/asm/netlogic/xlp-hal/pic.h | 2 +- + arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 1 + + arch/mips/include/asm/netlogic/xlr/fmn.h | 12 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 + + arch/mips/include/asm/page.h | 6 +- + arch/mips/include/asm/pci.h | 1 - + arch/mips/include/asm/processor.h | 35 ++- + arch/mips/include/asm/stackframe.h | 29 ++- + arch/mips/include/asm/stackprotector.h | 40 ++++ + arch/mips/include/asm/switch_to.h | 19 +- + arch/mips/include/asm/thread_info.h | 11 +- + arch/mips/include/asm/xtalk/xtalk.h | 9 + + arch/mips/include/uapi/asm/fcntl.h | 16 +- + arch/mips/include/uapi/asm/inst.h | 9 +- + arch/mips/include/uapi/asm/msgbuf.h | 12 +- + arch/mips/include/uapi/asm/resource.h | 2 +- + arch/mips/include/uapi/asm/siginfo.h | 4 +- + arch/mips/include/uapi/asm/swab.h | 12 +- + arch/mips/kernel/asm-offsets.c | 3 + + arch/mips/kernel/branch.c | 1 - + arch/mips/kernel/cpu-bugs64.c | 5 + + arch/mips/kernel/cpu-probe.c | 12 +- + arch/mips/kernel/head.S | 39 --- + arch/mips/kernel/irq-gic.c | 15 +- + arch/mips/kernel/mcount.S | 4 - + arch/mips/kernel/octeon_switch.S | 34 +-- + arch/mips/kernel/proc.c | 4 +- + arch/mips/kernel/process.c | 9 +- + arch/mips/kernel/prom.c | 2 +- + arch/mips/kernel/ptrace.c | 12 + + arch/mips/kernel/r2300_switch.S | 7 + + arch/mips/kernel/r4k_switch.S | 6 + + arch/mips/kernel/rtlx.c | 1 - + arch/mips/kernel/scall32-o32.S | 2 +- + arch/mips/kernel/scall64-64.S | 2 +- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/signal.c | 5 + + arch/mips/kernel/smp-bmips.c | 29 ++- + arch/mips/kernel/traps.c | 104 +++++--- + arch/mips/kernel/unaligned.c | 8 +- + arch/mips/kernel/watch.c | 8 + + arch/mips/lantiq/prom.c | 2 +- + arch/mips/lasat/sysctl.c | 14 +- + arch/mips/loongson/common/cs5536/cs5536_isa.c | 14 ++ + arch/mips/math-emu/cp1emu.c | 3 + + arch/mips/mm/Makefile | 2 +- + arch/mips/mm/cerr-sb1.c | 4 - + arch/mips/mm/dma-default.c | 3 + + arch/mips/mm/fault.c | 15 +- + arch/mips/mm/page.c | 2 +- + arch/mips/mm/tlb-funcs.S | 37 +++ + arch/mips/mm/tlbex.c | 183 ++++++++------ + arch/mips/mti-malta/Makefile | 1 - + arch/mips/mti-malta/malta-int.c | 4 +- + arch/mips/mti-malta/malta-reset.c | 33 +-- + arch/mips/mti-sead3/sead3-reset.c | 5 +- + arch/mips/netlogic/Kconfig | 11 + + arch/mips/netlogic/common/Makefile | 2 + + arch/mips/netlogic/common/irq.c | 7 +- + arch/mips/netlogic/common/nlm-dma.c | 107 +++++++++ + arch/mips/netlogic/common/reset.S | 230 ++++++++++++++++++ + arch/mips/netlogic/common/smp.c | 18 +- + arch/mips/netlogic/common/smpboot.S | 194 +-------------- + arch/mips/netlogic/xlp/Makefile | 2 +- + arch/mips/netlogic/xlp/cop2-ex.c | 118 +++++++++ + arch/mips/netlogic/xlp/dt.c | 99 ++++++++ + arch/mips/netlogic/xlp/setup.c | 95 ++------ + arch/mips/netlogic/xlp/wakeup.c | 26 +- + arch/mips/netlogic/xlr/fmn.c | 18 +- + arch/mips/netlogic/xlr/setup.c | 7 + + arch/mips/netlogic/xlr/wakeup.c | 3 +- + arch/mips/pci/Makefile | 7 +- + arch/mips/pci/fixup-wrppmc.c | 37 --- + arch/mips/pci/pci-bcm63xx.c | 3 +- + arch/mips/pci/pci-ip27.c | 2 + + .../{mti-malta/malta-pci.c => pci/pci-malta.c} | 0 + arch/mips/pmcs-msp71xx/Makefile | 1 - + arch/mips/pmcs-msp71xx/gpio.c | 216 ----------------- + arch/mips/pmcs-msp71xx/gpio_extended.c | 146 ----------- + arch/mips/powertv/asic/asic_devices.c | 13 +- + arch/mips/ralink/of.c | 2 +- + arch/mips/sgi-ip27/Makefile | 1 + + arch/mips/sgi-ip27/ip27-irq-pci.c | 266 +++++++++++++++++++++ + arch/mips/sgi-ip27/ip27-irq.c | 214 ----------------- + arch/mips/sibyte/Kconfig | 3 +- + arch/mips/sibyte/Platform | 5 +- + arch/mips/sibyte/common/Makefile | 1 + + arch/mips/sibyte/{sb1250 => common}/bus_watcher.c | 14 +- + arch/mips/sibyte/common/sb_tbprof.c | 1 + + arch/mips/sibyte/sb1250/Makefile | 1 - + arch/mips/sni/pcimt.c | 2 + + arch/mips/sni/pcit.c | 16 +- + arch/mips/wrppmc/Makefile | 12 - + arch/mips/wrppmc/Platform | 7 - + arch/mips/wrppmc/irq.c | 56 ----- + arch/mips/wrppmc/pci.c | 52 ---- + arch/mips/wrppmc/reset.c | 41 ---- + arch/mips/wrppmc/serial.c | 80 ------- + arch/mips/wrppmc/setup.c | 128 ---------- + arch/mips/wrppmc/time.c | 39 --- + drivers/ata/Kconfig | 2 +- + drivers/char/hw_random/Kconfig | 2 +- + drivers/edac/Kconfig | 6 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/net/ethernet/octeon/Kconfig | 2 +- + drivers/net/phy/Kconfig | 2 +- + drivers/rapidio/switches/idt_gen2.c | 2 + + drivers/spi/Kconfig | 2 +- + drivers/ssb/Kconfig | 2 +- + drivers/staging/octeon/Kconfig | 2 +- + drivers/tty/serial/8250/8250_dw.c | 108 ++++++--- + drivers/usb/host/Kconfig | 4 +- + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/sb_wdog.c | 2 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/bcm933xx_hcs.h | 24 ++ + kernel/irq/irqdomain.c | 12 - + lib/Kconfig.debug | 2 +- + 175 files changed, 2286 insertions(+), 2375 deletions(-) + delete mode 100644 arch/mips/cavium-octeon/serial.c + delete mode 100644 arch/mips/configs/wrppmc_defconfig + delete mode 100644 arch/mips/dec/promcon.c + delete mode 100644 arch/mips/include/asm/kspd.h + create mode 100644 arch/mips/include/asm/mach-cavium-octeon/spaces.h + delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/gpio.h + delete mode 100644 arch/mips/include/asm/mach-wrppmc/mach-gt64120.h + delete mode 100644 arch/mips/include/asm/mach-wrppmc/war.h + create mode 100644 arch/mips/include/asm/stackprotector.h + create mode 100644 arch/mips/mm/tlb-funcs.S + create mode 100644 arch/mips/netlogic/common/nlm-dma.c + create mode 100644 arch/mips/netlogic/common/reset.S + create mode 100644 arch/mips/netlogic/xlp/cop2-ex.c + create mode 100644 arch/mips/netlogic/xlp/dt.c + delete mode 100644 arch/mips/pci/fixup-wrppmc.c + rename arch/mips/{mti-malta/malta-pci.c => pci/pci-malta.c} (100%) + delete mode 100644 arch/mips/pmcs-msp71xx/gpio.c + delete mode 100644 arch/mips/pmcs-msp71xx/gpio_extended.c + create mode 100644 arch/mips/sgi-ip27/ip27-irq-pci.c + rename arch/mips/sibyte/{sb1250 => common}/bus_watcher.c (94%) + delete mode 100644 arch/mips/wrppmc/Makefile + delete mode 100644 arch/mips/wrppmc/Platform + delete mode 100644 arch/mips/wrppmc/irq.c + delete mode 100644 arch/mips/wrppmc/pci.c + delete mode 100644 arch/mips/wrppmc/reset.c + delete mode 100644 arch/mips/wrppmc/serial.c + delete mode 100644 arch/mips/wrppmc/setup.c + delete mode 100644 arch/mips/wrppmc/time.c + create mode 100644 include/uapi/linux/bcm933xx_hcs.h +Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) +$ git merge --no-ff 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 --no-ff parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (c069114 mn10300: Fix include dependency in irqflags.h et al.) +$ git merge --no-ff parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (090b928 powerpc/tm: Clear MSR RI in non-recoverable TM code) +$ git merge --no-ff powerpc/next +Recorded preimage for 'arch/powerpc/kernel/eeh_pe.c' +Auto-merging fs/pstore/inode.c +Auto-merging arch/sparc/mm/tlb.c +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kernel/irq.c +Auto-merging arch/powerpc/kernel/eeh_sysfs.c +Auto-merging arch/powerpc/kernel/eeh_pe.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/eeh_pe.c +Auto-merging arch/powerpc/kernel/eeh_event.c +Auto-merging arch/powerpc/kernel/eeh_driver.c +Auto-merging arch/powerpc/kernel/eeh_cache.c +Auto-merging arch/powerpc/kernel/eeh.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/powerpc/kernel/eeh_pe.c'. +[master eaf4b37] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/vfio.txt | 63 ++ + arch/powerpc/Kconfig | 17 +- + arch/powerpc/Kconfig.debug | 7 + + arch/powerpc/boot/dts/currituck.dts | 5 + + arch/powerpc/configs/c2k_defconfig | 2 + + arch/powerpc/configs/g5_defconfig | 2 + + arch/powerpc/configs/maple_defconfig | 2 + + arch/powerpc/configs/pmac32_defconfig | 2 + + arch/powerpc/configs/ppc64_defconfig | 2 + + arch/powerpc/configs/ppc6xx_defconfig | 2 + + arch/powerpc/configs/pseries_defconfig | 1 + + arch/powerpc/include/asm/eeh.h | 34 +- + arch/powerpc/include/asm/eeh_event.h | 2 + + arch/powerpc/include/asm/hugetlb.h | 8 +- + arch/powerpc/include/asm/iommu.h | 26 + + arch/powerpc/include/asm/kvm_book3s_64.h | 58 +- + arch/powerpc/include/asm/machdep.h | 11 +- + arch/powerpc/include/asm/mmu-hash64.h | 14 + + arch/powerpc/include/asm/opal.h | 140 +++- + arch/powerpc/include/asm/pgalloc-64.h | 6 +- + arch/powerpc/include/asm/pgtable-ppc64-64k.h | 3 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 241 +++++- + arch/powerpc/include/asm/pgtable.h | 6 + + arch/powerpc/include/asm/probes.h | 25 + + arch/powerpc/include/asm/processor.h | 12 +- + arch/powerpc/include/asm/tlbflush.h | 3 +- + arch/powerpc/kernel/Makefile | 4 +- + arch/powerpc/kernel/asm-offsets.c | 6 +- + arch/powerpc/{platforms/pseries => kernel}/eeh.c | 157 +++- + .../{platforms/pseries => kernel}/eeh_cache.c | 1 - + .../{platforms/pseries => kernel}/eeh_dev.c | 0 + .../{platforms/pseries => kernel}/eeh_driver.c | 146 +++- + .../{platforms/pseries => kernel}/eeh_event.c | 134 +-- + .../powerpc/{platforms/pseries => kernel}/eeh_pe.c | 80 +- + .../{platforms/pseries => kernel}/eeh_sysfs.c | 1 - + arch/powerpc/kernel/entry_64.S | 30 +- + arch/powerpc/kernel/hw_breakpoint.c | 1 + + arch/powerpc/kernel/io-workarounds.c | 11 +- + arch/powerpc/kernel/iommu.c | 323 ++++++++ + arch/powerpc/kernel/irq.c | 2 - + arch/powerpc/kernel/kprobes.c | 20 +- + arch/powerpc/kernel/pci-hotplug.c | 111 +++ + arch/powerpc/kernel/prom.c | 35 + + arch/powerpc/kernel/ptrace.c | 4 +- + arch/powerpc/kernel/signal_32.c | 70 +- + arch/powerpc/kernel/signal_64.c | 8 +- + arch/powerpc/kernel/tm.S | 18 +- + arch/powerpc/kernel/traps.c | 38 +- + arch/powerpc/kernel/udbg.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 8 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 14 +- + arch/powerpc/lib/sstep.c | 2 +- + arch/powerpc/math-emu/Makefile | 3 +- + arch/powerpc/math-emu/fre.c | 11 + + arch/powerpc/math-emu/frsqrtes.c | 11 + + arch/powerpc/math-emu/math.c | 14 +- + arch/powerpc/mm/Makefile | 8 +- + arch/powerpc/mm/gup.c | 18 +- + arch/powerpc/mm/hash_low_64.S | 21 +- + arch/powerpc/mm/hash_native_64.c | 195 +++-- + arch/powerpc/mm/hash_utils_64.c | 65 +- + arch/powerpc/mm/hugepage-hash64.c | 175 ++++ + arch/powerpc/mm/hugetlbpage-hash64.c | 2 +- + arch/powerpc/mm/hugetlbpage.c | 299 ++++--- + arch/powerpc/mm/init_64.c | 9 +- + arch/powerpc/mm/mem.c | 4 + + arch/powerpc/mm/{mmap_64.c => mmap.c} | 0 + arch/powerpc/mm/mmu_context_nohash.c | 9 +- + arch/powerpc/mm/pgtable.c | 8 + + arch/powerpc/mm/pgtable_64.c | 414 ++++++++++ + arch/powerpc/mm/subpage-prot.c | 48 ++ + arch/powerpc/mm/tlb_hash64.c | 36 +- + arch/powerpc/platforms/44x/currituck.c | 39 +- + arch/powerpc/platforms/8xx/m8xx_setup.c | 1 + + arch/powerpc/platforms/Kconfig | 5 + + arch/powerpc/platforms/Kconfig.cputype | 1 + + arch/powerpc/platforms/cell/beat_htab.c | 16 +- + arch/powerpc/platforms/cell/smp.c | 2 +- + arch/powerpc/platforms/powernv/Makefile | 1 + + arch/powerpc/platforms/powernv/eeh-ioda.c | 909 +++++++++++++++++++++ + arch/powerpc/platforms/powernv/eeh-powernv.c | 419 ++++++++++ + arch/powerpc/platforms/powernv/opal-wrappers.S | 3 + + arch/powerpc/platforms/powernv/opal.c | 69 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 40 +- + arch/powerpc/platforms/powernv/pci-p5ioc2.c | 11 +- + arch/powerpc/platforms/powernv/pci.c | 45 +- + arch/powerpc/platforms/powernv/pci.h | 28 + + arch/powerpc/platforms/powernv/setup.c | 4 + + arch/powerpc/platforms/powernv/smp.c | 2 +- + arch/powerpc/platforms/ps3/htab.c | 5 +- + arch/powerpc/platforms/pseries/Kconfig | 5 - + arch/powerpc/platforms/pseries/Makefile | 4 +- + arch/powerpc/platforms/pseries/io_event_irq.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 4 + + arch/powerpc/platforms/pseries/lpar.c | 139 +++- + arch/powerpc/platforms/pseries/nvram.c | 353 ++++++-- + arch/powerpc/platforms/pseries/pci_dlpar.c | 85 -- + arch/powerpc/platforms/pseries/ras.c | 8 +- + arch/powerpc/platforms/pseries/smp.c | 2 +- + arch/powerpc/sysdev/cpm1.c | 1 + + arch/s390/include/asm/pgtable.h | 5 +- + arch/s390/mm/pgtable.c | 5 +- + arch/sparc/include/asm/pgtable_64.h | 5 +- + arch/sparc/mm/tlb.c | 5 +- + drivers/iommu/Kconfig | 8 + + drivers/macintosh/adb.c | 2 +- + drivers/vfio/Kconfig | 6 + + drivers/vfio/Makefile | 1 + + drivers/vfio/vfio.c | 1 + + drivers/vfio/vfio_iommu_spapr_tce.c | 377 +++++++++ + fs/pstore/inode.c | 9 + + include/asm-generic/pgtable.h | 5 +- + include/linux/huge_mm.h | 6 +- + include/linux/pstore.h | 4 + + include/uapi/linux/vfio.h | 34 + + mm/huge_memory.c | 28 +- + mm/pgtable-generic.c | 5 +- + 118 files changed, 5180 insertions(+), 801 deletions(-) + rename arch/powerpc/{platforms/pseries => kernel}/eeh.c (89%) + rename arch/powerpc/{platforms/pseries => kernel}/eeh_cache.c (99%) + rename arch/powerpc/{platforms/pseries => kernel}/eeh_dev.c (100%) + rename arch/powerpc/{platforms/pseries => kernel}/eeh_driver.c (85%) + rename arch/powerpc/{platforms/pseries => kernel}/eeh_event.c (56%) + rename arch/powerpc/{platforms/pseries => kernel}/eeh_pe.c (92%) + rename arch/powerpc/{platforms/pseries => kernel}/eeh_sysfs.c (99%) + create mode 100644 arch/powerpc/kernel/pci-hotplug.c + create mode 100644 arch/powerpc/math-emu/fre.c + create mode 100644 arch/powerpc/math-emu/frsqrtes.c + create mode 100644 arch/powerpc/mm/hugepage-hash64.c + rename arch/powerpc/mm/{mmap_64.c => mmap.c} (100%) + create mode 100644 arch/powerpc/platforms/powernv/eeh-ioda.c + create mode 100644 arch/powerpc/platforms/powernv/eeh-powernv.c + create mode 100644 drivers/vfio/vfio_iommu_spapr_tce.c +Merging 4xx/next (2074b1d powerpc: Fix irq distribution) +$ git merge --no-ff 4xx/next +Already up-to-date. +Merging mpc5xxx/next (dd0120d powerpc/mpc512x: enable USB support in defconfig) +$ git merge --no-ff mpc5xxx/next +Merge made by the 'recursive' strategy. + arch/powerpc/configs/mpc512x_defconfig | 27 +++++++++-------------- + arch/powerpc/include/asm/mpc5121.h | 1 - + arch/powerpc/platforms/512x/mpc5121_ads.c | 6 ++---- + arch/powerpc/platforms/512x/mpc512x.h | 12 +++-------- + arch/powerpc/platforms/512x/mpc512x_generic.c | 4 ++-- + arch/powerpc/platforms/512x/mpc512x_shared.c | 31 ++++++++++++++++++++++++--- + arch/powerpc/platforms/512x/pdm360ng.c | 4 ++-- + 7 files changed, 47 insertions(+), 38 deletions(-) +Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) +$ git merge --no-ff galak/next +Already up-to-date. +Merging s390/features (2ab1461 s390/appldata_net_sum: do not use static data) +$ git merge --no-ff s390/features +Auto-merging arch/s390/mm/pgtable.c +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 1 + + arch/s390/appldata/appldata_mem.c | 18 +++- + arch/s390/appldata/appldata_net_sum.c | 18 +++- + arch/s390/hypfs/hypfs_diag.c | 8 +- + arch/s390/include/asm/airq.h | 15 ++- + arch/s390/include/asm/dma-mapping.h | 2 +- + arch/s390/include/asm/facility.h | 17 ++-- + arch/s390/include/asm/io.h | 22 ----- + arch/s390/include/asm/pci.h | 2 - + arch/s390/include/asm/pgalloc.h | 3 + + arch/s390/include/asm/ptrace.h | 1 + + arch/s390/include/uapi/asm/Kbuild | 1 + + arch/s390/include/uapi/asm/chsc.h | 13 +++ + arch/s390/include/uapi/asm/sclp_ctl.h | 24 +++++ + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/entry.S | 12 ++- + arch/s390/kernel/entry.h | 2 +- + arch/s390/kernel/entry64.S | 16 +++- + arch/s390/kernel/irq.c | 8 +- + arch/s390/kernel/smp.c | 5 +- + arch/s390/mm/pgtable.c | 48 ++++++++++ + arch/s390/pci/pci.c | 83 ++++++++--------- + arch/s390/pci/pci_clp.c | 1 - + arch/s390/pci/pci_debug.c | 29 ------ + arch/s390/pci/pci_dma.c | 6 +- + arch/s390/pci/pci_sysfs.c | 20 ++-- + drivers/pci/hotplug/s390_pci_hpc.c | 60 ++++++++---- + drivers/pci/pci.c | 10 ++ + drivers/pci/probe.c | 1 + + drivers/s390/block/dasd_eckd.c | 2 +- + drivers/s390/char/Makefile | 2 +- + drivers/s390/char/sclp.c | 86 +++++++++++++++-- + drivers/s390/char/sclp.h | 7 +- + drivers/s390/char/sclp_cmd.c | 20 ++-- + drivers/s390/char/sclp_con.c | 31 ++++++- + drivers/s390/char/sclp_ctl.c | 144 +++++++++++++++++++++++++++++ + drivers/s390/char/sclp_vt220.c | 39 +++++++- + drivers/s390/char/tape_class.c | 2 +- + drivers/s390/char/vmwatchdog.c | 5 +- + drivers/s390/cio/airq.c | 167 ++++++++++++---------------------- + drivers/s390/cio/chsc.c | 60 ++++++++++++ + drivers/s390/cio/chsc.h | 44 +++++++-- + drivers/s390/cio/chsc_sch.c | 155 ++++++++++++++++++++++++++++++- + drivers/s390/cio/cio.c | 68 ++++++-------- + drivers/s390/cio/qdio.h | 34 ------- + drivers/s390/cio/qdio_main.c | 44 --------- + drivers/s390/cio/qdio_setup.c | 47 ++++------ + drivers/s390/cio/qdio_thinint.c | 79 ++++++---------- + drivers/s390/crypto/ap_bus.c | 64 +++++++------ + drivers/s390/net/claw.c | 2 +- + drivers/s390/net/ctcm_main.c | 2 +- + drivers/s390/net/lcs.c | 2 +- + drivers/s390/net/qeth_core_main.c | 2 +- + include/linux/pci.h | 1 + + 54 files changed, 1010 insertions(+), 546 deletions(-) + create mode 100644 arch/s390/include/uapi/asm/sclp_ctl.h + create mode 100644 drivers/s390/char/sclp_ctl.c +Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) +$ git merge --no-ff sh/sh-latest +Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution. +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 aaa495a] 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 --no-ff sparc-next/master +Already up-to-date. +Merging tile/master (317ddd2 Linux 3.10-rc5) +$ git merge --no-ff tile/master +Already up-to-date. +Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge --no-ff unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (0756a12 xtensa: tell git to ignore copied zlib source files) +$ git merge --no-ff xtensa/for_next +Merge made by the 'recursive' strategy. + arch/xtensa/boot/.gitignore | 2 + + arch/xtensa/boot/boot-elf/.gitignore | 1 + + arch/xtensa/boot/lib/.gitignore | 3 + + arch/xtensa/include/asm/cmpxchg.h | 1 + + arch/xtensa/include/asm/pgtable.h | 140 +++++++++++++++++++++-------------- + arch/xtensa/include/asm/platform.h | 5 -- + arch/xtensa/kernel/.gitignore | 1 + + arch/xtensa/kernel/entry.S | 7 +- + arch/xtensa/kernel/pci.c | 10 +-- + arch/xtensa/kernel/platform.c | 1 - + arch/xtensa/mm/tlb.c | 7 +- + arch/xtensa/platforms/iss/network.c | 2 +- + arch/xtensa/platforms/xtfpga/setup.c | 2 +- + 13 files changed, 108 insertions(+), 74 deletions(-) + create mode 100644 arch/xtensa/boot/.gitignore + create mode 100644 arch/xtensa/boot/boot-elf/.gitignore + create mode 100644 arch/xtensa/boot/lib/.gitignore + create mode 100644 arch/xtensa/kernel/.gitignore +Merging btrfs/next (667e7d9 Btrfs: allow superblock mismatch from older mkfs) +$ git merge --no-ff btrfs/next +Already up-to-date. +Merging ceph/master (60fc6ea ceph: Free mdsc if alloc mdsc->mdsmap failed.) +$ git merge --no-ff ceph/master +Resolved 'drivers/block/rbd.c' using previous resolution. +Auto-merging fs/ceph/file.c +Auto-merging drivers/block/rbd.c +CONFLICT (content): Merge conflict in drivers/block/rbd.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a9fc2db] Merge remote-tracking branch 'ceph/master' +$ git diff -M --stat --summary HEAD^.. + drivers/block/rbd.c | 206 +++++++++++++++++++++++----------------- + fs/ceph/addr.c | 88 ++++++++--------- + fs/ceph/caps.c | 37 +++++--- + fs/ceph/file.c | 2 - + fs/ceph/locks.c | 2 +- + fs/ceph/mds_client.c | 6 +- + fs/ceph/mdsmap.c | 42 ++++---- + fs/ceph/xattr.c | 9 +- + include/linux/ceph/osd_client.h | 1 - + net/ceph/osd_client.c | 49 +++++----- + 10 files changed, 240 insertions(+), 202 deletions(-) +Merging cifs/for-next (7ac0feb cifs: fill TRANS2_QUERY_FILE_INFO ByteCount fields) +$ git merge --no-ff cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 1 + + fs/cifs/cifs_debug.c | 52 +++++- + fs/cifs/cifs_unicode.h | 8 +- + fs/cifs/cifsencrypt.c | 40 ++++- + fs/cifs/cifsfs.c | 11 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 48 +++--- + fs/cifs/cifspdu.h | 17 +- + fs/cifs/cifsproto.h | 4 + + fs/cifs/cifssmb.c | 425 +++++++++++++++++++++++------------------------- + fs/cifs/connect.c | 159 ++++++++---------- + fs/cifs/misc.c | 3 +- + fs/cifs/readdir.c | 29 ++++ + fs/cifs/sess.c | 95 ++++++++--- + fs/cifs/smb1ops.c | 23 +-- + fs/cifs/smb2glob.h | 2 + + fs/cifs/smb2misc.c | 4 + + fs/cifs/smb2ops.c | 48 +++++- + fs/cifs/smb2pdu.c | 282 +++++++++++++++++++++----------- + fs/cifs/smb2pdu.h | 100 +++++++++++- + fs/cifs/smb2proto.h | 4 + + fs/cifs/smb2transport.c | 151 ++++++++++++++++- + fs/cifs/smbfsctl.h | 27 ++- + fs/cifs/transport.c | 4 +- + 24 files changed, 1034 insertions(+), 505 deletions(-) +Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge --no-ff configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (0df5ed6 eCryptfs: Make extent and scatterlist crypt function parameters similar) +$ git merge --no-ff ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 337 +++++++++++------------------------------------- + fs/ecryptfs/messaging.c | 3 +- + 2 files changed, 79 insertions(+), 261 deletions(-) +Merging ext3/for_next (7ea2177 quota: Convert use of typedef ctl_table to struct ctl_table) +$ git merge --no-ff ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext3/fsync.c | 8 ++++++-- + fs/ext3/super.c | 13 ++++++++++++- + fs/quota/dquot.c | 6 +++--- + 3 files changed, 21 insertions(+), 6 deletions(-) +Merging ext4/dev (ab7c8b6 ext4: optimize starting extent in ext4_ext_rm_leaf()) +$ git merge --no-ff ext4/dev +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 6 +- + Documentation/filesystems/vfs.txt | 20 +- + fs/9p/vfs_addr.c | 5 +- + fs/afs/file.c | 10 +- + fs/btrfs/disk-io.c | 3 +- + fs/btrfs/extent_io.c | 2 +- + fs/btrfs/inode.c | 3 +- + fs/buffer.c | 21 +- + fs/ceph/addr.c | 15 +- + fs/cifs/file.c | 5 +- + fs/exofs/inode.c | 6 +- + fs/ext3/inode.c | 9 +- + fs/ext3/namei.c | 7 +- + fs/ext4/balloc.c | 14 +- + fs/ext4/ext4.h | 187 ++-- + fs/ext4/ext4_jbd2.c | 58 +- + fs/ext4/ext4_jbd2.h | 29 +- + fs/ext4/extents.c | 193 ++-- + fs/ext4/extents_status.c | 75 +- + fs/ext4/extents_status.h | 5 +- + fs/ext4/file.c | 14 +- + fs/ext4/fsync.c | 52 +- + fs/ext4/ialloc.c | 3 +- + fs/ext4/indirect.c | 40 +- + fs/ext4/inline.c | 4 +- + fs/ext4/inode.c | 1775 +++++++++++++++++-------------------- + fs/ext4/mballoc.c | 21 +- + fs/ext4/move_extent.c | 3 - + fs/ext4/namei.c | 7 +- + fs/ext4/page-io.c | 325 ++++--- + fs/ext4/resize.c | 24 +- + fs/ext4/super.c | 155 +++- + fs/f2fs/data.c | 3 +- + fs/f2fs/node.c | 3 +- + fs/gfs2/aops.c | 17 +- + fs/jbd/transaction.c | 19 +- + fs/jbd2/Kconfig | 6 +- + fs/jbd2/checkpoint.c | 22 +- + fs/jbd2/commit.c | 184 ++-- + fs/jbd2/journal.c | 166 ++-- + fs/jbd2/recovery.c | 11 +- + fs/jbd2/revoke.c | 49 +- + fs/jbd2/transaction.c | 526 ++++++----- + fs/jfs/jfs_metapage.c | 5 +- + fs/logfs/file.c | 3 +- + fs/logfs/segment.c | 3 +- + fs/nfs/file.c | 8 +- + fs/ntfs/aops.c | 2 +- + fs/ocfs2/aops.c | 5 +- + fs/reiserfs/inode.c | 12 +- + fs/ubifs/file.c | 5 +- + fs/xfs/xfs_aops.c | 14 +- + fs/xfs/xfs_trace.h | 15 +- + include/linux/buffer_head.h | 3 +- + include/linux/fs.h | 2 +- + include/linux/jbd.h | 28 +- + include/linux/jbd2.h | 175 ++-- + include/linux/jbd_common.h | 26 +- + include/linux/mm.h | 3 +- + include/trace/events/ext3.h | 12 +- + include/trace/events/ext4.h | 304 +++++-- + mm/readahead.c | 2 +- + mm/truncate.c | 117 ++- + 63 files changed, 2664 insertions(+), 2182 deletions(-) +Merging f2fs/dev (7201ddb f2fs: fix to recover i_size from roll-forward) +$ git merge --no-ff f2fs/dev +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 9 +- + fs/f2fs/Kconfig | 12 ++ + fs/f2fs/acl.c | 2 +- + fs/f2fs/checkpoint.c | 99 +++++++++++---- + fs/f2fs/data.c | 68 +++++++--- + fs/f2fs/debug.c | 4 +- + fs/f2fs/dir.c | 109 +++++++++------- + fs/f2fs/f2fs.h | 66 +++++++--- + fs/f2fs/file.c | 58 +++++++-- + fs/f2fs/gc.c | 42 +++--- + fs/f2fs/inode.c | 13 +- + fs/f2fs/namei.c | 17 +-- + fs/f2fs/node.c | 34 ++--- + fs/f2fs/node.h | 68 ++++------ + fs/f2fs/recovery.c | 150 ++++++++++++++-------- + fs/f2fs/segment.c | 101 ++++----------- + fs/f2fs/super.c | 253 ++++++++++++++++++++++++------------- + fs/f2fs/xattr.c | 68 +++++++++- + fs/f2fs/xattr.h | 24 ++-- + include/linux/f2fs_fs.h | 4 +- + 20 files changed, 750 insertions(+), 451 deletions(-) +Merging fscache/fscache (bbd645c FS-Cache: Don't use spin_is_locked() in assertions) +$ git merge --no-ff fscache/fscache +Auto-merging include/linux/wait.h +Merge made by the 'recursive' strategy. + fs/cachefiles/interface.c | 13 +- + fs/cachefiles/namei.c | 10 +- + fs/cachefiles/xattr.c | 6 +- + fs/fscache/cache.c | 34 +- + fs/fscache/cookie.c | 93 ++-- + fs/fscache/fsdef.c | 1 + + fs/fscache/internal.h | 11 +- + fs/fscache/main.c | 11 +- + fs/fscache/netfs.c | 1 + + fs/fscache/object-list.c | 103 ++-- + fs/fscache/object.c | 1106 +++++++++++++++++++++-------------------- + fs/fscache/operation.c | 37 +- + fs/fscache/page.c | 65 ++- + include/linux/fscache-cache.h | 175 +++---- + include/linux/wait.h | 24 + + kernel/wait.c | 88 ++++ + 16 files changed, 956 insertions(+), 822 deletions(-) +Merging fuse/for-next (e5c5f05 fuse: fix alignment in short read optimization for async_dio) +$ git merge --no-ff fuse/for-next +Already up-to-date. +Merging gfs2/master (a01aedf GFS2: Reserve journal space for quota change in do_grow) +$ git merge --no-ff gfs2/master +Merge made by the 'recursive' strategy. + fs/dcache.c | 11 +++- + fs/gfs2/bmap.c | 4 +- + fs/gfs2/dir.c | 26 +++++---- + fs/gfs2/dir.h | 3 +- + fs/gfs2/file.c | 69 ++++++++++++++++-------- + fs/gfs2/glops.c | 8 --- + fs/gfs2/inode.c | 150 ++++++++++++++++++++++++++++++++++++--------------- + fs/gfs2/inode.h | 1 + + fs/gfs2/log.c | 78 +++++++++++++++++++++++++-- + fs/gfs2/log.h | 2 + + fs/gfs2/lops.c | 22 ++++++-- + fs/gfs2/lops.h | 1 - + fs/gfs2/meta_io.c | 4 -- + fs/gfs2/ops_fstype.c | 8 +-- + fs/gfs2/quota.c | 7 +-- + fs/gfs2/rgrp.c | 14 ++--- + fs/gfs2/trans.c | 9 +--- + 17 files changed, 291 insertions(+), 126 deletions(-) +Merging jfs/jfs-next (eb8630d jfs: Update jfs_error) +$ git merge --no-ff jfs/jfs-next +Auto-merging fs/jfs/jfs_metapage.c +Merge made by the 'recursive' strategy. + fs/jfs/jfs_dmap.c | 70 +++++++++++++++++++------------------------------ + fs/jfs/jfs_dtree.c | 37 +++++++++++++------------- + fs/jfs/jfs_extent.c | 2 +- + fs/jfs/jfs_imap.c | 69 ++++++++++++++++++++---------------------------- + fs/jfs/jfs_metapage.c | 5 ++-- + fs/jfs/jfs_superblock.h | 1 + + fs/jfs/jfs_txnmgr.c | 2 +- + fs/jfs/jfs_xtree.c | 62 +++++++++++++++++++++---------------------- + fs/jfs/namei.c | 2 +- + fs/jfs/resize.c | 2 +- + fs/jfs/super.c | 22 +++++++++------- + fs/jfs/xattr.c | 8 +++--- + 12 files changed, 128 insertions(+), 154 deletions(-) +Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) +$ git merge --no-ff 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 (959d921 Merge branch 'labeled-nfs' into linux-next) +$ git merge --no-ff nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/Kconfig | 14 + + fs/nfs/Makefile | 6 +- + fs/nfs/blocklayout/blocklayout.c | 3 +- + fs/nfs/callback.c | 1 + + fs/nfs/callback.h | 3 + + fs/nfs/callback_proc.c | 3 +- + fs/nfs/callback_xdr.c | 52 ++- + fs/nfs/client.c | 4 +- + fs/nfs/dir.c | 75 ++-- + fs/nfs/dns_resolve.c | 32 +- + fs/nfs/getroot.c | 2 +- + fs/nfs/idmap.c | 56 ++- + fs/nfs/inode.c | 136 +++++-- + fs/nfs/internal.h | 3 +- + fs/nfs/mount_clnt.c | 14 +- + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs3proc.c | 7 +- + fs/nfs/nfs4_fs.h | 8 +- + fs/nfs/nfs4client.c | 15 +- + fs/nfs/nfs4file.c | 1 - + fs/nfs/nfs4filelayout.c | 3 +- + fs/nfs/nfs4filelayout.h | 3 +- + fs/nfs/nfs4filelayoutdev.c | 8 +- + fs/nfs/nfs4proc.c | 687 ++++++++++++++++++++++++++++++------ + fs/nfs/nfs4session.c | 40 +-- + fs/nfs/nfs4session.h | 7 +- + fs/nfs/nfs4state.c | 36 +- + fs/nfs/nfs4super.c | 14 +- + fs/nfs/nfs4xdr.c | 182 ++++++++-- + fs/nfs/objlayout/objlayout.c | 4 +- + fs/nfs/pnfs.c | 42 +-- + fs/nfs/pnfs.h | 6 +- + fs/nfs/proc.c | 13 +- + fs/nfs/super.c | 199 ++++++----- + fs/nfsd/nfsd.h | 6 + + include/linux/nfs4.h | 22 ++ + include/linux/nfs_fs.h | 27 +- + include/linux/nfs_fs_sb.h | 8 +- + include/linux/nfs_xdr.h | 20 +- + include/linux/security.h | 57 ++- + include/linux/sunrpc/sched.h | 20 -- + net/sunrpc/clnt.c | 71 ++-- + net/sunrpc/rpc_pipe.c | 8 +- + net/sunrpc/sched.c | 19 +- + security/capability.c | 19 +- + security/security.c | 24 +- + security/selinux/hooks.c | 92 ++++- + security/selinux/include/security.h | 2 + + security/selinux/ss/policydb.c | 5 +- + security/smack/smack_lsm.c | 11 + + 50 files changed, 1550 insertions(+), 542 deletions(-) +Merging nfsd/nfsd-next (1a9357f nfsd: avoid undefined signed overflow) +$ git merge --no-ff nfsd/nfsd-next +Auto-merging security/capability.c +Merge made by the 'recursive' strategy. + fs/nfsd/Kconfig | 16 ++++++++ + fs/nfsd/nfs4proc.c | 41 +++++++++++++++++++ + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfs4xdr.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++---- + fs/nfsd/nfsd.h | 20 +++++++-- + fs/nfsd/vfs.c | 28 +++++++++++++ + fs/nfsd/vfs.h | 7 +--- + fs/nfsd/xdr4.h | 4 ++ + net/sunrpc/cache.c | 8 ++-- + net/sunrpc/xprtsock.c | 1 - + security/capability.c | 2 +- + 11 files changed, 218 insertions(+), 24 deletions(-) +Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) +$ git merge --no-ff 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 --no-ff omfs/for-next +Already up-to-date. +Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) +$ git merge --no-ff squashfs/master +Already up-to-date. +Merging v9fs/for-next (59b3e32 fs/9p: Remove the unused variable "err" in v9fs_vfs_getattr()) +$ git merge --no-ff v9fs/for-next +Auto-merging net/9p/client.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 ++ + fs/9p/Kconfig | 13 +++++ + fs/9p/Makefile | 4 +- + fs/9p/vfs_inode.c | 2 - + fs/9p/xattr.c | 4 ++ + fs/9p/xattr.h | 2 + + fs/9p/xattr_security.c | 80 +++++++++++++++++++++++++++ + fs/9p/xattr_trusted.c | 80 +++++++++++++++++++++++++++ + include/net/9p/transport.h | 6 +++ + include/trace/events/9p.h | 28 ++-------- + net/9p/client.c | 70 ++++++++++++++---------- + net/9p/trans_fd.c | 40 +++++++++++++- + net/9p/trans_rdma.c | 132 ++++++++++++++++++++++++++++----------------- + 13 files changed, 362 insertions(+), 104 deletions(-) + create mode 100644 fs/9p/xattr_security.c + create mode 100644 fs/9p/xattr_trusted.c +Merging ubifs/linux-next (c1be5a5 Linux 3.9) +$ git merge --no-ff ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (83e782e xfs: Remove incore use of XFS_OQUOTA_ENFD and XFS_OQUOTA_CHKD) +$ git merge --no-ff xfs/for-next +Resolved 'fs/xfs/xfs_log_cil.c' using previous resolution. +Resolved 'fs/xfs/xfs_log_recover.c' using previous resolution. +Auto-merging fs/xfs/xfs_vnodeops.c +Auto-merging fs/xfs/xfs_trace.h +Auto-merging fs/xfs/xfs_symlink.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_quota.h +Auto-merging fs/xfs/xfs_qm_syscalls.c +Auto-merging fs/xfs/xfs_qm.c +Auto-merging fs/xfs/xfs_mount.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_log_cil.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_log_cil.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_inode.c +Auto-merging fs/xfs/xfs_fsops.c +Auto-merging fs/xfs/xfs_dquot.c +Auto-merging fs/xfs/xfs_dir2_leaf.c +Auto-merging fs/xfs/xfs_dfrag.c +Auto-merging fs/xfs/xfs_buf_item.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 65d1426] Merge remote-tracking branch 'xfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/xfs/Makefile | 1 + + fs/xfs/xfs_alloc.c | 24 ++++-- + fs/xfs/xfs_bmap_btree.h | 2 + + fs/xfs/xfs_buf_item.c | 87 ++++++++++++++------- + fs/xfs/xfs_buf_item.h | 4 +- + fs/xfs/xfs_dfrag.c | 8 +- + fs/xfs/xfs_dir2_leaf.c | 3 + + fs/xfs/xfs_dquot.c | 16 ++-- + fs/xfs/xfs_dquot.h | 4 - + fs/xfs/xfs_fsops.c | 2 +- + fs/xfs/xfs_ialloc.c | 74 +++++++++++++----- + fs/xfs/xfs_ialloc.h | 8 ++ + fs/xfs/xfs_icache.c | 3 +- + fs/xfs/xfs_icache.h | 1 - + fs/xfs/xfs_icreate_item.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++ + fs/xfs/xfs_icreate_item.h | 52 +++++++++++++ + fs/xfs/xfs_inode.c | 68 ++++++++-------- + fs/xfs/xfs_iomap.c | 13 ++++ + fs/xfs/xfs_iops.c | 3 +- + fs/xfs/xfs_itable.c | 5 +- + fs/xfs/xfs_log.c | 22 +++++- + fs/xfs/xfs_log.h | 5 +- + fs/xfs/xfs_log_cil.c | 75 ++++++++++++------ + fs/xfs/xfs_log_recover.c | 114 +++++++++++++++++++++++++-- + fs/xfs/xfs_mount.c | 92 +++++++++++++++------- + fs/xfs/xfs_mount.h | 4 - + fs/xfs/xfs_qm.c | 175 +++++++++++++++++++++-------------------- + fs/xfs/xfs_qm.h | 83 ++++++++++++++------ + fs/xfs/xfs_qm_syscalls.c | 51 ++++++------ + fs/xfs/xfs_quota.h | 47 ++++++----- + fs/xfs/xfs_quotaops.c | 6 +- + fs/xfs/xfs_sb.h | 6 ++ + fs/xfs/xfs_super.c | 39 ++++++---- + fs/xfs/xfs_symlink.c | 51 +++++++++++- + fs/xfs/xfs_symlink.h | 2 +- + fs/xfs/xfs_sysctl.c | 26 +++---- + fs/xfs/xfs_trace.h | 5 ++ + fs/xfs/xfs_trans.c | 118 ++++++++++++++++++---------- + fs/xfs/xfs_trans.h | 16 ++-- + fs/xfs/xfs_trans_buf.c | 34 +++++++- + fs/xfs/xfs_trans_dquot.c | 87 +++++++++------------ + fs/xfs/xfs_trans_inode.c | 11 +++ + fs/xfs/xfs_vnodeops.c | 15 +--- + 43 files changed, 1180 insertions(+), 477 deletions(-) + create mode 100644 fs/xfs/xfs_icreate_item.c + create mode 100644 fs/xfs/xfs_icreate_item.h +Merging vfs/for-next (d405be4 ext4: ->tmpfile() support) +$ git merge --no-ff vfs/for-next +Auto-merging security/selinux/hooks.c +Auto-merging include/linux/fs.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging fs/xfs/xfs_dir2_leaf.c +Auto-merging fs/splice.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfs/nfs4state.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/jfs/namei.c +Auto-merging fs/jfs/jfs_dtree.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/dir.h +Auto-merging fs/gfs2/dir.c +Auto-merging fs/fuse/file.c +Auto-merging fs/f2fs/dir.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/inline.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext3/namei.c +Auto-merging fs/exec.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/dcache.c +Auto-merging fs/cifs/readdir.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/cifsfs.h +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/locks.c +Auto-merging fs/ceph/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging drivers/block/loop.h +Auto-merging arch/xtensa/include/asm/pgtable.h +Auto-merging arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/powerpc/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm/include/asm/pgtable.h +Auto-merging arch/arc/kernel/troubleshoot.c +Auto-merging arch/arc/include/asm/pgtable.h +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 35 +- + Documentation/filesystems/porting | 6 + + Documentation/filesystems/vfs.txt | 23 +- + arch/alpha/include/asm/pgtable.h | 3 - + arch/alpha/include/uapi/asm/fcntl.h | 1 + + arch/alpha/kernel/osf_sys.c | 15 +- + arch/alpha/kernel/pci-sysfs.c | 1 - + arch/arc/include/asm/pgtable.h | 3 - + arch/arc/kernel/troubleshoot.c | 2 +- + arch/arm/include/asm/pgtable-nommu.h | 2 - + arch/arm/include/asm/pgtable.h | 7 - + arch/arm64/include/asm/pgtable.h | 7 - + arch/avr32/include/asm/pgtable.h | 3 - + arch/blackfin/include/asm/pgtable.h | 1 - + arch/c6x/include/asm/pgtable.h | 1 - + arch/cris/include/asm/pgtable.h | 3 - + arch/frv/include/asm/pgtable.h | 3 - + arch/h8300/include/asm/pgtable.h | 3 - + arch/hexagon/include/asm/pgtable.h | 4 - + arch/ia64/include/asm/pgtable.h | 3 - + arch/ia64/kernel/elfcore.c | 13 +- + arch/m32r/include/asm/pgtable.h | 3 - + arch/m68k/include/asm/pgtable_mm.h | 3 - + arch/m68k/include/asm/pgtable_no.h | 3 - + arch/metag/include/asm/pgtable.h | 3 - + arch/microblaze/include/asm/pgtable.h | 3 - + arch/mips/include/asm/pgtable.h | 4 +- + arch/mn10300/include/asm/pgtable.h | 3 - + arch/mn10300/unit-asb2305/pci-asb2305.c | 2 +- + arch/openrisc/include/asm/pgtable.h | 3 - + arch/parisc/hpux/fs.c | 16 +- + arch/parisc/include/asm/pgtable.h | 3 - + arch/parisc/include/uapi/asm/fcntl.h | 1 + + arch/powerpc/include/asm/pgtable.h | 3 - + arch/powerpc/include/asm/spu.h | 3 +- + arch/powerpc/kernel/proc_powerpc.c | 20 +- + arch/powerpc/platforms/cell/spu_syscalls.c | 4 +- + arch/powerpc/platforms/cell/spufs/coredump.c | 64 +--- + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/powerpc/platforms/cell/spufs/spufs.h | 2 +- + arch/s390/include/asm/pgtable.h | 3 - + arch/score/include/asm/pgtable.h | 3 - + arch/sh/include/asm/pgtable.h | 3 - + arch/sparc/include/asm/pgtable_32.h | 1 + + arch/sparc/include/asm/pgtable_64.h | 1 + + arch/sparc/include/uapi/asm/fcntl.h | 1 + + arch/sparc/kernel/pci.c | 10 - + arch/tile/include/asm/pgtable.h | 3 - + arch/um/include/asm/pgtable.h | 2 - + arch/unicore32/include/asm/pgtable.h | 7 - + arch/x86/ia32/ia32_aout.c | 20 +- + arch/x86/include/asm/pgtable.h | 3 - + arch/x86/um/elfcore.c | 16 +- + arch/xtensa/include/asm/pgtable.h | 8 - + drivers/block/cryptoloop.c | 2 +- + drivers/block/loop.c | 2 +- + {include/linux => drivers/block}/loop.h | 2 +- + drivers/char/ps3flash.c | 28 +- + drivers/char/tile-srom.c | 28 +- + drivers/gpu/drm/drm_vm.c | 1 - + drivers/gpu/drm/i810/i810_dma.c | 2 +- + drivers/mtd/mtdchar.c | 20 +- + drivers/mtd/ubi/cdev.c | 26 +- + drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 22 +- + drivers/net/wireless/ti/wlcore/debugfs.c | 4 +- + drivers/parisc/eisa_eeprom.c | 15 +- + drivers/pci/hotplug/cpqphp_sysfs.c | 22 +- + drivers/pci/proc.c | 23 +- + drivers/pnp/isapnp/proc.c | 22 +- + drivers/scsi/bfa/bfad_debugfs.c | 28 +- + drivers/scsi/fnic/fnic_debugfs.c | 16 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 18 +- + drivers/staging/android/logger.c | 2 +- + drivers/staging/comedi/comedi_fops.c | 3 - + drivers/tty/vt/vc_screen.c | 17 +- + drivers/vfio/pci/vfio_pci.c | 1 - + drivers/video/au1100fb.c | 2 - + drivers/video/au1200fb.c | 4 - + drivers/video/pxa3xx-gcu.c | 1 - + drivers/zorro/proc.c | 22 +- + fs/9p/vfs_dir.c | 72 ++-- + fs/adfs/dir.c | 48 +-- + fs/affs/dir.c | 69 ++-- + fs/affs/namei.c | 26 +- + fs/afs/dir.c | 99 ++--- + fs/afs/flock.c | 7 +- + fs/aio.c | 2 + + fs/autofs4/root.c | 4 +- + fs/bad_inode.c | 4 +- + fs/befs/linuxvfs.c | 40 +- + fs/bfs/dir.c | 35 +- + fs/binfmt_aout.c | 9 +- + fs/binfmt_elf.c | 84 ++--- + fs/binfmt_elf_fdpic.c | 87 ++--- + fs/block_dev.c | 23 +- + fs/btrfs/delayed-inode.c | 9 +- + fs/btrfs/delayed-inode.h | 3 +- + fs/btrfs/file.c | 15 +- + fs/btrfs/inode.c | 49 +-- + fs/btrfs/ioctl.c | 8 +- + fs/ceph/dir.c | 99 +++-- + fs/ceph/file.c | 11 +- + fs/ceph/locks.c | 2 +- + fs/ceph/mds_client.c | 8 +- + fs/cifs/cifsfs.c | 4 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/dir.c | 9 +- + fs/cifs/file.c | 15 +- + fs/cifs/readdir.c | 178 ++++----- + fs/coda/dir.c | 74 +--- + fs/compat.c | 43 +-- + fs/compat_ioctl.c | 3 - + fs/configfs/dir.c | 122 +++---- + fs/coredump.c | 62 ++-- + fs/cramfs/inode.c | 21 +- + fs/dcache.c | 66 ++-- + fs/ecryptfs/crypto.c | 5 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/file.c | 44 +-- + fs/ecryptfs/inode.c | 2 +- + fs/efivarfs/super.c | 9 +- + fs/efs/dir.c | 75 ++-- + fs/exec.c | 10 +- + fs/exofs/dir.c | 38 +- + fs/exportfs/expfs.c | 14 +- + fs/ext2/dir.c | 27 +- + fs/ext2/namei.c | 24 ++ + fs/ext3/dir.c | 157 ++++---- + fs/ext3/namei.c | 47 ++- + fs/ext4/dir.c | 158 ++++---- + fs/ext4/ext4.h | 2 +- + fs/ext4/file.c | 24 +- + fs/ext4/inline.c | 164 ++++----- + fs/ext4/namei.c | 47 ++- + fs/f2fs/dir.c | 36 +- + fs/fat/dir.c | 104 +++--- + fs/fat/namei_msdos.c | 6 +- + fs/fat/namei_vfat.c | 12 +- + fs/file_table.c | 2 +- + fs/freevxfs/vxfs_lookup.c | 55 ++- + fs/fuse/dir.c | 37 +- + fs/fuse/file.c | 3 +- + fs/gfs2/dentry.c | 3 +- + fs/gfs2/dir.c | 56 ++- + fs/gfs2/dir.h | 4 +- + fs/gfs2/export.c | 10 +- + fs/gfs2/file.c | 25 +- + fs/hfs/dir.c | 49 ++- + fs/hfs/hfs_fs.h | 7 +- + fs/hfs/string.c | 6 +- + fs/hfsplus/dir.c | 50 ++- + fs/hfsplus/hfsplus_fs.h | 7 +- + fs/hfsplus/unicode.c | 7 +- + fs/hostfs/hostfs_kern.c | 13 +- + fs/hpfs/dentry.c | 7 +- + fs/hpfs/dir.c | 56 +-- + fs/hppfs/hppfs.c | 33 +- + fs/inode.c | 4 +- + fs/internal.h | 6 +- + fs/isofs/dir.c | 42 +-- + fs/isofs/inode.c | 48 +-- + fs/isofs/namei.c | 3 +- + fs/jffs2/dir.c | 52 +-- + fs/jfs/jfs_dtree.c | 63 ++-- + fs/jfs/jfs_dtree.h | 2 +- + fs/jfs/namei.c | 9 +- + fs/libfs.c | 80 ++-- + fs/lockd/svclock.c | 14 +- + fs/lockd/svcsubs.c | 12 +- + fs/locks.c | 281 +++++++++----- + fs/logfs/dir.c | 49 +-- + fs/minix/dir.c | 42 +-- + fs/minix/namei.c | 13 + + fs/namei.c | 113 ++++-- + fs/ncpfs/dir.c | 123 +++---- + fs/ncpfs/inode.c | 4 + + fs/nfs/delegation.c | 10 +- + fs/nfs/dir.c | 51 ++- + fs/nfs/nfs4state.c | 8 +- + fs/nfsd/nfs4recover.c | 20 +- + fs/nfsd/nfs4state.c | 8 +- + fs/nfsd/vfs.c | 9 +- + fs/nilfs2/dir.c | 48 +-- + fs/notify/fanotify/fanotify_user.c | 3 - + fs/ntfs/dir.c | 84 ++--- + fs/ocfs2/dir.c | 151 +++----- + fs/ocfs2/dir.h | 5 +- + fs/ocfs2/file.c | 16 +- + fs/ocfs2/journal.c | 14 +- + fs/omfs/dir.c | 94 ++--- + fs/open.c | 63 ++-- + fs/openpromfs/inode.c | 95 +++-- + fs/proc/base.c | 462 +++++++++--------------- + fs/proc/fd.c | 114 +++--- + fs/proc/generic.c | 100 ++--- + fs/proc/internal.h | 10 +- + fs/proc/namespaces.c | 87 ++--- + fs/proc/proc_net.c | 9 +- + fs/proc/proc_sysctl.c | 78 ++-- + fs/proc/root.c | 19 +- + fs/qnx4/dir.c | 66 ++-- + fs/qnx6/dir.c | 31 +- + fs/read_write.c | 65 +++- + fs/readdir.c | 56 +-- + fs/reiserfs/dir.c | 36 +- + fs/reiserfs/reiserfs.h | 2 +- + fs/reiserfs/xattr.c | 33 +- + fs/romfs/super.c | 21 +- + fs/splice.c | 38 +- + fs/squashfs/dir.c | 40 +- + fs/sysfs/dir.c | 66 +--- + fs/sysv/dir.c | 37 +- + fs/sysv/namei.c | 3 +- + fs/ubifs/dir.c | 57 +-- + fs/udf/dir.c | 63 ++-- + fs/udf/namei.c | 24 ++ + fs/ufs/dir.c | 28 +- + fs/xfs/xfs_dir2.c | 13 +- + fs/xfs/xfs_dir2_block.c | 17 +- + fs/xfs/xfs_dir2_leaf.c | 18 +- + fs/xfs/xfs_dir2_priv.h | 11 +- + fs/xfs/xfs_dir2_sf.c | 31 +- + fs/xfs/xfs_file.c | 18 +- + fs/xfs/xfs_vnodeops.h | 3 +- + include/asm-generic/pgtable.h | 4 + + include/linux/binfmts.h | 1 + + include/linux/coredump.h | 5 +- + include/linux/dcache.h | 11 +- + include/linux/elf.h | 7 +- + include/linux/elfcore.h | 5 +- + include/linux/fs.h | 96 +++-- + include/linux/fsnotify.h | 8 +- + include/uapi/asm-generic/fcntl.h | 4 + + kernel/elfcore.c | 6 +- + mm/shmem.c | 37 +- + net/sunrpc/auth_gss/svcauth_gss.c | 4 +- + security/integrity/ima/ima_main.c | 2 +- + security/selinux/hooks.c | 24 +- + sound/core/pcm_native.c | 40 +- + sound/soc/samsung/idma.c | 1 - + 240 files changed, 3056 insertions(+), 4041 deletions(-) + rename {include/linux => drivers/block}/loop.h (98%) +Merging pci/next (a0f75f9 Merge branch 'pci/misc' into next) +$ git merge --no-ff pci/next +Resolved 'arch/ia64/sn/kernel/io_init.c' using previous resolution. +Resolved 'drivers/acpi/pci_root.c' using previous resolution. +Resolved 'drivers/pci/probe.c' using previous resolution. +Resolved 'include/linux/aer.h' using previous resolution. +Auto-merging include/linux/pci.h +Auto-merging include/linux/aer.h +CONFLICT (content): Merge conflict in include/linux/aer.h +Auto-merging include/acpi/acpi_bus.h +Auto-merging drivers/pci/probe.c +CONFLICT (content): Merge conflict in drivers/pci/probe.c +Auto-merging drivers/pci/pcie/aer/aerdrv_core.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/ata/ahci.c +Auto-merging drivers/acpi/pci_root.c +CONFLICT (content): Merge conflict in drivers/acpi/pci_root.c +Auto-merging drivers/acpi/apei/ghes.c +Auto-merging arch/sparc/kernel/pci.c +Auto-merging arch/ia64/sn/kernel/io_init.c +CONFLICT (content): Merge conflict in arch/ia64/sn/kernel/io_init.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2c035be] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/i2c/busses/i2c-piix4 | 2 +- + MAINTAINERS | 3 + + arch/ia64/sn/kernel/io_init.c | 2 - + arch/m68k/platform/coldfire/pci.c | 1 - + arch/powerpc/kernel/pci_of_scan.c | 5 +- + arch/sparc/kernel/pci.c | 5 +- + arch/unicore32/kernel/pci.c | 5 -- + arch/x86/pci/acpi.c | 7 +-- + drivers/acpi/apei/ghes.c | 10 ++++ + drivers/acpi/pci_root.c | 101 +++++++++++++------------------- + drivers/ata/ahci.c | 1 + + drivers/char/agp/alpha-agp.c | 2 +- + drivers/char/agp/parisc-agp.c | 2 +- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-piix4.c | 3 +- + drivers/iommu/irq_remapping.c | 12 ++-- + drivers/pci/bus.c | 15 +++++ + drivers/pci/ioapic.c | 13 +---- + drivers/pci/iov.c | 65 +++++++++------------ + drivers/pci/msi.c | 10 +++- + drivers/pci/pci-acpi.c | 10 ++-- + drivers/pci/pci-sysfs.c | 48 ++++++++++++---- + drivers/pci/pci.c | 4 +- + drivers/pci/pcie/aer/aerdrv.h | 4 -- + drivers/pci/pcie/aer/aerdrv_acpi.c | 47 +++++++-------- + drivers/pci/pcie/aer/aerdrv_core.c | 17 +++--- + drivers/pci/pcie/aspm.c | 29 +++++++--- + drivers/pci/pcie/pme.c | 2 +- + drivers/pci/probe.c | 114 +++++++++++++++++++++++-------------- + drivers/pci/quirks.c | 33 +++++++++-- + drivers/scsi/megaraid.c | 2 +- + include/acpi/acpi_bus.h | 1 - + include/linux/aer.h | 21 ++++--- + include/linux/msi.h | 1 + + include/linux/pci.h | 5 +- + include/linux/pci_ids.h | 7 ++- + include/uapi/linux/pci_regs.h | 2 +- + 37 files changed, 348 insertions(+), 264 deletions(-) +Merging hid/for-next (ce07632 Merge branch 'for-3.11/wiimote' into for-next) +$ git merge --no-ff hid/for-next +Removing drivers/hid/hid-wiimote-ext.c +Removing drivers/hid/hid-ps3remote.c +Auto-merging drivers/hid/hid-multitouch.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-hid-wiimote | 39 +- + drivers/hid/Kconfig | 63 +- + drivers/hid/Makefile | 9 +- + drivers/hid/hid-core.c | 11 +- + drivers/hid/hid-elo.c | 273 +++ + drivers/hid/hid-holtek-mouse.c | 77 + + drivers/hid/hid-huion.c | 177 ++ + drivers/hid/hid-hyperv.c | 4 +- + drivers/hid/hid-ids.h | 21 +- + drivers/hid/hid-input.c | 11 +- + drivers/hid/hid-multitouch.c | 34 +- + drivers/hid/hid-ps3remote.c | 204 -- + drivers/hid/hid-roccat.c | 16 +- + drivers/hid/hid-sony.c | 473 ++++- + drivers/hid/hid-wiimote-core.c | 1658 ++++++++++------ + drivers/hid/hid-wiimote-debug.c | 14 +- + drivers/hid/hid-wiimote-ext.c | 849 -------- + drivers/hid/hid-wiimote-modules.c | 2086 ++++++++++++++++++++ + drivers/hid/hid-wiimote.h | 217 +- + drivers/hid/i2c-hid/i2c-hid.c | 20 +- + include/uapi/linux/input.h | 17 +- + net/bluetooth/hidp/core.c | 56 +- + net/bluetooth/hidp/hidp.h | 2 + + 23 files changed, 4604 insertions(+), 1727 deletions(-) + create mode 100644 drivers/hid/hid-elo.c + create mode 100644 drivers/hid/hid-holtek-mouse.c + create mode 100644 drivers/hid/hid-huion.c + delete mode 100644 drivers/hid/hid-ps3remote.c + delete mode 100644 drivers/hid/hid-wiimote-ext.c + create mode 100644 drivers/hid/hid-wiimote-modules.c +Merging i2c/i2c/for-next (4c730a0 i2c: mv64xxx: Set bus frequency to 100kHz if clock-frequency is not provided) +$ git merge --no-ff i2c/i2c/for-next +Removing drivers/i2c/busses/i2c-intel-mid.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 6 +- + .../devicetree/bindings/i2c/i2c-vt8500.txt | 24 + + Documentation/i2c/busses/i2c-i801 | 1 + + MAINTAINERS | 1 + + drivers/i2c/busses/Kconfig | 24 +- + drivers/i2c/busses/Makefile | 2 +- + drivers/i2c/busses/i2c-bfin-twi.c | 47 +- + drivers/i2c/busses/i2c-cpm.c | 4 +- + drivers/i2c/busses/i2c-davinci.c | 8 +- + drivers/i2c/busses/i2c-designware-core.c | 17 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 8 +- + drivers/i2c/busses/i2c-i801.c | 3 + + drivers/i2c/busses/i2c-ibm_iic.c | 4 +- + drivers/i2c/busses/i2c-imx.c | 15 +- + drivers/i2c/busses/i2c-intel-mid.c | 1121 -------------------- + drivers/i2c/busses/i2c-mpc.c | 4 +- + drivers/i2c/busses/i2c-mv64xxx.c | 321 +++--- + drivers/i2c/busses/i2c-mxs.c | 6 - + drivers/i2c/busses/i2c-nomadik.c | 52 +- + drivers/i2c/busses/i2c-omap.c | 23 +- + drivers/i2c/busses/i2c-pxa.c | 6 +- + drivers/i2c/busses/i2c-rcar.c | 7 +- + drivers/i2c/busses/i2c-wmt.c | 479 +++++++++ + 23 files changed, 796 insertions(+), 1387 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-vt8500.txt + delete mode 100644 drivers/i2c/busses/i2c-intel-mid.c + create mode 100644 drivers/i2c/busses/i2c-wmt.c +Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge --no-ff jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (a50d9a4 hwmon: (ds1621) Fix temperature rounding operations) +$ git merge --no-ff hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/hwmon/g762.txt | 47 + + Documentation/devicetree/bindings/i2c/ina2xx.txt | 22 + + Documentation/hwmon/ds1621 | 144 ++- + Documentation/hwmon/g762 | 65 ++ + Documentation/hwmon/ina2xx | 4 +- + drivers/hwmon/Kconfig | 21 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/abituguru3.c | 1 - + drivers/hwmon/adm1021.c | 32 +- + drivers/hwmon/coretemp.c | 2 - + drivers/hwmon/ds1621.c | 226 ++++- + drivers/hwmon/g762.c | 1149 ++++++++++++++++++++++ + drivers/hwmon/i5k_amb.c | 2 - + drivers/hwmon/iio_hwmon.c | 1 + + drivers/hwmon/ina2xx.c | 5 + + drivers/hwmon/nct6775.c | 92 +- + drivers/hwmon/ntc_thermistor.c | 1 - + drivers/hwmon/w83627ehf.c | 2 - + include/linux/platform_data/g762.h | 37 + + 19 files changed, 1743 insertions(+), 111 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/g762.txt + create mode 100644 Documentation/devicetree/bindings/i2c/ina2xx.txt + create mode 100644 Documentation/hwmon/g762 + create mode 100644 drivers/hwmon/g762.c + create mode 100644 include/linux/platform_data/g762.h +Merging v4l-dvb/master (17a6961 Merge /home/v4l/v4l/patchwork) +$ git merge --no-ff v4l-dvb/master +Removing include/media/v4l2-chip-ident.h +Auto-merging drivers/media/platform/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml +Merge made by the 'recursive' strategy. + Documentation/DocBook/media/v4l/compat.xml | 14 +- + Documentation/DocBook/media/v4l/v4l2.xml | 11 +- + .../DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml | 271 -- + .../DocBook/media/v4l/vidioc-dbg-g-chip-info.xml | 20 +- + .../DocBook/media/v4l/vidioc-dbg-g-register.xml | 64 +- + .../DocBook/media/v4l/vidioc-querystd.xml | 3 +- + .../devicetree/bindings/media/exynos-fimc-lite.txt | 6 +- + .../devicetree/bindings/media/i2c/mt9p031.txt | 40 + + .../devicetree/bindings/media/i2c/tvp514x.txt | 44 + + .../devicetree/bindings/media/samsung-fimc.txt | 26 +- + .../bindings/media/samsung-mipi-csis.txt | 4 +- + .../devicetree/bindings/media/sh_mobile_ceu.txt | 18 + + Documentation/media-framework.txt | 2 +- + Documentation/video4linux/CARDLIST.bttv | 3 + + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/CARDLIST.tuner | 6 +- + Documentation/video4linux/fimc.txt | 21 +- + Documentation/video4linux/v4l2-framework.txt | 103 +- + Documentation/zh_CN/video4linux/v4l2-framework.txt | 13 +- + MAINTAINERS | 18 +- + arch/arm/mach-davinci/board-dm365-evm.c | 1 - + drivers/base/dma-buf.c | 5 +- + drivers/media/common/saa7146/saa7146_video.c | 23 - + drivers/media/common/siano/smscoreapi.c | 23 +- + drivers/media/common/siano/smsdvb-main.c | 1 + + drivers/media/common/tveeprom.c | 142 +- + drivers/media/dvb-core/dmxdev.c | 8 +- + drivers/media/dvb-core/dvb-usb-ids.h | 2 + + drivers/media/dvb-frontends/au8522_decoder.c | 21 - + drivers/media/dvb-frontends/dib8000.c | 4 +- + drivers/media/dvb-frontends/drxk.h | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 3154 ++++++++++---------- + drivers/media/dvb-frontends/drxk_hard.h | 277 +- + drivers/media/dvb-frontends/stb0899_algo.c | 105 +- + drivers/media/dvb-frontends/stb0899_drv.c | 7 +- + drivers/media/dvb-frontends/stb0899_drv.h | 5 +- + drivers/media/i2c/Kconfig | 18 + + drivers/media/i2c/Makefile | 2 + + drivers/media/i2c/ad9389b.c | 35 +- + drivers/media/i2c/adp1653.c | 5 +- + drivers/media/i2c/adv7170.c | 16 +- + drivers/media/i2c/adv7175.c | 12 +- + drivers/media/i2c/adv7180.c | 79 +- + drivers/media/i2c/adv7183.c | 80 +- + drivers/media/i2c/adv7343.c | 10 - + drivers/media/i2c/adv7393.c | 18 +- + drivers/media/i2c/adv7604.c | 33 +- + drivers/media/i2c/ak881x.c | 39 +- + drivers/media/i2c/as3645a.c | 7 +- + drivers/media/i2c/bt819.c | 26 +- + drivers/media/i2c/bt856.c | 12 +- + drivers/media/i2c/bt866.c | 16 +- + drivers/media/i2c/cs5345.c | 25 +- + drivers/media/i2c/cs53l32a.c | 14 +- + drivers/media/i2c/cx25840/cx25840-core.c | 72 +- + drivers/media/i2c/cx25840/cx25840-core.h | 34 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 7 +- + drivers/media/i2c/ir-kbd-i2c.c | 10 +- + drivers/media/i2c/ks0127.c | 36 +- + drivers/media/i2c/m52790.c | 22 +- + drivers/media/i2c/m5mols/m5mols_core.c | 43 +- + drivers/media/i2c/ml86v7667.c | 431 +++ + drivers/media/i2c/msp3400-driver.c | 15 +- + drivers/media/i2c/mt9m032.c | 13 +- + drivers/media/i2c/mt9p031.c | 87 +- + drivers/media/i2c/mt9t001.c | 4 +- + drivers/media/i2c/mt9v011.c | 34 +- + drivers/media/i2c/mt9v032.c | 8 +- + drivers/media/i2c/noon010pc30.c | 41 +- + drivers/media/i2c/ov7640.c | 6 +- + drivers/media/i2c/ov7670.c | 26 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 88 +- + drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 4 +- + drivers/media/i2c/s5k6aa.c | 73 +- + drivers/media/i2c/saa6588.c | 19 +- + drivers/media/i2c/saa7110.c | 17 +- + drivers/media/i2c/saa7115.c | 297 +- + drivers/media/i2c/saa7127.c | 55 +- + drivers/media/i2c/saa717x.c | 16 +- + drivers/media/i2c/saa7185.c | 12 +- + drivers/media/i2c/saa7191.c | 28 +- + drivers/media/i2c/smiapp/smiapp-core.c | 20 +- + drivers/media/i2c/soc_camera/imx074.c | 51 +- + drivers/media/i2c/soc_camera/mt9m001.c | 50 +- + drivers/media/i2c/soc_camera/mt9m111.c | 53 +- + drivers/media/i2c/soc_camera/mt9t031.c | 54 +- + drivers/media/i2c/soc_camera/mt9t112.c | 35 +- + drivers/media/i2c/soc_camera/mt9v022.c | 64 +- + drivers/media/i2c/soc_camera/ov2640.c | 35 +- + drivers/media/i2c/soc_camera/ov5642.c | 39 +- + drivers/media/i2c/soc_camera/ov6650.c | 29 +- + drivers/media/i2c/soc_camera/ov772x.c | 31 +- + drivers/media/i2c/soc_camera/ov9640.c | 35 +- + drivers/media/i2c/soc_camera/ov9640.h | 1 + + drivers/media/i2c/soc_camera/ov9740.c | 35 +- + drivers/media/i2c/soc_camera/rj54n1cb0c.c | 48 +- + drivers/media/i2c/soc_camera/tw9910.c | 33 +- + drivers/media/i2c/sony-btf-mpx.c | 5 +- + drivers/media/i2c/sr030pc30.c | 280 +- + drivers/media/i2c/tda7432.c | 4 +- + drivers/media/i2c/tda9840.c | 16 +- + drivers/media/i2c/tea6415c.c | 16 +- + drivers/media/i2c/tea6420.c | 16 +- + drivers/media/i2c/ths7303.c | 81 +- + drivers/media/i2c/ths8200.c | 556 ++++ + drivers/media/i2c/ths8200_regs.h | 161 + + drivers/media/i2c/tlv320aic23b.c | 4 +- + drivers/media/i2c/tvaudio.c | 14 +- + drivers/media/i2c/tvp514x.c | 87 +- + drivers/media/i2c/tvp5150.c | 50 +- + drivers/media/i2c/tvp7002.c | 143 +- + drivers/media/i2c/tw2804.c | 6 +- + drivers/media/i2c/tw9903.c | 5 +- + drivers/media/i2c/tw9906.c | 5 +- + drivers/media/i2c/uda1342.c | 3 +- + drivers/media/i2c/upd64031a.c | 24 +- + drivers/media/i2c/upd64083.c | 24 +- + drivers/media/i2c/vp27smpx.c | 12 +- + drivers/media/i2c/vpx3220.c | 29 +- + drivers/media/i2c/vs6624.c | 46 +- + drivers/media/i2c/wm8739.c | 13 +- + drivers/media/i2c/wm8775.c | 13 +- + drivers/media/media-device.c | 3 + + drivers/media/media-entity.c | 81 +- + drivers/media/parport/bw-qcam.c | 2 + + drivers/media/pci/Kconfig | 4 +- + drivers/media/pci/b2c2/flexcop-pci.c | 13 +- + drivers/media/pci/bt8xx/bttv-cards.c | 52 +- + drivers/media/pci/bt8xx/bttv-driver.c | 48 +- + drivers/media/pci/bt8xx/bttv.h | 4 + + drivers/media/pci/cx18/cx18-av-core.c | 36 - + drivers/media/pci/cx18/cx18-av-core.h | 1 - + drivers/media/pci/cx18/cx18-ioctl.c | 82 +- + drivers/media/pci/cx23885/cx23885-417.c | 9 +- + drivers/media/pci/cx23885/cx23885-ioctl.c | 145 +- + drivers/media/pci/cx23885/cx23885-ioctl.h | 4 +- + drivers/media/pci/cx23885/cx23885-video.c | 9 +- + drivers/media/pci/cx23885/cx23888-ir.c | 31 - + drivers/media/pci/cx88/cx88-cards.c | 12 +- + drivers/media/pci/cx88/cx88-core.c | 7 + + drivers/media/pci/cx88/cx88-video.c | 25 +- + drivers/media/pci/cx88/cx88.h | 8 +- + drivers/media/pci/dm1105/dm1105.c | 13 +- + drivers/media/pci/ivtv/ivtv-driver.c | 8 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 45 +- + drivers/media/pci/mantis/hopper_cards.c | 13 +- + drivers/media/pci/mantis/mantis_cards.c | 13 +- + drivers/media/pci/mantis/mantis_vp1041.c | 2 +- + drivers/media/pci/pluto2/pluto2.c | 13 +- + drivers/media/pci/pt1/pt1.c | 15 +- + drivers/media/pci/saa7134/saa6752hs.c | 525 +--- + drivers/media/pci/saa7134/saa7134-empress.c | 33 +- + drivers/media/pci/saa7134/saa7134-video.c | 260 +- + drivers/media/pci/saa7134/saa7134.h | 17 +- + drivers/media/pci/saa7146/mxb.c | 23 +- + drivers/media/pci/saa7164/saa7164-core.c | 8 + + drivers/media/pci/saa7164/saa7164-encoder.c | 58 +- + drivers/media/pci/saa7164/saa7164-vbi.c | 24 +- + drivers/media/pci/saa7164/saa7164.h | 5 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 3 +- + drivers/media/pci/ttpci/budget-av.c | 2 +- + drivers/media/pci/ttpci/budget-ci.c | 2 +- + drivers/media/pci/zoran/zoran_card.c | 2 +- + drivers/media/pci/zoran/zoran_driver.c | 23 - + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/blackfin/bfin_capture.c | 81 +- + drivers/media/platform/blackfin/ppi.c | 12 + + drivers/media/platform/coda.c | 635 ++-- + drivers/media/platform/coda.h | 11 +- + drivers/media/platform/davinci/vpbe_display.c | 31 +- + drivers/media/platform/davinci/vpbe_osd.c | 24 +- + drivers/media/platform/davinci/vpif.c | 45 +- + drivers/media/platform/davinci/vpif_capture.c | 160 +- + drivers/media/platform/davinci/vpif_capture.h | 5 +- + drivers/media/platform/davinci/vpif_display.c | 153 +- + drivers/media/platform/davinci/vpif_display.h | 5 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 2 +- + drivers/media/platform/exynos4-is/Kconfig | 7 +- + drivers/media/platform/exynos4-is/Makefile | 5 +- + drivers/media/platform/exynos4-is/common.c | 53 + + drivers/media/platform/exynos4-is/common.h | 16 + + drivers/media/platform/exynos4-is/fimc-capture.c | 412 +-- + drivers/media/platform/exynos4-is/fimc-core.c | 11 - + drivers/media/platform/exynos4-is/fimc-core.h | 15 +- + drivers/media/platform/exynos4-is/fimc-is-i2c.c | 2 +- + drivers/media/platform/exynos4-is/fimc-is-param.c | 84 +- + drivers/media/platform/exynos4-is/fimc-is-regs.c | 4 +- + drivers/media/platform/exynos4-is/fimc-is.c | 12 +- + drivers/media/platform/exynos4-is/fimc-is.h | 12 +- + drivers/media/platform/exynos4-is/fimc-isp.c | 130 +- + drivers/media/platform/exynos4-is/fimc-isp.h | 21 +- + drivers/media/platform/exynos4-is/fimc-lite-reg.c | 55 +- + drivers/media/platform/exynos4-is/fimc-lite-reg.h | 10 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 321 +- + drivers/media/platform/exynos4-is/fimc-lite.h | 35 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 1 + + drivers/media/platform/exynos4-is/fimc-reg.c | 7 +- + drivers/media/platform/exynos4-is/media-dev.c | 272 +- + drivers/media/platform/exynos4-is/media-dev.h | 54 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 67 +- + drivers/media/platform/fsl-viu.c | 2 +- + drivers/media/platform/indycam.c | 12 - + drivers/media/platform/m2m-deinterlace.c | 1 + + drivers/media/platform/marvell-ccic/cafe-driver.c | 4 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 67 +- + drivers/media/platform/marvell-ccic/mcam-core.h | 9 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 4 +- + drivers/media/platform/mem2mem_testdev.c | 3 +- + drivers/media/platform/mx2_emmaprp.c | 1 + + drivers/media/platform/omap/omap_vout.c | 3 +- + drivers/media/platform/omap24xxcam.c | 9 +- + drivers/media/platform/omap24xxcam.h | 3 + + drivers/media/platform/omap3isp/isp.c | 51 +- + drivers/media/platform/omap3isp/ispccdc.c | 2 +- + drivers/media/platform/omap3isp/ispccp2.c | 21 +- + drivers/media/platform/omap3isp/ispcsi2.c | 2 +- + drivers/media/platform/omap3isp/ispqueue.h | 1 + + drivers/media/platform/omap3isp/ispvideo.c | 6 +- + drivers/media/platform/s3c-camif/camif-capture.c | 2 +- + drivers/media/platform/s3c-camif/camif-core.c | 6 +- + drivers/media/platform/s3c-camif/camif-regs.c | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 2 +- + drivers/media/platform/s5p-tv/hdmi_drv.c | 39 +- + drivers/media/platform/s5p-tv/mixer_drv.c | 22 +- + drivers/media/platform/s5p-tv/mixer_video.c | 3 +- + drivers/media/platform/s5p-tv/sdo_drv.c | 22 +- + drivers/media/platform/s5p-tv/sii9234_drv.c | 4 +- + drivers/media/platform/sh_veu.c | 5 +- + drivers/media/platform/sh_vou.c | 34 +- + drivers/media/platform/soc_camera/Kconfig | 12 +- + drivers/media/platform/soc_camera/Makefile | 6 +- + drivers/media/platform/soc_camera/atmel-isi.c | 38 +- + drivers/media/platform/soc_camera/mx1_camera.c | 48 +- + drivers/media/platform/soc_camera/mx2_camera.c | 41 +- + drivers/media/platform/soc_camera/mx3_camera.c | 44 +- + drivers/media/platform/soc_camera/omap1_camera.c | 41 +- + drivers/media/platform/soc_camera/pxa_camera.c | 46 +- + .../platform/soc_camera/sh_mobile_ceu_camera.c | 642 ++-- + drivers/media/platform/soc_camera/sh_mobile_csi2.c | 161 +- + drivers/media/platform/soc_camera/soc_camera.c | 737 ++++- + .../platform/soc_camera/soc_camera_platform.c | 14 +- + drivers/media/platform/soc_camera/soc_scale_crop.c | 402 +++ + drivers/media/platform/soc_camera/soc_scale_crop.h | 47 + + drivers/media/platform/timblogiw.c | 11 +- + drivers/media/platform/via-camera.c | 24 +- + drivers/media/radio/radio-keene.c | 7 +- + drivers/media/radio/radio-sf16fmi.c | 127 +- + drivers/media/radio/radio-si476x.c | 11 - + drivers/media/radio/radio-tea5764.c | 190 +- + drivers/media/radio/radio-timb.c | 81 +- + drivers/media/radio/saa7706h.c | 66 +- + drivers/media/radio/tef6862.c | 24 +- + drivers/media/radio/wl128x/fmdrv.h | 2 + + drivers/media/radio/wl128x/fmdrv_common.c | 24 +- + drivers/media/radio/wl128x/fmdrv_v4l2.c | 8 + + drivers/media/rc/gpio-ir-recv.c | 2 - + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-delock-61959.c | 83 + + drivers/media/tuners/r820t.c | 18 +- + drivers/media/usb/Kconfig | 5 +- + drivers/media/usb/Makefile | 1 + + drivers/media/usb/au0828/au0828-video.c | 40 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 1 - + drivers/media/usb/cx231xx/cx231xx-avcore.c | 1 - + drivers/media/usb/cx231xx/cx231xx-cards.c | 1 - + drivers/media/usb/cx231xx/cx231xx-vbi.c | 1 - + drivers/media/usb/cx231xx/cx231xx-video.c | 424 +-- + drivers/media/usb/cx231xx/cx231xx.h | 2 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 66 +- + drivers/media/usb/dvb-usb-v2/af9035.h | 11 +- + drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +- + drivers/media/usb/dvb-usb-v2/it913x.c | 5 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c | 8 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 90 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 180 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.h | 6 + + drivers/media/usb/dvb-usb/az6027.c | 2 +- + drivers/media/usb/dvb-usb/pctv452e.c | 2 +- + drivers/media/usb/em28xx/em28xx-cards.c | 239 +- + drivers/media/usb/em28xx/em28xx-core.c | 27 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 73 +- + drivers/media/usb/em28xx/em28xx-input.c | 1 - + drivers/media/usb/em28xx/em28xx-reg.h | 23 +- + drivers/media/usb/em28xx/em28xx-video.c | 66 +- + drivers/media/usb/em28xx/em28xx.h | 7 +- + drivers/media/usb/gspca/gspca.c | 32 +- + drivers/media/usb/gspca/gspca.h | 6 +- + drivers/media/usb/gspca/pac7302.c | 19 +- + drivers/media/usb/gspca/sn9c20x.c | 69 +- + drivers/media/usb/hdpvr/Kconfig | 2 +- + drivers/media/usb/hdpvr/hdpvr-control.c | 34 +- + drivers/media/usb/hdpvr/hdpvr-core.c | 8 - + drivers/media/usb/hdpvr/hdpvr-video.c | 110 +- + drivers/media/usb/hdpvr/hdpvr.h | 3 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 42 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 13 +- + drivers/media/usb/pvrusb2/pvrusb2-io.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 43 +- + drivers/media/usb/sn9c102/sn9c102.h | 3 + + drivers/media/usb/sn9c102/sn9c102_core.c | 13 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 41 - + drivers/media/usb/tm6000/tm6000-cards.c | 2 +- + drivers/media/usb/tm6000/tm6000-video.c | 13 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 2 + + drivers/media/usb/usbtv/Kconfig | 10 + + drivers/media/usb/usbtv/Makefile | 1 + + drivers/media/usb/usbtv/usbtv.c | 696 +++++ + drivers/media/usb/usbvision/usbvision-video.c | 19 +- + drivers/media/usb/uvc/Kconfig | 1 + + drivers/media/usb/uvc/uvc_driver.c | 41 +- + drivers/media/usb/uvc/uvc_status.c | 21 +- + drivers/media/usb/uvc/uvc_v4l2.c | 14 +- + drivers/media/usb/uvc/uvcvideo.h | 7 +- + drivers/media/v4l2-core/Makefile | 3 +- + drivers/media/v4l2-core/v4l2-async.c | 284 ++ + drivers/media/v4l2-core/v4l2-clk.c | 242 ++ + drivers/media/v4l2-core/v4l2-common.c | 60 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 1 - + drivers/media/v4l2-core/v4l2-dev.c | 40 +- + drivers/media/v4l2-core/v4l2-device.c | 13 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 83 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 19 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 10 +- + drivers/media/v4l2-core/videobuf-vmalloc.c | 10 +- + drivers/media/v4l2-core/videobuf2-core.c | 4 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 4 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 4 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 4 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 14 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 14 +- + drivers/staging/media/dt3155v4l/dt3155v4l.c | 1 - + drivers/staging/media/go7007/go7007-usb.c | 4 +- + drivers/staging/media/lirc/lirc_imon.c | 7 +- + drivers/staging/media/solo6x10/solo6x10-tw28.c | 112 +- + drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 38 +- + drivers/usb/gadget/f_uvc.c | 9 +- + drivers/usb/gadget/uvc.h | 2 + + include/media/davinci/vpbe_osd.h | 4 +- + include/media/media-device.h | 9 +- + include/media/media-entity.h | 5 +- + include/media/rc-map.h | 1 + + include/media/s5p_fimc.h | 58 +- + include/media/sh_mobile_ceu.h | 2 + + include/media/sh_mobile_csi2.h | 2 +- + include/media/soc_camera.h | 43 +- + include/media/ths7303.h | 2 - + include/media/tveeprom.h | 11 + + include/media/tvp7002.h | 46 +- + include/media/v4l2-async.h | 105 + + include/media/v4l2-chip-ident.h | 352 --- + include/media/v4l2-clk.h | 54 + + include/media/v4l2-common.h | 10 - + include/media/v4l2-dev.h | 5 +- + include/media/v4l2-int-device.h | 3 - + include/media/v4l2-ioctl.h | 2 - + include/media/v4l2-subdev.h | 14 +- + include/uapi/linux/v4l2-controls.h | 4 +- + include/uapi/linux/videodev2.h | 27 +- + 358 files changed, 10866 insertions(+), 9826 deletions(-) + delete mode 100644 Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml + create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/tvp514x.txt + create mode 100644 Documentation/devicetree/bindings/media/sh_mobile_ceu.txt + create mode 100644 drivers/media/i2c/ml86v7667.c + create mode 100644 drivers/media/i2c/ths8200.c + create mode 100644 drivers/media/i2c/ths8200_regs.h + create mode 100644 drivers/media/platform/exynos4-is/common.c + create mode 100644 drivers/media/platform/exynos4-is/common.h + create mode 100644 drivers/media/platform/soc_camera/soc_scale_crop.c + create mode 100644 drivers/media/platform/soc_camera/soc_scale_crop.h + create mode 100644 drivers/media/rc/keymaps/rc-delock-61959.c + create mode 100644 drivers/media/usb/usbtv/Kconfig + create mode 100644 drivers/media/usb/usbtv/Makefile + create mode 100644 drivers/media/usb/usbtv/usbtv.c + create mode 100644 drivers/media/v4l2-core/v4l2-async.c + create mode 100644 drivers/media/v4l2-core/v4l2-clk.c + create mode 100644 include/media/v4l2-async.h + delete mode 100644 include/media/v4l2-chip-ident.h + create mode 100644 include/media/v4l2-clk.h +Merging kbuild/for-next (8641c8f Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge --no-ff kbuild/for-next +Auto-merging scripts/Makefile.lib +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig.txt | 13 +++++ + MAINTAINERS | 2 + + Makefile | 6 ++- + scripts/Makefile.headersinst | 20 +++++--- + scripts/Makefile.lib | 2 +- + scripts/coccicheck | 14 ++++-- + scripts/coccinelle/free/kfreeaddr.cocci | 32 ++++++++++++ + scripts/config | 12 +++-- + scripts/headers_install.sh | 7 ++- + scripts/kconfig/conf.c | 6 ++- + scripts/kconfig/confdata.c | 33 +++++++++--- + scripts/kconfig/expr.h | 3 ++ + scripts/kconfig/lkc.h | 3 +- + scripts/kconfig/lkc_proto.h | 1 + + scripts/kconfig/lxdialog/checklist.c | 8 +-- + scripts/kconfig/lxdialog/dialog.h | 14 ++++++ + scripts/kconfig/lxdialog/inputbox.c | 8 +-- + scripts/kconfig/lxdialog/menubox.c | 6 +-- + scripts/kconfig/lxdialog/textbox.c | 6 +-- + scripts/kconfig/lxdialog/util.c | 46 ++++++++++------- + scripts/kconfig/lxdialog/yesno.c | 8 +-- + scripts/kconfig/mconf.c | 21 ++++---- + scripts/kconfig/menu.c | 16 ++++++ + scripts/kconfig/nconf.c | 39 +++++++++------ + scripts/kconfig/nconf.gui.c | 20 ++++---- + scripts/kconfig/symbol.c | 89 +++++++++++++++++++++++++++++---- + scripts/mod/Makefile | 15 ++---- + scripts/package/mkspec | 1 + + scripts/setlocalversion | 3 -- + 29 files changed, 333 insertions(+), 121 deletions(-) + create mode 100644 scripts/coccinelle/free/kfreeaddr.cocci +Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') +$ git merge --no-ff kconfig/for-next +Already up-to-date. +Merging libata/for-next (930ed52 Merge branch 'for-3.11' into for-next) +$ git merge --no-ff libata/for-next +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/ahci.c +Auto-merging drivers/ata/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-platform.txt | 5 + + Documentation/kernel-parameters.txt | 2 + + arch/arm/boot/dts/ecx-common.dtsi | 2 + + drivers/ata/Kconfig | 1 - + drivers/ata/acard-ahci.c | 4 +- + drivers/ata/ahci.c | 11 +- + drivers/ata/ahci.h | 2 + + drivers/ata/ahci_platform.c | 1 + + drivers/ata/ata_piix.c | 8 +- + drivers/ata/libahci.c | 26 ++- + drivers/ata/libata-core.c | 9 +- + drivers/ata/libata-pmp.c | 33 ++-- + drivers/ata/libata-scsi.c | 37 ++--- + drivers/ata/libata-transport.c | 4 +- + drivers/ata/libata-zpodd.c | 7 +- + drivers/ata/pata_ali.c | 2 +- + drivers/ata/pata_amd.c | 2 +- + drivers/ata/pata_arasan_cf.c | 2 +- + drivers/ata/pata_artop.c | 2 +- + drivers/ata/pata_at91.c | 2 +- + drivers/ata/pata_atp867x.c | 2 +- + drivers/ata/pata_bf54x.c | 10 +- + drivers/ata/pata_cmd640.c | 2 +- + drivers/ata/pata_cmd64x.c | 2 +- + drivers/ata/pata_cs5520.c | 4 +- + drivers/ata/pata_cs5530.c | 2 +- + drivers/ata/pata_hpt366.c | 2 +- + drivers/ata/pata_hpt3x3.c | 2 +- + drivers/ata/pata_imx.c | 2 +- + drivers/ata/pata_it821x.c | 2 +- + drivers/ata/pata_macio.c | 6 +- + drivers/ata/pata_mpc52xx.c | 4 +- + drivers/ata/pata_ninja32.c | 2 +- + drivers/ata/pata_ns87415.c | 2 +- + drivers/ata/pata_pdc2027x.c | 2 +- + drivers/ata/pata_pxa.c | 2 +- + drivers/ata/pata_rdc.c | 2 +- + drivers/ata/pata_rz1000.c | 2 +- + drivers/ata/pata_serverworks.c | 2 +- + drivers/ata/pata_sil680.c | 2 +- + drivers/ata/pata_sis.c | 2 +- + drivers/ata/pata_sl82c105.c | 2 +- + drivers/ata/pata_triflex.c | 2 +- + drivers/ata/pata_via.c | 2 +- + drivers/ata/sata_fsl.c | 14 +- + drivers/ata/sata_highbank.c | 181 ++++++++++++++++++++- + drivers/ata/sata_inic162x.c | 2 +- + drivers/ata/sata_nv.c | 2 +- + drivers/ata/sata_rcar.c | 138 ++++++++-------- + drivers/ata/sata_sil.c | 2 +- + drivers/ata/sata_sil24.c | 2 +- + drivers/scsi/ipr.c | 1 - + include/linux/libata.h | 5 + + 53 files changed, 388 insertions(+), 185 deletions(-) +Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) +$ git merge --no-ff pstore/master +Already up-to-date. +Merging pm/linux-next (2c843bd Merge branch 'pm-cpufreq') +$ git merge --no-ff pm/linux-next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging net/sunrpc/sched.c +Auto-merging include/acpi/acpi_bus.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/nfs3proc.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/cifs/transport.c +Auto-merging drivers/devfreq/exynos/exynos4_bus.c +Auto-merging drivers/cpufreq/pasemi-cpufreq.c +Auto-merging drivers/ata/libata-core.c +Auto-merging arch/powerpc/platforms/Kconfig +Auto-merging arch/cris/Kconfig +Auto-merging arch/arm/mach-tegra/Kconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Removing Documentation/power/video_extension.txt +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 43bd4e3] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-acpi | 58 ++ + Documentation/ABI/testing/sysfs-class-devfreq | 20 + + Documentation/ABI/testing/sysfs-devices-online | 20 + + Documentation/ABI/testing/sysfs-devices-sun | 2 +- + Documentation/ABI/testing/sysfs-devices-system-cpu | 15 + + Documentation/ABI/testing/sysfs-firmware-acpi | 10 + + Documentation/acpi/namespace.txt | 395 ++++++++++ + Documentation/acpi/video_extension.txt | 106 +++ + Documentation/cpu-freq/cpu-drivers.txt | 10 +- + Documentation/cpu-hotplug.txt | 6 +- + Documentation/kernel-parameters.txt | 9 + + Documentation/power/pm_qos_interface.txt | 50 +- + Documentation/power/runtime_pm.txt | 20 +- + Documentation/power/video_extension.txt | 37 - + Documentation/trace/events-power.txt | 31 + + MAINTAINERS | 8 +- + arch/arm/mach-davinci/Kconfig | 1 + + arch/arm/mach-davinci/da850.c | 8 +- + arch/arm/mach-omap2/omap_device.c | 7 +- + arch/arm/mach-omap2/smartreflex-class3.c | 8 +- + arch/arm/mach-pxa/Kconfig | 3 + + arch/arm/mach-s3c24xx/cpufreq-utils.c | 2 +- + arch/arm/mach-s3c24xx/cpufreq.c | 4 +- + arch/arm/mach-s3c24xx/pll-s3c2410.c | 54 +- + arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 54 +- + arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 110 +-- + arch/arm/mach-shmobile/clock-sh7372.c | 6 +- + arch/arm/mach-tegra/Kconfig | 3 - + arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 2 +- + arch/cris/Kconfig | 2 + + arch/ia64/hp/common/sba_iommu.c | 24 +- + arch/mips/loongson/lemote-2f/clock.c | 3 +- + arch/powerpc/platforms/Kconfig | 31 - + arch/powerpc/platforms/pasemi/Makefile | 1 - + arch/powerpc/platforms/powermac/Makefile | 2 - + arch/x86/include/asm/acpi.h | 2 +- + arch/x86/kernel/acpi/boot.c | 7 + + arch/x86/kernel/acpi/sleep.c | 4 +- + arch/x86/kernel/acpi/sleep.h | 2 + + drivers/acpi/Makefile | 2 + + drivers/acpi/acpi_cmos_rtc.c | 92 +++ + drivers/acpi/acpi_lpss.c | 125 +++- + drivers/acpi/acpi_memhotplug.c | 62 +- + drivers/acpi/acpi_processor.c | 494 +++++++++++++ + drivers/acpi/acpica/Makefile | 4 + + drivers/acpi/acpica/acglobal.h | 6 + + drivers/acpi/acpica/aclocal.h | 17 - + drivers/acpi/acpica/acmacros.h | 10 +- + drivers/acpi/acpica/acnamesp.h | 43 +- + drivers/acpi/acpica/acpredef.h | 4 +- + drivers/acpi/acpica/acstruct.h | 40 +- + drivers/acpi/acpica/acutils.h | 50 +- + drivers/acpi/acpica/dscontrol.c | 4 +- + drivers/acpi/acpica/dsfield.c | 4 + + drivers/acpi/acpica/dsinit.c | 1 + + drivers/acpi/acpica/dsmthdat.c | 2 +- + drivers/acpi/acpica/dsobject.c | 3 +- + drivers/acpi/acpica/dsopcode.c | 1 + + drivers/acpi/acpica/dsutils.c | 5 +- + drivers/acpi/acpica/dswexec.c | 3 +- + drivers/acpi/acpica/dswload.c | 7 +- + drivers/acpi/acpica/dswload2.c | 4 + + drivers/acpi/acpica/evglock.c | 1 + + drivers/acpi/acpica/evgpe.c | 7 +- + drivers/acpi/acpica/evgpeblk.c | 2 + + drivers/acpi/acpica/evgpeinit.c | 3 + + drivers/acpi/acpica/evhandler.c | 7 + + drivers/acpi/acpica/evmisc.c | 3 + + drivers/acpi/acpica/evregion.c | 63 +- + drivers/acpi/acpica/evrgnini.c | 2 + + drivers/acpi/acpica/evxfgpe.c | 3 + + drivers/acpi/acpica/evxfregn.c | 1 + + drivers/acpi/acpica/exconfig.c | 3 +- + drivers/acpi/acpica/exconvrt.c | 13 +- + drivers/acpi/acpica/excreate.c | 3 - + drivers/acpi/acpica/exdebug.c | 2 + + drivers/acpi/acpica/exdump.c | 2 + + drivers/acpi/acpica/exfield.c | 4 + + drivers/acpi/acpica/exfldio.c | 2 - + drivers/acpi/acpica/exmisc.c | 12 +- + drivers/acpi/acpica/exoparg1.c | 16 +- + drivers/acpi/acpica/exoparg2.c | 1 - + drivers/acpi/acpica/exoparg3.c | 1 - + drivers/acpi/acpica/exoparg6.c | 5 - + drivers/acpi/acpica/exprep.c | 7 + + drivers/acpi/acpica/exregion.c | 27 +- + drivers/acpi/acpica/exresnte.c | 1 + + drivers/acpi/acpica/exresolv.c | 6 +- + drivers/acpi/acpica/exresop.c | 9 +- + drivers/acpi/acpica/exstore.c | 4 +- + drivers/acpi/acpica/exstoren.c | 4 - + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 3 + + drivers/acpi/acpica/hwregs.c | 4 +- + drivers/acpi/acpica/hwxface.c | 9 +- + drivers/acpi/acpica/hwxfsleep.c | 12 +- + drivers/acpi/acpica/nsaccess.c | 1 + + drivers/acpi/acpica/nsarguments.c | 294 ++++++++ + drivers/acpi/acpica/nsconvert.c | 3 + + drivers/acpi/acpica/nsdump.c | 10 + + drivers/acpi/acpica/nseval.c | 247 ++++--- + drivers/acpi/acpica/nsinit.c | 16 +- + drivers/acpi/acpica/nspredef.c | 216 ++---- + drivers/acpi/acpica/nsprepkg.c | 81 +- + drivers/acpi/acpica/nsrepair.c | 51 +- + drivers/acpi/acpica/nsrepair2.c | 358 +++++++-- + drivers/acpi/acpica/nsutils.c | 3 + + drivers/acpi/acpica/nsxfeval.c | 163 +++- + drivers/acpi/acpica/psargs.c | 4 + + drivers/acpi/acpica/psloop.c | 2 +- + drivers/acpi/acpica/psobject.c | 1 + + drivers/acpi/acpica/psparse.c | 3 +- + drivers/acpi/acpica/pstree.c | 2 + + drivers/acpi/acpica/psxface.c | 14 +- + drivers/acpi/acpica/rscalc.c | 7 +- + drivers/acpi/acpica/rscreate.c | 27 - + drivers/acpi/acpica/rsdump.c | 10 + + drivers/acpi/acpica/rsmisc.c | 3 +- + drivers/acpi/acpica/rsutils.c | 7 +- + drivers/acpi/acpica/rsxface.c | 1 + + drivers/acpi/acpica/tbinstal.c | 7 +- + drivers/acpi/acpica/tbprint.c | 237 ++++++ + drivers/acpi/acpica/tbutils.c | 191 +---- + drivers/acpi/acpica/tbxfload.c | 25 +- + drivers/acpi/acpica/utbuffer.c | 201 +++++ + drivers/acpi/acpica/utcopy.c | 11 +- + drivers/acpi/acpica/utdebug.c | 148 +--- + drivers/acpi/acpica/utdelete.c | 3 +- + drivers/acpi/acpica/uterror.c | 289 ++++++++ + drivers/acpi/acpica/uteval.c | 9 +- + drivers/acpi/acpica/utexcep.c | 1 + + drivers/acpi/acpica/utids.c | 3 + + drivers/acpi/acpica/utmisc.c | 2 + + drivers/acpi/acpica/utobject.c | 5 +- + drivers/acpi/acpica/utpredef.c | 16 +- + drivers/acpi/acpica/utstring.c | 19 +- + drivers/acpi/acpica/uttrack.c | 8 + + drivers/acpi/acpica/utxferror.c | 234 ------ + drivers/acpi/battery.c | 18 +- + drivers/acpi/bus.c | 17 +- + drivers/acpi/device_pm.c | 170 +++-- + drivers/acpi/ec.c | 4 + + drivers/acpi/ec_sys.c | 18 +- + drivers/acpi/glue.c | 12 +- + drivers/acpi/internal.h | 10 + + drivers/acpi/osl.c | 27 +- + drivers/acpi/processor_driver.c | 818 ++------------------- + drivers/acpi/processor_idle.c | 4 +- + drivers/acpi/processor_perflib.c | 4 +- + drivers/acpi/scan.c | 205 ++++-- + drivers/acpi/sleep.c | 2 + + drivers/acpi/sysfs.c | 31 + + drivers/acpi/video.c | 3 - + drivers/amba/bus.c | 2 +- + drivers/ata/libata-core.c | 2 +- + drivers/base/core.c | 130 ++++ + drivers/base/cpu.c | 101 ++- + drivers/base/memory.c | 114 ++- + drivers/base/platform.c | 1 - + drivers/base/power/domain.c | 1 - + drivers/base/power/generic_ops.c | 23 - + drivers/base/power/opp.c | 4 +- + drivers/base/power/qos.c | 6 + + drivers/base/power/runtime.c | 12 +- + drivers/base/power/wakeup.c | 9 +- + drivers/clk/x86/clk-lpt.c | 4 +- + drivers/cpufreq/Kconfig.arm | 17 +- + drivers/cpufreq/Kconfig.powerpc | 37 + + drivers/cpufreq/Kconfig.x86 | 1 + + drivers/cpufreq/Makefile | 8 +- + drivers/cpufreq/acpi-cpufreq.c | 46 +- + drivers/cpufreq/arm_big_little.c | 4 +- + drivers/cpufreq/blackfin-cpufreq.c | 10 +- + drivers/cpufreq/cpufreq.c | 223 ++++-- + drivers/cpufreq/cpufreq_governor.c | 51 +- + drivers/cpufreq/cpufreq_governor.h | 5 +- + drivers/cpufreq/cpufreq_performance.c | 4 - + drivers/cpufreq/cpufreq_powersave.c | 6 +- + drivers/cpufreq/cpufreq_stats.c | 5 +- + drivers/cpufreq/cpufreq_userspace.c | 112 +-- + drivers/cpufreq/davinci-cpufreq.c | 3 + + drivers/cpufreq/dbx500-cpufreq.c | 4 +- + drivers/cpufreq/e_powersaver.c | 11 +- + drivers/cpufreq/exynos-cpufreq.c | 10 +- + drivers/cpufreq/freq_table.c | 26 +- + drivers/cpufreq/ia64-acpi-cpufreq.c | 2 +- + drivers/cpufreq/imx6q-cpufreq.c | 17 +- + drivers/cpufreq/kirkwood-cpufreq.c | 2 +- + drivers/cpufreq/longhaul.c | 16 +- + drivers/cpufreq/loongson2_cpufreq.c | 2 +- + drivers/cpufreq/omap-cpufreq.c | 6 +- + drivers/cpufreq/p4-clockmod.c | 4 +- + .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 5 +- + drivers/cpufreq/pcc-cpufreq.c | 2 + + .../cpufreq/pmac32-cpufreq.c | 0 + .../cpufreq/pmac64-cpufreq.c | 0 + drivers/cpufreq/powernow-k6.c | 8 +- + drivers/cpufreq/powernow-k7.c | 16 +- + drivers/cpufreq/powernow-k8.c | 24 +- + drivers/cpufreq/ppc-corenet-cpufreq.c | 380 ++++++++++ + drivers/cpufreq/ppc_cbe_cpufreq.c | 4 +- + drivers/cpufreq/pxa2xx-cpufreq.c | 8 +- + drivers/cpufreq/pxa3xx-cpufreq.c | 4 +- + drivers/cpufreq/s3c2416-cpufreq.c | 6 +- + drivers/cpufreq/s3c64xx-cpufreq.c | 10 +- + drivers/cpufreq/sc520_freq.c | 2 +- + drivers/cpufreq/sparc-us2e-cpufreq.c | 12 +- + drivers/cpufreq/sparc-us3-cpufreq.c | 8 +- + drivers/cpufreq/spear-cpufreq.c | 4 +- + drivers/cpufreq/speedstep-centrino.c | 8 +- + drivers/cpufreq/tegra-cpufreq.c | 23 +- + drivers/cpuidle/Kconfig | 27 +- + drivers/cpuidle/Makefile | 1 + + drivers/cpuidle/cpuidle-zynq.c | 83 +++ + drivers/cpuidle/cpuidle.c | 4 +- + drivers/cpuidle/driver.c | 324 +++++--- + drivers/devfreq/Kconfig | 12 +- + drivers/devfreq/Makefile | 3 +- + drivers/devfreq/devfreq.c | 25 +- + drivers/devfreq/exynos/Makefile | 3 + + drivers/devfreq/{ => exynos}/exynos4_bus.c | 1 + + drivers/devfreq/exynos/exynos5_bus.c | 503 +++++++++++++ + drivers/devfreq/exynos/exynos_ppmu.c | 56 ++ + drivers/devfreq/exynos/exynos_ppmu.h | 78 ++ + drivers/dma/intel_mid_dma.c | 2 +- + drivers/gpio/gpio-langwell.c | 6 +- + drivers/i2c/i2c-core.c | 2 +- + drivers/mfd/ab8500-gpadc.c | 8 +- + drivers/mfd/db8500-prcmu.c | 10 +- + drivers/mmc/core/bus.c | 2 +- + drivers/mmc/core/sdio_bus.c | 2 +- + drivers/pci/pci-driver.c | 14 +- + drivers/pnp/manager.c | 14 +- + drivers/power/avs/smartreflex.c | 154 ++-- + drivers/scsi/scsi_pm.c | 11 +- + drivers/sh/clk/core.c | 4 +- + drivers/sh/pm_runtime.c | 2 +- + drivers/spi/spi.c | 2 +- + drivers/staging/android/binder.c | 5 +- + drivers/tty/serial/mfd.c | 9 +- + drivers/usb/core/driver.c | 3 +- + drivers/usb/core/port.c | 1 - + fs/cifs/transport.c | 2 +- + fs/eventpoll.c | 4 +- + fs/nfs/inode.c | 2 +- + fs/nfs/nfs3proc.c | 2 +- + fs/nfs/nfs4proc.c | 4 +- + fs/select.c | 4 +- + include/acpi/acconfig.h | 4 +- + include/acpi/acoutput.h | 8 +- + include/acpi/acpi_bus.h | 29 +- + include/acpi/acpixf.h | 3 +- + include/acpi/processor.h | 5 + + include/linux/acpi.h | 3 +- + include/linux/cpufreq.h | 54 +- + include/linux/cpuidle.h | 6 +- + include/linux/debug_locks.h | 4 +- + include/linux/devfreq.h | 2 + + include/linux/device.h | 21 + + include/linux/freezer.h | 171 ++++- + include/linux/memory_hotplug.h | 14 +- + include/linux/pm_runtime.h | 2 - + include/linux/power/smartreflex.h | 10 +- + include/linux/suspend.h | 1 + + include/trace/events/power.h | 173 +++++ + include/xen/acpi.h | 16 +- + kernel/exit.c | 2 +- + kernel/freezer.c | 12 + + kernel/futex.c | 3 +- + kernel/hrtimer.c | 3 +- + kernel/lockdep.c | 17 +- + kernel/power/main.c | 6 + + kernel/power/process.c | 26 +- + kernel/power/qos.c | 14 +- + kernel/power/snapshot.c | 5 +- + kernel/power/suspend.c | 2 +- + kernel/signal.c | 2 +- + mm/memory_hotplug.c | 81 +- + net/sunrpc/sched.c | 2 +- + net/unix/af_unix.c | 3 +- + 280 files changed, 6878 insertions(+), 3420 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-acpi + create mode 100644 Documentation/ABI/testing/sysfs-devices-online + create mode 100644 Documentation/acpi/namespace.txt + create mode 100644 Documentation/acpi/video_extension.txt + delete mode 100644 Documentation/power/video_extension.txt + create mode 100644 drivers/acpi/acpi_cmos_rtc.c + create mode 100644 drivers/acpi/acpi_processor.c + create mode 100644 drivers/acpi/acpica/nsarguments.c + create mode 100644 drivers/acpi/acpica/tbprint.c + create mode 100644 drivers/acpi/acpica/utbuffer.c + create mode 100644 drivers/acpi/acpica/uterror.c + rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (98%) + rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) + rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%) + create mode 100644 drivers/cpufreq/ppc-corenet-cpufreq.c + create mode 100644 drivers/cpuidle/cpuidle-zynq.c + create mode 100644 drivers/devfreq/exynos/Makefile + rename drivers/devfreq/{ => exynos}/exynos4_bus.c (99%) + create mode 100644 drivers/devfreq/exynos/exynos5_bus.c + create mode 100644 drivers/devfreq/exynos/exynos_ppmu.c + create mode 100644 drivers/devfreq/exynos/exynos_ppmu.h +Merging idle/next (5c99726b Merge branch 'fspin' into next) +$ git merge --no-ff 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 --no-ff apm/for-next +Already up-to-date. +Merging cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next) +$ git merge --no-ff cpuidle/cpuidle-next +Resolved 'drivers/acpi/processor_driver.c' using previous resolution. +Resolved 'drivers/base/power/qos.c' using previous resolution. +Auto-merging drivers/base/power/qos.c +CONFLICT (content): Merge conflict in drivers/base/power/qos.c +Auto-merging drivers/acpi/processor_driver.c +CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bc95b17] Merge remote-tracking branch 'cpuidle/cpuidle-next' +$ git diff -M --stat --summary HEAD^.. +Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) +$ git merge --no-ff cpupowerutils/master +Already up-to-date. +Merging thermal/next (9d1968f Merge branch 'cpu-package-thermal' of .git into next) +$ git merge --no-ff thermal/next +Auto-merging drivers/thermal/ti-soc-thermal/ti-thermal.h +Auto-merging drivers/thermal/ti-soc-thermal/ti-thermal-common.c +Auto-merging drivers/thermal/ti-soc-thermal/ti-bandgap.h +Auto-merging drivers/thermal/ti-soc-thermal/ti-bandgap.c +Auto-merging drivers/thermal/ti-soc-thermal/Makefile +Auto-merging drivers/thermal/ti-soc-thermal/Kconfig +Auto-merging drivers/thermal/exynos_thermal.c +Auto-merging drivers/thermal/dove_thermal.c +Auto-merging drivers/thermal/armada_thermal.c +Auto-merging drivers/staging/Kconfig +Auto-merging arch/x86/kernel/cpu/mcheck/therm_throt.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt +Merge made by the 'recursive' strategy. + .../bindings/thermal}/ti_soc_thermal.txt | 13 + + Documentation/thermal/x86_pkg_temperature_thermal | 47 ++ + MAINTAINERS | 4 +- + arch/x86/include/asm/mce.h | 7 + + arch/x86/kernel/cpu/mcheck/therm_throt.c | 63 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/thermal/Kconfig | 15 + + drivers/thermal/Makefile | 3 +- + drivers/thermal/armada_thermal.c | 3 +- + drivers/thermal/cpu_cooling.c | 2 +- + drivers/thermal/dove_thermal.c | 10 +- + drivers/thermal/exynos_thermal.c | 3 - + drivers/thermal/kirkwood_thermal.c | 10 +- + drivers/thermal/rcar_thermal.c | 10 +- + drivers/thermal/spear_thermal.c | 20 +- + drivers/thermal/thermal_core.c | 11 +- + .../{staging => thermal}/ti-soc-thermal/Kconfig | 12 + + .../{staging => thermal}/ti-soc-thermal/Makefile | 1 + + drivers/{staging => thermal}/ti-soc-thermal/TODO | 0 + drivers/thermal/ti-soc-thermal/dra752-bandgap.h | 280 +++++++++ + .../thermal/ti-soc-thermal/dra752-thermal-data.c | 476 +++++++++++++++ + .../ti-soc-thermal/omap4-thermal-data.c | 0 + .../ti-soc-thermal/omap4xxx-bandgap.h | 0 + .../ti-soc-thermal/omap5-thermal-data.c | 0 + .../ti-soc-thermal/omap5xxx-bandgap.h | 0 + .../ti-soc-thermal/ti-bandgap.c | 28 +- + .../ti-soc-thermal/ti-bandgap.h | 5 + + .../ti-soc-thermal/ti-thermal-common.c | 43 +- + .../ti-soc-thermal/ti-thermal.h | 6 + + drivers/thermal/x86_pkg_temp_thermal.c | 642 +++++++++++++++++++++ + 31 files changed, 1637 insertions(+), 80 deletions(-) + rename {drivers/staging/ti-soc-thermal => Documentation/devicetree/bindings/thermal}/ti_soc_thermal.txt (87%) + create mode 100644 Documentation/thermal/x86_pkg_temperature_thermal + rename drivers/{staging => thermal}/ti-soc-thermal/Kconfig (81%) + rename drivers/{staging => thermal}/ti-soc-thermal/Makefile (80%) + rename drivers/{staging => thermal}/ti-soc-thermal/TODO (100%) + create mode 100644 drivers/thermal/ti-soc-thermal/dra752-bandgap.h + create mode 100644 drivers/thermal/ti-soc-thermal/dra752-thermal-data.c + rename drivers/{staging => thermal}/ti-soc-thermal/omap4-thermal-data.c (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/omap4xxx-bandgap.h (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/omap5-thermal-data.c (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/omap5xxx-bandgap.h (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/ti-bandgap.c (98%) + rename drivers/{staging => thermal}/ti-soc-thermal/ti-bandgap.h (99%) + rename drivers/{staging => thermal}/ti-soc-thermal/ti-thermal-common.c (91%) + rename drivers/{staging => thermal}/ti-soc-thermal/ti-thermal.h (95%) + create mode 100644 drivers/thermal/x86_pkg_temp_thermal.c +Merging ieee1394/for-next (bcabcfd firewire: remove support of fw_driver.driver.probe and .remove methods) +$ git merge --no-ff ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/core-device.c | 39 ++++++++++--- + drivers/firewire/net.c | 50 ++++++++--------- + drivers/firewire/sbp2.c | 17 +++--- + drivers/media/firewire/firedtv-fw.c | 19 +++---- + drivers/staging/fwserial/fwserial.c | 14 ++--- + include/linux/firewire.h | 2 + + sound/firewire/isight.c | 44 +++++++-------- + sound/firewire/scs1x.c | 39 ++++++------- + sound/firewire/speakers.c | 106 +++++++++++++++--------------------- + 9 files changed, 160 insertions(+), 170 deletions(-) +Merging ubi/linux-next (584d462 UBI: fastmap break out of used PEB search) +$ git merge --no-ff ubi/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 20 ++++++++++++-------- + drivers/mtd/ubi/fastmap.c | 4 +++- + include/uapi/mtd/ubi-user.h | 5 ++++- + 3 files changed, 19 insertions(+), 10 deletions(-) +Merging dlm/next (cfa805f dlm: Avoid LVB truncation) +$ git merge --no-ff dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 5 +- + fs/dlm/lock.c | 8 +-- + fs/dlm/lockspace.c | 9 ++- + fs/dlm/lowcomms.c | 177 ++++++++++++++++++++++++++++++++++++++++------------- + 4 files changed, 149 insertions(+), 50 deletions(-) +Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) +$ git merge --no-ff swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (469fd0d DMA: shdma: add DT support) +$ git merge --no-ff slave-dma/next +Auto-merging drivers/dma/dw/regs.h +Auto-merging drivers/dma/dw/core.c +Removing arch/mips/jz4740/dma.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/atmel-dma.txt | 7 +- + .../devicetree/bindings/dma/fsl-imx-dma.txt | 48 ++ + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 56 ++ + Documentation/devicetree/bindings/dma/shdma.txt | 75 +++ + MAINTAINERS | 3 +- + arch/arm/mach-lpc32xx/phy3250.c | 4 +- + arch/arm/mach-spear/spear3xx.c | 4 +- + arch/arm/mach-spear/spear6xx.c | 4 +- + arch/mips/include/asm/mach-jz4740/dma.h | 56 -- + arch/mips/include/asm/mach-jz4740/platform.h | 1 + + arch/mips/jz4740/Makefile | 2 +- + arch/mips/jz4740/board-qi_lb60.c | 1 + + arch/mips/jz4740/clock.c | 2 +- + arch/mips/jz4740/dma.c | 287 ---------- + arch/mips/jz4740/platform.c | 21 + + drivers/dma/Kconfig | 26 +- + drivers/dma/Makefile | 3 +- + drivers/dma/amba-pl08x.c | 8 +- + drivers/dma/at_hdmac.c | 211 ++++--- + drivers/dma/at_hdmac_regs.h | 5 + + drivers/dma/dma-jz4740.c | 617 +++++++++++++++++++++ + drivers/dma/dw/Kconfig | 29 + + drivers/dma/dw/Makefile | 8 + + drivers/dma/{dw_dmac.c => dw/core.c} | 320 ++--------- + drivers/dma/dw/internal.h | 70 +++ + drivers/dma/dw/pci.c | 101 ++++ + drivers/dma/dw/platform.c | 317 +++++++++++ + drivers/dma/{dw_dmac_regs.h => dw/regs.h} | 7 + + drivers/dma/fsldma.c | 5 +- + drivers/dma/imx-dma.c | 77 ++- + drivers/dma/imx-sdma.c | 40 ++ + drivers/dma/mmp_tdma.c | 4 + + drivers/dma/mxs-dma.c | 2 +- + drivers/dma/of-dma.c | 17 +- + drivers/dma/pl330.c | 29 +- + drivers/dma/ppc4xx/adma.c | 5 +- + drivers/dma/sh/Makefile | 2 +- + drivers/dma/sh/shdma-base.c | 26 +- + drivers/dma/sh/shdma-of.c | 82 +++ + drivers/dma/sh/shdma.c | 33 +- + drivers/dma/sirf-dma.c | 17 + + drivers/dma/tegra20-apb-dma.c | 3 +- + drivers/dma/timb_dma.c | 2 - + include/dt-bindings/dma/at91.h | 27 + + include/linux/amba/pl08x.h | 8 +- + include/linux/of_dma.h | 1 - + include/linux/platform_data/dma-atmel.h | 4 + + include/linux/platform_data/dma-imx.h | 6 +- + include/linux/sh_dma.h | 2 - + include/linux/shdma-base.h | 3 + + 50 files changed, 1889 insertions(+), 799 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/shdma.txt + delete mode 100644 arch/mips/jz4740/dma.c + create mode 100644 drivers/dma/dma-jz4740.c + create mode 100644 drivers/dma/dw/Kconfig + create mode 100644 drivers/dma/dw/Makefile + rename drivers/dma/{dw_dmac.c => dw/core.c} (85%) + create mode 100644 drivers/dma/dw/internal.h + create mode 100644 drivers/dma/dw/pci.c + create mode 100644 drivers/dma/dw/platform.c + rename drivers/dma/{dw_dmac_regs.h => dw/regs.h} (97%) + create mode 100644 drivers/dma/sh/shdma-of.c + create mode 100644 include/dt-bindings/dma/at91.h +Merging dmaengine/next (41ef2d5 Linux 3.9-rc7) +$ git merge --no-ff dmaengine/next +Already up-to-date. +Merging net-next/master (008aebd bonding: combine pr_debugs in bond_set_dev_addr into one) +$ git merge --no-ff net-next/master +Resolved 'drivers/net/ethernet/freescale/fec_main.c' using previous resolution. +Resolved 'drivers/net/ethernet/renesas/sh_eth.c' using previous resolution. +Resolved 'fs/select.c' using previous resolution. +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/netfilter/ipt_ULOG.c +Auto-merging net/ipv4/gre.c +Auto-merging net/core/sock.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/dev.c +Removing net/batman-adv/ring_buffer.h +Removing net/batman-adv/ring_buffer.c +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/netdevice.h +Auto-merging include/linux/if_vlan.h +Removing include/linux/can/platform/flexcan.h +Auto-merging fs/select.c +CONFLICT (content): Merge conflict in fs/select.c +Auto-merging drivers/scsi/fcoe/fcoe.c +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/net/wireless/ath/ath9k/xmit.c +Auto-merging drivers/net/wireless/ath/ath9k/htc_drv_main.c +Auto-merging drivers/net/wan/dlci.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/phy/Kconfig +Auto-merging drivers/net/macvtap.c +Auto-merging drivers/net/ethernet/ti/davinci_cpdma.c +Auto-merging drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/renesas/sh_eth.h +Auto-merging drivers/net/ethernet/renesas/sh_eth.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/renesas/sh_eth.c +Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c +Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c +Auto-merging drivers/net/ethernet/marvell/pxa168_eth.c +Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/bonding/bond_main.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +Auto-merging arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +Auto-merging arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +Auto-merging arch/mips/bcm63xx/boards/board_bcm963xx.c +Auto-merging arch/cris/arch-v32/drivers/Kconfig +Auto-merging arch/cris/arch-v10/drivers/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/ip-sysctl.txt +Removing Documentation/networking/ifenslave.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6f30ff6] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 13 +- + .../bindings/net/allwinner,sun4i-emac.txt | 22 + + .../bindings/net/allwinner,sun4i-mdio.txt | 26 + + Documentation/devicetree/bindings/net/arc_emac.txt | 38 + + .../devicetree/bindings/net/can/fsl-flexcan.txt | 2 + + Documentation/devicetree/bindings/net/cpsw.txt | 6 + + .../devicetree/bindings/net/davicom-dm9000.txt | 26 + + .../devicetree/bindings/net/marvell-orion-net.txt | 85 + + .../devicetree/bindings/net/micrel-ks8851.txt | 9 + + .../devicetree/bindings/net/via-velocity.txt | 20 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/networking/.gitignore | 1 - + Documentation/networking/00-INDEX | 2 - + Documentation/networking/Makefile | 5 - + Documentation/networking/bonding.txt | 79 +- + Documentation/networking/ifenslave.c | 1105 ------- + Documentation/networking/ip-sysctl.txt | 13 +- + Documentation/networking/netlink_mmap.txt | 18 +- + Documentation/networking/packet_mmap.txt | 133 +- + Documentation/networking/scaling.txt | 58 + + Documentation/sysctl/net.txt | 41 +- + MAINTAINERS | 5 + + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm/boot/dts/am335x-bone.dts | 2 + + arch/arm/boot/dts/am335x-evm.dts | 2 + + arch/arm/boot/dts/am335x-evmsk.dts | 10 + + arch/arm/boot/dts/imx28-evk.dts | 12 + + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 15 + + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 41 + + arch/arm/boot/dts/sun4i-a10.dtsi | 27 + + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/mach-imx/Kconfig | 4 - + arch/arm/mach-imx/devices-imx25.h | 8 +- + arch/arm/mach-imx/devices-imx35.h | 8 +- + arch/arm/mach-imx/devices/Kconfig | 1 - + arch/arm/mach-imx/devices/devices-common.h | 4 +- + arch/arm/mach-imx/devices/platform-flexcan.c | 5 +- + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 2 +- + arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 2 +- + arch/arm/mach-imx/mach-mx25_3ds.c | 2 +- + arch/arm/mach-imx/mach-pcm043.c | 2 +- + arch/arm/mach-mxs/Kconfig | 1 - + arch/arm/mach-mxs/mach-mxs.c | 50 +- + arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +- + arch/arm/mach-shmobile/clock-r8a7740.c | 2 +- + arch/arm/mach-shmobile/clock-r8a7778.c | 2 +- + arch/arm/mach-shmobile/clock-r8a7779.c | 2 +- + arch/arm/net/bpf_jit_32.c | 18 +- + arch/avr32/include/uapi/asm/socket.h | 2 + + arch/cris/arch-v10/drivers/Kconfig | 4 +- + arch/cris/arch-v32/drivers/Kconfig | 4 +- + arch/cris/include/uapi/asm/socket.h | 2 + + arch/frv/include/uapi/asm/socket.h | 2 + + arch/h8300/include/uapi/asm/socket.h | 2 + + arch/ia64/hp/sim/simeth.c | 2 +- + arch/ia64/include/uapi/asm/socket.h | 2 + + arch/m32r/include/uapi/asm/socket.h | 2 + + arch/mips/bcm63xx/boards/board_bcm963xx.c | 4 + + arch/mips/bcm63xx/dev-enet.c | 181 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 7 +- + .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h | 122 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 93 +- + .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 2 + + arch/mips/include/uapi/asm/socket.h | 2 + + arch/mips/txx9/generic/setup_tx4939.c | 3 +- + arch/mn10300/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/uapi/asm/socket.h | 2 + + arch/powerpc/net/bpf_jit_comp.c | 19 +- + arch/s390/include/uapi/asm/socket.h | 2 + + arch/sh/boards/board-espt.c | 2 +- + arch/sh/boards/board-sh7757lcr.c | 8 +- + arch/sh/boards/mach-ecovec24/setup.c | 4 +- + arch/sh/boards/mach-se/770x/setup.c | 8 +- + arch/sh/boards/mach-se/7724/setup.c | 4 +- + arch/sh/boards/mach-sh7763rdp/setup.c | 2 +- + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 4 +- + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 2 +- + arch/sparc/include/uapi/asm/socket.h | 2 + + arch/sparc/net/bpf_jit_comp.c | 20 +- + arch/x86/net/bpf_jit_comp.c | 61 +- + arch/xtensa/include/uapi/asm/socket.h | 2 + + drivers/atm/ambassador.c | 2 +- + drivers/bcma/Kconfig | 1 + + drivers/bcma/core.c | 28 +- + drivers/bcma/driver_chipcommon_sflash.c | 8 +- + drivers/bcma/sprom.c | 71 +- + drivers/bluetooth/btmrvl_sdio.c | 1 + + drivers/bluetooth/btusb.c | 3 + + drivers/infiniband/core/cma.c | 4 +- + drivers/infiniband/hw/mlx4/main.c | 2 +- + drivers/isdn/i4l/isdn_net.c | 2 +- + drivers/net/Kconfig | 20 +- + drivers/net/Makefile | 1 + + drivers/net/bonding/bond_alb.c | 99 +- + drivers/net/bonding/bond_main.c | 290 +- + drivers/net/bonding/bond_sysfs.c | 133 +- + drivers/net/bonding/bonding.h | 49 +- + drivers/net/can/Kconfig | 5 +- + drivers/net/can/at91_can.c | 8 +- + drivers/net/can/bfin_can.c | 10 +- + drivers/net/can/c_can/c_can_platform.c | 6 +- + drivers/net/can/cc770/cc770_isa.c | 5 +- + drivers/net/can/cc770/cc770_platform.c | 4 +- + drivers/net/can/flexcan.c | 52 +- + drivers/net/can/grcan.c | 12 +- + drivers/net/can/janz-ican3.c | 2 +- + drivers/net/can/led.c | 4 +- + drivers/net/can/mscan/mpc5xxx_can.c | 10 +- + drivers/net/can/sja1000/sja1000_isa.c | 5 +- + drivers/net/can/sja1000/sja1000_of_platform.c | 6 +- + drivers/net/can/sja1000/sja1000_platform.c | 5 +- + drivers/net/can/slcan.c | 2 +- + drivers/net/can/softing/softing_main.c | 2 +- + drivers/net/can/ti_hecc.c | 1 - + drivers/net/ethernet/3com/3c509.c | 19 - + drivers/net/ethernet/3com/3c59x.c | 42 +- + drivers/net/ethernet/3com/Kconfig | 1 - + drivers/net/ethernet/8390/ne.c | 1 - + drivers/net/ethernet/8390/ne2k-pci.c | 2 +- + drivers/net/ethernet/Kconfig | 6 +- + drivers/net/ethernet/Makefile | 2 + + drivers/net/ethernet/adaptec/Kconfig | 1 - + drivers/net/ethernet/adi/Kconfig | 1 - + drivers/net/ethernet/adi/bfin_mac.c | 4 - + drivers/net/ethernet/aeroflex/greth.c | 4 +- + drivers/net/ethernet/allwinner/Kconfig | 35 + + drivers/net/ethernet/allwinner/Makefile | 5 + + drivers/net/ethernet/allwinner/sun4i-emac.c | 954 ++++++ + drivers/net/ethernet/allwinner/sun4i-emac.h | 108 + + drivers/net/ethernet/alteon/acenic.c | 15 +- + drivers/net/ethernet/amd/Kconfig | 2 - + drivers/net/ethernet/amd/amd8111e.c | 19 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 - + drivers/net/ethernet/amd/sunlance.c | 6 +- + drivers/net/ethernet/apple/bmac.c | 5 +- + drivers/net/ethernet/arc/Kconfig | 31 + + drivers/net/ethernet/arc/Makefile | 6 + + drivers/net/ethernet/arc/emac.h | 214 ++ + drivers/net/ethernet/arc/emac_main.c | 819 ++++++ + drivers/net/ethernet/arc/emac_mdio.c | 152 + + drivers/net/ethernet/atheros/Kconfig | 4 - + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 25 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 25 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 27 +- + drivers/net/ethernet/broadcom/Kconfig | 2 - + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 1188 +++++++- + drivers/net/ethernet/broadcom/bcm63xx_enet.h | 86 + + drivers/net/ethernet/broadcom/bnx2.c | 18 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 185 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 211 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 75 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 52 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 3 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | 7 - + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 106 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 685 +++-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 6 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 284 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 55 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 89 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 9 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 4 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 33 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 5 +- + drivers/net/ethernet/broadcom/cnic.c | 2 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 9 +- + drivers/net/ethernet/broadcom/tg3.c | 425 ++- + drivers/net/ethernet/broadcom/tg3.h | 2 + + drivers/net/ethernet/brocade/bna/bfa_defs.h | 3 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 7 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.h | 2 + + drivers/net/ethernet/brocade/bna/bna.h | 2 + + drivers/net/ethernet/brocade/bna/bna_enet.c | 7 +- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 15 + + drivers/net/ethernet/brocade/bna/bnad.c | 3 + + drivers/net/ethernet/brocade/bna/bnad.h | 2 +- + drivers/net/ethernet/brocade/bna/cna.h | 4 +- + drivers/net/ethernet/cadence/Kconfig | 1 - + drivers/net/ethernet/cadence/at91_ether.c | 1 - + drivers/net/ethernet/cadence/macb.c | 325 ++- + drivers/net/ethernet/cadence/macb.h | 14 + + drivers/net/ethernet/calxeda/xgmac.c | 2 - + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 15 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 9 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 116 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 27 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 10 +- + drivers/net/ethernet/cirrus/Kconfig | 1 - + drivers/net/ethernet/cirrus/ep93xx_eth.c | 1 - + drivers/net/ethernet/davicom/Kconfig | 1 - + drivers/net/ethernet/davicom/dm9000.c | 53 +- + drivers/net/ethernet/dec/tulip/Kconfig | 1 - + drivers/net/ethernet/dec/tulip/tulip_core.c | 6 - + drivers/net/ethernet/dec/tulip/xircom_cb.c | 14 +- + drivers/net/ethernet/dlink/Kconfig | 1 - + drivers/net/ethernet/emulex/benet/be.h | 4 + + drivers/net/ethernet/emulex/benet/be_cmds.c | 66 + + drivers/net/ethernet/emulex/benet/be_cmds.h | 3 + + drivers/net/ethernet/emulex/benet/be_ethtool.c | 37 +- + drivers/net/ethernet/emulex/benet/be_hw.h | 2 + + drivers/net/ethernet/emulex/benet/be_main.c | 150 +- + drivers/net/ethernet/ethoc.c | 2 - + drivers/net/ethernet/faraday/Kconfig | 1 - + drivers/net/ethernet/faraday/ftgmac100.c | 2 - + drivers/net/ethernet/faraday/ftmac100.c | 2 - + drivers/net/ethernet/freescale/fec.h | 58 +- + drivers/net/ethernet/freescale/fec_main.c | 189 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 9 +- + drivers/net/ethernet/freescale/fec_ptp.c | 3 +- + drivers/net/ethernet/freescale/fs_enet/Kconfig | 1 - + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 5 +- + .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 6 +- + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 6 +- + drivers/net/ethernet/freescale/gianfar.c | 57 +- + drivers/net/ethernet/freescale/gianfar_ptp.c | 4 +- + drivers/net/ethernet/freescale/ucc_geth.c | 4 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 4 +- + drivers/net/ethernet/ibm/Kconfig | 3 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +- + drivers/net/ethernet/ibm/emac/mal.c | 6 +- + drivers/net/ethernet/ibm/emac/rgmii.c | 18 +- + drivers/net/ethernet/ibm/emac/tah.c | 14 +- + drivers/net/ethernet/ibm/emac/zmii.c | 18 +- + drivers/net/ethernet/icplus/Kconfig | 1 - + drivers/net/ethernet/icplus/ipg.c | 13 +- + drivers/net/ethernet/intel/Kconfig | 1 - + drivers/net/ethernet/intel/e100.c | 4 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.c | 24 +- + drivers/net/ethernet/intel/e1000e/82571.c | 30 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 34 +- + drivers/net/ethernet/intel/e1000e/hw.h | 34 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 62 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 55 +- + drivers/net/ethernet/intel/e1000e/nvm.c | 1 - + drivers/net/ethernet/intel/e1000e/phy.c | 22 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 120 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 36 +- + drivers/net/ethernet/intel/igb/e1000_hw.h | 2 + + drivers/net/ethernet/intel/igb/e1000_i210.h | 6 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 45 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 124 + + drivers/net/ethernet/intel/igb/e1000_phy.h | 20 + + drivers/net/ethernet/intel/igb/igb.h | 14 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 74 +- + drivers/net/ethernet/intel/igb/igb_main.c | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 134 + + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 23 + + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 3 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 40 + + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 69 +- + drivers/net/ethernet/jme.c | 1 - + drivers/net/ethernet/korina.c | 7 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 200 +- + drivers/net/ethernet/marvell/mvneta.c | 46 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 3 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 54 + + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 3 + + drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 3 - + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 20 +- + drivers/net/ethernet/mellanox/mlx4/en_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 88 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 184 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 9 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 8 + + drivers/net/ethernet/mellanox/mlx4/main.c | 11 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 1 + + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 145 +- + drivers/net/ethernet/micrel/Kconfig | 4 - + drivers/net/ethernet/micrel/ks8695net.c | 1 - + drivers/net/ethernet/micrel/ks8842.c | 1 - + drivers/net/ethernet/micrel/ks8851_mll.c | 34 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- + drivers/net/ethernet/netx-eth.c | 5 +- + drivers/net/ethernet/nuvoton/Kconfig | 1 - + drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 - + drivers/net/ethernet/nvidia/forcedeth.c | 17 +- + drivers/net/ethernet/nxp/lpc_eth.c | 2 - + drivers/net/ethernet/octeon/octeon_mgmt.c | 4 +- + drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 1 - + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 + + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c | 70 +- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 327 ++- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 63 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 26 +- + drivers/net/ethernet/packetengines/Kconfig | 1 - + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 14 +- + .../net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 3 + + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 133 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 59 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 346 ++- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 13 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 59 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 62 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 172 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 6 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h | 1 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 103 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 8 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 226 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 225 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 4 + + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 60 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 36 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 126 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 13 +- + drivers/net/ethernet/rdc/Kconfig | 1 - + drivers/net/ethernet/realtek/8139cp.c | 2 +- + drivers/net/ethernet/realtek/Kconfig | 3 - + drivers/net/ethernet/renesas/Kconfig | 7 - + drivers/net/ethernet/renesas/sh_eth.c | 521 ++-- + drivers/net/ethernet/renesas/sh_eth.h | 29 +- + drivers/net/ethernet/s6gmac.c | 1 - + drivers/net/ethernet/seeq/sgiseeq.c | 1 - + drivers/net/ethernet/sfc/efx.c | 42 +- + drivers/net/ethernet/sfc/efx.h | 1 + + drivers/net/ethernet/sfc/ethtool.c | 16 +- + drivers/net/ethernet/sfc/filter.c | 15 +- + drivers/net/ethernet/sfc/net_driver.h | 5 +- + drivers/net/ethernet/sfc/nic.c | 74 +- + drivers/net/ethernet/sfc/nic.h | 4 +- + drivers/net/ethernet/sfc/ptp.c | 13 +- + drivers/net/ethernet/sfc/rx.c | 8 +- + drivers/net/ethernet/sfc/siena.c | 2 +- + drivers/net/ethernet/sgi/Kconfig | 1 - + drivers/net/ethernet/sgi/ioc3-eth.c | 14 +- + drivers/net/ethernet/sgi/meth.c | 1 - + drivers/net/ethernet/silan/sc92031.c | 14 +- + drivers/net/ethernet/sis/Kconfig | 2 - + drivers/net/ethernet/sis/sis190.c | 13 +- + drivers/net/ethernet/smsc/Kconfig | 7 +- + drivers/net/ethernet/smsc/smc911x.c | 2 - + drivers/net/ethernet/smsc/smc91x.c | 3 - + drivers/net/ethernet/smsc/smsc911x.c | 2 - + drivers/net/ethernet/stmicro/stmmac/Kconfig | 1 - + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 - + drivers/net/ethernet/sun/niu.c | 5 +- + drivers/net/ethernet/sun/sunbmac.c | 6 +- + drivers/net/ethernet/sun/sungem.c | 13 +- + drivers/net/ethernet/sun/sunhme.c | 4 +- + drivers/net/ethernet/sun/sunqe.c | 10 +- + drivers/net/ethernet/ti/cpsw.c | 7 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 5 + + drivers/net/ethernet/ti/davinci_emac.c | 118 +- + drivers/net/ethernet/ti/davinci_mdio.c | 5 +- + drivers/net/ethernet/ti/tlan.c | 3 +- + drivers/net/ethernet/ti/tlan.h | 1 - + drivers/net/ethernet/toshiba/tc35815.c | 14 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 1 - + drivers/net/ethernet/via/Kconfig | 5 +- + drivers/net/ethernet/via/via-velocity.c | 507 ++-- + drivers/net/ethernet/via/via-velocity.h | 8 +- + drivers/net/ethernet/wiznet/w5100.c | 2 - + drivers/net/ethernet/wiznet/w5300.c | 2 - + drivers/net/ethernet/xilinx/Kconfig | 4 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 5 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 236 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 - + drivers/net/fddi/skfp/skfddi.c | 13 +- + drivers/net/hamradio/bpqether.c | 7 +- + drivers/net/hippi/rrunner.c | 13 +- + drivers/net/irda/bfin_sir.c | 1 - + drivers/net/irda/sh_irda.c | 1 - + drivers/net/irda/sh_sir.c | 1 - + drivers/net/macvlan.c | 12 +- + drivers/net/macvtap.c | 341 ++- + drivers/net/netconsole.c | 5 +- + drivers/net/nlmon.c | 174 ++ + drivers/net/phy/Kconfig | 10 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/at803x.c | 128 +- + drivers/net/phy/bcm63xx.c | 4 +- + drivers/net/phy/marvell.c | 108 +- + drivers/net/phy/mdio-sun4i.c | 194 ++ + drivers/net/phy/phy.c | 26 +- + drivers/net/phy/phy_device.c | 11 +- + drivers/net/phy/spi_ks8995.c | 14 +- + drivers/net/phy/vitesse.c | 38 +- + drivers/net/ppp/pppoe.c | 2 +- + drivers/net/team/team.c | 86 +- + drivers/net/team/team_mode_loadbalance.c | 3 +- + drivers/net/team/team_mode_roundrobin.c | 3 +- + drivers/net/tun.c | 12 +- + drivers/net/usb/Kconfig | 4 - + drivers/net/usb/ax88179_178a.c | 5 +- + drivers/net/usb/kalmia.c | 45 +- + drivers/net/usb/r8152.c | 14 +- + drivers/net/veth.c | 7 - + drivers/net/vxlan.c | 304 +- + drivers/net/wan/dlci.c | 2 +- + drivers/net/wan/hdlc.c | 2 +- + drivers/net/wan/ixp4xx_hss.c | 1 - + drivers/net/wan/lapbether.c | 2 +- + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 2 + + drivers/net/wireless/ath/Kconfig | 1 + + drivers/net/wireless/ath/Makefile | 1 + + drivers/net/wireless/ath/ath.h | 13 +- + drivers/net/wireless/ath/ath10k/Kconfig | 39 + + drivers/net/wireless/ath/ath10k/Makefile | 20 + + drivers/net/wireless/ath/ath10k/bmi.c | 295 ++ + drivers/net/wireless/ath/ath10k/bmi.h | 224 ++ + drivers/net/wireless/ath/ath10k/ce.c | 1189 ++++++++ + drivers/net/wireless/ath/ath10k/ce.h | 516 ++++ + drivers/net/wireless/ath/ath10k/core.c | 665 +++++ + drivers/net/wireless/ath/ath10k/core.h | 369 +++ + drivers/net/wireless/ath/ath10k/debug.c | 503 ++++ + drivers/net/wireless/ath/ath10k/debug.h | 90 + + drivers/net/wireless/ath/ath10k/hif.h | 137 + + drivers/net/wireless/ath/ath10k/htc.c | 1000 +++++++ + drivers/net/wireless/ath/ath10k/htc.h | 368 +++ + drivers/net/wireless/ath/ath10k/htt.c | 152 + + drivers/net/wireless/ath/ath10k/htt.h | 1338 +++++++++ + drivers/net/wireless/ath/ath10k/htt_rx.c | 1167 ++++++++ + drivers/net/wireless/ath/ath10k/htt_tx.c | 510 ++++ + drivers/net/wireless/ath/ath10k/hw.h | 304 ++ + drivers/net/wireless/ath/ath10k/mac.c | 3066 ++++++++++++++++++++ + drivers/net/wireless/ath/ath10k/mac.h | 61 + + drivers/net/wireless/ath/ath10k/pci.c | 2506 ++++++++++++++++ + drivers/net/wireless/ath/ath10k/pci.h | 355 +++ + drivers/net/wireless/ath/ath10k/rx_desc.h | 990 +++++++ + drivers/net/wireless/ath/ath10k/targaddrs.h | 449 +++ + drivers/net/wireless/ath/ath10k/trace.c | 20 + + drivers/net/wireless/ath/ath10k/trace.h | 170 ++ + drivers/net/wireless/ath/ath10k/txrx.c | 417 +++ + drivers/net/wireless/ath/ath10k/txrx.h | 39 + + drivers/net/wireless/ath/ath10k/wmi.c | 2081 +++++++++++++ + drivers/net/wireless/ath/ath10k/wmi.h | 3052 +++++++++++++++++++ + drivers/net/wireless/ath/ath5k/ahb.c | 2 - + drivers/net/wireless/ath/ath5k/base.c | 79 +- + drivers/net/wireless/ath/ath5k/base.h | 14 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 51 +- + drivers/net/wireless/ath/ath6kl/debug.c | 8 +- + drivers/net/wireless/ath/ath6kl/init.c | 14 +- + drivers/net/wireless/ath/ath6kl/sdio.c | 12 +- + drivers/net/wireless/ath/ath6kl/usb.c | 36 +- + drivers/net/wireless/ath/ath9k/Kconfig | 8 - + drivers/net/wireless/ath/ath9k/ahb.c | 2 - + drivers/net/wireless/ath/ath9k/ani.c | 89 +- + drivers/net/wireless/ath/ath9k/ani.h | 23 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 4 - + drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 14 - + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 26 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 22 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 5 +- + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 19 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 103 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 + + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 282 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 15 +- + drivers/net/wireless/ath/ath9k/beacon.c | 31 +- + drivers/net/wireless/ath/ath9k/calib.c | 1 - + drivers/net/wireless/ath/ath9k/debug.c | 430 +-- + drivers/net/wireless/ath/ath9k/debug.h | 59 - + drivers/net/wireless/ath/ath9k/dfs_debug.c | 2 +- + drivers/net/wireless/ath/ath9k/htc.h | 8 + + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 5 +- + drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 10 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 37 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 26 +- + drivers/net/wireless/ath/ath9k/hw.h | 20 +- + drivers/net/wireless/ath/ath9k/init.c | 65 +- + drivers/net/wireless/ath/ath9k/link.c | 9 +- + drivers/net/wireless/ath/ath9k/mac.c | 16 +- + drivers/net/wireless/ath/ath9k/mac.h | 4 +- + drivers/net/wireless/ath/ath9k/main.c | 55 +- + drivers/net/wireless/ath/ath9k/pci.c | 44 + + drivers/net/wireless/ath/ath9k/recv.c | 9 +- + drivers/net/wireless/ath/ath9k/wow.c | 168 +- + drivers/net/wireless/ath/ath9k/xmit.c | 333 ++- + drivers/net/wireless/ath/carl9170/carl9170.h | 3 + + drivers/net/wireless/ath/carl9170/main.c | 3 + + drivers/net/wireless/ath/carl9170/tx.c | 182 +- + drivers/net/wireless/ath/regd.c | 6 +- + drivers/net/wireless/ath/wil6210/Kconfig | 12 + + drivers/net/wireless/ath/wil6210/Makefile | 21 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 38 +- + drivers/net/wireless/ath/wil6210/debug.c | 69 + + drivers/net/wireless/ath/wil6210/debugfs.c | 8 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 29 +- + drivers/net/wireless/ath/wil6210/main.c | 64 +- + drivers/net/wireless/ath/wil6210/netdev.c | 54 + + drivers/net/wireless/ath/wil6210/trace.c | 20 + + drivers/net/wireless/ath/wil6210/trace.h | 235 ++ + drivers/net/wireless/ath/wil6210/txrx.c | 195 +- + drivers/net/wireless/ath/wil6210/txrx.h | 32 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 28 +- + drivers/net/wireless/ath/wil6210/wmi.c | 60 +- + drivers/net/wireless/b43/Kconfig | 6 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 179 +- + .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 117 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 2 + + drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 3 + + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 18 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 6 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 23 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 176 +- + drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 787 +++-- + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h | 1 + + .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 15 +- + .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 21 + + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 8 + + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 18 +- + drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 2 +- + drivers/net/wireless/cw1200/Kconfig | 30 + + drivers/net/wireless/cw1200/Makefile | 21 + + drivers/net/wireless/cw1200/bh.c | 619 ++++ + drivers/net/wireless/cw1200/bh.h | 28 + + drivers/net/wireless/cw1200/cw1200.h | 323 +++ + drivers/net/wireless/cw1200/cw1200_sdio.c | 425 +++ + drivers/net/wireless/cw1200/cw1200_spi.c | 463 +++ + drivers/net/wireless/cw1200/debug.c | 428 +++ + drivers/net/wireless/cw1200/debug.h | 93 + + drivers/net/wireless/cw1200/fwio.c | 520 ++++ + drivers/net/wireless/cw1200/fwio.h | 39 + + drivers/net/wireless/cw1200/hwbus.h | 33 + + drivers/net/wireless/cw1200/hwio.c | 310 ++ + drivers/net/wireless/cw1200/hwio.h | 246 ++ + drivers/net/wireless/cw1200/main.c | 605 ++++ + drivers/net/wireless/cw1200/pm.c | 367 +++ + drivers/net/wireless/cw1200/pm.h | 43 + + drivers/net/wireless/cw1200/queue.c | 583 ++++ + drivers/net/wireless/cw1200/queue.h | 116 + + drivers/net/wireless/cw1200/scan.c | 461 +++ + drivers/net/wireless/cw1200/scan.h | 56 + + drivers/net/wireless/cw1200/sta.c | 2404 +++++++++++++++ + drivers/net/wireless/cw1200/sta.h | 123 + + drivers/net/wireless/cw1200/txrx.c | 1474 ++++++++++ + drivers/net/wireless/cw1200/txrx.h | 106 + + drivers/net/wireless/cw1200/wsm.c | 1823 ++++++++++++ + drivers/net/wireless/cw1200/wsm.h | 1873 ++++++++++++ + drivers/net/wireless/ipw2x00/ipw2100.c | 2 - + drivers/net/wireless/iwlegacy/3945-mac.c | 5 +- + drivers/net/wireless/iwlegacy/3945.c | 18 + + drivers/net/wireless/iwlegacy/4965-mac.c | 25 +- + drivers/net/wireless/iwlegacy/commands.h | 8 - + drivers/net/wireless/iwlegacy/common.c | 11 + + drivers/net/wireless/iwlegacy/common.h | 41 +- + drivers/net/wireless/iwlwifi/Makefile | 6 +- + drivers/net/wireless/iwlwifi/dvm/agn.h | 21 +- + drivers/net/wireless/iwlwifi/dvm/calib.c | 8 +- + drivers/net/wireless/iwlwifi/dvm/commands.h | 12 - + drivers/net/wireless/iwlwifi/dvm/dev.h | 60 +- + drivers/net/wireless/iwlwifi/dvm/devices.c | 107 +- + drivers/net/wireless/iwlwifi/dvm/lib.c | 20 +- + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 35 +- + drivers/net/wireless/iwlwifi/dvm/main.c | 52 +- + drivers/net/wireless/iwlwifi/dvm/power.c | 6 +- + drivers/net/wireless/iwlwifi/dvm/rs.c | 8 +- + drivers/net/wireless/iwlwifi/dvm/rx.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/scan.c | 12 +- + drivers/net/wireless/iwlwifi/dvm/tt.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/tx.c | 12 +- + drivers/net/wireless/iwlwifi/dvm/ucode.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 3 - + drivers/net/wireless/iwlwifi/iwl-2000.c | 39 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 4 - + drivers/net/wireless/iwlwifi/iwl-6000.c | 32 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 53 +- + drivers/net/wireless/iwlwifi/iwl-config.h | 53 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 19 + + drivers/net/wireless/iwlwifi/iwl-debug.h | 4 + + drivers/net/wireless/iwlwifi/iwl-drv.c | 3 + + drivers/net/wireless/iwlwifi/iwl-drv.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-fw.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-modparams.h | 3 + + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-phy-db.c | 39 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 12 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 21 +- + drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 8 +- + drivers/net/wireless/iwlwifi/mvm/d3.c | 191 +- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 428 ++- + drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 4 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 8 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 93 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 10 +- + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 233 ++ + drivers/net/wireless/iwlwifi/mvm/fw.c | 37 +- + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 41 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 299 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 196 +- + drivers/net/wireless/iwlwifi/mvm/nvm.c | 212 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 37 +- + drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 76 +- + drivers/net/wireless/iwlwifi/mvm/power.c | 196 +- + drivers/net/wireless/iwlwifi/mvm/quota.c | 25 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 141 +- + drivers/net/wireless/iwlwifi/mvm/rs.h | 17 + + drivers/net/wireless/iwlwifi/mvm/rx.c | 22 + + drivers/net/wireless/iwlwifi/mvm/scan.c | 6 - + drivers/net/wireless/iwlwifi/mvm/sta.c | 24 +- + drivers/net/wireless/iwlwifi/mvm/sta.h | 8 +- + drivers/net/wireless/iwlwifi/mvm/tt.c | 512 ++++ + drivers/net/wireless/iwlwifi/mvm/tx.c | 7 +- + drivers/net/wireless/iwlwifi/mvm/utils.c | 41 + + drivers/net/wireless/iwlwifi/pcie/drv.c | 54 +- + drivers/net/wireless/iwlwifi/pcie/internal.h | 2 + + drivers/net/wireless/iwlwifi/pcie/rx.c | 44 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 51 +- + drivers/net/wireless/iwlwifi/pcie/tx.c | 40 +- + drivers/net/wireless/libertas/mesh.c | 2 +- + drivers/net/wireless/mwifiex/11h.c | 101 + + drivers/net/wireless/mwifiex/Kconfig | 4 +- + drivers/net/wireless/mwifiex/Makefile | 1 + + drivers/net/wireless/mwifiex/cfg80211.c | 122 +- + drivers/net/wireless/mwifiex/cmdevt.c | 1 + + drivers/net/wireless/mwifiex/fw.h | 33 + + drivers/net/wireless/mwifiex/init.c | 115 +- + drivers/net/wireless/mwifiex/join.c | 7 +- + drivers/net/wireless/mwifiex/main.c | 101 +- + drivers/net/wireless/mwifiex/main.h | 32 +- + drivers/net/wireless/mwifiex/scan.c | 60 +- + drivers/net/wireless/mwifiex/sdio.c | 463 ++- + drivers/net/wireless/mwifiex/sdio.h | 340 ++- + drivers/net/wireless/mwifiex/sta_cmd.c | 62 + + drivers/net/wireless/mwifiex/sta_cmdresp.c | 17 + + drivers/net/wireless/mwifiex/sta_event.c | 11 + + drivers/net/wireless/mwifiex/sta_ioctl.c | 52 +- + drivers/net/wireless/mwifiex/uap_cmd.c | 21 + + drivers/net/wireless/mwifiex/uap_event.c | 25 +- + drivers/net/wireless/mwifiex/wmm.c | 5 +- + drivers/net/wireless/mwl8k.c | 11 +- + drivers/net/wireless/orinoco/orinoco_pci.h | 2 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 3 +- + drivers/net/wireless/p54/p54spi.c | 37 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 66 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 66 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 66 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 782 +++-- + drivers/net/wireless/rt2x00/rt2800pci.c | 63 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 127 +- + drivers/net/wireless/rt2x00/rt2x00.h | 9 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 54 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 9 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 32 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 21 +- + drivers/net/wireless/rt2x00/rt61pci.c | 57 +- + drivers/net/wireless/rt2x00/rt73usb.c | 55 +- + drivers/net/wireless/rtlwifi/base.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 2 +- + drivers/net/wireless/ti/wl1251/spi.c | 30 +- + drivers/net/wireless/ti/wl18xx/main.c | 47 +- + drivers/net/wireless/ti/wl18xx/reg.h | 15 + + drivers/net/wireless/ti/wlcore/Makefile | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 284 +- + drivers/net/wireless/ti/wlcore/ps.c | 2 +- + drivers/net/wireless/ti/wlcore/spi.c | 14 +- + drivers/net/wireless/ti/wlcore/sysfs.c | 216 ++ + drivers/net/wireless/ti/wlcore/sysfs.h | 28 + + drivers/net/wireless/ti/wlcore/tx.c | 2 +- + drivers/net/xen-netback/common.h | 14 +- + drivers/net/xen-netback/interface.c | 102 +- + drivers/net/xen-netback/netback.c | 35 +- + drivers/net/xen-netback/xenbus.c | 46 +- + drivers/net/xen-netfront.c | 225 +- + drivers/nfc/Kconfig | 10 + + drivers/nfc/Makefile | 1 + + drivers/nfc/mei_phy.c | 6 +- + drivers/nfc/microread/microread.c | 6 +- + drivers/nfc/nfcsim.c | 541 ++++ + drivers/nfc/nfcwilink.c | 18 +- + drivers/nfc/pn533.c | 31 +- + drivers/nfc/pn544/pn544.c | 40 +- + drivers/of/of_net.c | 1 + + drivers/s390/net/netiucv.c | 20 - + drivers/s390/net/qeth_core.h | 2 +- + drivers/s390/net/qeth_core_main.c | 23 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 +- + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/fcoe/fcoe_transport.c | 2 +- + drivers/scsi/libiscsi_tcp.c | 1 - + drivers/ssb/driver_chipcommon_sflash.c | 34 +- + drivers/ssb/main.c | 8 + + drivers/ssb/pcihost_wrapper.c | 2 +- + drivers/ssb/sprom.c | 2 +- + drivers/ssb/ssb_private.h | 4 + + drivers/staging/csr/netdev.c | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 2 +- + drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 4 +- + drivers/staging/silicom/Kconfig | 7 +- + drivers/staging/silicom/bpctl_mod.c | 2 +- + fs/select.c | 34 +- + include/linux/can/platform/flexcan.h | 20 - + include/linux/filter.h | 4 +- + include/linux/ieee80211.h | 10 + + include/linux/if_link.h | 1 + + include/linux/if_macvlan.h | 12 +- + include/linux/if_team.h | 11 + + include/linux/if_vlan.h | 2 - + include/linux/igmp.h | 1 + + include/linux/inetdevice.h | 5 + + include/linux/ktime.h | 13 + + include/linux/marvell_phy.h | 2 + + include/linux/mlx4/cmd.h | 2 +- + include/linux/mv643xx_eth.h | 2 + + include/linux/net.h | 6 +- + include/linux/netdev_features.h | 4 +- + include/linux/netdevice.h | 85 +- + include/linux/netfilter.h | 2 +- + include/linux/netlink.h | 27 + + include/linux/netpoll.h | 4 +- + include/linux/phy.h | 27 + + include/linux/platform_data/net-cw1200.h | 81 + + include/linux/sched.h | 9 + + include/linux/skbuff.h | 137 +- + include/linux/ssb/ssb_driver_mips.h | 15 + + include/linux/ssb/ssb_regs.h | 1 + + include/linux/tcp.h | 1 - + include/net/act_api.h | 2 +- + include/net/addrconf.h | 1 + + include/net/cfg80211.h | 192 +- + include/net/gen_stats.h | 10 +- + include/net/gre.h | 27 + + include/net/ieee80211_radiotap.h | 7 + + include/net/if_inet6.h | 13 +- + include/net/inet_ecn.h | 6 +- + include/net/inet_sock.h | 1 - + include/net/ip_fib.h | 4 +- + include/net/ip_tunnels.h | 36 +- + include/net/ip_vs.h | 8 +- + include/net/ipv6.h | 10 +- + include/net/ll_poll.h | 159 + + include/net/mac80211.h | 25 +- + include/net/ndisc.h | 2 +- + include/net/net_namespace.h | 11 + + include/net/netfilter/xt_rateest.h | 2 +- + include/net/netns/x_tables.h | 6 + + include/net/nfc/hci.h | 7 +- + include/net/nfc/nci_core.h | 58 +- + include/net/nfc/nfc.h | 35 +- + include/net/ping.h | 65 +- + include/net/sch_generic.h | 17 +- + include/net/sctp/sctp.h | 36 - + include/net/sctp/structs.h | 6 +- + include/net/sock.h | 21 +- + include/net/tcp.h | 29 +- + include/net/transp_v6.h | 79 +- + include/net/udp.h | 7 +- + include/uapi/asm-generic/poll.h | 2 + + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/ethtool.h | 4 +- + include/uapi/linux/gen_stats.h | 11 + + include/uapi/linux/if_arp.h | 1 + + include/uapi/linux/if_link.h | 15 + + include/uapi/linux/if_tun.h | 2 + + include/uapi/linux/nfc.h | 18 +- + include/uapi/linux/nl80211.h | 33 + + include/uapi/linux/openvswitch.h | 20 +- + include/uapi/linux/rtnetlink.h | 2 + + include/uapi/linux/snmp.h | 2 + + include/uapi/linux/tipc.h | 2 +- + include/uapi/linux/tipc_config.h | 2 +- + include/xen/interface/io/netif.h | 12 + + net/8021q/vlan.c | 2 +- + net/Kconfig | 17 + + net/Makefile | 1 + + net/appletalk/aarp.c | 2 +- + net/appletalk/ddp.c | 2 +- + net/atm/clip.c | 8 +- + net/atm/mpc.c | 6 +- + net/ax25/af_ax25.c | 6 +- + net/ax25/sysctl_net_ax25.c | 2 +- + net/batman-adv/Makefile | 1 - + net/batman-adv/bat_iv_ogm.c | 123 +- + net/batman-adv/bridge_loop_avoidance.c | 94 +- + net/batman-adv/bridge_loop_avoidance.h | 12 +- + net/batman-adv/distributed-arp-table.c | 82 +- + net/batman-adv/hard-interface.c | 98 +- + net/batman-adv/icmp_socket.c | 4 +- + net/batman-adv/main.c | 1 - + net/batman-adv/main.h | 18 +- + net/batman-adv/network-coding.c | 22 +- + net/batman-adv/network-coding.h | 6 +- + net/batman-adv/originator.c | 6 +- + net/batman-adv/originator.h | 2 +- + net/batman-adv/ring_buffer.c | 51 - + net/batman-adv/ring_buffer.h | 27 - + net/batman-adv/routing.c | 64 +- + net/batman-adv/routing.h | 1 - + net/batman-adv/send.c | 36 +- + net/batman-adv/send.h | 6 +- + net/batman-adv/soft-interface.c | 6 +- + net/batman-adv/translation-table.c | 74 +- + net/batman-adv/translation-table.h | 2 +- + net/batman-adv/types.h | 6 +- + net/batman-adv/unicast.c | 2 +- + net/batman-adv/vis.c | 19 +- + net/bridge/br_device.c | 21 +- + net/bridge/br_forward.c | 14 +- + net/bridge/br_if.c | 2 +- + net/bridge/br_input.c | 15 +- + net/bridge/br_multicast.c | 72 +- + net/bridge/br_netfilter.c | 4 +- + net/bridge/br_netlink.c | 10 +- + net/bridge/br_notify.c | 2 +- + net/bridge/br_private.h | 9 +- + net/bridge/br_sysfs_br.c | 26 + + net/bridge/br_sysfs_if.c | 4 + + net/bridge/netfilter/ebt_ulog.c | 6 + + net/bridge/netfilter/ebtables.c | 6 +- + net/caif/caif_dev.c | 4 +- + net/caif/caif_usb.c | 4 +- + net/can/af_can.c | 4 +- + net/can/bcm.c | 4 +- + net/can/gw.c | 4 +- + net/can/raw.c | 4 +- + net/core/datagram.c | 4 + + net/core/dev.c | 232 +- + net/core/drop_monitor.c | 4 +- + net/core/dst.c | 2 +- + net/core/ethtool.c | 3 +- + net/core/fib_rules.c | 4 +- + net/core/gen_estimator.c | 12 +- + net/core/gen_stats.c | 22 +- + net/core/link_watch.c | 3 + + net/core/neighbour.c | 22 +- + net/core/net-procfs.c | 16 +- + net/core/netpoll.c | 16 +- + net/core/netprio_cgroup.c | 2 +- + net/core/pktgen.c | 81 +- + net/core/rtnetlink.c | 24 +- + net/core/skbuff.c | 68 +- + net/core/sock.c | 26 + + net/core/sysctl_net_core.c | 139 +- + net/decnet/af_decnet.c | 4 +- + net/decnet/dn_dev.c | 6 +- + net/decnet/sysctl_net_decnet.c | 6 +- + net/ieee802154/6lowpan.c | 5 +- + net/ipv4/Kconfig | 11 +- + net/ipv4/Makefile | 6 +- + net/ipv4/af_inet.c | 26 +- + net/ipv4/ah4.c | 7 +- + net/ipv4/arp.c | 8 +- + net/ipv4/devinet.c | 9 +- + net/ipv4/esp4.c | 7 +- + net/ipv4/fib_frontend.c | 4 +- + net/ipv4/fib_semantics.c | 3 +- + net/ipv4/gre.c | 323 ++- + net/ipv4/icmp.c | 51 +- + net/ipv4/igmp.c | 79 +- + net/ipv4/inet_fragment.c | 2 - + net/ipv4/ip_gre.c | 249 +- + net/ipv4/ip_tunnel.c | 82 +- + net/ipv4/ip_tunnel_core.c | 122 + + net/ipv4/ipcomp.c | 7 +- + net/ipv4/ipip.c | 8 +- + net/ipv4/ipmr.c | 4 +- + net/ipv4/netfilter/Kconfig | 2 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 7 +- + net/ipv4/netfilter/ipt_ULOG.c | 6 + + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- + net/ipv4/ping.c | 641 ++-- + net/ipv4/proc.c | 1 + + net/ipv4/route.c | 144 +- + net/ipv4/sysctl_net_ipv4.c | 31 +- + net/ipv4/tcp.c | 344 +-- + net/ipv4/tcp_input.c | 517 ++-- + net/ipv4/tcp_ipv4.c | 78 +- + net/ipv4/tcp_minisocks.c | 6 +- + net/ipv4/tcp_offload.c | 332 +++ + net/ipv4/tcp_output.c | 39 +- + net/ipv4/udp.c | 87 +- + net/ipv4/udp_offload.c | 100 + + net/ipv4/xfrm4_tunnel.c | 2 +- + net/ipv6/Makefile | 2 +- + net/ipv6/addrconf.c | 304 +- + net/ipv6/addrconf_core.c | 1 + + net/ipv6/af_inet6.c | 12 + + net/ipv6/datagram.c | 27 + + net/ipv6/exthdrs_core.c | 2 +- + net/ipv6/icmp.c | 23 +- + net/ipv6/ip6_offload.c | 1 + + net/ipv6/ip6mr.c | 2 +- + net/ipv6/mcast.c | 57 +- + net/ipv6/mip6.c | 6 +- + net/ipv6/ndisc.c | 11 +- + net/ipv6/netfilter/ip6t_MASQUERADE.c | 6 +- + net/ipv6/output_core.c | 3 +- + net/ipv6/ping.c | 272 ++ + net/ipv6/raw.c | 48 +- + net/ipv6/route.c | 10 +- + net/ipv6/sit.c | 205 +- + net/ipv6/sysctl_net_ipv6.c | 4 +- + net/ipv6/tcp_ipv6.c | 2 + + net/ipv6/udp.c | 55 +- + net/ipv6/udp_offload.c | 3 +- + net/ipx/af_ipx.c | 2 +- + net/irda/irsysctl.c | 6 +- + net/iucv/af_iucv.c | 2 +- + net/mac80211/aes_ccm.c | 6 +- + net/mac80211/cfg.c | 53 +- + net/mac80211/debugfs_netdev.c | 15 +- + net/mac80211/driver-ops.h | 3 +- + net/mac80211/ht.c | 4 +- + net/mac80211/ibss.c | 49 +- + net/mac80211/ieee80211_i.h | 31 +- + net/mac80211/iface.c | 34 +- + net/mac80211/key.c | 24 +- + net/mac80211/key.h | 15 +- + net/mac80211/main.c | 7 +- + net/mac80211/mesh.c | 62 +- + net/mac80211/mesh.h | 5 +- + net/mac80211/mlme.c | 407 +-- + net/mac80211/rx.c | 56 +- + net/mac80211/sta_info.c | 6 +- + net/mac80211/sta_info.h | 8 + + net/mac80211/tx.c | 11 +- + net/mac80211/util.c | 41 +- + net/mac80211/wep.c | 48 +- + net/mac80211/wpa.c | 68 +- + net/mpls/Kconfig | 9 + + net/mpls/Makefile | 4 + + net/mpls/mpls_gso.c | 108 + + net/netfilter/core.c | 21 +- + net/netfilter/ipvs/ip_vs_conn.c | 23 +- + net/netfilter/ipvs/ip_vs_ctl.c | 16 +- + net/netfilter/ipvs/ip_vs_lblc.c | 2 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 2 +- + net/netfilter/nf_conntrack_ftp.c | 73 +- + net/netfilter/nf_conntrack_standalone.c | 4 +- + net/netfilter/nf_log.c | 6 +- + net/netfilter/nf_nat_helper.c | 2 +- + net/netfilter/nfnetlink_queue_core.c | 31 +- + net/netfilter/xt_CT.c | 10 +- + net/netfilter/xt_TEE.c | 2 +- + net/netfilter/xt_rateest.c | 2 +- + net/netfilter/xt_socket.c | 26 +- + net/netlabel/netlabel_unlabeled.c | 7 +- + net/netlink/af_netlink.c | 178 +- + net/netlink/af_netlink.h | 1 + + net/netrom/af_netrom.c | 2 +- + net/netrom/sysctl_net_netrom.c | 2 +- + net/nfc/core.c | 224 +- + net/nfc/hci/core.c | 75 +- + net/nfc/llcp.h | 3 +- + net/nfc/llcp_commands.c | 22 +- + net/nfc/llcp_core.c | 16 +- + net/nfc/llcp_sock.c | 19 +- + net/nfc/nci/Kconfig | 10 + + net/nfc/nci/Makefile | 4 +- + net/nfc/nci/core.c | 37 +- + net/nfc/nci/data.c | 2 - + net/nfc/nci/spi.c | 378 +++ + net/nfc/netlink.c | 183 +- + net/nfc/nfc.h | 11 + + net/openvswitch/Kconfig | 2 + + net/openvswitch/Makefile | 3 +- + net/openvswitch/actions.c | 8 + + net/openvswitch/datapath.c | 371 ++- + net/openvswitch/datapath.h | 4 + + net/openvswitch/dp_notify.c | 2 +- + net/openvswitch/flow.c | 211 +- + net/openvswitch/flow.h | 47 +- + net/openvswitch/vport-gre.c | 274 ++ + net/openvswitch/vport-internal_dev.c | 3 +- + net/openvswitch/vport-netdev.c | 9 +- + net/openvswitch/vport-netdev.h | 1 - + net/openvswitch/vport.c | 34 +- + net/openvswitch/vport.h | 23 +- + net/packet/af_packet.c | 5 +- + net/phonet/pn_dev.c | 4 +- + net/phonet/sysctl.c | 4 +- + net/rds/ib_sysctl.c | 2 +- + net/rds/iw_sysctl.c | 2 +- + net/rds/sysctl.c | 2 +- + net/rose/af_rose.c | 6 +- + net/rose/sysctl_net_rose.c | 2 +- + net/sched/act_mirred.c | 2 +- + net/sched/sch_cbq.c | 2 +- + net/sched/sch_drr.c | 2 +- + net/sched/sch_generic.c | 44 +- + net/sched/sch_hfsc.c | 2 +- + net/sched/sch_htb.c | 261 +- + net/sched/sch_qfq.c | 2 +- + net/sched/sch_tbf.c | 47 +- + net/sctp/associola.c | 17 +- + net/sctp/bind_addr.c | 2 +- + net/sctp/chunk.c | 2 +- + net/sctp/endpointola.c | 22 +- + net/sctp/input.c | 6 +- + net/sctp/ipv6.c | 8 +- + net/sctp/proc.c | 12 +- + net/sctp/protocol.c | 8 +- + net/sctp/sm_make_chunk.c | 29 +- + net/sctp/sm_sideeffect.c | 5 +- + net/sctp/sm_statefuns.c | 8 +- + net/sctp/socket.c | 119 +- + net/sctp/sysctl.c | 10 +- + net/sctp/transport.c | 2 +- + net/sctp/tsnmap.c | 10 +- + net/sctp/ulpevent.c | 10 +- + net/socket.c | 23 +- + net/sunrpc/sysctl.c | 10 +- + net/sunrpc/xprtrdma/svc_rdma.c | 8 +- + net/sunrpc/xprtrdma/transport.c | 4 +- + net/sunrpc/xprtsock.c | 4 +- + net/tipc/Makefile | 3 +- + net/tipc/bcast.c | 3 +- + net/tipc/bcast.h | 3 +- + net/tipc/config.c | 119 +- + net/tipc/core.c | 22 +- + net/tipc/core.h | 17 +- + net/tipc/discover.c | 7 +- + net/tipc/eth_media.c | 19 +- + net/tipc/ib_media.c | 17 +- + net/tipc/link.c | 88 +- + net/tipc/msg.c | 19 +- + net/tipc/msg.h | 8 +- + net/tipc/name_table.c | 10 +- + net/tipc/name_table.h | 11 +- + net/tipc/node_subscr.c | 2 +- + net/tipc/port.c | 320 +- + net/tipc/port.h | 85 +- + net/tipc/server.c | 596 ++++ + net/tipc/server.h | 94 + + net/tipc/socket.c | 146 +- + net/tipc/subscr.c | 348 +-- + net/tipc/subscr.h | 21 +- + net/tipc/sysctl.c | 64 + + net/unix/sysctl_net_unix.c | 2 +- + net/vmw_vsock/af_vsock.c | 55 +- + net/vmw_vsock/vmci_transport.c | 18 +- + net/wireless/core.c | 264 +- + net/wireless/core.h | 123 +- + net/wireless/debugfs.c | 4 +- + net/wireless/ibss.c | 16 +- + net/wireless/mesh.c | 15 +- + net/wireless/mlme.c | 427 +-- + net/wireless/nl80211.c | 531 ++-- + net/wireless/reg.c | 138 +- + net/wireless/scan.c | 47 +- + net/wireless/sme.c | 629 ++-- + net/wireless/sysfs.c | 8 +- + net/wireless/trace.h | 46 +- + net/wireless/util.c | 39 +- + net/wireless/wext-compat.c | 22 +- + net/wireless/wext-sme.c | 49 +- + net/x25/af_x25.c | 2 +- + net/xfrm/xfrm_input.c | 5 + + net/xfrm/xfrm_output.c | 9 +- + net/xfrm/xfrm_policy.c | 2 +- + net/xfrm/xfrm_proc.c | 1 + + security/selinux/netif.c | 2 +- + 1070 files changed, 67478 insertions(+), 16116 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt + create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt + create mode 100644 Documentation/devicetree/bindings/net/arc_emac.txt + create mode 100644 Documentation/devicetree/bindings/net/davicom-dm9000.txt + create mode 100644 Documentation/devicetree/bindings/net/marvell-orion-net.txt + create mode 100644 Documentation/devicetree/bindings/net/micrel-ks8851.txt + create mode 100644 Documentation/devicetree/bindings/net/via-velocity.txt + delete mode 100644 Documentation/networking/ifenslave.c + create mode 100644 drivers/net/ethernet/allwinner/Kconfig + create mode 100644 drivers/net/ethernet/allwinner/Makefile + create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.c + create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.h + create mode 100644 drivers/net/ethernet/arc/Kconfig + create mode 100644 drivers/net/ethernet/arc/Makefile + create mode 100644 drivers/net/ethernet/arc/emac.h + create mode 100644 drivers/net/ethernet/arc/emac_main.c + create mode 100644 drivers/net/ethernet/arc/emac_mdio.c + create mode 100644 drivers/net/nlmon.c + create mode 100644 drivers/net/phy/mdio-sun4i.c + create mode 100644 drivers/net/wireless/ath/ath10k/Kconfig + create mode 100644 drivers/net/wireless/ath/ath10k/Makefile + create mode 100644 drivers/net/wireless/ath/ath10k/bmi.c + create mode 100644 drivers/net/wireless/ath/ath10k/bmi.h + create mode 100644 drivers/net/wireless/ath/ath10k/ce.c + create mode 100644 drivers/net/wireless/ath/ath10k/ce.h + create mode 100644 drivers/net/wireless/ath/ath10k/core.c + create mode 100644 drivers/net/wireless/ath/ath10k/core.h + create mode 100644 drivers/net/wireless/ath/ath10k/debug.c + create mode 100644 drivers/net/wireless/ath/ath10k/debug.h + create mode 100644 drivers/net/wireless/ath/ath10k/hif.h + create mode 100644 drivers/net/wireless/ath/ath10k/htc.c + create mode 100644 drivers/net/wireless/ath/ath10k/htc.h + create mode 100644 drivers/net/wireless/ath/ath10k/htt.c + create mode 100644 drivers/net/wireless/ath/ath10k/htt.h + create mode 100644 drivers/net/wireless/ath/ath10k/htt_rx.c + create mode 100644 drivers/net/wireless/ath/ath10k/htt_tx.c + create mode 100644 drivers/net/wireless/ath/ath10k/hw.h + create mode 100644 drivers/net/wireless/ath/ath10k/mac.c + create mode 100644 drivers/net/wireless/ath/ath10k/mac.h + create mode 100644 drivers/net/wireless/ath/ath10k/pci.c + create mode 100644 drivers/net/wireless/ath/ath10k/pci.h + create mode 100644 drivers/net/wireless/ath/ath10k/rx_desc.h + create mode 100644 drivers/net/wireless/ath/ath10k/targaddrs.h + create mode 100644 drivers/net/wireless/ath/ath10k/trace.c + create mode 100644 drivers/net/wireless/ath/ath10k/trace.h + create mode 100644 drivers/net/wireless/ath/ath10k/txrx.c + create mode 100644 drivers/net/wireless/ath/ath10k/txrx.h + create mode 100644 drivers/net/wireless/ath/ath10k/wmi.c + create mode 100644 drivers/net/wireless/ath/ath10k/wmi.h + create mode 100644 drivers/net/wireless/ath/wil6210/debug.c + create mode 100644 drivers/net/wireless/ath/wil6210/trace.c + create mode 100644 drivers/net/wireless/ath/wil6210/trace.h + create mode 100644 drivers/net/wireless/cw1200/Kconfig + create mode 100644 drivers/net/wireless/cw1200/Makefile + create mode 100644 drivers/net/wireless/cw1200/bh.c + create mode 100644 drivers/net/wireless/cw1200/bh.h + create mode 100644 drivers/net/wireless/cw1200/cw1200.h + create mode 100644 drivers/net/wireless/cw1200/cw1200_sdio.c + create mode 100644 drivers/net/wireless/cw1200/cw1200_spi.c + create mode 100644 drivers/net/wireless/cw1200/debug.c + create mode 100644 drivers/net/wireless/cw1200/debug.h + create mode 100644 drivers/net/wireless/cw1200/fwio.c + create mode 100644 drivers/net/wireless/cw1200/fwio.h + create mode 100644 drivers/net/wireless/cw1200/hwbus.h + create mode 100644 drivers/net/wireless/cw1200/hwio.c + create mode 100644 drivers/net/wireless/cw1200/hwio.h + create mode 100644 drivers/net/wireless/cw1200/main.c + create mode 100644 drivers/net/wireless/cw1200/pm.c + create mode 100644 drivers/net/wireless/cw1200/pm.h + create mode 100644 drivers/net/wireless/cw1200/queue.c + create mode 100644 drivers/net/wireless/cw1200/queue.h + create mode 100644 drivers/net/wireless/cw1200/scan.c + create mode 100644 drivers/net/wireless/cw1200/scan.h + create mode 100644 drivers/net/wireless/cw1200/sta.c + create mode 100644 drivers/net/wireless/cw1200/sta.h + create mode 100644 drivers/net/wireless/cw1200/txrx.c + create mode 100644 drivers/net/wireless/cw1200/txrx.h + create mode 100644 drivers/net/wireless/cw1200/wsm.c + create mode 100644 drivers/net/wireless/cw1200/wsm.h + create mode 100644 drivers/net/wireless/iwlwifi/mvm/tt.c + create mode 100644 drivers/net/wireless/mwifiex/11h.c + create mode 100644 drivers/net/wireless/ti/wlcore/sysfs.c + create mode 100644 drivers/net/wireless/ti/wlcore/sysfs.h + create mode 100644 drivers/nfc/nfcsim.c + delete mode 100644 include/linux/can/platform/flexcan.h + create mode 100644 include/linux/platform_data/net-cw1200.h + create mode 100644 include/net/ll_poll.h + delete mode 100644 net/batman-adv/ring_buffer.c + delete mode 100644 net/batman-adv/ring_buffer.h + create mode 100644 net/ipv4/ip_tunnel_core.c + create mode 100644 net/ipv4/tcp_offload.c + create mode 100644 net/ipv4/udp_offload.c + create mode 100644 net/ipv6/ping.c + create mode 100644 net/mpls/Kconfig + create mode 100644 net/mpls/Makefile + create mode 100644 net/mpls/mpls_gso.c + create mode 100644 net/nfc/nci/spi.c + create mode 100644 net/openvswitch/vport-gre.c + create mode 100644 net/tipc/server.c + create mode 100644 net/tipc/server.h + create mode 100644 net/tipc/sysctl.c +Merging ipsec-next/master (0289094 af_key: constify lookup tables) +$ git merge --no-ff ipsec-next/master +Auto-merging net/key/af_key.c +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 2 +- + net/key/af_key.c | 6 +++--- + net/xfrm/xfrm_state.c | 12 +++++++----- + 3 files changed, 11 insertions(+), 9 deletions(-) +Merging wireless-next/master (0f817ed ath10k: minimally handle new channel width enumeration values) +$ git merge --no-ff wireless-next/master +Resolved 'net/wireless/nl80211.c' using previous resolution. +Auto-merging net/wireless/nl80211.c +CONFLICT (content): Merge conflict in net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Auto-merging net/bluetooth/hidp/core.c +Removing drivers/net/wireless/iwlwifi/iwl-testmode.h +Removing drivers/net/wireless/iwlwifi/iwl-test.h +Removing drivers/net/wireless/iwlwifi/iwl-test.c +Removing drivers/net/wireless/iwlwifi/dvm/testmode.c +Auto-merging drivers/net/wireless/ath/ath9k/htc_drv_debug.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 87768c9] Merge remote-tracking branch 'wireless-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bcma/bcma_private.h | 2 + + drivers/bcma/driver_chipcommon.c | 11 +- + drivers/bcma/driver_chipcommon_pmu.c | 123 ++ + drivers/bcma/host_pci.c | 1 + + drivers/bcma/main.c | 19 + + drivers/bcma/sprom.c | 1 + + drivers/bluetooth/btusb.c | 1 + + drivers/net/wireless/ath/ath10k/mac.c | 53 +- + drivers/net/wireless/ath/ath10k/pci.c | 5 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 7 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 62 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 4 +- + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 63 + + .../net/wireless/ath/ath9k/ar9462_2p1_initvals.h | 1774 ++++++++++++++++++++ + drivers/net/wireless/ath/ath9k/ath9k.h | 1 + + drivers/net/wireless/ath/ath9k/hif_usb.c | 8 +- + drivers/net/wireless/ath/ath9k/htc.h | 16 + + drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 97 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 13 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 44 + + drivers/net/wireless/ath/ath9k/hw.c | 2 +- + drivers/net/wireless/ath/ath9k/init.c | 1 + + drivers/net/wireless/ath/ath9k/pci.c | 57 + + drivers/net/wireless/ath/ath9k/reg.h | 13 +- + drivers/net/wireless/ath/ath9k/xmit.c | 10 +- + drivers/net/wireless/ath/wil6210/txrx.c | 12 +- + drivers/net/wireless/ath/wil6210/txrx.h | 4 + + drivers/net/wireless/b43/Kconfig | 6 - + drivers/net/wireless/b43/main.c | 12 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 165 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 29 +- + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 260 ++- + .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 5 - + drivers/net/wireless/cw1200/cw1200.h | 2 +- + drivers/net/wireless/cw1200/cw1200_spi.c | 32 +- + drivers/net/wireless/cw1200/hwio.c | 18 +- + drivers/net/wireless/cw1200/hwio.h | 31 +- + drivers/net/wireless/cw1200/main.c | 4 +- + drivers/net/wireless/cw1200/queue.c | 2 +- + drivers/net/wireless/cw1200/sta.c | 23 +- + drivers/net/wireless/cw1200/txrx.c | 9 +- + drivers/net/wireless/cw1200/wsm.c | 33 +- + drivers/net/wireless/cw1200/wsm.h | 45 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 1 + + drivers/net/wireless/ipw2x00/libipw_rx.c | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 10 - + drivers/net/wireless/iwlwifi/Makefile | 1 - + drivers/net/wireless/iwlwifi/dvm/Makefile | 1 - + drivers/net/wireless/iwlwifi/dvm/agn.h | 37 - + drivers/net/wireless/iwlwifi/dvm/dev.h | 13 +- + drivers/net/wireless/iwlwifi/dvm/lib.c | 6 - + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 2 - + drivers/net/wireless/iwlwifi/dvm/main.c | 15 +- + drivers/net/wireless/iwlwifi/dvm/rs.c | 43 +- + drivers/net/wireless/iwlwifi/dvm/rx.c | 40 +- + drivers/net/wireless/iwlwifi/dvm/testmode.c | 471 ------ + drivers/net/wireless/iwlwifi/dvm/tx.c | 12 - + drivers/net/wireless/iwlwifi/iwl-7000.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-config.h | 1 + + drivers/net/wireless/iwlwifi/iwl-drv.c | 16 - + drivers/net/wireless/iwlwifi/iwl-modparams.h | 6 - + drivers/net/wireless/iwlwifi/iwl-test.c | 852 ---------- + drivers/net/wireless/iwlwifi/iwl-test.h | 161 -- + drivers/net/wireless/iwlwifi/iwl-testmode.h | 309 ---- + drivers/net/wireless/iwlwifi/iwl-trans.h | 2 - + drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 21 +- + drivers/net/wireless/iwlwifi/mvm/d3.c | 6 + + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 27 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 5 + + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 56 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 8 +- + drivers/net/wireless/iwlwifi/mvm/power.c | 22 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 30 +- + drivers/net/wireless/iwlwifi/mvm/tt.c | 22 +- + drivers/net/wireless/iwlwifi/pcie/rx.c | 71 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 17 +- + drivers/net/wireless/rt2x00/rt2800.h | 12 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 53 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 11 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 8 +- + drivers/net/wireless/rt2x00/rt61pci.c | 3 +- + drivers/net/wireless/rt2x00/rt73usb.c | 3 +- + drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 6 +- + include/linux/bcma/bcma.h | 1 + + include/linux/bcma/bcma_driver_chipcommon.h | 55 + + include/linux/platform_data/brcmfmac-sdio.h | 5 + + include/net/bluetooth/hci.h | 1 - + include/net/bluetooth/hci_core.h | 29 +- + include/net/bluetooth/l2cap.h | 2 +- + include/net/cfg80211.h | 46 +- + include/net/mac80211.h | 2 + + include/uapi/linux/nl80211.h | 4 + + net/bluetooth/hci_core.c | 192 +-- + net/bluetooth/hci_event.c | 71 +- + net/bluetooth/hidp/core.c | 14 +- + net/bluetooth/l2cap_core.c | 121 +- + net/bluetooth/l2cap_sock.c | 4 +- + net/bluetooth/mgmt.c | 229 ++- + net/mac80211/cfg.c | 14 +- + net/mac80211/ht.c | 4 +- + net/mac80211/ibss.c | 65 +- + net/mac80211/ieee80211_i.h | 6 +- + net/mac80211/mesh.c | 57 +- + net/mac80211/mesh.h | 2 + + net/mac80211/mesh_plink.c | 8 +- + net/mac80211/mlme.c | 35 +- + net/mac80211/rate.c | 8 +- + net/mac80211/scan.c | 9 + + net/mac80211/sta_info.c | 2 + + net/mac80211/sta_info.h | 1 + + net/mac80211/vht.c | 2 +- + net/wireless/chan.c | 57 +- + net/wireless/core.c | 6 + + net/wireless/mlme.c | 12 +- + net/wireless/nl80211.c | 287 ++-- + net/wireless/scan.c | 4 + + net/wireless/sme.c | 23 +- + net/wireless/sysfs.c | 2 +- + 119 files changed, 3765 insertions(+), 3095 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath9k/ar9462_2p1_initvals.h + delete mode 100644 drivers/net/wireless/iwlwifi/dvm/testmode.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-test.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-test.h + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-testmode.h +Merging bluetooth/master (2237c82 Bluetooth: Add support for Atheros [0cf3:e003]) +$ git merge --no-ff bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 2 ++ + drivers/bluetooth/btusb.c | 1 + + 2 files changed, 3 insertions(+) +Merging infiniband/for-next (71e1990 Merge branches 'af_ib', 'cxgb4', 'misc', 'ocrdma', 'qib' and 'srp' into for-next) +$ git merge --no-ff infiniband/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/core/addr.c | 20 +- + drivers/infiniband/core/cma.c | 906 ++++++++++++++++------------ + drivers/infiniband/core/sa_query.c | 6 + + drivers/infiniband/core/sysfs.c | 8 +- + drivers/infiniband/core/ucma.c | 321 ++++++++-- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 3 +- + drivers/infiniband/hw/ehca/ehca_main.c | 1 + + drivers/infiniband/hw/ocrdma/ocrdma.h | 63 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 86 ++- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 35 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 135 ++--- + drivers/infiniband/hw/qib/Kconfig | 8 + + drivers/infiniband/hw/qib/Makefile | 1 + + drivers/infiniband/hw/qib/qib.h | 61 +- + drivers/infiniband/hw/qib/qib_common.h | 2 +- + drivers/infiniband/hw/qib/qib_cq.c | 67 +- + drivers/infiniband/hw/qib/qib_debugfs.c | 283 +++++++++ + drivers/infiniband/hw/qib/qib_debugfs.h | 45 ++ + drivers/infiniband/hw/qib/qib_driver.c | 1 - + drivers/infiniband/hw/qib/qib_file_ops.c | 176 ++++-- + drivers/infiniband/hw/qib/qib_iba6120.c | 10 + + drivers/infiniband/hw/qib/qib_iba7220.c | 10 + + drivers/infiniband/hw/qib/qib_iba7322.c | 393 ++++++++++-- + drivers/infiniband/hw/qib/qib_init.c | 139 ++++- + drivers/infiniband/hw/qib/qib_qp.c | 123 +++- + drivers/infiniband/hw/qib/qib_verbs.c | 8 +- + drivers/infiniband/hw/qib/qib_verbs.h | 33 +- + drivers/infiniband/ulp/srp/ib_srp.c | 14 +- + include/linux/socket.h | 2 + + include/rdma/ib.h | 89 +++ + include/rdma/ib_addr.h | 6 +- + include/rdma/ib_sa.h | 7 + + include/rdma/rdma_cm.h | 13 + + include/uapi/rdma/rdma_user_cm.h | 73 ++- + 35 files changed, 2365 insertions(+), 789 deletions(-) + create mode 100644 drivers/infiniband/hw/qib/qib_debugfs.c + create mode 100644 drivers/infiniband/hw/qib/qib_debugfs.h + create mode 100644 include/rdma/ib.h +Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd) +$ git merge --no-ff mtd/master +Already up-to-date. +Merging l2-mtd/master (449e74c mtd: tests: don't print error messages when out-of-memory) +$ git merge --no-ff l2-mtd/master +Auto-merging arch/mips/bcm63xx/nvram.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/fsmc-nand.txt | 25 ++- + 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/devices/bcm47xxsflash.c | 68 ++++++ + drivers/mtd/devices/bcm47xxsflash.h | 2 + + drivers/mtd/devices/block2mtd.c | 58 +++--- + drivers/mtd/devices/elm.c | 6 +- + drivers/mtd/devices/m25p80.c | 44 +++- + drivers/mtd/devices/mtd_dataflash.c | 8 +- + drivers/mtd/devices/spear_smi.c | 6 +- + drivers/mtd/devices/sst25l.c | 6 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/davinci_nand.c | 13 +- + drivers/mtd/nand/fsl_ifc_nand.c | 3 +- + drivers/mtd/nand/fsmc_nand.c | 24 ++- + drivers/mtd/nand/gpio.c | 227 ++++++--------------- + drivers/mtd/nand/nand_base.c | 27 +-- + drivers/mtd/nand/pxa3xx_nand.c | 93 +++------ + drivers/mtd/nand/r852.c | 5 +- + drivers/mtd/tests/mtd_oobtest.c | 12 +- + drivers/mtd/tests/mtd_pagetest.c | 20 +- + drivers/mtd/tests/mtd_readtest.c | 12 +- + drivers/mtd/tests/mtd_speedtest.c | 8 +- + drivers/mtd/tests/mtd_stresstest.c | 8 +- + drivers/mtd/tests/mtd_subpagetest.c | 12 +- + include/linux/mtd/fsmc.h | 1 + + include/linux/mtd/nand.h | 9 +- + 29 files changed, 350 insertions(+), 375 deletions(-) +Merging crypto/master (02c0241 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto) +$ git merge --no-ff crypto/master +Auto-merging lib/Kconfig +Auto-merging drivers/char/hw_random/omap-rng.c +Removing arch/x86/include/asm/crypto/blowfish.h +Removing arch/x86/crypto/twofish_avx2_glue.c +Removing arch/x86/crypto/twofish-avx2-asm_64.S +Removing arch/x86/crypto/blowfish_avx2_glue.c +Removing arch/x86/crypto/blowfish-avx2-asm_64.S +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/x86/crypto/Makefile | 8 +- + arch/x86/crypto/blowfish-avx2-asm_64.S | 449 ------------- + arch/x86/crypto/blowfish_avx2_glue.c | 585 ----------------- + arch/x86/crypto/blowfish_glue.c | 32 +- + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 160 ++--- + arch/x86/crypto/crct10dif-pcl-asm_64.S | 643 +++++++++++++++++++ + arch/x86/crypto/crct10dif-pclmul_glue.c | 151 +++++ + arch/x86/crypto/sha256_ssse3_glue.c | 57 +- + arch/x86/crypto/sha512_ssse3_glue.c | 58 +- + arch/x86/crypto/twofish-avx2-asm_64.S | 600 ------------------ + arch/x86/crypto/twofish_avx2_glue.c | 584 ----------------- + arch/x86/crypto/twofish_avx_glue.c | 14 +- + arch/x86/include/asm/crypto/blowfish.h | 43 -- + arch/x86/include/asm/crypto/twofish.h | 18 - + crypto/Kconfig | 63 +- + crypto/Makefile | 1 + + crypto/crct10dif.c | 178 ++++++ + crypto/sha512_generic.c | 2 + + crypto/tcrypt.c | 8 + + crypto/testmgr.c | 176 ++++-- + crypto/testmgr.h | 33 + + drivers/char/hw_random/atmel-rng.c | 2 - + drivers/char/hw_random/bcm2835-rng.c | 2 +- + drivers/char/hw_random/bcm63xx-rng.c | 2 - + drivers/char/hw_random/n2-drv.c | 6 +- + drivers/char/hw_random/nomadik-rng.c | 2 +- + drivers/char/hw_random/octeon-rng.c | 4 +- + drivers/char/hw_random/omap-rng.c | 6 +- + drivers/char/hw_random/timeriomem-rng.c | 2 - + drivers/char/hw_random/tx4939-rng.c | 1 - + drivers/crypto/Kconfig | 12 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/caam/ctrl.c | 10 +- + drivers/crypto/caam/desc.h | 22 +- + drivers/crypto/caam/desc_constr.h | 81 ++- + drivers/crypto/caam/pdb.h | 1 + + drivers/crypto/caam/regs.h | 42 +- + drivers/crypto/dcp.c | 912 +++++++++++++++++++++++++++ + drivers/crypto/hifn_795x.c | 4 +- + drivers/crypto/mv_cesa.c | 1 - + drivers/crypto/omap-aes.c | 36 +- + drivers/crypto/omap-sham.c | 7 +- + drivers/crypto/picoxcell_crypto.c | 2 +- + drivers/crypto/s5p-sss.c | 2 - + drivers/crypto/ux500/cryp/cryp_core.c | 2 +- + include/linux/crc-t10dif.h | 4 + + lib/Kconfig | 2 + + lib/crc-t10dif.c | 73 +-- + 49 files changed, 2542 insertions(+), 2564 deletions(-) + delete mode 100644 arch/x86/crypto/blowfish-avx2-asm_64.S + delete mode 100644 arch/x86/crypto/blowfish_avx2_glue.c + create mode 100644 arch/x86/crypto/crct10dif-pcl-asm_64.S + create mode 100644 arch/x86/crypto/crct10dif-pclmul_glue.c + delete mode 100644 arch/x86/crypto/twofish-avx2-asm_64.S + delete mode 100644 arch/x86/crypto/twofish_avx2_glue.c + delete mode 100644 arch/x86/include/asm/crypto/blowfish.h + create mode 100644 crypto/crct10dif.c + create mode 100644 drivers/crypto/dcp.c +Merging drm/drm-next (d482e5f Revert "drm: kms_helper: don't lose hotplug event") +$ git merge --no-ff drm/drm-next +Resolved 'drivers/gpu/drm/drm_vm.c' using previous resolution. +Auto-merging lib/Kconfig.debug +Auto-merging drivers/gpu/drm/i915/i915_suspend.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/drm_vm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_vm.c +Auto-merging MAINTAINERS +Auto-merging Documentation/DocBook/device-drivers.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9e63fb6] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/device-drivers.tmpl | 2 + + Documentation/DocBook/drm.tmpl | 271 +- + .../devicetree/bindings/drm/tilcdc/tilcdc.txt | 8 + + .../devicetree/bindings/video/display-timing.txt | 1 + + Documentation/fb/uvesafb.txt | 16 +- + Documentation/ww-mutex-design.txt | 344 + + MAINTAINERS | 8 +- + arch/ia64/include/asm/mutex.h | 10 +- + arch/powerpc/include/asm/mutex.h | 10 +- + arch/sh/include/asm/mutex-llsc.h | 4 +- + arch/x86/include/asm/io.h | 7 + + arch/x86/include/asm/mtrr.h | 10 +- + arch/x86/include/asm/mutex_32.h | 11 +- + arch/x86/include/asm/mutex_64.h | 11 +- + arch/x86/kernel/cpu/mtrr/main.c | 71 + + drivers/base/Makefile | 2 +- + drivers/base/reservation.c | 39 + + drivers/char/agp/ati-agp.c | 4 +- + drivers/char/agp/frontend.c | 8 +- + drivers/char/agp/nvidia-agp.c | 6 +- + drivers/gpu/drm/Kconfig | 3 + + drivers/gpu/drm/Makefile | 4 +- + drivers/gpu/drm/ast/ast_drv.h | 20 +- + drivers/gpu/drm/ast/ast_fb.c | 5 +- + drivers/gpu/drm/ast/ast_ttm.c | 31 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 21 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 5 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 33 +- + drivers/gpu/drm/drm_bufs.c | 26 +- + drivers/gpu/drm/drm_crtc.c | 191 +- + drivers/gpu/drm/drm_crtc_helper.c | 45 +- + drivers/gpu/drm/drm_drv.c | 1 + + drivers/gpu/drm/drm_edid.c | 106 +- + drivers/gpu/drm/drm_edid_load.c | 3 +- + drivers/gpu/drm/drm_fb_helper.c | 43 +- + drivers/gpu/drm/drm_gem.c | 105 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 412 +- + drivers/gpu/drm/drm_ioctl.c | 15 +- + drivers/gpu/drm/drm_modes.c | 14 +- + drivers/gpu/drm/drm_pci.c | 8 +- + drivers/gpu/drm/drm_prime.c | 176 +- + drivers/gpu/drm/drm_rect.c | 295 + + drivers/gpu/drm/drm_stub.c | 14 +- + drivers/gpu/drm/drm_vm.c | 24 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 7 - + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/dvo_ch7xxx.c | 28 +- + drivers/gpu/drm/i915/i915_debugfs.c | 404 +- + drivers/gpu/drm/i915/i915_dma.c | 90 +- + drivers/gpu/drm/i915/i915_drv.c | 98 +- + drivers/gpu/drm/i915/i915_drv.h | 357 +- + drivers/gpu/drm/i915/i915_gem.c | 246 +- + drivers/gpu/drm/i915/i915_gem_context.c | 116 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 18 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 114 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 22 +- + drivers/gpu/drm/i915/i915_irq.c | 905 ++- + drivers/gpu/drm/i915/i915_reg.h | 624 +- + drivers/gpu/drm/i915/i915_suspend.c | 10 + + drivers/gpu/drm/i915/i915_sysfs.c | 74 +- + drivers/gpu/drm/i915/i915_ums.c | 90 +- + drivers/gpu/drm/i915/intel_bios.c | 100 +- + drivers/gpu/drm/i915/intel_crt.c | 35 +- + drivers/gpu/drm/i915/intel_ddi.c | 749 +-- + drivers/gpu/drm/i915/intel_display.c | 3122 +++++---- + drivers/gpu/drm/i915/intel_dp.c | 479 +- + drivers/gpu/drm/i915/intel_drv.h | 183 +- + drivers/gpu/drm/i915/intel_dvo.c | 31 + + drivers/gpu/drm/i915/intel_fb.c | 28 +- + drivers/gpu/drm/i915/intel_hdmi.c | 156 +- + drivers/gpu/drm/i915/intel_lvds.c | 297 +- + drivers/gpu/drm/i915/intel_opregion.c | 106 +- + drivers/gpu/drm/i915/intel_overlay.c | 17 +- + drivers/gpu/drm/i915/intel_panel.c | 296 +- + drivers/gpu/drm/i915/intel_pm.c | 1361 +++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 236 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 31 +- + drivers/gpu/drm/i915/intel_sdvo.c | 168 +- + drivers/gpu/drm/i915/intel_sideband.c | 177 + + drivers/gpu/drm/i915/intel_sprite.c | 229 +- + drivers/gpu/drm/i915/intel_tv.c | 11 +- + drivers/gpu/drm/mgag200/Makefile | 2 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 275 + + drivers/gpu/drm/mgag200/mgag200_drv.h | 44 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 25 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 72 +- + drivers/gpu/drm/mgag200/mgag200_reg.h | 6 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 32 +- + drivers/gpu/drm/nouveau/Kconfig | 7 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 1 + + drivers/gpu/drm/nouveau/nouveau_display.c | 103 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 1 + + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 23 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 43 +- + drivers/gpu/drm/nouveau/nouveau_gem.h | 1 + + drivers/gpu/drm/nouveau/nouveau_prime.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 13 +- + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 5 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 14 - + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 35 +- + drivers/gpu/drm/qxl/qxl_display.c | 29 +- + drivers/gpu/drm/qxl/qxl_fb.c | 4 - + drivers/gpu/drm/qxl/qxl_object.h | 5 - + drivers/gpu/drm/radeon/Makefile | 5 +- + drivers/gpu/drm/radeon/ObjectID.h | 40 + + drivers/gpu/drm/radeon/atombios.h | 547 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 88 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 51 +- + drivers/gpu/drm/radeon/btc_dpm.c | 2740 ++++++++ + drivers/gpu/drm/radeon/btc_dpm.h | 57 + + drivers/gpu/drm/radeon/btcd.h | 181 + + drivers/gpu/drm/radeon/cik.c | 6987 ++++++++++++++++++++ + drivers/gpu/drm/radeon/cik_blit_shaders.c | 246 + + drivers/gpu/drm/radeon/cik_blit_shaders.h | 32 + + drivers/gpu/drm/radeon/cik_reg.h | 147 + + drivers/gpu/drm/radeon/cikd.h | 1297 ++++ + drivers/gpu/drm/radeon/clearstate_cayman.h | 1081 +++ + drivers/gpu/drm/radeon/clearstate_defs.h | 44 + + drivers/gpu/drm/radeon/clearstate_evergreen.h | 1080 +++ + drivers/gpu/drm/radeon/clearstate_si.h | 941 +++ + drivers/gpu/drm/radeon/cypress_dpm.c | 2176 ++++++ + drivers/gpu/drm/radeon/cypress_dpm.h | 160 + + drivers/gpu/drm/radeon/evergreen.c | 644 +- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 11 +- + drivers/gpu/drm/radeon/evergreen_reg.h | 12 + + drivers/gpu/drm/radeon/evergreen_smc.h | 67 + + drivers/gpu/drm/radeon/evergreend.h | 389 +- + drivers/gpu/drm/radeon/ni.c | 198 +- + drivers/gpu/drm/radeon/ni_dpm.c | 4316 ++++++++++++ + drivers/gpu/drm/radeon/ni_dpm.h | 248 + + drivers/gpu/drm/radeon/nid.h | 561 ++ + drivers/gpu/drm/radeon/nislands_smc.h | 329 + + drivers/gpu/drm/radeon/ppsmc.h | 113 + + drivers/gpu/drm/radeon/r600.c | 147 +- + drivers/gpu/drm/radeon/r600_dpm.c | 1024 +++ + drivers/gpu/drm/radeon/r600_dpm.h | 226 + + drivers/gpu/drm/radeon/r600_hdmi.c | 11 +- + drivers/gpu/drm/radeon/r600_reg.h | 6 + + drivers/gpu/drm/radeon/r600d.h | 232 +- + drivers/gpu/drm/radeon/radeon.h | 520 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 145 + + drivers/gpu/drm/radeon/radeon_asic.c | 698 +- + drivers/gpu/drm/radeon/radeon_asic.h | 178 + + drivers/gpu/drm/radeon/radeon_atombios.c | 880 ++- + drivers/gpu/drm/radeon/radeon_cs.c | 19 +- + drivers/gpu/drm/radeon/radeon_cursor.c | 10 +- + drivers/gpu/drm/radeon/radeon_device.c | 106 +- + drivers/gpu/drm/radeon/radeon_display.c | 21 +- + drivers/gpu/drm/radeon/radeon_drv.c | 9 +- + drivers/gpu/drm/radeon/radeon_family.h | 3 + + drivers/gpu/drm/radeon/radeon_irq_kms.c | 20 + + drivers/gpu/drm/radeon/radeon_kms.c | 41 +- + drivers/gpu/drm/radeon/radeon_mode.h | 93 + + drivers/gpu/drm/radeon/radeon_object.c | 41 +- + drivers/gpu/drm/radeon/radeon_object.h | 30 +- + drivers/gpu/drm/radeon/radeon_pm.c | 607 +- + drivers/gpu/drm/radeon/radeon_prime.c | 18 +- + drivers/gpu/drm/radeon/radeon_reg.h | 1 + + drivers/gpu/drm/radeon/radeon_ring.c | 51 +- + drivers/gpu/drm/radeon/radeon_test.c | 75 +- + drivers/gpu/drm/radeon/radeon_ucode.h | 129 + + drivers/gpu/drm/radeon/radeon_uvd.c | 59 +- + drivers/gpu/drm/radeon/rs690.c | 291 +- + drivers/gpu/drm/radeon/rs780_dpm.c | 963 +++ + drivers/gpu/drm/radeon/rs780_dpm.h | 109 + + drivers/gpu/drm/radeon/rs780d.h | 168 + + drivers/gpu/drm/radeon/rv515.c | 224 +- + drivers/gpu/drm/radeon/rv6xx_dpm.c | 2059 ++++++ + drivers/gpu/drm/radeon/rv6xx_dpm.h | 95 + + drivers/gpu/drm/radeon/rv6xxd.h | 246 + + drivers/gpu/drm/radeon/rv730_dpm.c | 508 ++ + drivers/gpu/drm/radeon/rv730d.h | 165 + + drivers/gpu/drm/radeon/rv740_dpm.c | 416 ++ + drivers/gpu/drm/radeon/rv740d.h | 117 + + drivers/gpu/drm/radeon/rv770_dpm.c | 2462 +++++++ + drivers/gpu/drm/radeon/rv770_dpm.h | 288 + + drivers/gpu/drm/radeon/rv770_smc.c | 621 ++ + drivers/gpu/drm/radeon/rv770_smc.h | 209 + + drivers/gpu/drm/radeon/rv770d.h | 279 +- + drivers/gpu/drm/radeon/si.c | 1337 +++- + drivers/gpu/drm/radeon/si_dpm.c | 6387 ++++++++++++++++++ + drivers/gpu/drm/radeon/si_dpm.h | 227 + + drivers/gpu/drm/radeon/si_smc.c | 284 + + drivers/gpu/drm/radeon/sid.h | 599 +- + drivers/gpu/drm/radeon/sislands_smc.h | 397 ++ + drivers/gpu/drm/radeon/sumo_dpm.c | 1801 +++++ + drivers/gpu/drm/radeon/sumo_dpm.h | 220 + + drivers/gpu/drm/radeon/sumo_smc.c | 222 + + drivers/gpu/drm/radeon/sumod.h | 372 ++ + drivers/gpu/drm/radeon/trinity_dpm.c | 1887 ++++++ + drivers/gpu/drm/radeon/trinity_dpm.h | 131 + + drivers/gpu/drm/radeon/trinity_smc.c | 115 + + drivers/gpu/drm/radeon/trinityd.h | 228 + + drivers/gpu/drm/rcar-du/Kconfig | 9 + + drivers/gpu/drm/rcar-du/Makefile | 8 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 595 ++ + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 50 + + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 325 + + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 66 + + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 245 + + drivers/gpu/drm/rcar-du/rcar_du_kms.h | 59 + + drivers/gpu/drm/rcar-du/rcar_du_lvds.c | 216 + + drivers/gpu/drm/rcar-du/rcar_du_lvds.h | 24 + + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 507 ++ + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 67 + + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 445 ++ + drivers/gpu/drm/rcar-du/rcar_du_vga.c | 149 + + drivers/gpu/drm/rcar-du/rcar_du_vga.h | 24 + + drivers/gpu/drm/savage/savage_bci.c | 43 +- + drivers/gpu/drm/savage/savage_drv.h | 5 +- + drivers/gpu/drm/shmobile/Kconfig | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 35 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 9 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 122 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 37 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 25 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 2 + + drivers/gpu/drm/tilcdc/tilcdc_regs.h | 1 + + drivers/gpu/drm/tilcdc/tilcdc_slave.c | 51 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 2 + + drivers/gpu/drm/ttm/ttm_bo.c | 233 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 6 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 86 +- + drivers/gpu/drm/udl/udl_fb.c | 15 - + drivers/gpu/drm/udl/udl_modeset.c | 5 - + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 27 +- + drivers/gpu/host1x/dev.h | 8 +- + drivers/gpu/host1x/drm/dc.c | 5 + + drivers/gpu/host1x/drm/drm.c | 14 +- + drivers/gpu/host1x/drm/gr2d.c | 12 +- + drivers/gpu/host1x/hw/cdma_hw.c | 2 +- + drivers/gpu/host1x/hw/syncpt_hw.c | 12 +- + drivers/gpu/host1x/job.c | 135 +- + drivers/gpu/host1x/syncpt.c | 26 +- + drivers/gpu/host1x/syncpt.h | 13 +- + drivers/staging/imx-drm/ipuv3-crtc.c | 5 - + drivers/video/console/vgacon.c | 17 +- + drivers/video/of_display_timing.c | 7 +- + drivers/video/uvesafb.c | 70 +- + include/asm-generic/mutex-dec.h | 10 +- + include/asm-generic/mutex-null.h | 2 +- + include/asm-generic/mutex-xchg.h | 10 +- + include/drm/drmP.h | 38 +- + include/drm/drm_crtc.h | 37 +- + include/drm/drm_fixed.h | 94 + + include/drm/drm_gem_cma_helper.h | 9 + + include/drm/drm_os_linux.h | 16 - + include/drm/drm_pciids.h | 24 + + include/drm/drm_rect.h | 167 + + include/drm/i915_powerwell.h | 36 + + include/drm/ttm/ttm_bo_api.h | 37 +- + include/drm/ttm/ttm_bo_driver.h | 169 +- + include/drm/ttm/ttm_execbuf_util.h | 12 +- + include/linux/io.h | 25 + + include/linux/mutex-debug.h | 1 + + include/linux/mutex.h | 363 +- + include/linux/platform_data/rcar-du.h | 54 + + include/linux/reservation.h | 62 + + include/uapi/drm/drm.h | 1 + + include/uapi/drm/drm_mode.h | 13 + + include/uapi/drm/i915_drm.h | 3 +- + include/uapi/drm/tegra_drm.h | 2 + + include/video/display_timing.h | 1 + + include/video/uvesafb.h | 1 + + kernel/mutex.c | 384 +- + lib/Kconfig.debug | 13 + + lib/debug_locks.c | 2 + + lib/locking-selftest.c | 720 +- + sound/pci/hda/Kconfig | 10 + + sound/pci/hda/Makefile | 2 + + sound/pci/hda/hda_i915.c | 75 + + sound/pci/hda/hda_i915.h | 35 + + sound/pci/hda/hda_intel.c | 87 +- + 280 files changed, 68411 insertions(+), 5786 deletions(-) + create mode 100644 Documentation/ww-mutex-design.txt + create mode 100644 drivers/base/reservation.c + create mode 100644 drivers/gpu/drm/drm_rect.c + create mode 100644 drivers/gpu/drm/i915/intel_sideband.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_cursor.c + create mode 100644 drivers/gpu/drm/radeon/btc_dpm.c + create mode 100644 drivers/gpu/drm/radeon/btc_dpm.h + create mode 100644 drivers/gpu/drm/radeon/btcd.h + create mode 100644 drivers/gpu/drm/radeon/cik.c + create mode 100644 drivers/gpu/drm/radeon/cik_blit_shaders.c + create mode 100644 drivers/gpu/drm/radeon/cik_blit_shaders.h + create mode 100644 drivers/gpu/drm/radeon/cik_reg.h + create mode 100644 drivers/gpu/drm/radeon/cikd.h + create mode 100644 drivers/gpu/drm/radeon/clearstate_cayman.h + create mode 100644 drivers/gpu/drm/radeon/clearstate_defs.h + create mode 100644 drivers/gpu/drm/radeon/clearstate_evergreen.h + create mode 100644 drivers/gpu/drm/radeon/clearstate_si.h + create mode 100644 drivers/gpu/drm/radeon/cypress_dpm.c + create mode 100644 drivers/gpu/drm/radeon/cypress_dpm.h + create mode 100644 drivers/gpu/drm/radeon/evergreen_smc.h + create mode 100644 drivers/gpu/drm/radeon/ni_dpm.c + create mode 100644 drivers/gpu/drm/radeon/ni_dpm.h + create mode 100644 drivers/gpu/drm/radeon/nislands_smc.h + create mode 100644 drivers/gpu/drm/radeon/ppsmc.h + create mode 100644 drivers/gpu/drm/radeon/r600_dpm.c + create mode 100644 drivers/gpu/drm/radeon/r600_dpm.h + create mode 100644 drivers/gpu/drm/radeon/radeon_ucode.h + create mode 100644 drivers/gpu/drm/radeon/rs780_dpm.c + create mode 100644 drivers/gpu/drm/radeon/rs780_dpm.h + create mode 100644 drivers/gpu/drm/radeon/rs780d.h + create mode 100644 drivers/gpu/drm/radeon/rv6xx_dpm.c + create mode 100644 drivers/gpu/drm/radeon/rv6xx_dpm.h + create mode 100644 drivers/gpu/drm/radeon/rv6xxd.h + create mode 100644 drivers/gpu/drm/radeon/rv730_dpm.c + create mode 100644 drivers/gpu/drm/radeon/rv730d.h + create mode 100644 drivers/gpu/drm/radeon/rv740_dpm.c + create mode 100644 drivers/gpu/drm/radeon/rv740d.h + create mode 100644 drivers/gpu/drm/radeon/rv770_dpm.c + create mode 100644 drivers/gpu/drm/radeon/rv770_dpm.h + create mode 100644 drivers/gpu/drm/radeon/rv770_smc.c + create mode 100644 drivers/gpu/drm/radeon/rv770_smc.h + create mode 100644 drivers/gpu/drm/radeon/si_dpm.c + create mode 100644 drivers/gpu/drm/radeon/si_dpm.h + create mode 100644 drivers/gpu/drm/radeon/si_smc.c + create mode 100644 drivers/gpu/drm/radeon/sislands_smc.h + create mode 100644 drivers/gpu/drm/radeon/sumo_dpm.c + create mode 100644 drivers/gpu/drm/radeon/sumo_dpm.h + create mode 100644 drivers/gpu/drm/radeon/sumo_smc.c + create mode 100644 drivers/gpu/drm/radeon/sumod.h + create mode 100644 drivers/gpu/drm/radeon/trinity_dpm.c + create mode 100644 drivers/gpu/drm/radeon/trinity_dpm.h + create mode 100644 drivers/gpu/drm/radeon/trinity_smc.c + create mode 100644 drivers/gpu/drm/radeon/trinityd.h + create mode 100644 drivers/gpu/drm/rcar-du/Kconfig + create mode 100644 drivers/gpu/drm/rcar-du/Makefile + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_crtc.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_crtc.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_drv.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_drv.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_kms.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_kms.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvds.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvds.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_plane.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_plane.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_regs.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vga.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vga.h + create mode 100644 include/drm/drm_rect.h + create mode 100644 include/drm/i915_powerwell.h + create mode 100644 include/linux/platform_data/rcar-du.h + create mode 100644 include/linux/reservation.h + create mode 100644 sound/pci/hda/hda_i915.c + create mode 100644 sound/pci/hda/hda_i915.h +Merging drm-intel/for-linux-next (b110d88 drm/i915: flip on a no fb -> fb transition if crtc is active v3) +$ git merge --no-ff drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_debugfs.c | 241 ++++++++++------ + drivers/gpu/drm/i915/i915_dma.c | 8 +- + drivers/gpu/drm/i915/i915_drv.c | 23 +- + drivers/gpu/drm/i915/i915_drv.h | 75 +++-- + drivers/gpu/drm/i915/i915_gem.c | 49 ++-- + drivers/gpu/drm/i915/i915_gem_context.c | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 81 +++--- + drivers/gpu/drm/i915/i915_gem_stolen.c | 20 +- + drivers/gpu/drm/i915/i915_irq.c | 213 +++++++------- + drivers/gpu/drm/i915/i915_reg.h | 84 +++--- + drivers/gpu/drm/i915/intel_ddi.c | 7 +- + drivers/gpu/drm/i915/intel_display.c | 494 +++++++++++++++++++++----------- + drivers/gpu/drm/i915/intel_dp.c | 222 ++++++++------ + drivers/gpu/drm/i915/intel_drv.h | 29 +- + drivers/gpu/drm/i915/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 21 +- + drivers/gpu/drm/i915/intel_opregion.c | 8 +- + drivers/gpu/drm/i915/intel_pm.c | 183 ++++++------ + drivers/gpu/drm/i915/intel_sdvo.c | 3 - + 19 files changed, 1051 insertions(+), 714 deletions(-) +Merging drm-tegra/drm/for-next (ebae30b gpu: host1x: Rework CPU syncpoint increment) +$ git merge --no-ff drm-tegra/drm/for-next +Already up-to-date. +Merging sound/for-next (066624c ALSA: usb-audio: Add Audio Advantage Micro II) +$ git merge --no-ff sound/for-next +Removing sound/soc/pxa/tavorevb3.c +Removing sound/soc/pxa/saarb.c +Removing sound/soc/fsl/imx-pcm.c +Removing sound/soc/davinci/davinci-sffsdr.c +Auto-merging sound/soc/codecs/spdif_transmitter.c +Auto-merging sound/soc/codecs/hdmi.c +Auto-merging sound/soc/codecs/bt-sco.c +Removing sound/soc/blackfin/bf5xx-tdm.h +Removing sound/soc/blackfin/bf5xx-tdm.c +Removing sound/soc/blackfin/bf5xx-tdm-pcm.h +Removing sound/soc/blackfin/bf5xx-tdm-pcm.c +Removing sound/soc/blackfin/bf5xx-ac97-pcm.h +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging sound/pci/hda/Kconfig +Auto-merging sound/firewire/scs1x.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/arizona.txt | 62 + + .../devicetree/bindings/sound/adi,adau1701.txt | 35 + + .../devicetree/bindings/sound/imx-audio-wm8962.txt | 46 + + .../devicetree/bindings/sound/mxs-saif.txt | 17 +- + .../bindings/sound/nvidia,tegra-audio-rt5640.txt | 71 + + Documentation/devicetree/bindings/sound/rt5640.txt | 30 + + .../devicetree/bindings/sound/sgtl5000.txt | 3 + + .../devicetree/bindings/sound/spdif-receiver.txt | 10 + + .../bindings/sound/spdif-transmitter.txt | 10 + + .../devicetree/bindings/sound/ssm2518.txt | 20 + + .../devicetree/bindings/sound/ti,tas5086.txt | 11 + + Documentation/devicetree/bindings/sound/wm8962.txt | 23 + + Documentation/sound/alsa/HD-Audio-Models.txt | 40 +- + arch/blackfin/mach-bf527/boards/ad7160eval.c | 12 - + arch/blackfin/mach-bf527/boards/ezkit.c | 32 +- + arch/blackfin/mach-bf533/boards/ezkit.c | 12 - + arch/blackfin/mach-bf533/boards/stamp.c | 35 +- + arch/blackfin/mach-bf537/boards/stamp.c | 30 +- + arch/blackfin/mach-bf548/boards/ezkit.c | 28 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 14 +- + arch/blackfin/mach-bf609/boards/ezkit.c | 2 +- + drivers/mfd/arizona-core.c | 234 ++- + drivers/mfd/arizona-i2c.c | 10 +- + drivers/mfd/arizona-spi.c | 10 +- + drivers/mfd/arizona.h | 12 + + drivers/mfd/wm5102-tables.c | 9 +- + drivers/mfd/wm5110-tables.c | 8 + + drivers/misc/atmel-ssc.c | 8 +- + include/linux/mfd/arizona/core.h | 2 + + include/linux/mfd/arizona/pdata.h | 2 +- + include/linux/mfd/arizona/registers.h | 47 + + include/linux/mfd/twl6040.h | 7 + + include/linux/mfd/wm8994/pdata.h | 5 + + include/linux/mfd/wm8994/registers.h | 8 + + include/linux/platform_data/ssm2518.h | 22 + + include/sound/control.h | 3 +- + include/sound/core.h | 2 +- + include/sound/pcm.h | 5 +- + include/sound/rt5640.h | 22 + + include/sound/soc-dapm.h | 3 +- + include/sound/soc.h | 4 +- + include/uapi/sound/asound.h | 2 + + sound/arm/aaci.c | 2 - + sound/arm/pxa2xx-ac97.c | 1 - + sound/core/Kconfig | 9 + + sound/core/init.c | 55 +- + sound/core/pcm_lib.c | 3 +- + sound/core/vmaster.c | 65 +- + sound/drivers/aloop.c | 1 - + sound/drivers/dummy.c | 1 - + sound/drivers/ml403-ac97cr.c | 1 - + sound/drivers/mpu401/mpu401.c | 1 - + sound/drivers/mtpav.c | 1 - + sound/drivers/pcsp/pcsp.c | 1 - + sound/drivers/serial-u16550.c | 1 - + sound/drivers/virmidi.c | 1 - + sound/drivers/vx/vx_core.c | 2 +- + sound/firewire/amdtp.h | 1 - + sound/firewire/scs1x.c | 4 +- + sound/i2c/other/ak4xxx-adda.c | 2 +- + sound/isa/ad1848/ad1848.c | 1 - + sound/isa/adlib.c | 1 - + sound/isa/cmi8328.c | 1 - + sound/isa/cmi8330.c | 1 - + sound/isa/cs423x/cs4231.c | 1 - + sound/isa/cs423x/cs4236.c | 2 - + sound/isa/es1688/es1688.c | 1 - + sound/isa/es18xx.c | 2 - + sound/isa/galaxy/galaxy.c | 1 - + sound/isa/gus/gusclassic.c | 1 - + sound/isa/gus/gusextreme.c | 1 - + sound/isa/gus/gusmax.c | 1 - + sound/isa/gus/interwave.c | 1 - + sound/isa/msnd/msnd_pinnacle.c | 1 - + sound/isa/opl3sa2.c | 2 - + sound/isa/opti9xx/miro.c | 1 - + sound/isa/opti9xx/opti92x-ad1848.c | 1 - + sound/isa/sb/jazz16.c | 1 - + sound/isa/sb/sb16.c | 1 - + sound/isa/sb/sb8.c | 1 - + sound/isa/sc6000.c | 1 - + sound/isa/sscape.c | 1 - + sound/isa/wavefront/wavefront.c | 1 - + sound/oss/kahlua.c | 2 - + sound/parisc/harmony.c | 3 - + sound/pci/ac97/ac97_codec.c | 2 +- + sound/pci/ad1889.c | 1 - + sound/pci/ali5451/ali5451.c | 1 - + sound/pci/als300.c | 1 - + sound/pci/als4000.c | 1 - + sound/pci/asihpi/asihpi.c | 2 +- + sound/pci/asihpi/hpioctl.c | 1 - + sound/pci/atiixp.c | 1 - + sound/pci/atiixp_modem.c | 1 - + sound/pci/au88x0/au88x0.c | 1 - + sound/pci/aw2/aw2-alsa.c | 1 - + sound/pci/azt3328.c | 1 - + sound/pci/bt87x.c | 1 - + sound/pci/ca0106/ca0106_main.c | 1 - + sound/pci/cmipci.c | 1 - + sound/pci/cs4281.c | 3 +- + sound/pci/cs46xx/cs46xx.c | 1 - + sound/pci/cs5530.c | 1 - + sound/pci/cs5535audio/cs5535audio.c | 1 - + sound/pci/ctxfi/xfi.c | 1 - + sound/pci/echoaudio/echoaudio.c | 1 - + sound/pci/emu10k1/emu10k1.c | 1 - + sound/pci/emu10k1/emu10k1x.c | 1 - + sound/pci/ens1370.c | 3 +- + sound/pci/es1938.c | 1 - + sound/pci/es1968.c | 74 +- + sound/pci/fm801.c | 1 - + sound/pci/hda/Kconfig | 1 - + sound/pci/hda/hda_codec.c | 67 +- + sound/pci/hda/hda_codec.h | 11 +- + sound/pci/hda/hda_generic.c | 59 +- + sound/pci/hda/hda_generic.h | 4 + + sound/pci/hda/hda_intel.c | 53 +- + sound/pci/hda/hda_jack.c | 2 +- + sound/pci/hda/hda_local.h | 10 +- + sound/pci/hda/hda_proc.c | 15 + + sound/pci/hda/patch_ca0132.c | 8 +- + sound/pci/hda/patch_conexant.c | 2 +- + sound/pci/hda/patch_hdmi.c | 128 +- + sound/pci/hda/patch_realtek.c | 113 ++ + sound/pci/hda/patch_sigmatel.c | 14 +- + sound/pci/hda/patch_via.c | 15 +- + sound/pci/ice1712/ice1712.c | 1 - + sound/pci/ice1712/ice1724.c | 1 - + sound/pci/intel8x0.c | 1 - + sound/pci/intel8x0m.c | 1 - + sound/pci/korg1212/korg1212.c | 1 - + sound/pci/lola/lola.c | 1 - + sound/pci/lx6464es/lx6464es.c | 1 - + sound/pci/maestro3.c | 1 - + sound/pci/mixart/mixart.c | 1 - + sound/pci/nm256/nm256.c | 1 - + sound/pci/oxygen/oxygen_lib.c | 1 - + sound/pci/pcxhr/pcxhr.c | 1 - + sound/pci/riptide/riptide.c | 2 - + sound/pci/rme32.c | 1 - + sound/pci/rme96.c | 1 - + sound/pci/rme9652/hdsp.c | 1 - + sound/pci/rme9652/hdspm.c | 59 +- + sound/pci/rme9652/rme9652.c | 1 - + sound/pci/sis7019.c | 1 - + sound/pci/sonicvibes.c | 1 - + sound/pci/trident/trident.c | 1 - + sound/pci/via82xx.c | 1 - + sound/pci/via82xx_modem.c | 1 - + sound/pci/vx222/vx222.c | 1 - + sound/pci/ymfpci/ymfpci.c | 1 - + sound/pci/ymfpci/ymfpci_main.c | 2 +- + sound/ppc/powermac.c | 1 - + sound/sh/aica.c | 1 - + sound/sh/sh_dac_audio.c | 2 - + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/atmel/sam9g20_wm8731.c | 9 - + sound/soc/au1x/ac97c.c | 21 +- + sound/soc/au1x/psc-ac97.c | 33 +- + sound/soc/blackfin/Kconfig | 47 +- + sound/soc/blackfin/Makefile | 4 - + sound/soc/blackfin/bf5xx-ac97-pcm.c | 1 - + sound/soc/blackfin/bf5xx-ac97-pcm.h | 26 - + sound/soc/blackfin/bf5xx-ac97.c | 37 +- + sound/soc/blackfin/bf5xx-ad1836.c | 19 +- + sound/soc/blackfin/bf5xx-ad193x.c | 40 +- + sound/soc/blackfin/bf5xx-ad1980.c | 1 - + sound/soc/blackfin/bf5xx-ad73311.c | 1 - + sound/soc/blackfin/bf5xx-i2s-pcm.c | 183 +- + sound/soc/blackfin/bf5xx-i2s-pcm.h | 21 +- + sound/soc/blackfin/bf5xx-i2s.c | 129 +- + sound/soc/blackfin/bf5xx-sport.c | 10 +- + sound/soc/blackfin/bf5xx-sport.h | 2 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 1 - + sound/soc/blackfin/bf5xx-tdm-pcm.c | 345 ---- + sound/soc/blackfin/bf5xx-tdm-pcm.h | 18 - + sound/soc/blackfin/bf5xx-tdm.c | 328 --- + sound/soc/blackfin/bf5xx-tdm.h | 23 - + sound/soc/cirrus/Kconfig | 2 +- + sound/soc/cirrus/ep93xx-ac97.c | 28 +- + sound/soc/cirrus/ep93xx-i2s.c | 16 +- + sound/soc/cirrus/ep93xx-pcm.c | 138 +- + sound/soc/codecs/88pm860x-codec.c | 15 +- + sound/soc/codecs/Kconfig | 16 +- + sound/soc/codecs/Makefile | 14 +- + sound/soc/codecs/ab8500-codec.c | 85 +- + sound/soc/codecs/ab8500-codec.h | 42 +- + sound/soc/codecs/ac97.c | 7 +- + sound/soc/codecs/ad1980.c | 12 +- + sound/soc/codecs/adau1701.c | 302 ++- + sound/soc/codecs/arizona.c | 7 + + sound/soc/codecs/arizona.h | 3 +- + sound/soc/codecs/{dfbmcs320.c => bt-sco.c} | 37 +- + sound/soc/codecs/{omap-hdmi.c => hdmi.c} | 26 +- + sound/soc/codecs/jz4740.c | 2 - + sound/soc/codecs/max98090.c | 24 +- + sound/soc/codecs/rt5640.c | 2128 ++++++++++++++++++++ + sound/soc/codecs/rt5640.h | 2092 +++++++++++++++++++ + sound/soc/codecs/sgtl5000.c | 267 ++- + sound/soc/codecs/sgtl5000.h | 2 +- + sound/soc/codecs/sn95031.c | 2 +- + sound/soc/codecs/spdif_receiver.c | 10 + + .../{spdif_transciever.c => spdif_transmitter.c} | 10 + + sound/soc/codecs/ssm2518.c | 856 ++++++++ + sound/soc/codecs/ssm2518.h | 20 + + sound/soc/codecs/stac9766.c | 26 +- + sound/soc/codecs/tas5086.c | 330 ++- + sound/soc/codecs/tlv320aic3x.c | 6 +- + sound/soc/codecs/twl6040.c | 109 +- + sound/soc/codecs/wm0010.c | 10 + + sound/soc/codecs/wm5102.c | 205 +- + sound/soc/codecs/wm5110.c | 192 ++ + sound/soc/codecs/wm8400.c | 9 +- + sound/soc/codecs/wm8903.c | 6 +- + sound/soc/codecs/wm8904.c | 9 +- + sound/soc/codecs/wm8962.c | 112 +- + sound/soc/codecs/wm8990.c | 11 +- + sound/soc/codecs/wm8991.h | 9 +- + sound/soc/codecs/wm8994.c | 200 +- + sound/soc/codecs/wm8994.h | 3 + + sound/soc/codecs/wm8995.h | 7 +- + sound/soc/codecs/wm9705.c | 16 +- + sound/soc/codecs/wm9712.c | 18 +- + sound/soc/codecs/wm9713.c | 18 +- + sound/soc/codecs/wm_adsp.c | 459 ++++- + sound/soc/codecs/wm_adsp.h | 13 +- + sound/soc/codecs/wm_hubs.c | 6 +- + sound/soc/davinci/Kconfig | 10 - + sound/soc/davinci/Makefile | 2 - + sound/soc/davinci/davinci-mcasp.c | 4 +- + sound/soc/davinci/davinci-sffsdr.c | 181 -- + sound/soc/dwc/designware_i2s.c | 6 +- + sound/soc/fsl/Kconfig | 17 +- + sound/soc/fsl/Makefile | 13 +- + sound/soc/fsl/eukrea-tlv320.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 13 +- + sound/soc/fsl/imx-audmux.c | 8 - + sound/soc/fsl/imx-mc13783.c | 2 +- + sound/soc/fsl/imx-pcm-dma.c | 2 + + sound/soc/fsl/imx-pcm-fiq.c | 92 + + sound/soc/fsl/imx-pcm.c | 145 -- + sound/soc/fsl/imx-pcm.h | 10 +- + sound/soc/fsl/imx-sgtl5000.c | 39 +- + sound/soc/fsl/imx-ssi.c | 55 +- + sound/soc/fsl/imx-ssi.h | 3 - + sound/soc/fsl/imx-wm8962.c | 323 +++ + sound/soc/fsl/mpc5200_psc_ac97.c | 10 +- + sound/soc/fsl/mx27vis-aic32x4.c | 2 +- + sound/soc/fsl/phycore-ac97.c | 2 +- + sound/soc/fsl/wm1133-ev1.c | 2 +- + sound/soc/jz4740/jz4740-i2s.c | 17 +- + sound/soc/kirkwood/kirkwood-dma.c | 2 +- + sound/soc/mid-x86/mfld_machine.c | 32 +- + sound/soc/mxs/mxs-pcm.c | 18 - + sound/soc/mxs/mxs-pcm.h | 7 - + sound/soc/mxs/mxs-saif.c | 37 +- + sound/soc/mxs/mxs-saif.h | 1 - + sound/soc/mxs/mxs-sgtl5000.c | 10 +- + sound/soc/nuc900/nuc900-ac97.c | 60 +- + sound/soc/omap/Kconfig | 2 +- + sound/soc/omap/Makefile | 1 - + sound/soc/omap/omap-hdmi-card.c | 2 +- + sound/soc/omap/omap-mcbsp.c | 2 - + sound/soc/pxa/Kconfig | 20 - + sound/soc/pxa/Makefile | 4 - + sound/soc/pxa/mmp-pcm.c | 6 +- + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/soc/pxa/pxa2xx-ac97.c | 8 +- + sound/soc/pxa/saarb.c | 190 -- + sound/soc/pxa/tavorevb3.c | 189 -- + sound/soc/pxa/zylonite.c | 1 - + sound/soc/samsung/Kconfig | 2 +- + sound/soc/samsung/ac97.c | 42 +- + sound/soc/samsung/bells.c | 14 + + sound/soc/samsung/neo1973_wm8753.c | 2 +- + sound/soc/samsung/smdk_wm8580pcm.c | 1 - + sound/soc/samsung/smdk_wm8994pcm.c | 1 - + sound/soc/sh/fsi.c | 10 +- + sound/soc/sh/hac.c | 8 +- + sound/soc/soc-core.c | 122 +- + sound/soc/soc-dapm.c | 108 +- + sound/soc/soc-pcm.c | 91 +- + sound/soc/soc-utils.c | 13 +- + sound/soc/spear/Kconfig | 9 + + sound/soc/spear/Makefile | 8 + + sound/soc/spear/spdif_in.c | 31 +- + sound/soc/spear/spdif_out.c | 43 +- + sound/soc/spear/spear_pcm.c | 152 +- + sound/soc/tegra/Kconfig | 10 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra20_ac97.c | 66 +- + sound/soc/tegra/tegra30_ahub.c | 25 + + sound/soc/tegra/tegra30_i2s.c | 26 + + sound/soc/tegra/tegra_asoc_utils.c | 23 +- + sound/soc/tegra/tegra_rt5640.c | 257 +++ + sound/soc/txx9/txx9aclc-ac97.c | 17 +- + sound/soc/ux500/mop500.c | 2 +- + sound/soc/ux500/mop500_ab8500.c | 62 +- + sound/soc/ux500/ux500_msp_dai.c | 11 +- + sound/soc/ux500/ux500_msp_dai.h | 4 - + sound/soc/ux500/ux500_msp_i2s.c | 88 +- + sound/soc/ux500/ux500_msp_i2s.h | 74 +- + sound/soc/ux500/ux500_pcm.c | 30 + + sound/sparc/dbri.c | 2 - + sound/spi/at73c213.c | 1 - + sound/usb/6fire/chip.c | 2 +- + sound/usb/6fire/pcm.c | 12 +- + sound/usb/Kconfig | 31 + + sound/usb/Makefile | 2 +- + sound/usb/caiaq/audio.c | 14 +- + sound/usb/caiaq/device.c | 31 +- + sound/usb/card.h | 1 + + sound/usb/clock.c | 4 +- + sound/usb/format.c | 34 +- + sound/usb/format.h | 2 +- + sound/usb/hiface/Makefile | 2 + + sound/usb/hiface/chip.c | 297 +++ + sound/usb/hiface/chip.h | 30 + + sound/usb/hiface/pcm.c | 621 ++++++ + sound/usb/hiface/pcm.h | 24 + + sound/usb/midi.c | 74 + + sound/usb/misc/ua101.c | 2 +- + sound/usb/mixer_quirks.c | 212 ++ + sound/usb/pcm.c | 45 +- + sound/usb/quirks-table.h | 509 +---- + sound/usb/quirks.c | 209 ++ + sound/usb/stream.c | 18 +- + sound/usb/usbaudio.h | 2 + + sound/usb/usx2y/usbusx2y.c | 2 +- + sound/usb/usx2y/usbusx2yaudio.c | 3 - + 332 files changed, 11985 insertions(+), 4196 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/arizona.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau1701.txt + create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5640.txt + create mode 100644 Documentation/devicetree/bindings/sound/spdif-receiver.txt + create mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt + create mode 100644 Documentation/devicetree/bindings/sound/ssm2518.txt + create mode 100644 include/linux/platform_data/ssm2518.h + create mode 100644 include/sound/rt5640.h + delete mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.h + delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.c + delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.h + delete mode 100644 sound/soc/blackfin/bf5xx-tdm.c + delete mode 100644 sound/soc/blackfin/bf5xx-tdm.h + rename sound/soc/codecs/{dfbmcs320.c => bt-sco.c} (53%) + rename sound/soc/codecs/{omap-hdmi.c => hdmi.c} (69%) + create mode 100644 sound/soc/codecs/rt5640.c + create mode 100644 sound/soc/codecs/rt5640.h + rename sound/soc/codecs/{spdif_transciever.c => spdif_transmitter.c} (88%) + create mode 100644 sound/soc/codecs/ssm2518.c + create mode 100644 sound/soc/codecs/ssm2518.h + delete mode 100644 sound/soc/davinci/davinci-sffsdr.c + delete mode 100644 sound/soc/fsl/imx-pcm.c + create mode 100644 sound/soc/fsl/imx-wm8962.c + delete mode 100644 sound/soc/pxa/saarb.c + delete mode 100644 sound/soc/pxa/tavorevb3.c + create mode 100644 sound/soc/spear/Kconfig + create mode 100644 sound/soc/spear/Makefile + create mode 100644 sound/soc/tegra/tegra_rt5640.c + create mode 100644 sound/usb/hiface/Makefile + create mode 100644 sound/usb/hiface/chip.c + create mode 100644 sound/usb/hiface/chip.h + create mode 100644 sound/usb/hiface/pcm.c + create mode 100644 sound/usb/hiface/pcm.h +Merging sound-asoc/for-next (370887f Merge remote-tracking branch 'asoc/topic/x86' into asoc-next) +$ git merge --no-ff sound-asoc/for-next +Auto-merging sound/soc/soc-core.c +Merge made by the 'recursive' strategy. + sound/soc/codecs/adau1701.c | 21 ++++++++++++--------- + sound/soc/pxa/pxa2xx-ac97.c | 2 ++ + sound/soc/pxa/pxa2xx-ac97.h | 3 --- + sound/soc/soc-core.c | 1 + + sound/soc/tegra/tegra20_ac97.c | 3 +-- + 5 files changed, 16 insertions(+), 14 deletions(-) +Merging modules/modules-next (06df44e modpost.c: Add .text.unlikely to TEXT_SECTIONS) +$ git merge --no-ff modules/modules-next +Merge made by the 'recursive' strategy. + scripts/mod/modpost.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging virtio/virtio-next (b3087e4 virtio: remove virtqueue_add_buf().) +$ git merge --no-ff virtio/virtio-next +Auto-merging include/uapi/linux/virtio_console.h +Merge made by the 'recursive' strategy. + arch/x86/lguest/Makefile | 2 +- + arch/x86/lguest/{i386_head.S => head_32.S} | 0 + drivers/block/virtio_blk.c | 2 +- + drivers/virtio/virtio_ring.c | 37 +++--------------------------- + include/linux/virtio.h | 7 ------ + include/uapi/linux/virtio_console.h | 3 +++ + include/uapi/linux/virtio_pci.h | 4 +++- + 7 files changed, 11 insertions(+), 44 deletions(-) + rename arch/x86/lguest/{i386_head.S => head_32.S} (100%) +Merging input/next (20c3da9 Input: nspire-keypad - remove redundant dev_err call in nspire_keypad_probe()) +$ git merge --no-ff input/next +Auto-merging drivers/input/keyboard/samsung-keypad.c +Auto-merging drivers/input/keyboard/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/pxa27x-keypad.txt | 60 ++++ + .../devicetree/bindings/input/ti,nspire-keypad.txt | 60 ++++ + Documentation/input/multi-touch-protocol.txt | 2 + + arch/arm/mach-mmp/aspenite.c | 10 +- + arch/arm/mach-mmp/teton_bga.c | 8 +- + arch/arm/mach-pxa/em-x270.c | 20 +- + arch/arm/mach-pxa/ezx.c | 60 ++-- + arch/arm/mach-pxa/littleton.c | 10 +- + arch/arm/mach-pxa/mainstone.c | 10 +- + arch/arm/mach-pxa/mioa701.c | 11 +- + arch/arm/mach-pxa/palmld.c | 10 +- + arch/arm/mach-pxa/palmt5.c | 10 +- + arch/arm/mach-pxa/palmtreo.c | 23 +- + arch/arm/mach-pxa/palmtx.c | 10 +- + arch/arm/mach-pxa/palmz72.c | 10 +- + arch/arm/mach-pxa/tavorevb.c | 10 +- + arch/arm/mach-pxa/z2.c | 10 +- + arch/arm/mach-pxa/zylonite.c | 10 +- + drivers/input/evdev.c | 133 ++++++++- + drivers/input/keyboard/Kconfig | 11 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/amikbd.c | 1 - + drivers/input/keyboard/bf54x-keys.c | 2 - + drivers/input/keyboard/davinci_keyscan.c | 2 - + drivers/input/keyboard/ep93xx_keypad.c | 7 +- + drivers/input/keyboard/gpio_keys.c | 1 - + drivers/input/keyboard/gpio_keys_polled.c | 2 - + drivers/input/keyboard/jornada680_kbd.c | 2 - + drivers/input/keyboard/jornada720_kbd.c | 2 - + drivers/input/keyboard/matrix_keypad.c | 2 - + drivers/input/keyboard/nspire-keypad.c | 283 +++++++++++++++++++ + drivers/input/keyboard/omap4-keypad.c | 2 - + drivers/input/keyboard/opencores-kbd.c | 2 - + drivers/input/keyboard/pmic8xxx-keypad.c | 2 - + drivers/input/keyboard/pxa27x_keypad.c | 312 ++++++++++++++++++--- + drivers/input/keyboard/pxa930_rotary.c | 1 - + drivers/input/keyboard/samsung-keypad.c | 2 - + drivers/input/keyboard/sh_keysc.c | 2 - + drivers/input/keyboard/spear-keyboard.c | 1 - + drivers/input/keyboard/tnetv107x-keypad.c | 2 - + drivers/input/keyboard/twl4030_keypad.c | 3 +- + drivers/input/keyboard/w90p910_keypad.c | 5 +- + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ab8500-ponkey.c | 2 - + drivers/input/misc/bfin_rotary.c | 1 - + drivers/input/misc/gpio_tilt_polled.c | 2 - + drivers/input/misc/ixp4xx-beeper.c | 5 +- + drivers/input/misc/m68kspkr.c | 1 - + drivers/input/misc/max8925_onkey.c | 2 - + drivers/input/misc/mc13783-pwrbutton.c | 1 - + drivers/input/misc/pcspkr.c | 1 - + drivers/input/misc/pm8xxx-vibrator.c | 2 - + drivers/input/misc/pmic8xxx-pwrkey.c | 4 +- + drivers/input/misc/pwm-beeper.c | 1 - + drivers/input/misc/rotary_encoder.c | 2 - + drivers/input/misc/sgi_btns.c | 7 +- + drivers/input/misc/sirfsoc-onkey.c | 165 +++++++++++ + drivers/input/misc/sparcspkr.c | 14 +- + drivers/input/mouse/amimouse.c | 1 - + drivers/input/mouse/gpio_mouse.c | 3 - + drivers/input/mouse/navpoint.c | 2 +- + drivers/input/serio/altera_ps2.c | 1 - + drivers/input/serio/at32psif.c | 2 - + drivers/input/serio/q40kbd.c | 1 - + drivers/input/serio/xilinx_ps2.c | 2 - + drivers/input/touchscreen/88pm860x-ts.c | 3 +- + drivers/input/touchscreen/atmel-wm97xx.c | 2 - + drivers/input/touchscreen/atmel_tsadcc.c | 10 +- + drivers/input/touchscreen/da9052_tsi.c | 2 - + drivers/input/touchscreen/egalax_ts.c | 53 +--- + drivers/input/touchscreen/intel-mid-touch.c | 2 - + drivers/input/touchscreen/jornada720_ts.c | 2 - + drivers/input/touchscreen/mc13783_ts.c | 2 - + drivers/input/touchscreen/ti_am335x_tsc.c | 1 - + drivers/input/touchscreen/tnetv107x-ts.c | 2 - + drivers/input/touchscreen/w90p910_ts.c | 2 - + drivers/input/touchscreen/wacom_i2c.c | 14 +- + drivers/tty/sysrq.c | 19 +- + include/linux/platform_data/keypad-pxa27x.h | 3 +- + 80 files changed, 1217 insertions(+), 260 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/pxa27x-keypad.txt + create mode 100644 Documentation/devicetree/bindings/input/ti,nspire-keypad.txt + create mode 100644 drivers/input/keyboard/nspire-keypad.c + create mode 100644 drivers/input/misc/sirfsoc-onkey.c +Merging input-mt/for-next (257867d Input: MT - Specify that ABS_MT_SLOT must have a minimum of 0) +$ git merge --no-ff input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (9109d44 Merge branch 'for-3.11' into for-next) +$ git merge --no-ff cgroup/for-next +Auto-merging lib/Makefile +Merge made by the 'recursive' strategy. + include/linux/cgroup.h | 229 +++--- + include/linux/percpu-refcount.h | 174 +++++ + kernel/cgroup.c | 1536 ++++++++++++++++++++++----------------- + kernel/cpuset.c | 478 +++++++----- + lib/Makefile | 2 +- + lib/percpu-refcount.c | 158 ++++ + security/device_cgroup.c | 56 +- + 7 files changed, 1656 insertions(+), 977 deletions(-) + create mode 100644 include/linux/percpu-refcount.h + create mode 100644 lib/percpu-refcount.c +Merging block/for-next (bf5c717 Merge branch 'for-3.11/drivers' into for-next) +$ git merge --no-ff block/for-next +Resolved 'include/linux/cgroup.h' using previous resolution. +Auto-merging include/linux/cgroup.h +CONFLICT (content): Merge conflict in include/linux/cgroup.h +Auto-merging fs/block_dev.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 54fbcca] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-xen-blkback | 17 + + .../ABI/testing/sysfs-driver-xen-blkfront | 10 + + Documentation/cgroups/blkio-controller.txt | 29 +- + MAINTAINERS | 2 +- + block/blk-cgroup.c | 105 +- + block/blk-cgroup.h | 38 +- + block/blk-throttle.c | 1064 ++++++++++++++------ + drivers/block/Kconfig | 4 +- + drivers/block/drbd/drbd_actlog.c | 21 + + drivers/block/drbd/drbd_int.h | 15 +- + drivers/block/drbd/drbd_main.c | 61 +- + drivers/block/drbd/drbd_nl.c | 185 +++- + drivers/block/drbd/drbd_receiver.c | 12 +- + drivers/block/drbd/drbd_state.c | 4 +- + drivers/block/rsxx/core.c | 359 ++++++- + drivers/block/rsxx/cregs.c | 14 + + drivers/block/rsxx/dev.c | 33 +- + drivers/block/rsxx/dma.c | 185 ++-- + drivers/block/rsxx/rsxx_priv.h | 10 +- + drivers/block/xen-blkback/blkback.c | 872 ++++++++++------ + drivers/block/xen-blkback/common.h | 147 ++- + drivers/block/xen-blkback/xenbus.c | 85 ++ + drivers/block/xen-blkfront.c | 532 ++++++++-- + fs/block_dev.c | 9 +- + include/linux/cgroup.h | 2 + + include/linux/drbd.h | 6 +- + include/linux/drbd_genl.h | 2 + + include/linux/drbd_limits.h | 9 + + include/xen/interface/io/blkif.h | 53 + + include/xen/interface/io/ring.h | 5 + + 30 files changed, 2862 insertions(+), 1028 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkback + create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkfront +Merging device-mapper/master (597fd4c dm-switch is a new target that maps IO to underlying block devices efficiently when there are a large number of fixed-sized address regions but there is no simple pattern to allow for a compact mapping representation such as dm-stripe.) +$ git merge --no-ff device-mapper/master +Merge made by the 'recursive' strategy. + Documentation/device-mapper/switch.txt | 83 +++++ + drivers/md/Kconfig | 14 + + drivers/md/Makefile | 1 + + drivers/md/dm-ioctl.c | 122 +++++--- + drivers/md/dm-switch.c | 538 +++++++++++++++++++++++++++++++++ + drivers/md/dm-table.c | 35 --- + drivers/md/dm.c | 169 ++++++----- + include/linux/device-mapper.h | 6 +- + include/uapi/linux/dm-ioctl.h | 4 +- + 9 files changed, 820 insertions(+), 152 deletions(-) + create mode 100644 Documentation/device-mapper/switch.txt + create mode 100644 drivers/md/dm-switch.c +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge --no-ff embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge --no-ff firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge --no-ff pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (058f426 mmc: sdhci-pci: add another device id) +$ git merge --no-ff mmc/mmc-next +Auto-merging drivers/mmc/core/bus.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 1 + + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 23 ++ + .../devicetree/bindings/mmc/synopsis-dw-mshc.txt | 20 ++ + drivers/mmc/card/block.c | 130 ++++++++--- + drivers/mmc/card/mmc_test.c | 5 + + drivers/mmc/card/queue.c | 2 +- + drivers/mmc/core/bus.c | 51 ++++- + drivers/mmc/core/core.c | 200 +++++------------ + drivers/mmc/core/core.h | 7 +- + drivers/mmc/core/debugfs.c | 8 +- + drivers/mmc/core/host.c | 32 ++- + drivers/mmc/core/mmc.c | 249 +++++++++++++++------ + drivers/mmc/core/mmc_ops.c | 36 +-- + drivers/mmc/core/mmc_ops.h | 1 - + drivers/mmc/core/sd.c | 68 +++++- + drivers/mmc/core/sdio.c | 76 ++++++- + drivers/mmc/host/Kconfig | 8 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/android-goldfish.c | 2 - + drivers/mmc/host/atmel-mci.c | 14 +- + drivers/mmc/host/au1xmmc.c | 1 - + drivers/mmc/host/bfin_sdh.c | 2 - + drivers/mmc/host/cb710-mmc.c | 2 +- + drivers/mmc/host/cb710-mmc.h | 2 +- + drivers/mmc/host/davinci_mmc.c | 1 - + drivers/mmc/host/dw_mmc-exynos.c | 2 - + drivers/mmc/host/dw_mmc-pci.c | 58 ++--- + drivers/mmc/host/dw_mmc-pltfm.c | 73 +++--- + drivers/mmc/host/dw_mmc-socfpga.c | 140 ++++++++++++ + drivers/mmc/host/dw_mmc.c | 65 ++++-- + drivers/mmc/host/dw_mmc.h | 3 +- + drivers/mmc/host/jz4740_mmc.c | 180 ++++----------- + drivers/mmc/host/mvsdio.c | 74 +++--- + drivers/mmc/host/mxcmmc.c | 6 +- + drivers/mmc/host/mxs-mmc.c | 11 +- + drivers/mmc/host/omap.c | 18 -- + drivers/mmc/host/omap_hsmmc.c | 2 - + drivers/mmc/host/pxamci.c | 2 - + drivers/mmc/host/rtsx_pci_sdmmc.c | 2 - + drivers/mmc/host/sdhci-acpi.c | 96 +++++++- + drivers/mmc/host/sdhci-bcm2835.c | 2 +- + drivers/mmc/host/sdhci-cns3xxx.c | 2 +- + drivers/mmc/host/sdhci-dove.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 30 ++- + drivers/mmc/host/sdhci-esdhc.h | 16 +- + drivers/mmc/host/sdhci-of-esdhc.c | 63 +++++- + drivers/mmc/host/sdhci-of-hlwd.c | 2 +- + drivers/mmc/host/sdhci-pci.c | 43 +++- + drivers/mmc/host/sdhci-pltfm.c | 23 +- + drivers/mmc/host/sdhci-pltfm.h | 14 +- + drivers/mmc/host/sdhci-pxav2.c | 4 +- + drivers/mmc/host/sdhci-pxav3.c | 18 +- + drivers/mmc/host/sdhci-s3c.c | 1 - + drivers/mmc/host/sdhci-sirf.c | 59 ++--- + drivers/mmc/host/sdhci-spear.c | 2 - + drivers/mmc/host/sdhci-tegra.c | 11 +- + drivers/mmc/host/sdhci.c | 59 ++++- + drivers/mmc/host/sh_mmcif.c | 12 +- + drivers/mmc/host/sh_mobile_sdhi.c | 34 ++- + drivers/mmc/host/tmio_mmc.c | 2 - + drivers/mmc/host/tmio_mmc.h | 21 +- + drivers/mmc/host/tmio_mmc_dma.c | 48 ++-- + drivers/mmc/host/tmio_mmc_pio.c | 40 ++-- + drivers/mmc/host/wmt-sdmmc.c | 2 - + include/linux/mfd/tmio.h | 5 + + include/linux/mmc/card.h | 11 +- + include/linux/mmc/core.h | 5 + + include/linux/mmc/host.h | 12 +- + include/linux/mmc/sdhci.h | 6 +- + include/linux/platform_data/mmc-esdhc-imx.h | 1 + + 70 files changed, 1434 insertions(+), 790 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt + create mode 100644 drivers/mmc/host/dw_mmc-socfpga.c +Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) +$ git merge --no-ff kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (c55d728 Merge branch 'slab/next' into for-next) +$ git merge --no-ff slab/for-next +Merge made by the 'recursive' strategy. + include/linux/slab.h | 39 ++++++++++++++++++++++++++++----------- + mm/slab.c | 23 +++++++++++------------ + 2 files changed, 39 insertions(+), 23 deletions(-) +Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) +$ git merge --no-ff uclinux/for-next +Already up-to-date. +Merging md/for-next (25e3903 raid5: make release_stripe lockless) +$ git merge --no-ff md/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-raid.txt | 2 + + Documentation/md.txt | 13 +- + drivers/md/bitmap.c | 8 +- + drivers/md/dm-raid.c | 76 +++++- + drivers/md/md.c | 53 ++-- + drivers/md/md.h | 16 ++ + drivers/md/raid0.c | 1 + + drivers/md/raid1.c | 7 +- + drivers/md/raid10.c | 70 +++-- + drivers/md/raid5.c | 462 ++++++++++++++++++++++++++++++-- + drivers/md/raid5.h | 22 ++ + 11 files changed, 644 insertions(+), 86 deletions(-) +Merging mfd/master (55b5940 MAINTAINERS: Add include directory to MFD file patterns) +$ git merge --no-ff mfd/master +Removing include/linux/platform_data/ti_am335x_adc.h +Auto-merging include/linux/mfd/wm8994/pdata.h +Removing include/linux/input/ti_am335x_tsc.h +Auto-merging drivers/watchdog/Kconfig +Removing drivers/ssbi/Makefile +Removing drivers/ssbi/Kconfig +Auto-merging drivers/mfd/ssbi.c +Auto-merging drivers/mfd/ab8500-gpadc.c +Auto-merging drivers/input/touchscreen/ti_am335x_tsc.c +Auto-merging arch/arm/boot/dts/am33xx.dtsi +Auto-merging arch/arm/boot/dts/am335x-evm.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/ti-tsc-adc.txt | 44 + + Documentation/devicetree/bindings/mfd/max8998.txt | 119 ++ + .../devicetree/bindings/mfd/twl4030-power.txt | 28 + + .../bindings/regulator/twl-regulator.txt | 26 +- + .../devicetree/bindings/usb/twlxxxx-usb.txt | 2 +- + MAINTAINERS | 5 +- + arch/arm/boot/dts/am335x-evm.dts | 14 + + arch/arm/boot/dts/am33xx.dtsi | 18 + + arch/arm/mach-exynos/mach-universal_c210.c | 8 +- + arch/arm/mach-s5pv210/mach-aquila.c | 8 +- + arch/arm/mach-s5pv210/mach-goni.c | 8 +- + drivers/Kconfig | 2 - + drivers/Makefile | 1 - + drivers/iio/adc/ti_am335x_adc.c | 132 +- + drivers/input/touchscreen/ti_am335x_tsc.c | 288 ++-- + drivers/mfd/88pm800.c | 238 +-- + drivers/mfd/88pm805.c | 20 +- + drivers/mfd/88pm80x.c | 47 +- + drivers/mfd/88pm860x-core.c | 8 +- + drivers/mfd/Kconfig | 36 +- + drivers/mfd/Makefile | 6 +- + drivers/mfd/aat2870-core.c | 5 +- + drivers/mfd/ab3100-core.c | 28 +- + drivers/mfd/ab3100-otp.c | 14 +- + drivers/mfd/ab8500-core.c | 79 +- + drivers/mfd/ab8500-debugfs.c | 36 +- + drivers/mfd/ab8500-gpadc.c | 6 +- + drivers/mfd/abx500-core.c | 10 +- + drivers/mfd/adp5520.c | 8 +- + drivers/mfd/arizona-core.c | 27 + + drivers/mfd/arizona-i2c.c | 6 + + drivers/mfd/arizona-irq.c | 8 + + drivers/mfd/arizona.h | 5 + + drivers/mfd/asic3.c | 14 +- + drivers/mfd/cros_ec.c | 28 +- + drivers/mfd/davinci_voicecodec.c | 58 +- + drivers/mfd/dbx500-prcmu-regs.h | 4 +- + drivers/mfd/htc-egpio.c | 13 +- + drivers/mfd/htc-i2cpld.c | 15 +- + drivers/mfd/htc-pasic3.c | 4 +- + drivers/mfd/intel_msic.c | 1 - + drivers/mfd/janz-cmodio.c | 12 +- + drivers/mfd/jz4740-adc.c | 7 +- + drivers/mfd/kempld-core.c | 641 ++++++++ + drivers/mfd/lpc_ich.c | 30 +- + drivers/mfd/max77686.c | 26 +- + drivers/mfd/max8925-i2c.c | 4 +- + drivers/mfd/max8998-irq.c | 65 +- + drivers/mfd/max8998.c | 67 +- + drivers/mfd/mcp-sa11x0.c | 3 - + drivers/mfd/palmas.c | 146 +- + drivers/mfd/rtl8411.c | 132 ++ + drivers/mfd/rtsx_pcr.c | 5 + + drivers/mfd/rtsx_pcr.h | 1 + + drivers/mfd/sec-core.c | 3 +- + drivers/{ssbi => mfd}/ssbi.c | 70 +- + drivers/mfd/t7l66xb.c | 1 - + drivers/mfd/tc6387xb.c | 1 - + drivers/mfd/tc6393xb.c | 1 - + drivers/mfd/ti_am335x_tscadc.c | 112 +- + drivers/mfd/tps65912-core.c | 2 - + drivers/mfd/tps65912-i2c.c | 3 +- + drivers/mfd/tps65912-spi.c | 3 +- + drivers/mfd/twl-core.c | 70 +- + drivers/mfd/twl4030-audio.c | 5 +- + drivers/mfd/twl4030-irq.c | 1 + + drivers/mfd/twl4030-madc.c | 5 +- + drivers/mfd/twl4030-power.c | 148 +- + drivers/mfd/vexpress-sysreg.c | 10 +- + drivers/mfd/wm8994-core.c | 11 + + drivers/mfd/wm8994-irq.c | 100 +- + drivers/mfd/wm8997-tables.c | 1525 ++++++++++++++++++++ + drivers/regulator/max8998.c | 227 ++- + drivers/regulator/palmas-regulator.c | 4 + + drivers/regulator/twl-regulator.c | 76 +- + drivers/rtc/rtc-max8998.c | 14 +- + drivers/ssbi/Kconfig | 16 - + drivers/ssbi/Makefile | 1 - + drivers/usb/phy/phy-twl6030-usb.c | 2 +- + drivers/watchdog/Kconfig | 11 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/kempld_wdt.c | 581 ++++++++ + include/linux/i2c/twl.h | 31 +- + include/linux/input/ti_am335x_tsc.h | 23 - + include/linux/mfd/88pm80x.h | 17 +- + include/linux/mfd/abx500/ab8500.h | 2 + + include/linux/mfd/arizona/core.h | 2 + + include/linux/mfd/davinci_voicecodec.h | 3 +- + include/linux/mfd/kempld.h | 125 ++ + include/linux/mfd/max8998-private.h | 7 +- + include/linux/mfd/max8998.h | 20 +- + include/linux/mfd/palmas.h | 14 + + include/linux/mfd/rtsx_pci.h | 1 + + include/linux/mfd/samsung/core.h | 6 - + include/linux/mfd/ti_am335x_tscadc.h | 35 +- + include/linux/mfd/wm8994/core.h | 2 + + include/linux/mfd/wm8994/pdata.h | 5 + + include/linux/platform_data/ti_am335x_adc.h | 14 - + 98 files changed, 4810 insertions(+), 1067 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt + create mode 100644 Documentation/devicetree/bindings/mfd/max8998.txt + create mode 100644 Documentation/devicetree/bindings/mfd/twl4030-power.txt + create mode 100644 drivers/mfd/kempld-core.c + rename drivers/{ssbi => mfd}/ssbi.c (85%) + create mode 100644 drivers/mfd/wm8997-tables.c + delete mode 100644 drivers/ssbi/Kconfig + delete mode 100644 drivers/ssbi/Makefile + create mode 100644 drivers/watchdog/kempld_wdt.c + delete mode 100644 include/linux/input/ti_am335x_tsc.h + create mode 100644 include/linux/mfd/kempld.h + delete mode 100644 include/linux/platform_data/ti_am335x_adc.h +Merging battery/master (5a6c220 charger-manager: Fix regulator_get() return check) +$ git merge --no-ff battery/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/power_supply/lp8727_charger.txt | 44 +++++++ + MAINTAINERS | 8 +- + drivers/power/88pm860x_battery.c | 1 - + drivers/power/88pm860x_charger.c | 1 - + drivers/power/ab8500_btemp.c | 1 - + drivers/power/ab8500_charger.c | 2 - + drivers/power/ab8500_fg.c | 7 +- + drivers/power/abx500_chargalg.c | 1 - + drivers/power/bq27x00_battery.c | 2 - + drivers/power/charger-manager.c | 146 +++++++++------------ + drivers/power/generic-adc-battery.c | 4 +- + drivers/power/gpio-charger.c | 2 - + drivers/power/intel_mid_battery.c | 2 +- + drivers/power/jz4740-battery.c | 4 +- + drivers/power/lp8727_charger.c | 68 ++++++++++ + drivers/power/pcf50633-charger.c | 8 +- + drivers/power/pm2301_charger.c | 11 +- + drivers/power/power_supply_core.c | 4 + + drivers/power/reset/Kconfig | 3 +- + drivers/power/rx51_battery.c | 5 +- + drivers/power/sbs-battery.c | 1 + + drivers/power/tps65090-charger.c | 40 +++++- + drivers/power/twl4030_charger.c | 2 - + include/linux/power_supply.h | 4 +- + 24 files changed, 241 insertions(+), 130 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power_supply/lp8727_charger.txt +Merging fbdev/for-next (19fd744 Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next) +$ git merge --no-ff fbdev/for-next +Resolved 'drivers/video/of_display_timing.c' using previous resolution. +Auto-merging drivers/video/uvesafb.c +Auto-merging drivers/video/pxa3xx-gcu.c +Auto-merging drivers/video/of_display_timing.c +CONFLICT (content): Merge conflict in drivers/video/of_display_timing.c +Auto-merging drivers/video/au1100fb.c +Auto-merging drivers/gpu/drm/omapdrm/omap_crtc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a72604c] Merge remote-tracking branch 'fbdev/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/video/ssd1307fb.txt | 10 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 46 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 27 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 1 + + drivers/video/Kconfig | 2 +- + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/aty/atyfb_base.c | 9 +- + drivers/video/aty/radeon_pm.c | 2 +- + drivers/video/au1100fb.c | 1 - + drivers/video/bf54x-lq043fb.c | 1 - + drivers/video/bfin-lq035q1-fb.c | 24 +- + drivers/video/bfin-t350mcqb-fb.c | 2 - + drivers/video/ep93xx-fb.c | 2 - + drivers/video/fbmem.c | 6 +- + drivers/video/fsl-diu-fb.c | 4 +- + drivers/video/i740fb.c | 2 +- + drivers/video/imxfb.c | 7 +- + drivers/video/jz4740_fb.c | 2 - + drivers/video/mmp/fb/mmpfb.c | 1 - + drivers/video/mmp/hw/mmp_ctrl.c | 9 +- + drivers/video/mxsfb.c | 3 - + drivers/video/nuc900fb.c | 1 - + drivers/video/of_display_timing.c | 56 +- + drivers/video/omap2/Kconfig | 1 + + drivers/video/omap2/Makefile | 1 + + drivers/video/omap2/displays-new/Kconfig | 73 ++ + drivers/video/omap2/displays-new/Makefile | 12 + + .../video/omap2/displays-new/connector-analog-tv.c | 265 ++++ + drivers/video/omap2/displays-new/connector-dvi.c | 351 +++++ + drivers/video/omap2/displays-new/connector-hdmi.c | 375 ++++++ + drivers/video/omap2/displays-new/encoder-tfp410.c | 267 ++++ + .../video/omap2/displays-new/encoder-tpd12s015.c | 395 ++++++ + drivers/video/omap2/displays-new/panel-dpi.c | 270 ++++ + drivers/video/omap2/displays-new/panel-dsi-cm.c | 1336 ++++++++++++++++++++ + .../omap2/displays-new/panel-lgphilips-lb035q02.c | 358 ++++++ + .../omap2/displays-new/panel-nec-nl8048hl11.c | 394 ++++++ + .../omap2/displays-new/panel-sharp-ls037v7dw01.c | 324 +++++ + .../omap2/displays-new/panel-sony-acx565akm.c | 865 +++++++++++++ + .../omap2/displays-new/panel-tpo-td043mtea1.c | 646 ++++++++++ + drivers/video/omap2/displays/Kconfig | 2 +- + drivers/video/omap2/displays/panel-acx565akm.c | 16 +- + drivers/video/omap2/displays/panel-generic-dpi.c | 26 +- + .../omap2/displays/panel-lgphilips-lb035q02.c | 10 +- + drivers/video/omap2/displays/panel-n8x0.c | 30 +- + .../omap2/displays/panel-nec-nl8048hl11-01b.c | 4 +- + drivers/video/omap2/displays/panel-picodlp.c | 34 +- + .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 10 +- + drivers/video/omap2/displays/panel-taal.c | 170 +-- + drivers/video/omap2/displays/panel-tfp410.c | 32 +- + .../video/omap2/displays/panel-tpo-td043mtea1.c | 36 +- + drivers/video/omap2/dss/Kconfig | 1 + + drivers/video/omap2/dss/apply.c | 59 +- + drivers/video/omap2/dss/core.c | 108 +- + drivers/video/omap2/dss/dispc-compat.c | 3 +- + drivers/video/omap2/dss/dispc.c | 24 +- + drivers/video/omap2/dss/display-sysfs.c | 154 ++- + drivers/video/omap2/dss/display.c | 247 ++-- + drivers/video/omap2/dss/dpi.c | 209 ++- + drivers/video/omap2/dss/dsi.c | 232 ++-- + drivers/video/omap2/dss/dss.c | 3 +- + drivers/video/omap2/dss/dss.h | 35 +- + drivers/video/omap2/dss/dss_features.c | 1 - + drivers/video/omap2/dss/hdmi.c | 345 ++++- + drivers/video/omap2/dss/manager-sysfs.c | 47 +- + drivers/video/omap2/dss/manager.c | 29 +- + drivers/video/omap2/dss/output.c | 87 +- + drivers/video/omap2/dss/rfbi.c | 43 +- + drivers/video/omap2/dss/sdi.c | 143 ++- + drivers/video/omap2/dss/ti_hdmi.h | 5 +- + drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 87 +- + drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h | 1 + + drivers/video/omap2/dss/venc.c | 163 ++- + drivers/video/omap2/dss/venc_panel.c | 16 +- + drivers/video/omap2/omapfb/omapfb-ioctl.c | 9 +- + drivers/video/omap2/omapfb/omapfb-main.c | 27 +- + drivers/video/pxa3xx-gcu.c | 2 - + drivers/video/pxafb.c | 1 - + drivers/video/s3c2410fb.c | 2 - + drivers/video/sa1100fb.c | 1 - + drivers/video/sh7760fb.c | 1 - + drivers/video/sh_mipi_dsi.c | 1 - + drivers/video/smscufx.c | 2 +- + drivers/video/ssd1307fb.c | 392 ++++-- + drivers/video/tmiofb.c | 3 - + drivers/video/udlfb.c | 12 +- + drivers/video/uvesafb.c | 4 +- + drivers/video/vga16fb.c | 1 - + drivers/video/vt8500lcdfb.c | 1 - + drivers/video/wm8505fb.c | 2 +- + drivers/video/xilinxfb.c | 135 +- + include/linux/fb.h | 2 +- + include/video/of_display_timing.h | 3 + + include/video/omap-panel-data.h | 209 +++ + include/video/omapdss.h | 293 ++++- + 94 files changed, 8488 insertions(+), 1180 deletions(-) + create mode 100644 drivers/video/omap2/displays-new/Kconfig + create mode 100644 drivers/video/omap2/displays-new/Makefile + create mode 100644 drivers/video/omap2/displays-new/connector-analog-tv.c + create mode 100644 drivers/video/omap2/displays-new/connector-dvi.c + create mode 100644 drivers/video/omap2/displays-new/connector-hdmi.c + create mode 100644 drivers/video/omap2/displays-new/encoder-tfp410.c + create mode 100644 drivers/video/omap2/displays-new/encoder-tpd12s015.c + create mode 100644 drivers/video/omap2/displays-new/panel-dpi.c + create mode 100644 drivers/video/omap2/displays-new/panel-dsi-cm.c + create mode 100644 drivers/video/omap2/displays-new/panel-lgphilips-lb035q02.c + create mode 100644 drivers/video/omap2/displays-new/panel-nec-nl8048hl11.c + create mode 100644 drivers/video/omap2/displays-new/panel-sharp-ls037v7dw01.c + create mode 100644 drivers/video/omap2/displays-new/panel-sony-acx565akm.c + create mode 100644 drivers/video/omap2/displays-new/panel-tpo-td043mtea1.c +Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) +$ git merge --no-ff viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning) +$ git merge --no-ff omap_dss2/for-next +Merge made by the 'recursive' strategy. +Merging regulator/for-next (aabc5c6 Merge remote-tracking branch 'regulator/topic/tps62360' into regulator-next) +$ git merge --no-ff regulator/for-next +Auto-merging include/linux/mfd/palmas.h +Auto-merging drivers/regulator/palmas-regulator.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/max77693.txt | 55 ++ + .../devicetree/bindings/regulator/lp872x.txt | 160 ++++ + .../bindings/regulator/max8973-regulator.txt | 21 + + .../devicetree/bindings/regulator/regulator.txt | 1 + + .../bindings/regulator/ti-abb-regulator.txt | 128 +++ + drivers/regulator/88pm8607.c | 1 - + drivers/regulator/Kconfig | 19 + + drivers/regulator/Makefile | 4 +- + drivers/regulator/ab8500-ext.c | 82 +- + drivers/regulator/ab8500.c | 20 +- + drivers/regulator/core.c | 15 + + drivers/regulator/isl6271a-regulator.c | 2 +- + drivers/regulator/lp3971.c | 11 +- + drivers/regulator/lp3972.c | 11 +- + drivers/regulator/lp872x.c | 116 ++- + drivers/regulator/lp8755.c | 1 - + drivers/regulator/lp8788-buck.c | 1 - + drivers/regulator/lp8788-ldo.c | 2 - + drivers/regulator/max77686.c | 1 - + drivers/regulator/max77693.c | 324 ++++++++ + drivers/regulator/max8925-regulator.c | 1 - + drivers/regulator/max8973-regulator.c | 49 +- + drivers/regulator/mc13783-regulator.c | 2 - + drivers/regulator/mc13892-regulator.c | 2 - + drivers/regulator/of_regulator.c | 3 + + drivers/regulator/palmas-regulator.c | 39 +- + drivers/regulator/pcap-regulator.c | 1 - + drivers/regulator/pcf50633-regulator.c | 1 - + drivers/regulator/s2mps11.c | 1 - + drivers/regulator/ti-abb-regulator.c | 910 +++++++++++++++++++++ + drivers/regulator/tps62360-regulator.c | 8 +- + drivers/regulator/tps65217-regulator.c | 2 - + drivers/regulator/virtual.c | 2 - + drivers/regulator/wm831x-dcdc.c | 7 - + drivers/regulator/wm831x-isink.c | 2 - + drivers/regulator/wm831x-ldo.c | 2 - + drivers/regulator/wm8400-regulator.c | 1 - + drivers/regulator/wm8994-regulator.c | 2 - + include/linux/mfd/max77693-private.h | 13 + + include/linux/mfd/max77693.h | 18 + + include/linux/mfd/palmas.h | 9 +- + include/linux/regulator/ab8500.h | 4 - + include/linux/regulator/consumer.h | 1 + + 43 files changed, 1953 insertions(+), 102 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/max77693.txt + create mode 100644 Documentation/devicetree/bindings/regulator/lp872x.txt + create mode 100644 Documentation/devicetree/bindings/regulator/max8973-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt + create mode 100644 drivers/regulator/max77693.c + create mode 100644 drivers/regulator/ti-abb-regulator.c +$ git reset --hard HEAD^ +HEAD is now at 8f2add8 Merge remote-tracking branch 'omap_dss2/for-next' +Merging next-20130628 version of regulator +$ git merge -m next-20130628/regulator 1b3b96863b520e25bb1feb810af27ae84a9de95d +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/max77693.txt | 55 ++ + .../devicetree/bindings/regulator/lp872x.txt | 160 ++++ + .../bindings/regulator/max8973-regulator.txt | 21 + + .../devicetree/bindings/regulator/regulator.txt | 1 + + .../bindings/regulator/ti-abb-regulator.txt | 128 +++ + drivers/regulator/88pm8607.c | 1 - + drivers/regulator/Kconfig | 19 + + drivers/regulator/Makefile | 4 +- + drivers/regulator/ab8500-ext.c | 82 +- + drivers/regulator/ab8500.c | 20 +- + drivers/regulator/core.c | 15 + + drivers/regulator/isl6271a-regulator.c | 2 +- + drivers/regulator/lp3971.c | 11 +- + drivers/regulator/lp3972.c | 11 +- + drivers/regulator/lp872x.c | 116 ++- + drivers/regulator/lp8755.c | 1 - + drivers/regulator/lp8788-buck.c | 1 - + drivers/regulator/lp8788-ldo.c | 2 - + drivers/regulator/max77686.c | 1 - + drivers/regulator/max77693.c | 324 ++++++++ + drivers/regulator/max8925-regulator.c | 1 - + drivers/regulator/max8973-regulator.c | 49 +- + drivers/regulator/mc13783-regulator.c | 2 - + drivers/regulator/mc13892-regulator.c | 2 - + drivers/regulator/of_regulator.c | 3 + + drivers/regulator/pcap-regulator.c | 1 - + drivers/regulator/pcf50633-regulator.c | 1 - + drivers/regulator/s2mps11.c | 1 - + drivers/regulator/ti-abb-regulator.c | 910 +++++++++++++++++++++ + drivers/regulator/tps62360-regulator.c | 8 +- + drivers/regulator/tps65217-regulator.c | 2 - + drivers/regulator/virtual.c | 2 - + drivers/regulator/wm831x-dcdc.c | 7 - + drivers/regulator/wm831x-isink.c | 2 - + drivers/regulator/wm831x-ldo.c | 2 - + drivers/regulator/wm8400-regulator.c | 1 - + drivers/regulator/wm8994-regulator.c | 2 - + include/linux/mfd/max77693-private.h | 13 + + include/linux/mfd/max77693.h | 18 + + include/linux/regulator/ab8500.h | 4 - + include/linux/regulator/consumer.h | 1 + + 41 files changed, 1913 insertions(+), 94 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/max77693.txt + create mode 100644 Documentation/devicetree/bindings/regulator/lp872x.txt + create mode 100644 Documentation/devicetree/bindings/regulator/max8973-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt + create mode 100644 drivers/regulator/max77693.c + create mode 100644 drivers/regulator/ti-abb-regulator.c +Merging security/next (572e5b0 tpm/tpm_i2c_infineon: Remove unused header file) +$ git merge --no-ff security/next +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Auto-merging security/smack/smack_lsm.c +Auto-merging security/integrity/integrity_audit.c +Auto-merging mm/shmem.c +Auto-merging include/linux/security.h +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5775672] Merge remote-tracking branch 'security/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 10 +- + MAINTAINERS | 7 +- + drivers/char/tpm/tpm.c | 2 +- + drivers/char/tpm/tpm.h | 2 +- + drivers/char/tpm/tpm_i2c_infineon.c | 4 - + drivers/char/tpm/tpm_tis.c | 17 +- + include/linux/security.h | 3 +- + include/linux/tpm.h | 2 + + mm/shmem.c | 16 +- + security/apparmor/audit.c | 2 +- + security/apparmor/context.c | 44 +- + security/apparmor/domain.c | 26 +- + security/apparmor/include/apparmor.h | 12 +- + security/apparmor/include/context.h | 61 +- + security/apparmor/include/file.h | 14 +- + security/apparmor/include/match.h | 21 +- + security/apparmor/include/policy.h | 16 +- + security/apparmor/include/procattr.h | 1 - + security/apparmor/include/sid.h | 4 +- + security/apparmor/ipc.c | 13 +- + security/apparmor/lib.c | 44 +- + security/apparmor/lsm.c | 69 +-- + security/apparmor/match.c | 23 +- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 181 +++--- + security/apparmor/policy_unpack.c | 4 +- + security/apparmor/procattr.c | 6 - + security/apparmor/resource.c | 15 +- + security/integrity/Kconfig | 15 + + security/integrity/Makefile | 1 + + security/integrity/evm/evm_main.c | 15 +- + security/integrity/ima/Kconfig | 12 - + security/integrity/ima/Makefile | 1 - + security/integrity/ima/ima.h | 14 - + security/integrity/integrity.h | 14 + + .../{ima/ima_audit.c => integrity_audit.c} | 12 +- + security/smack/smack.h | 110 ++-- + security/smack/smack_access.c | 43 +- + security/smack/smack_lsm.c | 684 +++++++++++++++------ + security/smack/smackfs.c | 53 +- + 40 files changed, 985 insertions(+), 610 deletions(-) + rename security/integrity/{ima/ima_audit.c => integrity_audit.c} (85%) +Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) +$ git merge --no-ff selinux/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lblnet/master (5bfd379 selinux: remove the BUG_ON() from selinux_skb_xfrm_sid()) +$ git merge --no-ff lblnet/master +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/capability.c +Auto-merging include/linux/security.h +Merge made by the 'recursive' strategy. + include/linux/security.h | 26 ++- + security/capability.c | 15 +- + security/security.c | 13 +- + security/selinux/hooks.c | 11 +- + security/selinux/include/xfrm.h | 45 ++-- + security/selinux/netnode.c | 2 + + security/selinux/xfrm.c | 453 ++++++++++++++++++---------------------- + 7 files changed, 264 insertions(+), 301 deletions(-) +Merging watchdog/master (5a94250 Watchdog: fix clearing of the watchdog interrupt) +$ git merge --no-ff watchdog/master +Removing drivers/watchdog/mpcore_wdt.c +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/watchdog/brcm,bcm2835-pm-wdog.txt | 5 + + Documentation/watchdog/watchdog-parameters.txt | 8 - + arch/arm/configs/spear13xx_defconfig | 1 - + arch/arm/mach-dove/include/mach/bridge-regs.h | 1 + + arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 2 - + arch/arm/mach-orion5x/include/mach/bridge-regs.h | 3 - + drivers/watchdog/Kconfig | 22 +- + drivers/watchdog/Makefile | 2 +- + drivers/watchdog/at32ap700x_wdt.c | 17 +- + drivers/watchdog/bcm2835_wdt.c | 189 +++++++++ + drivers/watchdog/bcm63xx_wdt.c | 9 +- + drivers/watchdog/cpwd.c | 4 +- + drivers/watchdog/da9052_wdt.c | 4 +- + drivers/watchdog/da9055_wdt.c | 4 +- + drivers/watchdog/dw_wdt.c | 11 +- + drivers/watchdog/imx2_wdt.c | 6 +- + drivers/watchdog/jz4740_wdt.c | 2 +- + drivers/watchdog/mpcore_wdt.c | 456 --------------------- + drivers/watchdog/mtx-1_wdt.c | 3 +- + drivers/watchdog/mv64x60_wdt.c | 4 +- + drivers/watchdog/nuc900_wdt.c | 50 +-- + drivers/watchdog/of_xilinx_wdt.c | 31 +- + drivers/watchdog/orion_wdt.c | 7 +- + drivers/watchdog/pnx4008_wdt.c | 7 +- + drivers/watchdog/rc32434_wdt.c | 10 +- + drivers/watchdog/riowd.c | 12 +- + drivers/watchdog/s3c2410_wdt.c | 20 +- + drivers/watchdog/shwdt.c | 18 +- + drivers/watchdog/sp805_wdt.c | 7 +- + drivers/watchdog/ts72xx_wdt.c | 67 +-- + drivers/watchdog/twl4030_wdt.c | 5 +- + drivers/watchdog/watchdog_dev.c | 6 +- + drivers/watchdog/wdrtas.c | 29 +- + drivers/watchdog/wm831x_wdt.c | 21 +- + 34 files changed, 308 insertions(+), 735 deletions(-) + create mode 100644 drivers/watchdog/bcm2835_wdt.c + delete mode 100644 drivers/watchdog/mpcore_wdt.c +Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) +$ git merge --no-ff dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (01ce784 Merge branches 'x86/vt-d', 'arm/omap', 'core', 'x86/amd' and 'arm/smmu' into next) +$ git merge --no-ff iommu/next +Resolved 'drivers/iommu/Kconfig' using previous resolution. +Auto-merging drivers/iommu/Kconfig +CONFLICT (content): Merge conflict in drivers/iommu/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 63f16cd] Merge remote-tracking branch 'iommu/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/iommu/arm,smmu.txt | 70 + + MAINTAINERS | 6 + + drivers/iommu/Kconfig | 13 + + drivers/iommu/Makefile | 1 + + drivers/iommu/amd_iommu.c | 104 +- + drivers/iommu/arm-smmu.c | 1969 ++++++++++++++++++++ + drivers/iommu/dmar.c | 4 + + drivers/iommu/intel-iommu.c | 25 +- + drivers/iommu/intel_irq_remapping.c | 3 +- + drivers/iommu/iommu.c | 86 +- + drivers/iommu/omap-iommu.c | 15 +- + drivers/iommu/omap-iopgtable.h | 2 +- + drivers/iommu/omap-iovmm.c | 4 +- + 13 files changed, 2212 insertions(+), 90 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu.txt + create mode 100644 drivers/iommu/arm-smmu.c +Merging vfio/next (6d6768c vfio: Limit group opens) +$ git merge --no-ff vfio/next +Auto-merging include/uapi/linux/vfio.h +Auto-merging drivers/vfio/vfio.c +Auto-merging Documentation/vfio.txt +Merge made by the 'recursive' strategy. + Documentation/vfio.txt | 6 +- + drivers/vfio/vfio.c | 14 + + drivers/vfio/vfio_iommu_type1.c | 625 +++++++++++++++++++++++++--------------- + include/uapi/linux/vfio.h | 8 +- + 4 files changed, 422 insertions(+), 231 deletions(-) +Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) +$ git merge --no-ff osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge --no-ff jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (83a35e3 treewide: relase -> release) +$ git merge --no-ff trivial/for-next +Recorded preimage for 'drivers/video/omap2/displays/panel-n8x0.c' +Resolved 'Documentation/networking/netlink_mmap.txt' using previous resolution. +Auto-merging sound/pci/hda/hda_codec.c +Auto-merging include/linux/cpu.h +Auto-merging drivers/video/omap2/displays/panel-n8x0.c +CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-n8x0.c +Auto-merging drivers/scsi/libiscsi_tcp.c +Auto-merging drivers/nfc/pn533.c +Auto-merging drivers/net/wireless/ath/ath9k/Kconfig +Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c +Auto-merging drivers/net/ethernet/intel/igb/e1000_phy.c +Auto-merging drivers/misc/mei/init.c +Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +Auto-merging drivers/cpufreq/s3c2416-cpufreq.c +Auto-merging Makefile +Auto-merging Documentation/virtual/kvm/api.txt +Auto-merging Documentation/sysctl/net.txt +Auto-merging Documentation/networking/netlink_mmap.txt +CONFLICT (content): Merge conflict in Documentation/networking/netlink_mmap.txt +Auto-merging Documentation/media-framework.txt +Auto-merging Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt +Auto-merging Documentation/bcache.txt +Auto-merging Documentation/DocBook/drm.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/video/omap2/displays/panel-n8x0.c'. +[master 2fd34ad] Merge remote-tracking branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 6 +++--- + Documentation/DocBook/media/dvb/frontend.xml | 2 +- + Documentation/DocBook/media/v4l/controls.xml | 2 +- + Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml | 2 +- + Documentation/DocBook/writing_usb_driver.tmpl | 2 +- + Documentation/arm/IXP4xx | 2 +- + Documentation/bcache.txt | 10 +++++----- + Documentation/block/queue-sysfs.txt | 2 +- + Documentation/cgroups/memory.txt | 6 +++--- + Documentation/clk.txt | 2 +- + Documentation/device-mapper/cache.txt | 2 +- + .../devicetree/bindings/arm/samsung/interrupt-combiner.txt | 6 +++--- + Documentation/devicetree/bindings/arm/spear/shirq.txt | 2 +- + Documentation/devicetree/bindings/clock/silabs,si5351.txt | 2 +- + Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt | 2 +- + Documentation/devicetree/bindings/powerpc/4xx/emac.txt | 2 +- + Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt | 2 +- + .../devicetree/bindings/timer/samsung,exynos4210-mct.txt | 2 +- + Documentation/devicetree/bindings/usb/am33xx-usb.txt | 2 +- + Documentation/devicetree/bindings/usb/omap-usb.txt | 2 +- + Documentation/devicetree/usage-model.txt | 11 ++++++----- + Documentation/dynamic-debug-howto.txt | 2 +- + Documentation/early-userspace/README | 2 +- + Documentation/fb/cirrusfb.txt | 2 +- + Documentation/filesystems/jfs.txt | 2 +- + Documentation/filesystems/qnx6.txt | 2 +- + Documentation/filesystems/vfat.txt | 2 +- + Documentation/kdump/kdump.txt | 8 -------- + Documentation/kernel-doc-nano-HOWTO.txt | 11 ++++++----- + Documentation/kernel-per-CPU-kthreads.txt | 2 +- + Documentation/laptops/dslm.c | 2 +- + Documentation/media-framework.txt | 2 +- + Documentation/metag/kernel-ABI.txt | 2 +- + Documentation/misc-devices/mei/mei.txt | 2 +- + Documentation/networking/ieee802154.txt | 2 +- + Documentation/pinctrl.txt | 2 +- + Documentation/sysctl/net.txt | 6 +++--- + Documentation/thermal/exynos_thermal_emulation | 2 +- + Documentation/video4linux/si476x.txt | 2 +- + Documentation/video4linux/soc-camera.txt | 2 +- + Documentation/virtual/kvm/api.txt | 8 ++++---- + Documentation/vm/pagemap.txt | 2 +- + Documentation/w1/slaves/w1_ds28e04 | 2 +- + Makefile | 2 +- + arch/frv/kernel/pm.c | 8 ++++---- + arch/frv/kernel/sysctl.c | 4 ++-- + arch/powerpc/relocs_check.pl | 10 +++++----- + arch/x86/kernel/cpu/powerflags.c | 8 ++++---- + drivers/cpufreq/s3c2416-cpufreq.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 4 ++-- + drivers/gpu/drm/radeon/radeon_fb.c | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 2 +- + drivers/input/misc/da9055_onkey.c | 2 +- + drivers/lguest/page_tables.c | 2 +- + drivers/md/bcache/bset.c | 4 ++-- + drivers/media/dvb-frontends/stv0367.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 +- + drivers/misc/dummy-irq.c | 2 +- + drivers/misc/lattice-ecp3-config.c | 2 +- + drivers/misc/mei/hbm.c | 2 +- + drivers/misc/mei/init.c | 2 +- + drivers/misc/sgi-xp/xpc_main.c | 6 +++--- + drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 +- + drivers/net/wireless/ath/ath9k/Kconfig | 2 +- + drivers/nfc/pn533.c | 2 +- + drivers/of/fdt.c | 2 +- + drivers/of/pdt.c | 2 +- + drivers/s390/char/vmur.c | 2 +- + drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/libiscsi_tcp.c | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/tty/serial/serial-tegra.c | 2 +- + drivers/usb/musb/musb_dsps.c | 2 +- + drivers/usb/musb/omap2430.c | 2 +- + drivers/video/omap2/displays/panel-n8x0.c | 2 +- + fs/btrfs/ctree.c | 2 +- + fs/btrfs/free-space-cache.c | 2 +- + include/linux/cpu.h | 3 +-- + include/linux/kernel.h | 5 ++--- + include/linux/spinlock_api_smp.h | 2 +- + kernel/irq/generic-chip.c | 6 +++--- + lib/Kconfig.kgdb | 4 ++-- + lib/vsprintf.c | 2 +- + mm/mmu_notifier.c | 2 +- + mm/sparse.c | 3 +-- + sound/pci/hda/hda_codec.c | 2 +- + tools/testing/ktest/ktest.pl | 2 +- + 93 files changed, 136 insertions(+), 145 deletions(-) +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge --no-ff audit/for-next +Already up-to-date. +Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) +$ git merge --no-ff fsnotify/for-next +Already up-to-date. +Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device) +$ git merge --no-ff edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (aad19e5 EDAC, MCE, AMD: Add an MCE signature for new Fam15h models) +$ git merge --no-ff edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/amd64_edac_inj.c | 10 +++++----- + drivers/edac/edac_mc_sysfs.c | 2 +- + drivers/edac/i7core_edac.c | 10 +++++----- + drivers/edac/mce_amd.c | 5 +++-- + drivers/edac/mce_amd_inj.c | 4 ++-- + 5 files changed, 16 insertions(+), 15 deletions(-) +Merging devicetree/devicetree/next (ba166e9 of: remove CONFIG_OF_DEVICE) +$ git merge --no-ff devicetree/devicetree/next +Auto-merging drivers/of/base.c +Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c +Auto-merging drivers/infiniband/hw/ehca/ehca_main.c +Auto-merging drivers/base/platform.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/palmas.txt | 49 +++++++++++++++ + .../devicetree/bindings/regulator/palmas-pmic.txt | 72 ++++++++++++++++++++++ + arch/arm/boot/dts/omap3-devkit8000.dts | 29 ++++----- + arch/powerpc/include/asm/ibmebus.h | 4 +- + arch/powerpc/kernel/ibmebus.c | 22 +++---- + drivers/base/platform.c | 3 - + drivers/infiniband/hw/ehca/ehca_main.c | 5 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 8 +-- + drivers/of/Kconfig | 3 - + drivers/of/Makefile | 3 +- + drivers/of/base.c | 12 ++-- + drivers/usb/chipidea/Makefile | 2 +- + include/linux/of_device.h | 6 +- + include/linux/of_platform.h | 35 +---------- + include/linux/platform_device.h | 3 + + 15 files changed, 170 insertions(+), 86 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/palmas.txt + create mode 100644 Documentation/devicetree/bindings/regulator/palmas-pmic.txt +Merging dt-rh/for-next (d683b96 Linux 3.10-rc4) +$ git merge --no-ff dt-rh/for-next +Already up-to-date. +Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration) +$ git merge --no-ff spi/spi/next +Already up-to-date. +Merging spi-mb/for-next (ed89355 Merge remote-tracking branch 'spi/topic/xilinx' into spi-next) +$ git merge --no-ff spi-mb/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/omap-spi.txt | 27 +- + drivers/mfd/timberdale.c | 1 - + drivers/spi/spi-altera.c | 14 - + drivers/spi/spi-ath79.c | 6 +- + drivers/spi/spi-atmel.c | 51 +-- + drivers/spi/spi-au1550.c | 14 +- + drivers/spi/spi-bcm2835.c | 7 +- + drivers/spi/spi-bcm63xx.c | 23 +- + drivers/spi/spi-bfin-sport.c | 13 +- + drivers/spi/spi-bfin5xx.c | 24 +- + drivers/spi/spi-clps711x.c | 9 +- + drivers/spi/spi-coldfire-qspi.c | 23 +- + drivers/spi/spi-davinci.c | 12 +- + drivers/spi/spi-dw-mmio.c | 2 - + drivers/spi/spi-dw.c | 26 +- + drivers/spi/spi-ep93xx.c | 14 +- + drivers/spi/spi-fsl-espi.c | 9 +- + drivers/spi/spi-fsl-lib.c | 2 +- + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spi-gpio.c | 6 +- + drivers/spi/spi-imx.c | 17 +- + drivers/spi/spi-mpc512x-psc.c | 341 +++++++++++---------- + drivers/spi/spi-mpc52xx-psc.c | 2 +- + drivers/spi/spi-mpc52xx.c | 4 +- + drivers/spi/spi-mxs.c | 13 +- + drivers/spi/spi-nuc900.c | 15 - + drivers/spi/spi-oc-tiny.c | 2 - + drivers/spi/spi-omap-100k.c | 16 +- + drivers/spi/spi-omap-uwire.c | 4 +- + drivers/spi/spi-omap2-mcspi.c | 254 +++++++++++---- + drivers/spi/spi-orion.c | 4 +- + drivers/spi/spi-pl022.c | 1 + + drivers/spi/spi-ppc4xx.c | 19 +- + drivers/spi/spi-pxa2xx-dma.c | 11 +- + drivers/spi/spi-pxa2xx.c | 60 +--- + drivers/spi/spi-rspi.c | 4 +- + drivers/spi/spi-s3c24xx.c | 2 - + drivers/spi/spi-s3c64xx.c | 207 +++++++++---- + drivers/spi/spi-sh-hspi.c | 4 +- + drivers/spi/spi-sh.c | 4 +- + drivers/spi/spi-sirf.c | 61 +--- + drivers/spi/spi-tegra114.c | 4 +- + drivers/spi/spi-tegra20-sflash.c | 4 +- + drivers/spi/spi-tegra20-slink.c | 4 +- + drivers/spi/spi-ti-ssp.c | 16 +- + drivers/spi/spi-topcliff-pch.c | 25 +- + drivers/spi/spi-txx9.c | 10 +- + drivers/spi/spi-xcomm.c | 12 +- + drivers/spi/spi-xilinx.c | 48 ++- + include/linux/spi/spi.h | 3 + + include/linux/spi/xilinx_spi.h | 1 - + 51 files changed, 709 insertions(+), 748 deletions(-) +Merging tip/auto-latest (be82cd9 Merge branch 'core/locking') +$ git merge --no-ff tip/auto-latest +Resolved 'arch/arm/kernel/Makefile' using previous resolution. +Resolved 'kernel/futex.c' using previous resolution. +Auto-merging kernel/time/sched_clock.c +Auto-merging kernel/irq/irqdomain.c +Auto-merging kernel/irq/generic-chip.c +Auto-merging kernel/futex.c +CONFLICT (content): Merge conflict in kernel/futex.c +Auto-merging kernel/cpuset.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/ktime.h +Auto-merging include/linux/kernel.h +Auto-merging drivers/mfd/twl4030-irq.c +Auto-merging arch/x86/kernel/doublefault.c +Auto-merging arch/x86/kernel/cpu/mtrr/main.c +Auto-merging arch/x86/kernel/cpu/mcheck/therm_throt.c +Auto-merging arch/x86/include/asm/mce.h +Auto-merging arch/mn10300/include/asm/uaccess.h +Auto-merging arch/mips/kernel/scall32-o32.S +Auto-merging arch/arm/mach-ixp4xx/common.c +Auto-merging arch/arm/kernel/Makefile +CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging Documentation/kernel-per-CPU-kthreads.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e24764f] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../testing/sysfs-bus-event_source-devices-events | 32 +- + .../testing/sysfs-bus-event_source-devices-format | 6 + + Documentation/RCU/checklist.txt | 6 - + Documentation/RCU/torture.txt | 6 - + Documentation/RCU/trace.txt | 100 +- + Documentation/RCU/whatisRCU.txt | 22 +- + Documentation/acpi/apei/einj.txt | 9 +- + Documentation/cgroups/cpusets.txt | 2 +- + .../interrupt-controller/abilis,tb10x-ictl.txt | 38 + + .../interrupt-controller/marvell,orion-intc.txt | 48 + + .../devicetree/bindings/timer/lsi,zevio-timer.txt | 33 + + Documentation/kernel-per-CPU-kthreads.txt | 47 + + Documentation/rt-mutex-design.txt | 2 +- + Documentation/scheduler/sched-domains.txt | 4 +- + Documentation/spinlocks.txt | 2 +- + Documentation/sysctl/kernel.txt | 50 +- + Documentation/timers/NO_HZ.txt | 79 +- + Documentation/trace/events-nmi.txt | 43 + + Documentation/virtual/uml/UserModeLinux-HOWTO.txt | 4 +- + Documentation/x86/early-microcode.txt | 11 +- + arch/arm/Kconfig | 1 + + arch/arm/common/timer-sp.c | 2 +- + arch/arm/include/asm/sched_clock.h | 18 +- + arch/arm/kernel/Makefile | 2 +- + arch/arm/kernel/arch_timer.c | 2 +- + arch/arm/kernel/time.c | 4 +- + arch/arm/mach-davinci/time.c | 2 +- + arch/arm/mach-imx/time.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-mmp/time.c | 2 +- + arch/arm/mach-msm/timer.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap2/timer.c | 2 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-u300/timer.c | 2 +- + arch/arm/plat-iop/time.c | 2 +- + arch/arm/plat-omap/counter_32k.c | 2 +- + arch/arm/plat-orion/gpio.c | 2 +- + arch/arm/plat-orion/time.c | 2 +- + arch/arm/plat-samsung/samsung-time.c | 2 +- + arch/arm/plat-versatile/sched-clock.c | 2 +- + arch/arm64/include/asm/uaccess.h | 4 +- + arch/avr32/kernel/process.c | 2 +- + arch/cris/include/arch-v10/arch/bitops.h | 2 +- + arch/frv/include/asm/uaccess.h | 4 +- + arch/ia64/kernel/head.S | 2 +- + arch/m32r/include/asm/uaccess.h | 12 +- + arch/metag/kernel/perf/perf_event.c | 2 +- + arch/microblaze/include/asm/uaccess.h | 6 +- + arch/mips/cavium-octeon/octeon-irq.c | 2 +- + arch/mips/kernel/mips-mt-fpaff.c | 4 +- + arch/mips/kernel/scall32-o32.S | 5 +- + arch/mn10300/include/asm/uaccess.h | 4 +- + arch/powerpc/include/asm/mmu_context.h | 2 +- + arch/powerpc/include/asm/uaccess.h | 16 +- + arch/powerpc/kvm/book3s_hv.c | 2 +- + arch/powerpc/perf/power7-pmu.c | 73 ++ + arch/tile/include/asm/processor.h | 2 +- + arch/tile/include/asm/uaccess.h | 2 +- + arch/tile/kernel/stack.c | 2 +- + arch/um/kernel/sysrq.c | 2 +- + arch/x86/Kconfig | 16 +- + arch/x86/Kconfig.debug | 11 +- + arch/x86/Makefile | 7 + + arch/x86/boot/compressed/eboot.c | 20 +- + arch/x86/boot/compressed/head_64.S | 2 - + arch/x86/boot/tools/build.c | 1 + + arch/x86/configs/kvm_guest.config | 28 + + arch/x86/ia32/ia32_signal.c | 2 - + arch/x86/include/asm/apic.h | 27 + + arch/x86/include/asm/cpufeature.h | 118 ++- + arch/x86/include/asm/desc.h | 117 ++- + arch/x86/include/asm/efi.h | 28 +- + arch/x86/include/asm/entry_arch.h | 8 +- + arch/x86/include/asm/fixmap.h | 2 +- + arch/x86/include/asm/fpu-internal.h | 4 +- + arch/x86/include/asm/hw_irq.h | 17 + + arch/x86/include/asm/kvm_host.h | 2 +- + arch/x86/include/asm/mc146818rtc.h | 4 +- + arch/x86/include/asm/mce.h | 2 +- + arch/x86/include/asm/microcode_amd.h | 78 ++ + arch/x86/include/asm/microcode_intel.h | 2 + + arch/x86/include/asm/mrst-vrtc.h | 4 +- + arch/x86/include/asm/mshyperv.h | 3 + + arch/x86/include/asm/perf_event.h | 3 + + arch/x86/include/asm/processor.h | 5 +- + arch/x86/include/asm/sighandling.h | 4 +- + arch/x86/include/asm/special_insns.h | 2 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/include/asm/trace/irq_vectors.h | 104 ++ + arch/x86/include/asm/uaccess_64.h | 2 +- + arch/x86/include/asm/uv/uv_bau.h | 3 + + arch/x86/include/asm/x86_init.h | 6 +- + arch/x86/include/uapi/asm/msr-index.h | 3 + + arch/x86/include/uapi/asm/processor-flags.h | 154 ++- + arch/x86/kernel/Makefile | 6 +- + arch/x86/kernel/apic/apic.c | 71 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 66 +- + arch/x86/kernel/asm-offsets_32.c | 1 - + arch/x86/kernel/cpu/Makefile | 4 + + arch/x86/kernel/cpu/bugs.c | 21 +- + arch/x86/kernel/cpu/common.c | 39 +- + arch/x86/kernel/cpu/cyrix.c | 2 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 52 +- + arch/x86/kernel/cpu/mcheck/mce-inject.c | 4 +- + arch/x86/kernel/cpu/mcheck/mce.c | 5 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 12 + + arch/x86/kernel/cpu/mcheck/therm_throt.c | 24 +- + arch/x86/kernel/cpu/mcheck/threshold.c | 24 +- + arch/x86/kernel/cpu/mtrr/cyrix.c | 2 +- + arch/x86/kernel/cpu/mtrr/generic.c | 23 +- + arch/x86/kernel/cpu/mtrr/main.c | 16 +- + arch/x86/kernel/cpu/perf_event.c | 69 +- + arch/x86/kernel/cpu/perf_event.h | 24 +- + arch/x86/kernel/cpu/perf_event_amd.c | 34 +- + arch/x86/kernel/cpu/perf_event_amd_iommu.c | 504 ++++++++++ + arch/x86/kernel/cpu/perf_event_amd_iommu.h | 40 + + arch/x86/kernel/cpu/perf_event_intel.c | 136 ++- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 178 +++- + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 69 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 16 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.h | 4 +- + arch/x86/kernel/cpu/proc.c | 4 +- + .../x86/kernel/{doublefault_32.c => doublefault.c} | 15 + + arch/x86/kernel/entry_32.S | 12 +- + arch/x86/kernel/entry_64.S | 38 +- + arch/x86/kernel/head_32.S | 21 - + arch/x86/kernel/head_64.S | 8 +- + arch/x86/kernel/i387.c | 59 +- + arch/x86/kernel/irq.c | 33 +- + arch/x86/kernel/irq_work.c | 24 +- + arch/x86/kernel/kvmclock.c | 9 +- + arch/x86/kernel/microcode_amd.c | 133 ++- + arch/x86/kernel/microcode_amd_early.c | 302 ++++++ + arch/x86/kernel/microcode_core_early.c | 49 +- + arch/x86/kernel/microcode_intel_early.c | 6 +- + arch/x86/kernel/nmi.c | 36 +- + arch/x86/kernel/process_32.c | 13 +- + arch/x86/kernel/process_64.c | 11 +- + arch/x86/kernel/relocate_kernel_32.S | 2 +- + arch/x86/kernel/relocate_kernel_64.S | 34 +- + arch/x86/kernel/rtc.c | 17 +- + arch/x86/kernel/signal.c | 16 +- + arch/x86/kernel/smp.c | 65 +- + arch/x86/kernel/tracepoint.c | 61 ++ + arch/x86/kernel/traps.c | 7 +- + arch/x86/kernel/xsave.c | 5 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/lguest/boot.c | 6 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/platform/efi/efi.c | 17 +- + arch/x86/platform/mrst/vrtc.c | 11 +- + arch/x86/vdso/vdso32-setup.c | 4 +- + arch/x86/xen/enlighten.c | 2 +- + arch/x86/xen/time.c | 19 +- + drivers/acpi/apei/einj.c | 39 +- + drivers/clocksource/Kconfig | 5 + + drivers/clocksource/Makefile | 3 + + drivers/clocksource/bcm2835_timer.c | 2 +- + drivers/clocksource/clksrc-dbx500-prcmu.c | 3 +- + drivers/clocksource/dummy_timer.c | 69 ++ + drivers/clocksource/dw_apb_timer.c | 12 - + drivers/clocksource/dw_apb_timer_of.c | 6 +- + drivers/clocksource/mxs_timer.c | 2 +- + drivers/clocksource/nomadik-mtu.c | 2 +- + drivers/clocksource/samsung_pwm_timer.c | 2 +- + drivers/clocksource/tegra20_timer.c | 2 +- + drivers/clocksource/time-armada-370-xp.c | 2 +- + drivers/clocksource/timer-marco.c | 2 +- + drivers/clocksource/timer-prima2.c | 2 +- + drivers/clocksource/vf_pit_timer.c | 194 ++++ + drivers/clocksource/zevio-timer.c | 215 +++++ + drivers/gpio/gpio-mvebu.c | 2 +- + drivers/iommu/amd_iommu_init.c | 140 ++- + drivers/iommu/amd_iommu_proto.h | 7 + + drivers/iommu/amd_iommu_types.h | 15 +- + drivers/irqchip/Kconfig | 15 + + drivers/irqchip/Makefile | 3 + + drivers/irqchip/irq-nvic.c | 117 +++ + drivers/irqchip/irq-orion.c | 192 ++++ + drivers/irqchip/irq-tb10x.c | 195 ++++ + drivers/lguest/x86/core.c | 2 +- + drivers/mfd/stmpe.c | 3 +- + drivers/mfd/twl4030-irq.c | 5 +- + fs/timerfd.c | 131 ++- + include/asm-generic/uaccess.h | 10 +- + include/linux/alarmtimer.h | 4 + + include/linux/clockchips.h | 5 +- + include/linux/clocksource.h | 7 +- + include/linux/completion.h | 2 +- + include/linux/dw_apb_timer.h | 1 - + include/linux/efi.h | 32 +- + include/linux/hardirq.h | 2 +- + include/linux/hugetlb.h | 16 + + include/linux/irq.h | 53 +- + include/linux/irqdomain.h | 12 + + include/linux/kernel.h | 7 +- + include/linux/ktime.h | 10 +- + include/linux/perf_event.h | 30 +- + include/linux/rcupdate.h | 5 +- + include/linux/rcutiny.h | 41 +- + include/linux/rcutree.h | 3 +- + include/linux/sched.h | 9 +- + include/linux/sched_clock.h | 21 + + include/linux/spinlock_up.h | 2 +- + include/linux/srcu.h | 43 - + include/linux/tracepoint.h | 2 + + include/trace/define_trace.h | 5 + + include/trace/events/nmi.h | 37 + + include/trace/ftrace.h | 4 + + include/uapi/asm-generic/unistd.h | 2 +- + include/uapi/linux/const.h | 3 + + include/uapi/linux/perf_event.h | 5 +- + include/xen/events.h | 3 + + init/Kconfig | 49 +- + init/main.c | 4 +- + kernel/Kconfig.locks | 6 +- + kernel/cpuset.c | 4 +- + kernel/events/core.c | 278 +++++- + kernel/events/hw_breakpoint.c | 191 ++-- + kernel/futex.c | 3 +- + kernel/irq/chip.c | 13 + + kernel/irq/generic-chip.c | 302 +++++- + kernel/irq/irqdomain.c | 8 +- + kernel/irq/manage.c | 11 +- + kernel/printk.c | 2 +- + kernel/rcupdate.c | 29 +- + kernel/rcutiny.c | 21 +- + kernel/rcutiny_plugin.h | 1009 +------------------- + kernel/rcutorture.c | 39 - + kernel/rcutree.c | 168 +--- + kernel/rcutree.h | 15 +- + kernel/rcutree_plugin.h | 81 +- + kernel/resource.c | 1 + + kernel/rtmutex.c | 13 + + kernel/sched/Makefile | 2 +- + kernel/sched/auto_group.c | 3 +- + kernel/sched/core.c | 637 +----------- + kernel/sched/cputime.c | 5 +- + kernel/sched/debug.c | 16 +- + kernel/sched/fair.c | 175 ++-- + kernel/sched/proc.c | 591 ++++++++++++ + kernel/sched/rt.c | 132 +-- + kernel/sched/sched.h | 71 +- + kernel/sched/stats.h | 8 +- + kernel/sched/stop_task.c | 8 +- + kernel/sysctl.c | 12 +- + kernel/time.c | 2 +- + kernel/time/Makefile | 2 + + kernel/time/alarmtimer.c | 47 +- + kernel/time/clockevents.c | 271 +++++- + kernel/time/clocksource.c | 209 +++- + {arch/arm/kernel => kernel/time}/sched_clock.c | 17 +- + kernel/time/tick-broadcast.c | 33 +- + kernel/time/tick-common.c | 194 ++-- + kernel/time/tick-internal.h | 17 +- + kernel/time/timekeeping.c | 26 +- + kernel/time/timekeeping_debug.c | 72 ++ + kernel/time/timekeeping_internal.h | 14 + + kernel/workqueue_internal.h | 2 +- + mm/hugetlb.c | 17 + + mm/memory.c | 10 +- + tools/lib/lk/Makefile | 3 + + tools/perf/Documentation/perf-archive.txt | 2 +- + tools/perf/Documentation/perf-report.txt | 4 + + tools/perf/Documentation/perf-top.txt | 4 + + tools/perf/Makefile | 630 +++--------- + tools/perf/builtin-diff.c | 19 +- + tools/perf/builtin-kvm.c | 3 + + tools/perf/builtin-record.c | 2 +- + tools/perf/builtin-report.c | 102 +- + tools/perf/builtin-top.c | 74 +- + tools/perf/config/Makefile | 477 +++++++++ + tools/perf/tests/attr/base-record | 4 +- + tools/perf/tests/attr/base-stat | 4 +- + tools/perf/tests/attr/test-record-data | 5 +- + tools/perf/tests/bp_signal.c | 6 + + tools/perf/tests/bp_signal_overflow.c | 6 + + tools/perf/tests/builtin-test.c | 2 +- + tools/perf/tests/make | 138 +++ + tools/perf/ui/browsers/hists.c | 106 +- + tools/perf/ui/gtk/hists.c | 13 +- + tools/perf/ui/stdio/hist.c | 7 +- + tools/perf/util/evlist.c | 2 + + tools/perf/util/evsel.c | 2 +- + tools/perf/util/header.c | 2 - + tools/perf/util/header.h | 1 - + tools/perf/util/hist.c | 96 +- + tools/perf/util/hist.h | 16 +- + tools/perf/util/map.c | 1 + + tools/perf/util/session.h | 1 - + tools/perf/util/setup.py | 5 +- + tools/perf/util/sort.c | 128 ++- + tools/perf/util/sort.h | 36 +- + tools/perf/util/stat.c | 2 +- + tools/perf/util/thread.c | 4 + + tools/perf/util/thread.h | 1 + + tools/perf/util/top.c | 23 +- + tools/perf/util/top.h | 2 +- + tools/perf/util/util.h | 4 +- + 303 files changed, 8309 insertions(+), 4272 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/abilis,tb10x-ictl.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,orion-intc.txt + create mode 100644 Documentation/devicetree/bindings/timer/lsi,zevio-timer.txt + create mode 100644 Documentation/trace/events-nmi.txt + create mode 100644 arch/x86/configs/kvm_guest.config + create mode 100644 arch/x86/include/asm/microcode_amd.h + create mode 100644 arch/x86/include/asm/trace/irq_vectors.h + create mode 100644 arch/x86/kernel/cpu/perf_event_amd_iommu.c + create mode 100644 arch/x86/kernel/cpu/perf_event_amd_iommu.h + rename arch/x86/kernel/{doublefault_32.c => doublefault.c} (84%) + create mode 100644 arch/x86/kernel/microcode_amd_early.c + create mode 100644 arch/x86/kernel/tracepoint.c + create mode 100644 drivers/clocksource/dummy_timer.c + create mode 100644 drivers/clocksource/vf_pit_timer.c + create mode 100644 drivers/clocksource/zevio-timer.c + create mode 100644 drivers/irqchip/irq-nvic.c + create mode 100644 drivers/irqchip/irq-orion.c + create mode 100644 drivers/irqchip/irq-tb10x.c + create mode 100644 include/linux/sched_clock.h + create mode 100644 include/trace/events/nmi.h + create mode 100644 kernel/sched/proc.c + rename {arch/arm/kernel => kernel/time}/sched_clock.c (94%) + create mode 100644 kernel/time/timekeeping_debug.c + create mode 100644 kernel/time/timekeeping_internal.h + create mode 100644 tools/perf/config/Makefile + create mode 100644 tools/perf/tests/make +Merging ftrace/for-next (52d85d7 ftrace: Fix stddev calculation in function profiler) +$ git merge --no-ff ftrace/for-next +Auto-merging kernel/trace/trace.c +Auto-merging kernel/sysctl.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 13 +++++ + Documentation/trace/events.txt | 15 ++++-- + Documentation/trace/ftrace.txt | 13 +++++ + include/linux/ftrace.h | 9 ++-- + kernel/panic.c | 3 ++ + kernel/sysctl.c | 7 +++ + kernel/trace/ftrace.c | 33 ++++++++++-- + kernel/trace/trace.c | 19 ++++++- + kernel/trace/trace_events.c | 12 +---- + kernel/trace/trace_events_filter.c | 6 +++ + kernel/trace/trace_functions.c | 103 ++++++++++++++++++++++++++++++++++-- + kernel/trace/trace_kprobe.c | 3 +- + 12 files changed, 207 insertions(+), 29 deletions(-) +Merging rcu/rcu/next (be77f87 Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu.2013.06.10a' and 'tiny.2013.06.10a' into HEAD) +$ git merge --no-ff rcu/rcu/next +Already up-to-date. +Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) +$ git merge --no-ff cputime/cputime +Already up-to-date. +Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge --no-ff uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (96f7edf Merge git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-3.11 into queue) +$ git merge --no-ff kvm/linux-next +Resolved 'arch/s390/include/asm/pgtable.h' using previous resolution. +Auto-merging virt/kvm/arm/arch_timer.c +Auto-merging include/linux/kvm_host.h +Auto-merging include/kvm/arm_arch_timer.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/lapic.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/kernel/entry64.S +Auto-merging arch/s390/kernel/asm-offsets.c +Auto-merging arch/s390/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h +Auto-merging arch/arm/kvm/mmu.c +Auto-merging arch/arm/kvm/interrupts_head.S +Auto-merging arch/arm/kvm/arm.c +Auto-merging MAINTAINERS +Auto-merging Documentation/virtual/kvm/api.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d977092] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 8 +- + Documentation/virtual/kvm/mmu.txt | 91 ++++- + MAINTAINERS | 4 +- + arch/arm/include/asm/kvm_arm.h | 1 - + arch/arm/include/asm/kvm_asm.h | 24 +- + arch/arm/include/asm/kvm_emulate.h | 5 - + arch/arm/include/asm/kvm_host.h | 13 +- + arch/arm/kvm/Kconfig | 8 +- + arch/arm/kvm/Makefile | 7 +- + arch/arm/kvm/arm.c | 8 +- + arch/arm/kvm/coproc.c | 4 + + arch/arm/kvm/handle_exit.c | 3 - + arch/arm/kvm/interrupts.S | 16 +- + arch/arm/kvm/interrupts_head.S | 10 +- + arch/arm/kvm/mmio.c | 6 - + arch/arm/kvm/mmu.c | 3 - + arch/arm/kvm/psci.c | 2 +- + arch/arm/kvm/reset.c | 12 + + arch/ia64/kvm/Makefile | 7 +- + arch/powerpc/kvm/Makefile | 13 +- + arch/s390/include/asm/kvm_host.h | 18 +- + arch/s390/include/asm/perf_event.h | 10 + + arch/s390/include/asm/pgtable.h | 83 +++-- + arch/s390/kernel/asm-offsets.c | 3 + + arch/s390/kernel/entry64.S | 81 ++--- + arch/s390/kernel/perf_event.c | 52 +++ + arch/s390/kernel/s390_ksyms.c | 1 + + arch/s390/kvm/Makefile | 3 +- + arch/s390/kvm/diag.c | 3 + + arch/s390/kvm/intercept.c | 124 +------ + arch/s390/kvm/interrupt.c | 18 +- + arch/s390/kvm/kvm-s390.c | 105 +++++- + arch/s390/kvm/kvm-s390.h | 14 +- + arch/s390/kvm/priv.c | 274 ++++++++++++--- + arch/s390/kvm/sigp.c | 19 +- + arch/s390/mm/pgtable.c | 2 +- + arch/x86/include/asm/kvm_host.h | 15 +- + arch/x86/kvm/Makefile | 13 +- + arch/x86/kvm/emulate.c | 391 ++++++--------------- + arch/x86/kvm/lapic.c | 4 +- + arch/x86/kvm/mmu.c | 301 +++++++++++++--- + arch/x86/kvm/mmu.h | 18 + + arch/x86/kvm/mmutrace.h | 76 +++- + arch/x86/kvm/paging_tmpl.h | 10 +- + arch/x86/kvm/svm.c | 10 +- + arch/x86/kvm/trace.h | 21 ++ + arch/x86/kvm/vmx.c | 19 +- + arch/x86/kvm/x86.c | 80 +++-- + .../kvm/arm_arch_timer.h | 4 + + .../asm/kvm_vgic.h => include/kvm/arm_vgic.h | 0 + include/linux/kvm_host.h | 4 +- + {arch/arm/kvm => virt/kvm/arm}/arch_timer.c | 33 +- + {arch/arm/kvm => virt/kvm/arm}/vgic.c | 0 + virt/kvm/eventfd.c | 2 + + virt/kvm/kvm_main.c | 4 +- + 55 files changed, 1300 insertions(+), 760 deletions(-) + rename arch/arm/include/asm/kvm_arch_timer.h => include/kvm/arm_arch_timer.h (92%) + rename arch/arm/include/asm/kvm_vgic.h => include/kvm/arm_vgic.h (100%) + rename {arch/arm/kvm => virt/kvm/arm}/arch_timer.c (90%) + rename {arch/arm/kvm => virt/kvm/arm}/vgic.c (100%) +Merging kvm-arm/kvm-arm-next (8bd4ffd ARM: kvm: don't include drivers/virtio/Kconfig) +$ git merge --no-ff kvm-arm/kvm-arm-next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (a3ff5fb KVM: PPC: Ignore PIR writes) +$ git merge --no-ff kvm-ppc/kvm-ppc-next +Auto-merging arch/powerpc/kvm/booke.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/kvm_book3s.h | 6 ++- + arch/powerpc/kvm/book3s_64_mmu.c | 81 ++++++++++++++++++++++------------- + arch/powerpc/kvm/book3s_64_mmu_host.c | 21 ++++++++- + arch/powerpc/kvm/book3s_64_slb.S | 13 +----- + arch/powerpc/kvm/book3s_pr.c | 3 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/emulate.c | 3 ++ + 7 files changed, 82 insertions(+), 47 deletions(-) +Merging oprofile/for-next (f722406 Linux 3.10-rc1) +$ git merge --no-ff oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) +$ git merge --no-ff fw-nohz/nohz/next +Already up-to-date. +Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes) +$ git merge --no-ff xen/upstream/xen +Already up-to-date. +Merging xen-two/linux-next (21f3c04 Merge branch 'stable/for-linus-3.11' into linux-next) +$ git merge --no-ff xen-two/linux-next +Auto-merging arch/x86/xen/time.c +Merge made by the 'recursive' strategy. + arch/x86/xen/smp.c | 91 +++++++++++++++++++---------- + arch/x86/xen/spinlock.c | 7 ++- + arch/x86/xen/time.c | 58 +++++++++--------- + drivers/pci/xen-pcifront.c | 7 +-- + drivers/xen/balloon.c | 6 +- + drivers/xen/cpu_hotplug.c | 6 +- + drivers/xen/events.c | 23 ++++---- + drivers/xen/evtchn.c | 6 +- + drivers/xen/gntalloc.c | 6 +- + drivers/xen/gntdev.c | 8 ++- + drivers/xen/grant-table.c | 17 +++--- + drivers/xen/manage.c | 25 ++++---- + drivers/xen/mcelog.c | 36 +++++------- + drivers/xen/pcpu.c | 12 ++-- + drivers/xen/privcmd.c | 4 +- + drivers/xen/swiotlb-xen.c | 12 ++-- + drivers/xen/tmem.c | 10 ++-- + drivers/xen/xen-acpi-cpuhotplug.c | 2 + + drivers/xen/xen-acpi-memhotplug.c | 2 + + drivers/xen/xen-acpi-pad.c | 2 + + drivers/xen/xen-acpi-processor.c | 25 ++++---- + drivers/xen/xen-balloon.c | 6 +- + drivers/xen/xen-pciback/conf_space_header.c | 16 ++--- + drivers/xen/xen-pciback/pci_stub.c | 35 +++++------ + drivers/xen/xen-pciback/pciback_ops.c | 9 ++- + drivers/xen/xen-pciback/vpci.c | 10 ++-- + drivers/xen/xen-pciback/xenbus.c | 8 ++- + drivers/xen/xen-selfballoon.c | 11 ++-- + drivers/xen/xenbus/xenbus_comms.c | 13 +++-- + drivers/xen/xenbus/xenbus_dev_backend.c | 4 +- + drivers/xen/xenbus/xenbus_dev_frontend.c | 4 +- + drivers/xen/xenbus/xenbus_probe.c | 30 +++++----- + drivers/xen/xenbus/xenbus_probe_backend.c | 8 ++- + drivers/xen/xenbus/xenbus_probe_frontend.c | 35 +++++------ + drivers/xen/xenbus/xenbus_xs.c | 22 +++---- + drivers/xen/xencomm.c | 2 + + drivers/xen/xenfs/super.c | 4 +- + include/xen/hvm.h | 4 +- + 38 files changed, 321 insertions(+), 265 deletions(-) +Merging xen-arm/linux-next (e4aa937 Linux 3.10-rc3) +$ git merge --no-ff xen-arm/linux-next +Already up-to-date. +Merging percpu/for-next (a424445 percpu-refcount: use RCU-sched insted of normal RCU) +$ git merge --no-ff percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/percpu-refcount.h | 12 ++++++------ + lib/percpu-refcount.c | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) +Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for-next) +$ git merge --no-ff workqueues/for-next +Auto-merging drivers/net/phy/phy.c +Auto-merging block/blk-core.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 15 +++++++++++++++ + block/blk-core.c | 3 ++- + block/blk-ioc.c | 3 ++- + block/genhd.c | 12 ++++++++---- + drivers/net/phy/phy.c | 9 +++++---- + drivers/video/console/fbcon.c | 2 +- + include/linux/workqueue.h | 35 +++++++++++++++++++++++++++++++++++ + kernel/power/Kconfig | 20 ++++++++++++++++++++ + kernel/workqueue.c | 26 +++++++++++++++++++++++++- + 9 files changed, 113 insertions(+), 12 deletions(-) +Merging drivers-x86/linux-next (a1ec56e Add support for fan button on Ideapad Z580) +$ git merge --no-ff drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge --no-ff hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) +$ git merge --no-ff sysctl/master +Already up-to-date. +Merging regmap/for-next (7bc8c4c Merge remote-tracking branch 'regmap/topic/field' into regmap-next) +$ git merge --no-ff regmap/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/pinctrl-st.txt | 110 ++ + drivers/base/regmap/internal.h | 10 + + drivers/base/regmap/regcache-rbtree.c | 62 +- + drivers/base/regmap/regcache.c | 83 +- + drivers/base/regmap/regmap-debugfs.c | 8 +- + drivers/base/regmap/regmap.c | 156 ++- + drivers/pinctrl/Kconfig | 6 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-st.c | 1403 ++++++++++++++++++++ + include/linux/regmap.h | 43 + + include/trace/events/regmap.h | 23 + + 11 files changed, 1875 insertions(+), 30 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt + create mode 100644 drivers/pinctrl/pinctrl-st.c +Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) +$ git merge --no-ff hsi/for-next +Already up-to-date. +Merging leds/for-next (73e1ab4 leds: Convert led class driver from legacy pm ops to dev_pm_ops) +$ git merge --no-ff leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-lp55xx.txt | 147 +++++++ + arch/arm/mach-imx/mach-mx31moboard.c | 9 +- + drivers/leds/Kconfig | 6 +- + drivers/leds/led-class.c | 10 +- + drivers/leds/leds-88pm860x.c | 2 +- + drivers/leds/leds-atmel-pwm.c | 1 - + drivers/leds/leds-gpio.c | 8 - + drivers/leds/leds-lp5521.c | 28 +- + drivers/leds/leds-lp5523.c | 28 +- + drivers/leds/leds-lp5562.c | 28 +- + drivers/leds/leds-lp55xx-common.c | 45 ++ + drivers/leds/leds-lp55xx-common.h | 4 + + drivers/leds/leds-mc13783.c | 467 ++++++++++----------- + drivers/leds/leds-ns2.c | 2 - + drivers/leds/leds-renesas-tpu.c | 8 +- + drivers/leds/leds-sunfire.c | 4 +- + drivers/leds/leds-wm831x-status.c | 2 +- + include/linux/mfd/mc13xxx.h | 100 ++--- + 18 files changed, 553 insertions(+), 346 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.txt +Merging driver-core/driver-core-next (bfd63cd driver core: device.h: fix doc compilation warnings) +$ git merge --no-ff driver-core/driver-core-next +Resolved 'drivers/base/cpu.c' using previous resolution. +Resolved 'drivers/base/memory.c' using previous resolution. +Resolved 'include/linux/device.h' using previous resolution. +Resolved 'include/linux/platform_device.h' using previous resolution. +Auto-merging kernel/power/Kconfig +Auto-merging init/Kconfig +Auto-merging include/linux/platform_device.h +CONFLICT (content): Merge conflict in include/linux/platform_device.h +Auto-merging include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Auto-merging fs/sysfs/dir.c +Auto-merging drivers/edac/Kconfig +Auto-merging drivers/base/platform.c +Auto-merging drivers/base/memory.c +CONFLICT (content): Merge conflict in drivers/base/memory.c +Auto-merging drivers/base/cpu.c +CONFLICT (content): Merge conflict in drivers/base/cpu.c +Auto-merging drivers/base/core.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/mm/tlb_hash64.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/cris/arch-v32/drivers/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging Documentation/kbuild/kconfig.txt +Auto-merging Documentation/cpu-hotplug.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 54c6a25] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-pci | 5 +- + Documentation/HOWTO | 2 +- + Documentation/SubmitChecklist | 2 +- + Documentation/cpu-hotplug.txt | 2 +- + Documentation/hwmon/submitting-patches | 3 +- + Documentation/kbuild/kconfig.txt | 2 +- + Documentation/usb/hotplug.txt | 6 +- + arch/arm/Kconfig | 2 +- + arch/arm/kernel/module.c | 8 -- + arch/arm/kernel/vmlinux.lds.S | 4 - + arch/arm/mach-ixp4xx/Kconfig | 1 - + arch/blackfin/Kconfig | 2 +- + arch/cris/arch-v32/drivers/Kconfig | 1 - + arch/ia64/Kconfig | 1 - + arch/mips/Kconfig | 2 +- + arch/parisc/Kconfig | 1 - + arch/powerpc/Kconfig | 2 +- + arch/powerpc/mm/tlb_hash64.c | 4 +- + arch/s390/Kconfig | 1 - + arch/sh/Kconfig | 2 +- + arch/sparc/Kconfig | 1 - + arch/x86/Kconfig | 2 +- + drivers/base/Kconfig | 2 - + drivers/base/core.c | 16 ++-- + drivers/base/cpu.c | 26 ++++-- + drivers/base/firmware_class.c | 132 +++++++++++++++++++++-------- + drivers/base/memory.c | 145 ++++++++++++++------------------ + drivers/base/platform.c | 8 +- + drivers/char/pcmcia/Kconfig | 2 +- + drivers/edac/Kconfig | 2 +- + drivers/firmware/Kconfig | 1 + + drivers/misc/Kconfig | 2 +- + drivers/pci/Kconfig | 2 - + drivers/pci/hotplug/Kconfig | 2 +- + drivers/pcmcia/Kconfig | 1 - + drivers/ptp/Kconfig | 1 + + drivers/staging/media/go7007/go7007.txt | 1 - + drivers/video/geode/Kconfig | 2 +- + fs/debugfs/file.c | 43 ++++++++++ + fs/gfs2/Kconfig | 5 +- + fs/sysfs/dir.c | 2 +- + fs/sysfs/file.c | 10 ++- + fs/sysfs/inode.c | 2 - + include/asm-generic/vmlinux.lds.h | 20 ----- + include/linux/debugfs.h | 2 + + include/linux/device.h | 3 + + include/linux/firmware.h | 11 --- + include/linux/platform_device.h | 8 +- + init/Kconfig | 17 +++- + kernel/power/Kconfig | 1 - + lib/fault-inject.c | 21 ----- + lib/kobject.c | 2 +- + mm/Kconfig | 2 +- + 53 files changed, 296 insertions(+), 254 deletions(-) +Merging tty/tty-next (828c6a1 Revert "serial: 8250_pci: add support for another kind of NetMos Technology PCI 9835 Multi-I/O Controller") +$ git merge --no-ff tty/tty-next +Auto-merging drivers/video/console/fbcon.c +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/tty/serial/mfd.c +Auto-merging MAINTAINERS +Removing Documentation/serial/stallion.txt +Merge made by the 'recursive' strategy. + Documentation/console/console.txt | 28 +- + .../bindings/tty/serial/fsl-imx-uart.txt | 3 + + .../devicetree/bindings/tty/serial/fsl-lpuart.txt | 14 + + Documentation/serial/00-INDEX | 2 - + Documentation/serial/stallion.txt | 392 --------- + MAINTAINERS | 2 +- + arch/alpha/kernel/console.c | 4 +- + arch/alpha/kernel/process.c | 4 +- + arch/mips/pci/pci-bcm1480.c | 4 +- + arch/mips/pci/pci-sb1250.c | 4 +- + arch/parisc/kernel/setup.c | 2 +- + arch/powerpc/include/asm/mpc52xx_psc.h | 49 ++ + drivers/char/Kconfig | 12 - + drivers/tty/Makefile | 2 +- + drivers/tty/hvc/hvc_iucv.c | 2 +- + drivers/tty/n_tty.c | 88 ++- + drivers/tty/serial/8250/8250_pci.c | 4 - + drivers/tty/serial/8250/Kconfig | 5 +- + drivers/tty/serial/Kconfig | 27 +- + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/altera_uart.c | 1 - + drivers/tty/serial/amba-pl011.c | 11 +- + drivers/tty/serial/atmel_serial.c | 41 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 4 +- + drivers/tty/serial/fsl_lpuart.c | 874 +++++++++++++++++++++ + drivers/tty/serial/imx.c | 47 +- + drivers/tty/serial/mfd.c | 4 + + drivers/tty/serial/mpc52xx_uart.c | 424 ++++++++-- + drivers/tty/serial/of_serial.c | 4 +- + drivers/tty/serial/omap-serial.c | 43 +- + drivers/tty/serial/pch_uart.c | 5 + + drivers/tty/serial/samsung.c | 8 +- + drivers/tty/serial/sc26xx.c | 5 +- + drivers/tty/serial/serial_core.c | 6 - + drivers/tty/serial/sirfsoc_uart.c | 5 +- + drivers/tty/serial/sunhv.c | 6 +- + drivers/tty/serial/sunsab.c | 6 +- + drivers/tty/serial/sunsu.c | 8 +- + drivers/tty/serial/sunzilog.c | 6 +- + drivers/tty/serial/ucc_uart.c | 9 +- + drivers/tty/serial/vt8500_serial.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 36 +- + drivers/tty/sysrq.c | 2 +- + drivers/tty/tty_io.c | 19 +- + drivers/tty/tty_ldsem.c | 453 +++++++++++ + drivers/tty/vt/vt.c | 117 +-- + drivers/usb/misc/sisusbvga/sisusb_con.c | 18 +- + drivers/video/console/fbcon.c | 35 +- + drivers/video/console/mdacon.c | 8 +- + drivers/video/console/newport_con.c | 9 +- + drivers/video/console/sticon.c | 6 +- + include/linux/console.h | 3 - + include/linux/serial_core.h | 7 + + include/linux/tty.h | 3 - + include/linux/tty_ldisc.h | 52 ++ + include/linux/vt_kern.h | 2 - + include/uapi/linux/serial_core.h | 3 + + 57 files changed, 2144 insertions(+), 797 deletions(-) + create mode 100644 Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt + delete mode 100644 Documentation/serial/stallion.txt + create mode 100644 drivers/tty/serial/fsl_lpuart.c + create mode 100644 drivers/tty/tty_ldsem.c +Merging usb/usb-next (3a0ddc7 usb: musb: omap2430: make it compile again) +$ git merge --no-ff usb/usb-next +Resolved 'drivers/usb/chipidea/Makefile' using previous resolution. +Auto-merging drivers/usb/musb/omap2430.c +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/usb/gadget/f_uvc.c +Auto-merging drivers/usb/core/port.c +Auto-merging drivers/usb/chipidea/ci_hdrc_pci.c +Auto-merging drivers/usb/chipidea/ci_hdrc_msm.c +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Auto-merging drivers/usb/chipidea/Makefile +CONFLICT (content): Merge conflict in drivers/usb/chipidea/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f4df19e] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget | 81 + + Documentation/ABI/testing/configfs-usb-gadget-acm | 8 + + Documentation/ABI/testing/configfs-usb-gadget-ecm | 16 + + Documentation/ABI/testing/configfs-usb-gadget-eem | 14 + + Documentation/ABI/testing/configfs-usb-gadget-ncm | 15 + + Documentation/ABI/testing/configfs-usb-gadget-obex | 9 + + .../ABI/testing/configfs-usb-gadget-phonet | 8 + + .../ABI/testing/configfs-usb-gadget-rndis | 14 + + .../ABI/testing/configfs-usb-gadget-serial | 9 + + .../ABI/testing/configfs-usb-gadget-subset | 14 + + Documentation/ABI/testing/sysfs-bus-usb | 27 + + .../ABI/testing/sysfs-class-uwb_rc-wusbhc | 19 + + .../devicetree/bindings/usb/ci13xxx-imx.txt | 6 + + .../bindings/usb/nvidia,tegra20-ehci.txt | 27 +- + .../bindings/usb/nvidia,tegra20-usb-phy.txt | 41 +- + Documentation/devicetree/bindings/usb/usb3503.txt | 5 + + Documentation/usb/gadget_configfs.txt | 384 ++ + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 6 +- + arch/arm/boot/dts/tegra20-harmony.dts | 15 +- + arch/arm/boot/dts/tegra20-iris-512.dts | 9 +- + arch/arm/boot/dts/tegra20-paz00.dts | 15 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 26 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 4 + + arch/arm/boot/dts/tegra20-trimslice.dts | 25 +- + arch/arm/boot/dts/tegra20-ventana.dts | 15 +- + arch/arm/boot/dts/tegra20-whistler.dts | 28 + + arch/arm/boot/dts/tegra20.dtsi | 49 +- + drivers/staging/serqt_usb2/serqt_usb2.c | 36 +- + drivers/usb/Kconfig | 69 +- + drivers/usb/Makefile | 1 + + drivers/usb/chipidea/Kconfig | 6 +- + drivers/usb/chipidea/Makefile | 6 +- + drivers/usb/chipidea/bits.h | 16 +- + drivers/usb/chipidea/ci.h | 51 +- + .../usb/chipidea/{ci13xxx_imx.c => ci_hdrc_imx.c} | 117 +- + .../usb/chipidea/{ci13xxx_imx.h => ci_hdrc_imx.h} | 0 + .../usb/chipidea/{ci13xxx_msm.c => ci_hdrc_msm.c} | 49 +- + .../usb/chipidea/{ci13xxx_pci.c => ci_hdrc_pci.c} | 61 +- + drivers/usb/chipidea/core.c | 109 +- + drivers/usb/chipidea/debug.c | 61 +- + drivers/usb/chipidea/debug.h | 8 +- + drivers/usb/chipidea/host.c | 10 +- + drivers/usb/chipidea/host.h | 4 +- + drivers/usb/chipidea/udc.c | 785 +-- + drivers/usb/chipidea/udc.h | 26 +- + drivers/usb/chipidea/usbmisc_imx.c | 15 +- + drivers/usb/class/cdc-acm.c | 52 +- + drivers/usb/class/usbtmc.c | 273 +- + drivers/usb/core/devio.c | 7 +- + drivers/usb/core/file.c | 2 +- + drivers/usb/core/hcd.c | 28 + + drivers/usb/core/hub.c | 23 +- + drivers/usb/core/hub.h | 2 +- + drivers/usb/core/message.c | 16 +- + drivers/usb/core/port.c | 4 +- + drivers/usb/core/sysfs.c | 54 + + drivers/usb/core/usb.c | 33 + + drivers/usb/dwc3/dwc3-omap.c | 251 +- + drivers/usb/dwc3/dwc3-pci.c | 1 - + drivers/usb/gadget/Kconfig | 176 +- + drivers/usb/gadget/Makefile | 16 + + drivers/usb/gadget/cdc2.c | 85 +- + drivers/usb/gadget/ether.c | 180 +- + drivers/usb/gadget/f_ecm.c | 197 +- + drivers/usb/gadget/f_eem.c | 195 +- + drivers/usb/gadget/f_mass_storage.c | 6 +- + drivers/usb/gadget/f_ncm.c | 220 +- + drivers/usb/gadget/f_obex.c | 75 +- + drivers/usb/gadget/f_phonet.c | 177 +- + drivers/usb/gadget/f_rndis.c | 245 +- + drivers/usb/gadget/f_subset.c | 181 +- + drivers/usb/gadget/f_uac2.c | 20 +- + drivers/usb/gadget/f_uvc.c | 13 +- + drivers/usb/gadget/fotg210-udc.c | 1219 ++++ + drivers/usb/gadget/fotg210.h | 253 + + drivers/usb/gadget/fsl_qe_udc.c | 4 +- + drivers/usb/gadget/fusb300_udc.c | 4 +- + drivers/usb/gadget/g_ffs.c | 18 +- + drivers/usb/gadget/m66592-udc.c | 4 +- + drivers/usb/gadget/multi.c | 18 +- + drivers/usb/gadget/mv_u3d_core.c | 5 +- + drivers/usb/gadget/ncm.c | 58 +- + drivers/usb/gadget/nokia.c | 235 +- + drivers/usb/gadget/pxa27x_udc.c | 1 - + drivers/usb/gadget/r8a66597-udc.c | 8 +- + drivers/usb/gadget/rndis.c | 18 + + drivers/usb/gadget/rndis.h | 4 +- + drivers/usb/gadget/u_ecm.h | 36 + + drivers/usb/gadget/u_eem.h | 36 + + drivers/usb/gadget/u_ether.c | 232 +- + drivers/usb/gadget/u_ether.h | 166 +- + drivers/usb/gadget/u_ether_configfs.h | 164 + + drivers/usb/gadget/u_gether.h | 36 + + drivers/usb/gadget/u_ncm.h | 36 + + drivers/usb/gadget/u_phonet.h | 14 +- + drivers/usb/gadget/u_rndis.h | 41 + + drivers/usb/gadget/uvc_queue.c | 16 + + drivers/usb/host/Kconfig | 24 +- + drivers/usb/host/Makefile | 6 + + drivers/usb/host/ehci-atmel.c | 8 +- + drivers/usb/host/ehci-fsl.c | 1 + + drivers/usb/host/ehci-grlib.c | 6 +- + drivers/usb/host/ehci-hcd.c | 22 +- + drivers/usb/host/ehci-hub.c | 20 +- + drivers/usb/host/ehci-mv.c | 16 +- + drivers/usb/host/ehci-mxc.c | 1 - + drivers/usb/host/ehci-octeon.c | 2 - + drivers/usb/host/ehci-omap.c | 13 +- + drivers/usb/host/ehci-orion.c | 2 +- + drivers/usb/host/ehci-platform.c | 3 +- + drivers/usb/host/ehci-pmcmsp.c | 3 +- + drivers/usb/host/ehci-ppc-of.c | 6 +- + drivers/usb/host/ehci-s5p.c | 12 + + drivers/usb/host/ehci-sead3.c | 1 - + drivers/usb/host/ehci-sh.c | 1 - + drivers/usb/host/ehci-spear.c | 6 +- + drivers/usb/host/ehci-tegra.c | 515 +- + drivers/usb/host/ehci-tilegx.c | 1 - + drivers/usb/host/ehci-xilinx-of.c | 5 +- + drivers/usb/host/ehci.h | 2 + + drivers/usb/host/fhci-sched.c | 8 +- + drivers/usb/host/fhci.h | 2 +- + drivers/usb/host/fusbh200-hcd.c | 5972 ++++++++++++++++++++ + drivers/usb/host/fusbh200.h | 743 +++ + drivers/usb/host/hwa-hc.c | 16 +- + drivers/usb/host/imx21-hcd.c | 43 +- + drivers/usb/host/isp1760-if.c | 10 +- + drivers/usb/host/ohci-at91.c | 12 +- + drivers/usb/host/ohci-da8xx.c | 1 - + drivers/usb/host/ohci-hcd.c | 156 +- + drivers/usb/host/ohci-hub.c | 1 - + drivers/usb/host/ohci-jz4740.c | 3 - + drivers/usb/host/ohci-nxp.c | 3 - + drivers/usb/host/ohci-octeon.c | 2 - + drivers/usb/host/ohci-omap.c | 1 - + drivers/usb/host/ohci-omap3.c | 2 +- + drivers/usb/host/ohci-pci.c | 151 +- + drivers/usb/host/ohci-platform.c | 89 +- + drivers/usb/host/ohci-ppc-of.c | 5 +- + drivers/usb/host/ohci-pxa27x.c | 1 - + drivers/usb/host/ohci-q.c | 6 +- + drivers/usb/host/ohci-sm501.c | 1 - + drivers/usb/host/ohci-spear.c | 4 +- + drivers/usb/host/ohci-tilegx.c | 1 - + drivers/usb/host/ohci-tmio.c | 2 - + drivers/usb/host/ohci.h | 20 + + drivers/usb/host/oxu210hp-hcd.c | 2 - + drivers/usb/host/pci-quirks.c | 13 + + drivers/usb/host/pci-quirks.h | 2 + + drivers/usb/host/uhci-grlib.c | 6 +- + drivers/usb/host/uhci-platform.c | 5 +- + drivers/usb/host/whci/hcd.c | 2 - + drivers/usb/host/xhci-dbg.c | 10 +- + drivers/usb/host/xhci-ext-caps.h | 1 + + drivers/usb/host/xhci-hub.c | 16 +- + drivers/usb/host/xhci-mem.c | 98 +- + drivers/usb/host/xhci-plat.c | 3 +- + drivers/usb/host/xhci-ring.c | 6 +- + drivers/usb/host/xhci.c | 399 +- + drivers/usb/host/xhci.h | 32 +- + drivers/usb/misc/adutux.c | 141 +- + drivers/usb/misc/usb3503.c | 41 +- + drivers/usb/musb/Kconfig | 29 + + drivers/usb/musb/Makefile | 4 +- + drivers/usb/musb/blackfin.c | 18 +- + drivers/usb/musb/da8xx.c | 18 +- + drivers/usb/musb/davinci.c | 18 +- + drivers/usb/musb/musb_core.c | 137 +- + drivers/usb/musb/musb_core.h | 27 +- + drivers/usb/musb/musb_gadget.c | 10 - + drivers/usb/musb/musb_gadget.h | 38 +- + drivers/usb/musb/musb_host.c | 99 +- + drivers/usb/musb/musb_host.h | 57 +- + drivers/usb/musb/musb_virthub.c | 54 +- + drivers/usb/musb/omap2430.c | 20 +- + drivers/usb/musb/tusb6010.c | 18 +- + drivers/usb/musb/ux500.c | 18 +- + drivers/usb/musb/ux500_dma.c | 6 +- + drivers/usb/phy/Kconfig | 2 +- + drivers/usb/phy/Makefile | 1 + + drivers/usb/phy/of.c | 47 + + drivers/usb/phy/phy-ab8500-usb.c | 846 ++- + drivers/usb/phy/phy-nop.c | 2 +- + drivers/usb/phy/phy-omap-usb3.c | 7 +- + drivers/usb/phy/phy-rcar-usb.c | 2 +- + drivers/usb/phy/phy-samsung-usb.c | 159 +- + drivers/usb/phy/phy-samsung-usb.h | 24 +- + drivers/usb/phy/phy-samsung-usb2.c | 62 +- + drivers/usb/phy/phy-samsung-usb3.c | 23 +- + drivers/usb/phy/phy-tegra-usb.c | 354 +- + drivers/usb/phy/phy-ulpi-viewport.c | 2 + + drivers/usb/serial/Kconfig | 10 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/ark3116.c | 4 +- + drivers/usb/serial/bus.c | 6 +- + drivers/usb/serial/console.c | 8 +- + drivers/usb/serial/cp210x.c | 2 - + drivers/usb/serial/cypress_m8.c | 4 +- + drivers/usb/serial/digi_acceleport.c | 6 +- + drivers/usb/serial/f81232.c | 7 +- + drivers/usb/serial/flashloader.c | 39 + + drivers/usb/serial/garmin_gps.c | 6 +- + drivers/usb/serial/io_edgeport.c | 60 +- + drivers/usb/serial/io_ti.c | 23 +- + drivers/usb/serial/keyspan.c | 42 +- + drivers/usb/serial/metro-usb.c | 4 +- + drivers/usb/serial/mos7720.c | 39 +- + drivers/usb/serial/mos7840.c | 57 +- + drivers/usb/serial/opticon.c | 4 +- + drivers/usb/serial/option.c | 4 - + drivers/usb/serial/pl2303.c | 12 +- + drivers/usb/serial/qcserial.c | 8 +- + drivers/usb/serial/quatech2.c | 11 +- + drivers/usb/serial/sierra.c | 2 +- + drivers/usb/serial/ssu100.c | 2 +- + drivers/usb/serial/ti_usb_3410_5052.c | 12 +- + drivers/usb/serial/usb-serial.c | 133 +- + drivers/usb/serial/usb_wwan.c | 4 +- + drivers/usb/serial/whiteheat.c | 22 +- + drivers/usb/storage/alauda.c | 6 +- + drivers/usb/storage/sddr09.c | 6 +- + drivers/usb/usb-common.c | 35 + + drivers/usb/wusbcore/devconnect.c | 6 +- + drivers/usb/wusbcore/mmc.c | 33 +- + drivers/usb/wusbcore/pal.c | 5 +- + drivers/usb/wusbcore/reservation.c | 3 + + drivers/usb/wusbcore/rh.c | 20 - + drivers/usb/wusbcore/wa-nep.c | 3 +- + drivers/usb/wusbcore/wa-rpipe.c | 45 +- + drivers/usb/wusbcore/wa-xfer.c | 181 +- + drivers/usb/wusbcore/wusbhc.c | 79 +- + drivers/usb/wusbcore/wusbhc.h | 7 +- + drivers/uwb/drp.c | 4 +- + drivers/uwb/est.c | 7 +- + drivers/uwb/hwa-rc.c | 6 + + drivers/uwb/pal.c | 2 + + drivers/uwb/rsv.c | 4 +- + drivers/uwb/uwb-internal.h | 3 +- + drivers/uwb/whci.c | 14 +- + include/linux/platform_data/usb3503.h | 5 + + include/linux/usb.h | 21 + + include/linux/usb/chipidea.h | 31 +- + include/linux/usb/hcd.h | 1 + + include/linux/usb/of.h | 32 + + include/linux/usb/otg.h | 7 + + include/linux/usb/phy.h | 9 + + include/linux/usb/serial.h | 15 +- + include/linux/usb/tegra_usb_phy.h | 9 +- + include/linux/usb/wusb-wa.h | 17 +- + 249 files changed, 16059 insertions(+), 3376 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-acm + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-ecm + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-eem + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-ncm + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-obex + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-phonet + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-rndis + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-serial + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-subset + create mode 100644 Documentation/usb/gadget_configfs.txt + rename drivers/usb/chipidea/{ci13xxx_imx.c => ci_hdrc_imx.c} (66%) + rename drivers/usb/chipidea/{ci13xxx_imx.h => ci_hdrc_imx.h} (100%) + rename drivers/usb/chipidea/{ci13xxx_msm.c => ci_hdrc_msm.c} (58%) + rename drivers/usb/chipidea/{ci13xxx_pci.c => ci_hdrc_pci.c} (67%) + create mode 100644 drivers/usb/gadget/fotg210-udc.c + create mode 100644 drivers/usb/gadget/fotg210.h + create mode 100644 drivers/usb/gadget/u_ecm.h + create mode 100644 drivers/usb/gadget/u_eem.h + create mode 100644 drivers/usb/gadget/u_ether_configfs.h + create mode 100644 drivers/usb/gadget/u_gether.h + create mode 100644 drivers/usb/gadget/u_ncm.h + create mode 100644 drivers/usb/gadget/u_rndis.h + create mode 100644 drivers/usb/host/fusbh200-hcd.c + create mode 100644 drivers/usb/host/fusbh200.h + create mode 100644 drivers/usb/phy/of.c + create mode 100644 drivers/usb/serial/flashloader.c + create mode 100644 include/linux/usb/of.h +Merging usb-gadget/next (b1fd6cb usb: dwc3: omap: Adds dwc3_omap_readl/writel wrappers) +$ git merge --no-ff usb-gadget/next +Already up-to-date. +Merging staging/staging-next (0ad1ea6 Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency""") +$ git merge --no-ff staging/staging-next +Resolved 'Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt' using previous resolution. +Resolved 'drivers/staging/serqt_usb2/serqt_usb2.c' using previous resolution. +Resolved 'drivers/staging/silicom/bpctl_mod.c' using previous resolution. +Resolved 'drivers/thermal/ti-soc-thermal/ti-thermal-common.c' using previous resolution. +Auto-merging drivers/thermal/ti-soc-thermal/ti-thermal-common.c +CONFLICT (content): Merge conflict in drivers/thermal/ti-soc-thermal/ti-thermal-common.c +Removing drivers/staging/zram/zram_sysfs.c +Auto-merging drivers/staging/silicom/bpctl_mod.c +CONFLICT (content): Merge conflict in drivers/staging/silicom/bpctl_mod.c +Auto-merging drivers/staging/serqt_usb2/serqt_usb2.c +CONFLICT (content): Merge conflict in drivers/staging/serqt_usb2/serqt_usb2.c +Auto-merging drivers/staging/rtl8192u/r8192U_core.c +Removing drivers/staging/ozwpan/ozeventdef.h +Removing drivers/staging/ozwpan/ozevent.h +Removing drivers/staging/ozwpan/ozevent.c +Auto-merging drivers/staging/imx-drm/ipuv3-crtc.c +Removing drivers/staging/iio/trigger/iio-trig-gpio.c +Auto-merging drivers/staging/fwserial/fwserial.c +Auto-merging drivers/staging/csr/netdev.c +Removing drivers/staging/comedi/drivers/pcm3730.c +Removing drivers/staging/comedi/drivers/pcl725.c +Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c +Removing drivers/staging/comedi/drivers/acl7225b.c +Auto-merging drivers/staging/comedi/comedi_fops.c +Auto-merging drivers/staging/android/binder.c +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/iio/trigger/iio-trig-sysfs.c +Auto-merging drivers/iio/gyro/adis16130.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f12d4b6] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 90 +- + .../devicetree/bindings/iio/dac/ad7303.txt | 23 + + .../devicetree/bindings/iio/frequency/adf4350.txt | 86 + + .../bindings/iio/magnetometer/ak8975.txt | 18 + + .../devicetree/bindings/staging/imx-drm/ldb.txt | 99 + + MAINTAINERS | 2 +- + drivers/iio/Kconfig | 4 + + drivers/iio/Makefile | 2 + + drivers/iio/accel/Kconfig | 1 - + drivers/iio/accel/st_accel_core.c | 39 +- + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/at91_adc.c | 2 + + drivers/iio/adc/exynos_adc.c | 12 +- + drivers/iio/adc/max1363.c | 2 +- + drivers/iio/adc/mcp320x.c | 257 ++ + drivers/iio/common/st_sensors/st_sensors_buffer.c | 61 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 34 +- + drivers/iio/dac/Kconfig | 10 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad7303.c | 315 ++ + drivers/iio/frequency/adf4350.c | 186 +- + drivers/iio/gyro/Kconfig | 8 +- + drivers/iio/gyro/Makefile | 1 + + .../gyro/adis16130_core.c => iio/gyro/adis16130.c} | 65 +- + drivers/iio/gyro/st_gyro_core.c | 24 +- + drivers/iio/industrialio-buffer.c | 10 +- + drivers/iio/light/hid-sensor-als.c | 2 +- + drivers/iio/magnetometer/Kconfig | 1 - + drivers/iio/magnetometer/ak8975.c | 103 +- + drivers/iio/magnetometer/st_magn_core.c | 39 +- + drivers/iio/pressure/Kconfig | 35 + + drivers/iio/pressure/Makefile | 10 + + drivers/iio/pressure/st_pressure.h | 39 + + drivers/iio/pressure/st_pressure_buffer.c | 105 + + drivers/iio/pressure/st_pressure_core.c | 272 ++ + drivers/iio/pressure/st_pressure_i2c.c | 77 + + drivers/iio/pressure/st_pressure_spi.c | 76 + + drivers/iio/trigger/Kconfig | 26 + + drivers/iio/trigger/Makefile | 6 + + drivers/iio/trigger/iio-trig-interrupt.c | 121 + + drivers/{staging => }/iio/trigger/iio-trig-sysfs.c | 4 +- + drivers/staging/Kconfig | 6 + + drivers/staging/Makefile | 3 + + drivers/staging/android/ashmem.c | 3 +- + drivers/staging/android/binder.c | 2 +- + drivers/staging/android/sw_sync.c | 6 +- + drivers/staging/android/sync.c | 22 +- + drivers/staging/asus_oled/asus_oled.c | 38 +- + drivers/staging/bcm/Bcmchar.c | 2 +- + drivers/staging/bcm/InterfaceIdleMode.c | 199 +- + drivers/staging/bcm/Version.h | 8 +- + drivers/staging/bcm/vendorspecificextn.c | 198 +- + drivers/staging/btmtk_usb/Kconfig | 11 + + drivers/staging/btmtk_usb/Makefile | 1 + + drivers/staging/btmtk_usb/README | 14 + + drivers/staging/btmtk_usb/TODO | 10 + + drivers/staging/btmtk_usb/btmtk_usb.c | 1784 ++++++++ + drivers/staging/btmtk_usb/btmtk_usb.h | 138 + + drivers/staging/ced1401/ced_ioc.c | 665 ++- + drivers/staging/ced1401/ced_ioctl.h | 2 +- + drivers/staging/ced1401/machine.h | 32 +- + drivers/staging/ced1401/usb1401.c | 613 ++- + drivers/staging/ced1401/usb1401.h | 285 +- + drivers/staging/ced1401/use1401.h | 201 +- + drivers/staging/ced1401/use14_ioc.h | 503 ++- + drivers/staging/ced1401/userspace/use1401.c | 152 +- + drivers/staging/comedi/Kconfig | 61 +- + drivers/staging/comedi/comedi.h | 5 - + drivers/staging/comedi/comedi_buf.c | 4 - + drivers/staging/comedi/comedi_compat32.c | 5 - + drivers/staging/comedi/comedi_compat32.h | 5 - + drivers/staging/comedi/comedi_fops.c | 26 +- + drivers/staging/comedi/comedi_pci.c | 4 - + drivers/staging/comedi/comedi_pcmcia.c | 4 - + drivers/staging/comedi/comedi_usb.c | 16 +- + drivers/staging/comedi/comedidev.h | 30 +- + drivers/staging/comedi/comedilib.h | 5 - + drivers/staging/comedi/drivers.c | 52 +- + drivers/staging/comedi/drivers/8253.h | 5 - + drivers/staging/comedi/drivers/8255.c | 11 +- + drivers/staging/comedi/drivers/8255.h | 5 - + drivers/staging/comedi/drivers/8255_pci.c | 7 - + drivers/staging/comedi/drivers/Makefile | 5 +- + drivers/staging/comedi/drivers/acl7225b.c | 136 - + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 4 - + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Tor.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 4 - + .../staging/comedi/drivers/addi-data/addi_common.c | 61 +- + .../staging/comedi/drivers/addi-data/addi_common.h | 44 - + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 9 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci035.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 10 - + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 1376 ------ + drivers/staging/comedi/drivers/addi_apci_1032.c | 7 - + drivers/staging/comedi/drivers/addi_apci_1516.c | 8 - + drivers/staging/comedi/drivers/addi_apci_16xx.c | 7 - + drivers/staging/comedi/drivers/addi_apci_2032.c | 8 - + drivers/staging/comedi/drivers/addi_apci_2200.c | 8 - + drivers/staging/comedi/drivers/addi_apci_3120.c | 5 - + drivers/staging/comedi/drivers/addi_apci_3501.c | 7 - + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 1409 +++--- + drivers/staging/comedi/drivers/addi_watchdog.c | 8 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 4 - + drivers/staging/comedi/drivers/adl_pci7x3x.c | 4 - + drivers/staging/comedi/drivers/adl_pci8164.c | 4 - + drivers/staging/comedi/drivers/adl_pci9111.c | 4 - + drivers/staging/comedi/drivers/adq12b.c | 5 - + drivers/staging/comedi/drivers/adv_pci1723.c | 9 +- + drivers/staging/comedi/drivers/adv_pci1724.c | 7 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 8 - + drivers/staging/comedi/drivers/aio_aio12_8.c | 12 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 4 - + drivers/staging/comedi/drivers/amplc_dio200.c | 5 - + drivers/staging/comedi/drivers/amplc_dio200.h | 5 - + .../staging/comedi/drivers/amplc_dio200_common.c | 33 +- + drivers/staging/comedi/drivers/amplc_dio200_pci.c | 5 - + drivers/staging/comedi/drivers/amplc_pc236.c | 6 - + drivers/staging/comedi/drivers/amplc_pc263.c | 5 - + drivers/staging/comedi/drivers/amplc_pci224.c | 5 - + drivers/staging/comedi/drivers/amplc_pci230.c | 5 - + drivers/staging/comedi/drivers/amplc_pci263.c | 5 - + drivers/staging/comedi/drivers/c6xdigio.c | 5 - + drivers/staging/comedi/drivers/cb_das16_cs.c | 4 - + drivers/staging/comedi/drivers/cb_pcidas.c | 7 - + drivers/staging/comedi/drivers/cb_pcidas64.c | 8 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 13 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 5 - + drivers/staging/comedi/drivers/cb_pcimdda.c | 13 +- + drivers/staging/comedi/drivers/comedi_bond.c | 5 - + drivers/staging/comedi/drivers/comedi_fc.c | 7 +- + drivers/staging/comedi/drivers/comedi_fc.h | 7 +- + drivers/staging/comedi/drivers/comedi_parport.c | 5 - + drivers/staging/comedi/drivers/comedi_test.c | 7 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 5 - + drivers/staging/comedi/drivers/daqboard2000.c | 30 +- + drivers/staging/comedi/drivers/das08.c | 12 - + drivers/staging/comedi/drivers/das08.h | 6 - + drivers/staging/comedi/drivers/das08_cs.c | 15 +- + drivers/staging/comedi/drivers/das08_isa.c | 12 +- + drivers/staging/comedi/drivers/das08_pci.c | 12 +- + drivers/staging/comedi/drivers/das16.c | 7 - + drivers/staging/comedi/drivers/das16m1.c | 7 - + drivers/staging/comedi/drivers/das1800.c | 6 - + drivers/staging/comedi/drivers/das6402.c | 5 - + drivers/staging/comedi/drivers/das800.c | 6 - + drivers/staging/comedi/drivers/dmm32at.c | 5 - + drivers/staging/comedi/drivers/dt2811.c | 4 - + drivers/staging/comedi/drivers/dt2814.c | 5 - + drivers/staging/comedi/drivers/dt2815.c | 5 - + drivers/staging/comedi/drivers/dt2817.c | 5 - + drivers/staging/comedi/drivers/dt282x.c | 5 - + drivers/staging/comedi/drivers/dt3000.c | 5 - + drivers/staging/comedi/drivers/dt9812.c | 1031 ++--- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 4 - + drivers/staging/comedi/drivers/gsc_hpdi.c | 7 +- + drivers/staging/comedi/drivers/icp_multi.c | 5 - + drivers/staging/comedi/drivers/jr3_pci.c | 51 +- + drivers/staging/comedi/drivers/ke_counter.c | 5 - + drivers/staging/comedi/drivers/me4000.c | 5 - + drivers/staging/comedi/drivers/me_daq.c | 28 +- + drivers/staging/comedi/drivers/mite.c | 5 - + drivers/staging/comedi/drivers/mite.h | 5 - + drivers/staging/comedi/drivers/mpc624.c | 5 - + drivers/staging/comedi/drivers/multiq3.c | 5 - + drivers/staging/comedi/drivers/ni_6527.c | 5 - + drivers/staging/comedi/drivers/ni_65xx.c | 36 +- + drivers/staging/comedi/drivers/ni_660x.c | 4 - + drivers/staging/comedi/drivers/ni_670x.c | 5 - + drivers/staging/comedi/drivers/ni_at_a2150.c | 6 - + drivers/staging/comedi/drivers/ni_at_ao.c | 5 - + drivers/staging/comedi/drivers/ni_atmio.c | 4 - + drivers/staging/comedi/drivers/ni_atmio16d.c | 6 - + drivers/staging/comedi/drivers/ni_daq_700.c | 9 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 14 +- + drivers/staging/comedi/drivers/ni_labpc.c | 74 +- + drivers/staging/comedi/drivers/ni_labpc.h | 29 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 19 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 12 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 6 - + drivers/staging/comedi/drivers/ni_mio_cs.c | 5 - + drivers/staging/comedi/drivers/ni_pcidio.c | 30 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 4 - + drivers/staging/comedi/drivers/ni_stc.h | 5 - + drivers/staging/comedi/drivers/ni_tio.c | 4 - + drivers/staging/comedi/drivers/ni_tio.h | 5 - + drivers/staging/comedi/drivers/ni_tio_internal.h | 5 - + drivers/staging/comedi/drivers/ni_tiocmd.c | 4 - + drivers/staging/comedi/drivers/pcl711.c | 5 - + drivers/staging/comedi/drivers/pcl724.c | 219 +- + drivers/staging/comedi/drivers/pcl725.c | 91 - + drivers/staging/comedi/drivers/pcl726.c | 5 - + drivers/staging/comedi/drivers/pcl730.c | 332 +- + drivers/staging/comedi/drivers/pcm3724.c | 11 +- + drivers/staging/comedi/drivers/pcm3730.c | 136 - + drivers/staging/comedi/drivers/pcmad.c | 197 +- + drivers/staging/comedi/drivers/pcmda12.c | 245 +- + drivers/staging/comedi/drivers/pcmmio.c | 4 - + drivers/staging/comedi/drivers/pcmuio.c | 961 ++--- + drivers/staging/comedi/drivers/plx9052.h | 5 - + drivers/staging/comedi/drivers/poc.c | 58 +- + drivers/staging/comedi/drivers/rtd520.c | 4 - + drivers/staging/comedi/drivers/rti800.c | 4 - + drivers/staging/comedi/drivers/rti802.c | 5 - + drivers/staging/comedi/drivers/s526.c | 5 - + drivers/staging/comedi/drivers/s626.c | 5 - + drivers/staging/comedi/drivers/s626.h | 5 - + drivers/staging/comedi/drivers/serial2002.c | 5 - + drivers/staging/comedi/drivers/skel.c | 5 - + drivers/staging/comedi/drivers/ssv_dnp.c | 5 - + drivers/staging/comedi/drivers/unioxx5.c | 25 +- + drivers/staging/comedi/drivers/usbdux.c | 236 +- + drivers/staging/comedi/drivers/usbduxfast.c | 1282 ++---- + drivers/staging/comedi/drivers/usbduxsigma.c | 2960 +++++-------- + drivers/staging/comedi/drivers/vmk80xx.c | 88 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 5 - + drivers/staging/comedi/proc.c | 5 - + drivers/staging/comedi/range.c | 5 - + drivers/staging/cptm1217/clearpad_tm1217.c | 4 +- + drivers/staging/crystalhd/bc_dts_glob_lnx.h | 19 +- + drivers/staging/crystalhd/crystalhd_cmds.c | 28 +- + drivers/staging/crystalhd/crystalhd_cmds.h | 19 +- + drivers/staging/crystalhd/crystalhd_fw_if.h | 81 +- + drivers/staging/crystalhd/crystalhd_hw.c | 231 +- + drivers/staging/crystalhd/crystalhd_hw.h | 121 +- + drivers/staging/crystalhd/crystalhd_lnx.c | 33 +- + drivers/staging/crystalhd/crystalhd_lnx.h | 4 +- + drivers/staging/crystalhd/crystalhd_misc.c | 39 +- + drivers/staging/crystalhd/crystalhd_misc.h | 37 +- + drivers/staging/csr/bh.c | 213 +- + drivers/staging/csr/csr_framework_ext.c | 16 +- + drivers/staging/csr/csr_framework_ext.h | 8 +- + drivers/staging/csr/csr_wifi_nme_ap_sef.c | 4 +- + drivers/staging/csr/drv.c | 6 +- + drivers/staging/csr/io.c | 18 +- + drivers/staging/csr/monitor.c | 2 +- + drivers/staging/csr/netdev.c | 100 +- + drivers/staging/csr/sdio_mmc.c | 4 +- + drivers/staging/csr/sme_blocking.c | 24 +- + drivers/staging/csr/sme_native.c | 2 +- + drivers/staging/csr/sme_sys.c | 148 +- + drivers/staging/csr/sme_userspace.c | 4 +- + drivers/staging/csr/sme_wext.c | 116 +- + drivers/staging/csr/ul_int.c | 2 +- + drivers/staging/csr/unifi_event.c | 20 +- + drivers/staging/csr/unifi_pdu_processing.c | 492 +-- + drivers/staging/csr/unifi_priv.h | 30 +- + drivers/staging/csr/unifi_sme.c | 24 +- + drivers/staging/csr/unifi_sme.h | 8 +- + drivers/staging/cxt1e1/comet.c | 819 ++-- + drivers/staging/cxt1e1/functions.c | 10 +- + drivers/staging/cxt1e1/hwprobe.c | 6 +- + drivers/staging/cxt1e1/linux.c | 64 +- + drivers/staging/cxt1e1/musycc.c | 42 +- + drivers/staging/cxt1e1/pmcc4.h | 10 +- + drivers/staging/cxt1e1/pmcc4_drv.c | 52 +- + drivers/staging/cxt1e1/sbecom_inline_linux.h | 6 +- + drivers/staging/cxt1e1/sbeid.c | 6 +- + drivers/staging/cxt1e1/sbeproc.h | 4 +- + drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +- + drivers/staging/dgrp/dgrp_net_ops.c | 6 +- + drivers/staging/dgrp/drp.h | 2 +- + drivers/staging/dwc2/core.c | 44 +- + drivers/staging/dwc2/core_intr.c | 15 +- + drivers/staging/dwc2/hcd.c | 17 +- + drivers/staging/dwc2/hcd.h | 12 +- + drivers/staging/dwc2/hcd_intr.c | 26 +- + drivers/staging/dwc2/pci.c | 19 +- + drivers/staging/echo/echo.c | 78 +- + drivers/staging/echo/echo.h | 26 +- + drivers/staging/frontier/alphatrack.c | 51 +- + drivers/staging/frontier/alphatrack.h | 6 +- + drivers/staging/frontier/tranzport.c | 20 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 43 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 439 +- + drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 156 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 10 +- + drivers/staging/fwserial/fwserial.c | 135 +- + drivers/staging/fwserial/fwserial.h | 2 - + drivers/staging/gdm72xx/Kconfig | 10 +- + drivers/staging/gdm72xx/gdm_wimax.c | 3 +- + drivers/staging/goldfish/goldfish_audio.c | 30 +- + drivers/staging/goldfish/goldfish_nand.c | 11 +- + drivers/staging/goldfish/goldfish_nand_reg.h | 35 +- + drivers/staging/iio/adc/ad7192.c | 2 +- + drivers/staging/iio/adc/ad7280a.c | 2 +- + drivers/staging/iio/adc/ad7291.c | 217 +- + drivers/staging/iio/adc/ad7291.h | 12 + + drivers/staging/iio/adc/ad7606_core.c | 12 +- + drivers/staging/iio/adc/ad7606_par.c | 2 - + drivers/staging/iio/adc/ad7816.c | 8 +- + drivers/staging/iio/adc/ad799x_core.c | 4 +- + drivers/staging/iio/adc/lpc32xx_adc.c | 1 - + drivers/staging/iio/adc/mxs-lradc.c | 8 +- + drivers/staging/iio/adc/spear_adc.c | 3 +- + drivers/staging/iio/gyro/Kconfig | 7 - + drivers/staging/iio/gyro/Makefile | 3 - + drivers/staging/iio/trigger/Kconfig | 17 - + drivers/staging/iio/trigger/Makefile | 2 - + drivers/staging/iio/trigger/iio-trig-gpio.c | 167 - + drivers/staging/imx-drm/Kconfig | 8 + + drivers/staging/imx-drm/Makefile | 1 + + drivers/staging/imx-drm/TODO | 1 - + drivers/staging/imx-drm/imx-drm-core.c | 5 +- + drivers/staging/imx-drm/imx-ldb.c | 625 +++ + drivers/staging/imx-drm/imx-tve.c | 18 +- + drivers/staging/imx-drm/ipu-v3/ipu-common.c | 125 +- + drivers/staging/imx-drm/ipu-v3/ipu-di.c | 13 +- + drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c | 22 +- + drivers/staging/imx-drm/ipu-v3/ipu-prv.h | 4 +- + drivers/staging/imx-drm/ipuv3-crtc.c | 7 +- + drivers/staging/imx-drm/parallel-display.c | 11 +- + drivers/staging/keucr/init.c | 116 +- + drivers/staging/keucr/scsiglue.c | 19 +- + drivers/staging/keucr/smil.h | 28 +- + drivers/staging/keucr/smilmain.c | 1937 ++------- + drivers/staging/keucr/smilsub.c | 52 +- + drivers/staging/keucr/smscsi.c | 38 +- + drivers/staging/keucr/transport.c | 49 +- + drivers/staging/keucr/transport.h | 3 +- + drivers/staging/keucr/usb.c | 67 +- + drivers/staging/keucr/usb.h | 119 +- + drivers/staging/line6/pcm.c | 23 +- + drivers/staging/lustre/Kconfig | 3 + + drivers/staging/lustre/Makefile | 4 + + drivers/staging/lustre/TODO | 13 + + .../staging/lustre/include/linux/libcfs/bitmap.h | 111 + + .../staging/lustre/include/linux/libcfs/curproc.h | 110 + + .../staging/lustre/include/linux/libcfs/libcfs.h | 234 + + .../lustre/include/linux/libcfs/libcfs_cpu.h | 214 + + .../lustre/include/linux/libcfs/libcfs_crypto.h | 201 + + .../lustre/include/linux/libcfs/libcfs_debug.h | 350 ++ + .../lustre/include/linux/libcfs/libcfs_fail.h | 170 + + .../lustre/include/linux/libcfs/libcfs_hash.h | 851 ++++ + .../lustre/include/linux/libcfs/libcfs_heap.h | 200 + + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 222 + + .../include/linux/libcfs/libcfs_kernelcomm.h | 117 + + .../lustre/include/linux/libcfs/libcfs_prim.h | 101 + + .../lustre/include/linux/libcfs/libcfs_private.h | 577 +++ + .../lustre/include/linux/libcfs/libcfs_string.h | 137 + + .../lustre/include/linux/libcfs/libcfs_time.h | 132 + + .../lustre/include/linux/libcfs/libcfs_workitem.h | 110 + + .../lustre/include/linux/libcfs/linux/kp30.h | 286 ++ + .../lustre/include/linux/libcfs/linux/libcfs.h | 125 + + .../include/linux/libcfs/linux/linux-bitops.h | 38 + + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 175 + + .../include/linux/libcfs/linux/linux-crypto.h | 49 + + .../lustre/include/linux/libcfs/linux/linux-fs.h | 92 + + .../lustre/include/linux/libcfs/linux/linux-lock.h | 204 + + .../lustre/include/linux/libcfs/linux/linux-mem.h | 120 + + .../lustre/include/linux/libcfs/linux/linux-prim.h | 241 ++ + .../include/linux/libcfs/linux/linux-tcpip.h | 87 + + .../lustre/include/linux/libcfs/linux/linux-time.h | 275 ++ + .../include/linux/libcfs/linux/linux-types.h | 36 + + .../include/linux/libcfs/linux/portals_compat25.h | 114 + + .../staging/lustre/include/linux/libcfs/lucache.h | 162 + + .../lustre/include/linux/libcfs/params_tree.h | 166 + + .../lustre/include/linux/lnet/api-support.h | 44 + + drivers/staging/lustre/include/linux/lnet/api.h | 220 + + .../staging/lustre/include/linux/lnet/lib-lnet.h | 874 ++++ + .../staging/lustre/include/linux/lnet/lib-types.h | 765 ++++ + .../lustre/include/linux/lnet/linux/api-support.h | 43 + + .../lustre/include/linux/lnet/linux/lib-lnet.h | 72 + + .../lustre/include/linux/lnet/linux/lib-types.h | 45 + + .../staging/lustre/include/linux/lnet/linux/lnet.h | 56 + + .../lustre/include/linux/lnet/lnet-sysctl.h | 51 + + drivers/staging/lustre/include/linux/lnet/lnet.h | 51 + + .../staging/lustre/include/linux/lnet/lnetctl.h | 80 + + drivers/staging/lustre/include/linux/lnet/lnetst.h | 491 +++ + drivers/staging/lustre/include/linux/lnet/ptllnd.h | 94 + + .../lustre/include/linux/lnet/ptllnd_wire.h | 124 + + .../staging/lustre/include/linux/lnet/socklnd.h | 103 + + drivers/staging/lustre/include/linux/lnet/types.h | 503 +++ + drivers/staging/lustre/lnet/Kconfig | 40 + + drivers/staging/lustre/lnet/Makefile | 1 + + drivers/staging/lustre/lnet/klnds/Makefile | 1 + + drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile | 5 + + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 3259 ++++++++++++++ + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 1057 +++++ + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 3529 +++++++++++++++ + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 493 +++ + drivers/staging/lustre/lnet/klnds/socklnd/Makefile | 7 + + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 2902 +++++++++++++ + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 602 +++ + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 2664 ++++++++++++ + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 1088 +++++ + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h | 91 + + .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 198 + + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 797 ++++ + drivers/staging/lustre/lnet/lnet/Makefile | 8 + + drivers/staging/lustre/lnet/lnet/acceptor.c | 527 +++ + drivers/staging/lustre/lnet/lnet/api-errno.c | 39 + + drivers/staging/lustre/lnet/lnet/api-ni.c | 1941 +++++++++ + drivers/staging/lustre/lnet/lnet/config.c | 1264 ++++++ + drivers/staging/lustre/lnet/lnet/lib-eq.c | 447 ++ + drivers/staging/lustre/lnet/lnet/lib-md.c | 451 ++ + drivers/staging/lustre/lnet/lnet/lib-me.c | 297 ++ + drivers/staging/lustre/lnet/lnet/lib-move.c | 2441 +++++++++++ + drivers/staging/lustre/lnet/lnet/lib-msg.c | 650 +++ + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 938 ++++ + drivers/staging/lustre/lnet/lnet/lo.c | 120 + + drivers/staging/lustre/lnet/lnet/module.c | 154 + + drivers/staging/lustre/lnet/lnet/peer.c | 337 ++ + drivers/staging/lustre/lnet/lnet/router.c | 1694 ++++++++ + drivers/staging/lustre/lnet/lnet/router_proc.c | 950 +++++ + drivers/staging/lustre/lnet/selftest/Makefile | 6 + + drivers/staging/lustre/lnet/selftest/brw_test.c | 499 +++ + drivers/staging/lustre/lnet/selftest/conctl.c | 931 ++++ + drivers/staging/lustre/lnet/selftest/conrpc.c | 1397 ++++++ + drivers/staging/lustre/lnet/selftest/conrpc.h | 146 + + drivers/staging/lustre/lnet/selftest/console.c | 2071 +++++++++ + drivers/staging/lustre/lnet/selftest/console.h | 232 + + drivers/staging/lustre/lnet/selftest/framework.c | 1814 ++++++++ + drivers/staging/lustre/lnet/selftest/module.c | 169 + + drivers/staging/lustre/lnet/selftest/ping_test.c | 229 + + drivers/staging/lustre/lnet/selftest/rpc.c | 1666 ++++++++ + drivers/staging/lustre/lnet/selftest/rpc.h | 302 ++ + drivers/staging/lustre/lnet/selftest/selftest.h | 611 +++ + drivers/staging/lustre/lnet/selftest/timer.c | 253 ++ + drivers/staging/lustre/lnet/selftest/timer.h | 53 + + drivers/staging/lustre/lustre/Kconfig | 51 + + drivers/staging/lustre/lustre/Makefile | 2 + + drivers/staging/lustre/lustre/fid/Makefile | 5 + + drivers/staging/lustre/lustre/fid/fid_handler.c | 661 +++ + drivers/staging/lustre/lustre/fid/fid_internal.h | 84 + + drivers/staging/lustre/lustre/fid/fid_lib.c | 97 + + drivers/staging/lustre/lustre/fid/fid_request.c | 522 +++ + drivers/staging/lustre/lustre/fid/fid_store.c | 259 ++ + drivers/staging/lustre/lustre/fid/lproc_fid.c | 222 + + drivers/staging/lustre/lustre/fld/Makefile | 5 + + drivers/staging/lustre/lustre/fld/fld_cache.c | 566 +++ + drivers/staging/lustre/lustre/fld/fld_handler.c | 447 ++ + drivers/staging/lustre/lustre/fld/fld_index.c | 426 ++ + drivers/staging/lustre/lustre/fld/fld_internal.h | 223 + + drivers/staging/lustre/lustre/fld/fld_request.c | 519 +++ + drivers/staging/lustre/lustre/fld/lproc_fld.c | 373 ++ + drivers/staging/lustre/lustre/include/cl_object.h | 3279 ++++++++++++++ + drivers/staging/lustre/lustre/include/dt_object.h | 1498 +++++++ + .../staging/lustre/lustre/include/interval_tree.h | 124 + + drivers/staging/lustre/lustre/include/ioctl.h | 106 + + drivers/staging/lustre/lustre/include/lclient.h | 437 ++ + .../lustre/lustre/include/linux/lprocfs_status.h | 58 + + .../lustre/lustre/include/linux/lustre_acl.h | 66 + + .../lustre/lustre/include/linux/lustre_common.h | 22 + + .../lustre/lustre/include/linux/lustre_compat25.h | 349 ++ + .../lustre/lustre/include/linux/lustre_debug.h | 47 + + .../lustre/lustre/include/linux/lustre_dlm.h | 46 + + .../lustre/lustre/include/linux/lustre_fsfilt.h | 181 + + .../lustre/lustre/include/linux/lustre_handles.h | 53 + + .../lustre/lustre/include/linux/lustre_intent.h | 62 + + .../lustre/lustre/include/linux/lustre_lib.h | 87 + + .../lustre/lustre/include/linux/lustre_lite.h | 100 + + .../lustre/lustre/include/linux/lustre_log.h | 57 + + .../lustre/lustre/include/linux/lustre_net.h | 50 + + .../lustre/include/linux/lustre_patchless_compat.h | 85 + + .../lustre/lustre/include/linux/lustre_quota.h | 47 + + .../lustre/lustre/include/linux/lustre_user.h | 67 + + drivers/staging/lustre/lustre/include/linux/lvfs.h | 134 + + .../lustre/lustre/include/linux/lvfs_linux.h | 66 + + drivers/staging/lustre/lustre/include/linux/obd.h | 128 + + .../lustre/lustre/include/linux/obd_class.h | 58 + + .../lustre/lustre/include/linux/obd_support.h | 63 + + .../staging/lustre/lustre/include/lprocfs_status.h | 1043 +++++ + drivers/staging/lustre/lustre/include/lu_object.h | 1346 ++++++ + drivers/staging/lustre/lustre/include/lu_ref.h | 170 + + drivers/staging/lustre/lustre/include/lu_target.h | 91 + + .../staging/lustre/lustre/include/lustre/libiam.h | 145 + + .../lustre/lustre/include/lustre/liblustreapi.h | 43 + + .../lustre/lustre/include/lustre/ll_fiemap.h | 121 + + .../lustre/include/lustre/lustre_build_version.h | 2 + + .../lustre/lustre/include/lustre/lustre_idl.h | 3653 ++++++++++++++++ + .../lustre/include/lustre/lustre_lfsck_user.h | 95 + + .../lustre/lustre/include/lustre/lustre_user.h | 1145 +++++ + .../lustre/lustre/include/lustre/lustreapi.h | 310 ++ + drivers/staging/lustre/lustre/include/lustre_acl.h | 42 + + .../staging/lustre/lustre/include/lustre_capa.h | 305 ++ + drivers/staging/lustre/lustre/include/lustre_cfg.h | 299 ++ + .../staging/lustre/lustre/include/lustre_debug.h | 76 + + .../staging/lustre/lustre/include/lustre_disk.h | 543 +++ + drivers/staging/lustre/lustre/include/lustre_dlm.h | 1671 ++++++++ + .../staging/lustre/lustre/include/lustre_eacl.h | 95 + + .../staging/lustre/lustre/include/lustre_export.h | 389 ++ + drivers/staging/lustre/lustre/include/lustre_fid.h | 762 ++++ + drivers/staging/lustre/lustre/include/lustre_fld.h | 202 + + .../staging/lustre/lustre/include/lustre_fsfilt.h | 48 + + drivers/staging/lustre/lustre/include/lustre_ha.h | 67 + + .../staging/lustre/lustre/include/lustre_handles.h | 93 + + .../staging/lustre/lustre/include/lustre_idmap.h | 104 + + .../staging/lustre/lustre/include/lustre_import.h | 367 ++ + drivers/staging/lustre/lustre/include/lustre_lib.h | 667 +++ + .../staging/lustre/lustre/include/lustre_linkea.h | 57 + + .../staging/lustre/lustre/include/lustre_lite.h | 147 + + drivers/staging/lustre/lustre/include/lustre_log.h | 576 +++ + drivers/staging/lustre/lustre/include/lustre_mdc.h | 176 + + drivers/staging/lustre/lustre/include/lustre_mds.h | 81 + + drivers/staging/lustre/lustre/include/lustre_mdt.h | 84 + + drivers/staging/lustre/lustre/include/lustre_net.h | 3451 +++++++++++++++ + .../staging/lustre/lustre/include/lustre_param.h | 121 + + .../staging/lustre/lustre/include/lustre_quota.h | 239 ++ + .../lustre/lustre/include/lustre_req_layout.h | 334 ++ + drivers/staging/lustre/lustre/include/lustre_sec.h | 1145 +++++ + .../staging/lustre/lustre/include/lustre_update.h | 189 + + drivers/staging/lustre/lustre/include/lustre_ver.h | 24 + + drivers/staging/lustre/lustre/include/lvfs.h | 57 + + drivers/staging/lustre/lustre/include/md_object.h | 908 ++++ + drivers/staging/lustre/lustre/include/obd.h | 1677 ++++++++ + drivers/staging/lustre/lustre/include/obd_cache.h | 39 + + drivers/staging/lustre/lustre/include/obd_cksum.h | 176 + + drivers/staging/lustre/lustre/include/obd_class.h | 2281 ++++++++++ + drivers/staging/lustre/lustre/include/obd_lov.h | 126 + + drivers/staging/lustre/lustre/include/obd_ost.h | 96 + + .../staging/lustre/lustre/include/obd_support.h | 851 ++++ + drivers/staging/lustre/lustre/lclient/glimpse.c | 274 ++ + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 1325 ++++++ + .../staging/lustre/lustre/lclient/lcommon_misc.c | 194 + + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 764 ++++ + drivers/staging/lustre/lustre/ldlm/l_lock.c | 76 + + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 242 ++ + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 849 ++++ + .../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 75 + + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 276 ++ + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 868 ++++ + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 2429 +++++++++++ + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 1238 ++++++ + drivers/staging/lustre/lustre/ldlm/ldlm_plain.c | 72 + + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 1384 ++++++ + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2333 ++++++++++ + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1409 ++++++ + drivers/staging/lustre/lustre/libcfs/Makefile | 21 + + drivers/staging/lustre/lustre/libcfs/debug.c | 476 +++ + drivers/staging/lustre/lustre/libcfs/fail.c | 137 + + drivers/staging/lustre/lustre/libcfs/hash.c | 2123 ++++++++++ + drivers/staging/lustre/lustre/libcfs/heap.c | 475 +++ + .../lustre/lustre/libcfs/kernel_user_comm.c | 346 ++ + drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 204 + + drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 192 + + drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 205 + + .../staging/lustre/lustre/libcfs/libcfs_string.c | 647 +++ + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 1085 +++++ + .../lustre/libcfs/linux/linux-crypto-adler.c | 144 + + .../lustre/lustre/libcfs/linux/linux-crypto.c | 289 ++ + .../lustre/lustre/libcfs/linux/linux-curproc.c | 339 ++ + .../lustre/lustre/libcfs/linux/linux-debug.c | 264 ++ + .../lustre/lustre/libcfs/linux/linux-module.c | 183 + + .../lustre/lustre/libcfs/linux/linux-prim.c | 259 ++ + .../lustre/lustre/libcfs/linux/linux-proc.c | 580 +++ + .../lustre/lustre/libcfs/linux/linux-tcpip.c | 659 +++ + .../lustre/lustre/libcfs/linux/linux-tracefile.c | 275 ++ + .../lustre/lustre/libcfs/linux/linux-tracefile.h | 48 + + drivers/staging/lustre/lustre/libcfs/lwt.c | 266 ++ + drivers/staging/lustre/lustre/libcfs/module.c | 498 +++ + drivers/staging/lustre/lustre/libcfs/nidstrings.c | 867 ++++ + drivers/staging/lustre/lustre/libcfs/prng.c | 139 + + drivers/staging/lustre/lustre/libcfs/tracefile.c | 1195 ++++++ + drivers/staging/lustre/lustre/libcfs/tracefile.h | 340 ++ + .../staging/lustre/lustre/libcfs/upcall_cache.c | 462 ++ + drivers/staging/lustre/lustre/libcfs/watchdog.c | 516 +++ + drivers/staging/lustre/lustre/libcfs/workitem.c | 475 +++ + drivers/staging/lustre/lustre/llite/Makefile | 13 + + drivers/staging/lustre/lustre/llite/dcache.c | 675 +++ + drivers/staging/lustre/lustre/llite/dir.c | 1978 +++++++++ + drivers/staging/lustre/lustre/llite/file.c | 3198 ++++++++++++++ + drivers/staging/lustre/lustre/llite/llite_capa.c | 661 +++ + drivers/staging/lustre/lustre/llite/llite_close.c | 412 ++ + .../staging/lustre/lustre/llite/llite_internal.h | 1576 +++++++ + drivers/staging/lustre/lustre/llite/llite_lib.c | 2408 +++++++++++ + drivers/staging/lustre/lustre/llite/llite_mmap.c | 507 +++ + drivers/staging/lustre/lustre/llite/llite_nfs.c | 319 ++ + drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 301 ++ + drivers/staging/lustre/lustre/llite/lloop.c | 867 ++++ + drivers/staging/lustre/lustre/llite/lproc_llite.c | 1370 ++++++ + drivers/staging/lustre/lustre/llite/namei.c | 1279 ++++++ + drivers/staging/lustre/lustre/llite/remote_perm.c | 333 ++ + drivers/staging/lustre/lustre/llite/rw.c | 1314 ++++++ + drivers/staging/lustre/lustre/llite/rw26.c | 586 +++ + drivers/staging/lustre/lustre/llite/statahead.c | 1722 ++++++++ + drivers/staging/lustre/lustre/llite/super25.c | 226 + + drivers/staging/lustre/lustre/llite/symlink.c | 192 + + drivers/staging/lustre/lustre/llite/vvp_dev.c | 546 +++ + drivers/staging/lustre/lustre/llite/vvp_internal.h | 62 + + drivers/staging/lustre/lustre/llite/vvp_io.c | 1186 ++++++ + drivers/staging/lustre/lustre/llite/vvp_lock.c | 85 + + drivers/staging/lustre/lustre/llite/vvp_object.c | 186 + + drivers/staging/lustre/lustre/llite/vvp_page.c | 558 +++ + drivers/staging/lustre/lustre/llite/xattr.c | 578 +++ + drivers/staging/lustre/lustre/lmv/Makefile | 5 + + drivers/staging/lustre/lustre/lmv/lmv_fld.c | 88 + + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 328 ++ + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 159 + + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 2727 ++++++++++++ + drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 235 + + drivers/staging/lustre/lustre/lov/Makefile | 9 + + .../staging/lustre/lustre/lov/lov_cl_internal.h | 820 ++++ + drivers/staging/lustre/lustre/lov/lov_dev.c | 533 +++ + drivers/staging/lustre/lustre/lov/lov_ea.c | 333 ++ + drivers/staging/lustre/lustre/lov/lov_internal.h | 323 ++ + drivers/staging/lustre/lustre/lov/lov_io.c | 967 +++++ + drivers/staging/lustre/lustre/lov/lov_lock.c | 1253 ++++++ + drivers/staging/lustre/lustre/lov/lov_log.c | 278 ++ + drivers/staging/lustre/lustre/lov/lov_merge.c | 218 + + drivers/staging/lustre/lustre/lov/lov_obd.c | 2916 +++++++++++++ + drivers/staging/lustre/lustre/lov/lov_object.c | 942 +++++ + drivers/staging/lustre/lustre/lov/lov_offset.c | 267 ++ + drivers/staging/lustre/lustre/lov/lov_pack.c | 678 +++ + drivers/staging/lustre/lustre/lov/lov_page.c | 235 + + drivers/staging/lustre/lustre/lov/lov_pool.c | 681 +++ + drivers/staging/lustre/lustre/lov/lov_request.c | 1551 +++++++ + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 211 + + drivers/staging/lustre/lustre/lov/lovsub_io.c | 55 + + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 485 +++ + drivers/staging/lustre/lustre/lov/lovsub_object.c | 170 + + drivers/staging/lustre/lustre/lov/lovsub_page.c | 72 + + drivers/staging/lustre/lustre/lov/lproc_lov.c | 302 ++ + drivers/staging/lustre/lustre/lvfs/Makefile | 6 + + drivers/staging/lustre/lustre/lvfs/fsfilt.c | 138 + + drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c | 761 ++++ + drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 173 + + drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 295 ++ + drivers/staging/lustre/lustre/mdc/Makefile | 5 + + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 219 + + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 180 + + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 564 +++ + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 1229 ++++++ + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 489 +++ + drivers/staging/lustre/lustre/mdc/mdc_request.c | 2753 ++++++++++++ + drivers/staging/lustre/lustre/mgc/Makefile | 5 + + drivers/staging/lustre/lustre/mgc/libmgc.c | 166 + + drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 84 + + drivers/staging/lustre/lustre/mgc/mgc_internal.h | 73 + + drivers/staging/lustre/lustre/mgc/mgc_request.c | 1860 ++++++++ + drivers/staging/lustre/lustre/obdclass/Makefile | 13 + + drivers/staging/lustre/lustre/obdclass/acl.c | 546 +++ + drivers/staging/lustre/lustre/obdclass/capa.c | 401 ++ + .../staging/lustre/lustre/obdclass/cl_internal.h | 121 + + drivers/staging/lustre/lustre/obdclass/cl_io.c | 1753 ++++++++ + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 2304 ++++++++++ + drivers/staging/lustre/lustre/obdclass/cl_object.c | 1148 +++++ + drivers/staging/lustre/lustre/obdclass/cl_page.c | 1605 +++++++ + drivers/staging/lustre/lustre/obdclass/class_obd.c | 689 +++ + drivers/staging/lustre/lustre/obdclass/debug.c | 124 + + drivers/staging/lustre/lustre/obdclass/dt_object.c | 1055 +++++ + drivers/staging/lustre/lustre/obdclass/genops.c | 1853 ++++++++ + drivers/staging/lustre/lustre/obdclass/idmap.c | 474 +++ + drivers/staging/lustre/lustre/obdclass/linkea.c | 194 + + .../lustre/lustre/obdclass/linux/linux-module.c | 408 ++ + .../lustre/lustre/obdclass/linux/linux-obdo.c | 222 + + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 445 ++ + drivers/staging/lustre/lustre/obdclass/llog.c | 966 +++++ + drivers/staging/lustre/lustre/obdclass/llog_cat.c | 833 ++++ + .../staging/lustre/lustre/obdclass/llog_internal.h | 98 + + .../staging/lustre/lustre/obdclass/llog_ioctl.c | 427 ++ + drivers/staging/lustre/lustre/obdclass/llog_lvfs.c | 862 ++++ + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 319 ++ + drivers/staging/lustre/lustre/obdclass/llog_osd.c | 1323 ++++++ + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 407 ++ + drivers/staging/lustre/lustre/obdclass/llog_test.c | 1087 +++++ + .../staging/lustre/lustre/obdclass/local_storage.c | 903 ++++ + .../staging/lustre/lustre/obdclass/local_storage.h | 88 + + .../lustre/lustre/obdclass/lprocfs_jobstats.c | 562 +++ + .../lustre/lustre/obdclass/lprocfs_status.c | 1985 +++++++++ + drivers/staging/lustre/lustre/obdclass/lu_object.c | 2185 ++++++++++ + drivers/staging/lustre/lustre/obdclass/lu_ref.c | 50 + + drivers/staging/lustre/lustre/obdclass/lu_ucred.c | 107 + + .../lustre/lustre/obdclass/lustre_handles.c | 263 ++ + .../staging/lustre/lustre/obdclass/lustre_peer.c | 218 + + drivers/staging/lustre/lustre/obdclass/md_attrs.c | 202 + + drivers/staging/lustre/lustre/obdclass/mea.c | 112 + + .../staging/lustre/lustre/obdclass/obd_config.c | 1904 +++++++++ + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 1321 ++++++ + drivers/staging/lustre/lustre/obdclass/obdo.c | 362 ++ + .../staging/lustre/lustre/obdclass/statfs_pack.c | 75 + + drivers/staging/lustre/lustre/obdclass/uuid.c | 82 + + drivers/staging/lustre/lustre/obdecho/Makefile | 5 + + drivers/staging/lustre/lustre/obdecho/echo.c | 679 +++ + .../staging/lustre/lustre/obdecho/echo_client.c | 3223 ++++++++++++++ + .../staging/lustre/lustre/obdecho/echo_internal.h | 47 + + drivers/staging/lustre/lustre/obdecho/lproc_echo.c | 57 + + drivers/staging/lustre/lustre/osc/Makefile | 7 + + drivers/staging/lustre/lustre/osc/lproc_osc.c | 728 ++++ + drivers/staging/lustre/lustre/osc/osc_cache.c | 2916 +++++++++++++ + .../staging/lustre/lustre/osc/osc_cl_internal.h | 677 +++ + drivers/staging/lustre/lustre/osc/osc_dev.c | 261 ++ + drivers/staging/lustre/lustre/osc/osc_internal.h | 208 + + drivers/staging/lustre/lustre/osc/osc_io.c | 836 ++++ + drivers/staging/lustre/lustre/osc/osc_lock.c | 1663 ++++++++ + drivers/staging/lustre/lustre/osc/osc_object.c | 275 ++ + drivers/staging/lustre/lustre/osc/osc_page.c | 927 ++++ + drivers/staging/lustre/lustre/osc/osc_quota.c | 332 ++ + drivers/staging/lustre/lustre/osc/osc_request.c | 3708 ++++++++++++++++ + drivers/staging/lustre/lustre/ptlrpc/Makefile | 23 + + drivers/staging/lustre/lustre/ptlrpc/client.c | 3059 +++++++++++++ + drivers/staging/lustre/lustre/ptlrpc/connection.c | 248 ++ + drivers/staging/lustre/lustre/ptlrpc/events.c | 595 +++ + drivers/staging/lustre/lustre/ptlrpc/gss/Makefile | 8 + + drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h | 179 + + .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h | 84 + + .../staging/lustre/lustre/ptlrpc/gss/gss_bulk.c | 512 +++ + .../lustre/lustre/ptlrpc/gss/gss_cli_upcall.c | 447 ++ + drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h | 193 + + .../lustre/lustre/ptlrpc/gss/gss_generic_token.c | 285 ++ + .../lustre/lustre/ptlrpc/gss/gss_internal.h | 526 +++ + .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 1424 +++++++ + .../staging/lustre/lustre/ptlrpc/gss/gss_krb5.h | 163 + + .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 1786 ++++++++ + .../lustre/lustre/ptlrpc/gss/gss_mech_switch.c | 359 ++ + .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c | 1252 ++++++ + .../staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c | 242 ++ + .../lustre/lustre/ptlrpc/gss/gss_svc_upcall.c | 1099 +++++ + .../staging/lustre/lustre/ptlrpc/gss/lproc_gss.c | 219 + + drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 2916 +++++++++++++ + drivers/staging/lustre/lustre/ptlrpc/import.c | 1613 +++++++ + drivers/staging/lustre/lustre/ptlrpc/layout.c | 2396 +++++++++++ + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 354 ++ + drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 75 + + drivers/staging/lustre/lustre/ptlrpc/llog_server.c | 466 ++ + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 1345 ++++++ + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 728 ++++ + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 1790 ++++++++ + drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c | 40 + + drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 270 ++ + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 2575 +++++++++++ + drivers/staging/lustre/lustre/ptlrpc/pers.c | 75 + + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 763 ++++ + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 302 ++ + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 154 + + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 827 ++++ + drivers/staging/lustre/lustre/ptlrpc/recover.c | 357 ++ + drivers/staging/lustre/lustre/ptlrpc/sec.c | 2465 +++++++++++ + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 880 ++++ + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 1233 ++++++ + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 250 ++ + drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 199 + + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 464 ++ + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 1021 +++++ + drivers/staging/lustre/lustre/ptlrpc/service.c | 3129 ++++++++++++++ + drivers/staging/lustre/lustre/ptlrpc/wirehdr.c | 47 + + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 4474 ++++++++++++++++++++ + drivers/staging/netlogic/xlr_net.c | 11 +- + drivers/staging/nvec/nvec.c | 50 +- + drivers/staging/nvec/nvec.h | 25 - + drivers/staging/nvec/nvec_kbd.c | 10 +- + drivers/staging/octeon-usb/Kconfig | 10 + + drivers/staging/octeon-usb/Makefile | 3 + + drivers/staging/octeon-usb/TODO | 11 + + drivers/staging/octeon-usb/cvmx-usb.c | 3229 ++++++++++++++ + drivers/staging/octeon-usb/cvmx-usb.h | 1085 +++++ + drivers/staging/octeon-usb/cvmx-usbcx-defs.h | 1551 +++++++ + drivers/staging/octeon-usb/cvmx-usbnx-defs.h | 887 ++++ + drivers/staging/octeon-usb/octeon-hcd.c | 832 ++++ + drivers/staging/ozwpan/Kbuild | 3 +- + drivers/staging/ozwpan/ozappif.h | 2 - + drivers/staging/ozwpan/ozcdev.c | 7 +- + drivers/staging/ozwpan/ozconfig.h | 1 - + drivers/staging/ozwpan/ozevent.c | 195 - + drivers/staging/ozwpan/ozevent.h | 32 - + drivers/staging/ozwpan/ozeventdef.h | 40 - + drivers/staging/ozwpan/ozhcd.c | 49 +- + drivers/staging/ozwpan/ozmain.c | 9 - + drivers/staging/ozwpan/ozpd.c | 23 +- + drivers/staging/ozwpan/ozproto.c | 17 - + drivers/staging/ozwpan/ozusbsvc.c | 5 - + drivers/staging/ozwpan/ozusbsvc1.c | 5 - + drivers/staging/panel/panel.c | 25 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 51 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 +- + drivers/staging/rtl8192e/rtllib_rx.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 5 +- + drivers/staging/rtl8192u/ieee80211/dot11d.c | 14 +- + drivers/staging/rtl8192u/ieee80211/dot11d.h | 10 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 94 +- + .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 4 +- + .../staging/rtl8192u/ieee80211/ieee80211_crypt.h | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 14 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 8 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 37 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 78 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 26 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 106 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 82 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 10 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 30 +- + drivers/staging/rtl8192u/r8180_93cx6.c | 44 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 22 +- + drivers/staging/rtl8192u/r8190_rtl8256.h | 10 +- + drivers/staging/rtl8192u/r8192U.h | 808 ++-- + drivers/staging/rtl8192u/r8192U_core.c | 3590 +++++++--------- + drivers/staging/rtl8192u/r8192U_dm.c | 144 +- + drivers/staging/rtl8192u/r8192U_hw.h | 9 +- + drivers/staging/rtl8192u/r8192U_wx.c | 36 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 38 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.h | 6 +- + drivers/staging/rtl8192u/r819xU_firmware.c | 54 +- + drivers/staging/rtl8192u/r819xU_phy.c | 2390 ++++++----- + drivers/staging/rtl8192u/r819xU_phy.h | 88 +- + drivers/staging/rts5139/rts51x_transport.c | 8 +- + drivers/staging/sb105x/sb_pci_mp.c | 34 +- + drivers/staging/sb105x/sb_pci_mp.h | 1 - + drivers/staging/serqt_usb2/serqt_usb2.c | 288 +- + drivers/staging/silicom/bp_mod.h | 2 - + drivers/staging/silicom/bpctl_mod.c | 483 ++- + drivers/staging/silicom/bypasslib/bp_ioctl.h | 64 +- + drivers/staging/silicom/bypasslib/bplibk.h | 12 +- + drivers/staging/silicom/bypasslib/bypass.c | 89 +- + drivers/staging/slicoss/slicoss.c | 18 +- + drivers/staging/speakup/Kconfig | 32 +- + drivers/staging/speakup/devsynth.c | 14 +- + drivers/staging/speakup/i18n.c | 12 +- + drivers/staging/speakup/kobjects.c | 48 +- + drivers/staging/speakup/main.c | 79 +- + drivers/staging/speakup/serialio.c | 4 +- + drivers/staging/speakup/speakup_acntpc.c | 22 +- + drivers/staging/speakup/speakup_apollo.c | 20 +- + drivers/staging/speakup/speakup_decext.c | 20 +- + drivers/staging/speakup/speakup_decpc.c | 22 +- + drivers/staging/speakup/speakup_dectlk.c | 20 +- + drivers/staging/speakup/speakup_dtlk.c | 22 +- + drivers/staging/speakup/speakup_keypc.c | 22 +- + drivers/staging/speakup/speakup_soft.c | 34 +- + drivers/staging/speakup/spk_priv.h | 13 - + drivers/staging/speakup/synth.c | 38 +- + drivers/staging/speakup/thread.c | 4 +- + drivers/staging/speakup/varhandlers.c | 19 +- + drivers/staging/tidspbridge/core/_tiomap.h | 6 +- + drivers/staging/tidspbridge/core/_tiomap_pwr.h | 10 +- + drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 10 +- + drivers/staging/tidspbridge/core/ue_deh.c | 2 +- + drivers/staging/tidspbridge/core/wdt.c | 4 +- + drivers/staging/tidspbridge/rmgr/drv_interface.c | 1 + + drivers/staging/usbip/usbip_event.c | 2 +- + drivers/staging/vme/devices/vme_user.c | 6 +- + drivers/staging/vme/devices/vme_user.h | 12 +- + drivers/staging/vt6655/80211hdr.h | 2 +- + drivers/staging/vt6655/80211mgr.c | 72 +- + drivers/staging/vt6655/80211mgr.h | 107 +- + drivers/staging/vt6655/aes_ccmp.c | 37 +- + drivers/staging/vt6655/aes_ccmp.h | 2 +- + drivers/staging/vt6655/hostap.c | 6 +- + drivers/staging/vt6655/ioctl.c | 9 +- + drivers/staging/vt6656/mac.c | 51 +- + drivers/staging/vt6656/rf.c | 657 ++- + drivers/staging/vt6656/tether.h | 10 - + drivers/staging/vt6656/tmacro.h | 6 - + drivers/staging/winbond/phy_calibration.c | 2 +- + drivers/staging/winbond/reg.c | 25 +- + drivers/staging/winbond/wb35reg.c | 265 +- + drivers/staging/winbond/wb35rx.c | 3 +- + drivers/staging/wlags49_h2/wl_cs.c | 16 +- + drivers/staging/wlags49_h2/wl_cs.h | 4 +- + drivers/staging/wlags49_h2/wl_main.c | 4 +- + drivers/staging/wlan-ng/prism2sta.c | 3 +- + drivers/staging/xgifb/vb_def.h | 5 - + drivers/staging/xgifb/vb_init.c | 92 +- + drivers/staging/xgifb/vb_setmode.c | 433 +- + drivers/staging/xgifb/vb_setmode.h | 1 - + drivers/staging/zram/Makefile | 2 +- + drivers/staging/zram/zram_drv.c | 569 ++- + drivers/staging/zram/zram_drv.h | 36 +- + drivers/staging/zram/zram_sysfs.c | 227 - + drivers/staging/zsmalloc/zsmalloc-main.c | 7 +- + drivers/staging/zsmalloc/zsmalloc.h | 2 +- + include/linux/iio/common/st_sensors.h | 24 +- + include/linux/iio/frequency/adf4350.h | 4 +- + include/linux/platform_data/ad7303.h | 21 + + 874 files changed, 280707 insertions(+), 21125 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/dac/ad7303.txt + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adf4350.txt + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ak8975.txt + create mode 100644 Documentation/devicetree/bindings/staging/imx-drm/ldb.txt + create mode 100644 drivers/iio/adc/mcp320x.c + create mode 100644 drivers/iio/dac/ad7303.c + rename drivers/{staging/iio/gyro/adis16130_core.c => iio/gyro/adis16130.c} (77%) + create mode 100644 drivers/iio/pressure/Kconfig + create mode 100644 drivers/iio/pressure/Makefile + create mode 100644 drivers/iio/pressure/st_pressure.h + create mode 100644 drivers/iio/pressure/st_pressure_buffer.c + create mode 100644 drivers/iio/pressure/st_pressure_core.c + create mode 100644 drivers/iio/pressure/st_pressure_i2c.c + create mode 100644 drivers/iio/pressure/st_pressure_spi.c + create mode 100644 drivers/iio/trigger/Kconfig + create mode 100644 drivers/iio/trigger/Makefile + create mode 100644 drivers/iio/trigger/iio-trig-interrupt.c + rename drivers/{staging => }/iio/trigger/iio-trig-sysfs.c (98%) + create mode 100644 drivers/staging/btmtk_usb/Kconfig + create mode 100644 drivers/staging/btmtk_usb/Makefile + create mode 100644 drivers/staging/btmtk_usb/README + create mode 100644 drivers/staging/btmtk_usb/TODO + create mode 100644 drivers/staging/btmtk_usb/btmtk_usb.c + create mode 100644 drivers/staging/btmtk_usb/btmtk_usb.h + delete mode 100644 drivers/staging/comedi/drivers/acl7225b.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c + delete mode 100644 drivers/staging/comedi/drivers/pcl725.c + delete mode 100644 drivers/staging/comedi/drivers/pcm3730.c + create mode 100644 drivers/staging/iio/adc/ad7291.h + delete mode 100644 drivers/staging/iio/trigger/iio-trig-gpio.c + create mode 100644 drivers/staging/imx-drm/imx-ldb.c + create mode 100644 drivers/staging/lustre/Kconfig + create mode 100644 drivers/staging/lustre/Makefile + create mode 100644 drivers/staging/lustre/TODO + create mode 100644 drivers/staging/lustre/include/linux/libcfs/bitmap.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/curproc.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_heap.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_private.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_string.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/kp30.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-crypto.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-lock.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-types.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/lucache.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/params_tree.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/api-support.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/api.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lib-lnet.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lib-types.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/api-support.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/lib-types.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/lnet.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lnet-sysctl.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lnet.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lnetctl.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lnetst.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/ptllnd.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/ptllnd_wire.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/socklnd.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/types.h + create mode 100644 drivers/staging/lustre/lnet/Kconfig + create mode 100644 drivers/staging/lustre/lnet/Makefile + create mode 100644 drivers/staging/lustre/lnet/klnds/Makefile + create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile + create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c + create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h + create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c + create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/Makefile + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c + create mode 100644 drivers/staging/lustre/lnet/lnet/Makefile + create mode 100644 drivers/staging/lustre/lnet/lnet/acceptor.c + create mode 100644 drivers/staging/lustre/lnet/lnet/api-errno.c + create mode 100644 drivers/staging/lustre/lnet/lnet/api-ni.c + create mode 100644 drivers/staging/lustre/lnet/lnet/config.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-eq.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-md.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-me.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-move.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-msg.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-ptl.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lo.c + create mode 100644 drivers/staging/lustre/lnet/lnet/module.c + create mode 100644 drivers/staging/lustre/lnet/lnet/peer.c + create mode 100644 drivers/staging/lustre/lnet/lnet/router.c + create mode 100644 drivers/staging/lustre/lnet/lnet/router_proc.c + create mode 100644 drivers/staging/lustre/lnet/selftest/Makefile + create mode 100644 drivers/staging/lustre/lnet/selftest/brw_test.c + create mode 100644 drivers/staging/lustre/lnet/selftest/conctl.c + create mode 100644 drivers/staging/lustre/lnet/selftest/conrpc.c + create mode 100644 drivers/staging/lustre/lnet/selftest/conrpc.h + create mode 100644 drivers/staging/lustre/lnet/selftest/console.c + create mode 100644 drivers/staging/lustre/lnet/selftest/console.h + create mode 100644 drivers/staging/lustre/lnet/selftest/framework.c + create mode 100644 drivers/staging/lustre/lnet/selftest/module.c + create mode 100644 drivers/staging/lustre/lnet/selftest/ping_test.c + create mode 100644 drivers/staging/lustre/lnet/selftest/rpc.c + create mode 100644 drivers/staging/lustre/lnet/selftest/rpc.h + create mode 100644 drivers/staging/lustre/lnet/selftest/selftest.h + create mode 100644 drivers/staging/lustre/lnet/selftest/timer.c + create mode 100644 drivers/staging/lustre/lnet/selftest/timer.h + create mode 100644 drivers/staging/lustre/lustre/Kconfig + create mode 100644 drivers/staging/lustre/lustre/Makefile + create mode 100644 drivers/staging/lustre/lustre/fid/Makefile + create mode 100644 drivers/staging/lustre/lustre/fid/fid_handler.c + create mode 100644 drivers/staging/lustre/lustre/fid/fid_internal.h + create mode 100644 drivers/staging/lustre/lustre/fid/fid_lib.c + create mode 100644 drivers/staging/lustre/lustre/fid/fid_request.c + create mode 100644 drivers/staging/lustre/lustre/fid/fid_store.c + create mode 100644 drivers/staging/lustre/lustre/fid/lproc_fid.c + create mode 100644 drivers/staging/lustre/lustre/fld/Makefile + create mode 100644 drivers/staging/lustre/lustre/fld/fld_cache.c + create mode 100644 drivers/staging/lustre/lustre/fld/fld_handler.c + create mode 100644 drivers/staging/lustre/lustre/fld/fld_index.c + create mode 100644 drivers/staging/lustre/lustre/fld/fld_internal.h + create mode 100644 drivers/staging/lustre/lustre/fld/fld_request.c + create mode 100644 drivers/staging/lustre/lustre/fld/lproc_fld.c + create mode 100644 drivers/staging/lustre/lustre/include/cl_object.h + create mode 100644 drivers/staging/lustre/lustre/include/dt_object.h + create mode 100644 drivers/staging/lustre/lustre/include/interval_tree.h + create mode 100644 drivers/staging/lustre/lustre/include/ioctl.h + create mode 100644 drivers/staging/lustre/lustre/include/lclient.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lprocfs_status.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_acl.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_common.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_compat25.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_debug.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_dlm.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_handles.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_intent.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_lib.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_lite.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_log.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_net.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_quota.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_user.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lvfs.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lvfs_linux.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/obd.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/obd_class.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/obd_support.h + create mode 100644 drivers/staging/lustre/lustre/include/lprocfs_status.h + create mode 100644 drivers/staging/lustre/lustre/include/lu_object.h + create mode 100644 drivers/staging/lustre/lustre/include/lu_ref.h + create mode 100644 drivers/staging/lustre/lustre/include/lu_target.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/libiam.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/liblustreapi.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_build_version.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_idl.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_lfsck_user.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_user.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustreapi.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_acl.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_capa.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_cfg.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_debug.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_disk.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_dlm.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_eacl.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_export.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_fid.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_fld.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_fsfilt.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_ha.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_handles.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_idmap.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_import.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_lib.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_linkea.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_lite.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_log.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_mdc.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_mds.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_mdt.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_net.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_param.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_quota.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_req_layout.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_sec.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_update.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_ver.h + create mode 100644 drivers/staging/lustre/lustre/include/lvfs.h + create mode 100644 drivers/staging/lustre/lustre/include/md_object.h + create mode 100644 drivers/staging/lustre/lustre/include/obd.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_cache.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_cksum.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_class.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_lov.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_ost.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_support.h + create mode 100644 drivers/staging/lustre/lustre/lclient/glimpse.c + create mode 100644 drivers/staging/lustre/lustre/lclient/lcommon_cl.c + create mode 100644 drivers/staging/lustre/lustre/lclient/lcommon_misc.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/interval_tree.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/l_lock.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_internal.h + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_plain.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_request.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/Makefile + create mode 100644 drivers/staging/lustre/lustre/libcfs/debug.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/fail.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/hash.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/heap.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/kernel_user_comm.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_lock.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_mem.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_string.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-module.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.h + create mode 100644 drivers/staging/lustre/lustre/libcfs/lwt.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/module.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/nidstrings.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/prng.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/tracefile.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/tracefile.h + create mode 100644 drivers/staging/lustre/lustre/libcfs/upcall_cache.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/watchdog.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/workitem.c + create mode 100644 drivers/staging/lustre/lustre/llite/Makefile + create mode 100644 drivers/staging/lustre/lustre/llite/dcache.c + create mode 100644 drivers/staging/lustre/lustre/llite/dir.c + create mode 100644 drivers/staging/lustre/lustre/llite/file.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_capa.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_close.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_internal.h + create mode 100644 drivers/staging/lustre/lustre/llite/llite_lib.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_mmap.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_nfs.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_rmtacl.c + create mode 100644 drivers/staging/lustre/lustre/llite/lloop.c + create mode 100644 drivers/staging/lustre/lustre/llite/lproc_llite.c + create mode 100644 drivers/staging/lustre/lustre/llite/namei.c + create mode 100644 drivers/staging/lustre/lustre/llite/remote_perm.c + create mode 100644 drivers/staging/lustre/lustre/llite/rw.c + create mode 100644 drivers/staging/lustre/lustre/llite/rw26.c + create mode 100644 drivers/staging/lustre/lustre/llite/statahead.c + create mode 100644 drivers/staging/lustre/lustre/llite/super25.c + create mode 100644 drivers/staging/lustre/lustre/llite/symlink.c + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_dev.c + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_internal.h + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_io.c + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_lock.c + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_object.c + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_page.c + create mode 100644 drivers/staging/lustre/lustre/llite/xattr.c + create mode 100644 drivers/staging/lustre/lustre/lmv/Makefile + create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_fld.c + create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_intent.c + create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_internal.h + create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_obd.c + create mode 100644 drivers/staging/lustre/lustre/lmv/lproc_lmv.c + create mode 100644 drivers/staging/lustre/lustre/lov/Makefile + create mode 100644 drivers/staging/lustre/lustre/lov/lov_cl_internal.h + create mode 100644 drivers/staging/lustre/lustre/lov/lov_dev.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_ea.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_internal.h + create mode 100644 drivers/staging/lustre/lustre/lov/lov_io.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_lock.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_log.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_merge.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_obd.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_object.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_offset.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_pack.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_page.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_pool.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_request.c + create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_dev.c + create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_io.c + create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_lock.c + create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_object.c + create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_page.c + create mode 100644 drivers/staging/lustre/lustre/lov/lproc_lov.c + create mode 100644 drivers/staging/lustre/lustre/lvfs/Makefile + create mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt.c + create mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c + create mode 100644 drivers/staging/lustre/lustre/lvfs/lvfs_lib.c + create mode 100644 drivers/staging/lustre/lustre/lvfs/lvfs_linux.c + create mode 100644 drivers/staging/lustre/lustre/mdc/Makefile + create mode 100644 drivers/staging/lustre/lustre/mdc/lproc_mdc.c + create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_internal.h + create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_lib.c + create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_locks.c + create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_reint.c + create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_request.c + create mode 100644 drivers/staging/lustre/lustre/mgc/Makefile + create mode 100644 drivers/staging/lustre/lustre/mgc/libmgc.c + create mode 100644 drivers/staging/lustre/lustre/mgc/lproc_mgc.c + create mode 100644 drivers/staging/lustre/lustre/mgc/mgc_internal.h + create mode 100644 drivers/staging/lustre/lustre/mgc/mgc_request.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/Makefile + create mode 100644 drivers/staging/lustre/lustre/obdclass/acl.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/capa.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_internal.h + create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_io.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_lock.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_object.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_page.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/class_obd.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/debug.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/dt_object.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/genops.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/idmap.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/linkea.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-module.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_cat.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_internal.h + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_ioctl.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_lvfs.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_obd.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_osd.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_swab.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_test.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.h + create mode 100644 drivers/staging/lustre/lustre/obdclass/lprocfs_jobstats.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lprocfs_status.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lu_object.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ref.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ucred.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lustre_handles.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lustre_peer.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/md_attrs.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/mea.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/obd_config.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/obd_mount.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/obdo.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/statfs_pack.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/uuid.c + create mode 100644 drivers/staging/lustre/lustre/obdecho/Makefile + create mode 100644 drivers/staging/lustre/lustre/obdecho/echo.c + create mode 100644 drivers/staging/lustre/lustre/obdecho/echo_client.c + create mode 100644 drivers/staging/lustre/lustre/obdecho/echo_internal.h + create mode 100644 drivers/staging/lustre/lustre/obdecho/lproc_echo.c + create mode 100644 drivers/staging/lustre/lustre/osc/Makefile + create mode 100644 drivers/staging/lustre/lustre/osc/lproc_osc.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_cache.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_cl_internal.h + create mode 100644 drivers/staging/lustre/lustre/osc/osc_dev.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_internal.h + create mode 100644 drivers/staging/lustre/lustre/osc/osc_io.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_lock.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_object.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_page.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_quota.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_request.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/Makefile + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/client.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/connection.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/events.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/Makefile + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_asn1.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_bulk.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_generic_token.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_internal.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5_mech.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_mech_switch.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/lproc_gss.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/import.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/layout.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_client.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_net.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_server.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/niobuf.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/pack_generic.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/pers.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/pinger.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/recover.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_config.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_gc.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_null.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_plain.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/service.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/wiretest.c + create mode 100644 drivers/staging/octeon-usb/Kconfig + create mode 100644 drivers/staging/octeon-usb/Makefile + create mode 100644 drivers/staging/octeon-usb/TODO + create mode 100644 drivers/staging/octeon-usb/cvmx-usb.c + create mode 100644 drivers/staging/octeon-usb/cvmx-usb.h + create mode 100644 drivers/staging/octeon-usb/cvmx-usbcx-defs.h + create mode 100644 drivers/staging/octeon-usb/cvmx-usbnx-defs.h + create mode 100644 drivers/staging/octeon-usb/octeon-hcd.c + delete mode 100644 drivers/staging/ozwpan/ozevent.c + delete mode 100644 drivers/staging/ozwpan/ozevent.h + delete mode 100644 drivers/staging/ozwpan/ozeventdef.h + delete mode 100644 drivers/staging/zram/zram_sysfs.c + create mode 100644 include/linux/platform_data/ad7303.h +$ git am -3 ../patches/0001-staging-lustre-fix-for-invalidatepage-API-change.patch +Applying: staging/lustre: fix for invalidatepage() API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h +M drivers/staging/lustre/lustre/llite/rw26.c +$ git add -A . +$ git commit -v -a --amend +[master 55033bf] Merge remote-tracking branch 'staging/staging-next' +Merging char-misc/char-misc-next (3806726 Revert "char: misc: assign file->private_data in all cases") +$ git merge --no-ff char-misc/char-misc-next +Auto-merging net/core/netpoll.c +Auto-merging net/Kconfig +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging include/linux/mfd/palmas.h +Auto-merging include/linux/kernel.h +Auto-merging drivers/pcmcia/Kconfig +Auto-merging drivers/net/netconsole.c +Auto-merging drivers/misc/mei/init.c +Auto-merging drivers/misc/mei/hbm.c +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 2 + + .../devicetree/bindings/ata/atmel-at91_cf.txt | 19 ++ + .../devicetree/bindings/extcon/extcon-twl.txt | 15 + + .../bindings/memory-controllers/mvebu-devbus.txt | 156 +++++++++ + Documentation/fmc/00-INDEX | 38 +++ + Documentation/fmc/API.txt | 47 +++ + Documentation/fmc/FMC-and-SDB.txt | 88 +++++ + Documentation/fmc/carrier.txt | 311 ++++++++++++++++++ + Documentation/fmc/fmc-chardev.txt | 64 ++++ + Documentation/fmc/fmc-fakedev.txt | 36 +++ + Documentation/fmc/fmc-trivial.txt | 17 + + Documentation/fmc/fmc-write-eeprom.txt | 125 ++++++++ + Documentation/fmc/identifiers.txt | 168 ++++++++++ + Documentation/fmc/mezzanine.txt | 123 +++++++ + Documentation/fmc/parameters.txt | 56 ++++ + Documentation/w1/w1.generic | 4 +- + MAINTAINERS | 10 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/char/hpet.c | 6 +- + drivers/char/ipmi/ipmi_poweroff.c | 6 +- + drivers/char/mem.c | 2 +- + drivers/char/mspec.c | 2 +- + drivers/char/random.c | 8 +- + drivers/char/rtc.c | 6 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.h | 10 +- + drivers/extcon/Kconfig | 7 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-class.c | 25 +- + drivers/extcon/extcon-palmas.c | 246 ++++++++++++++ + drivers/fmc/Kconfig | 51 +++ + drivers/fmc/Makefile | 13 + + drivers/fmc/fmc-chardev.c | 202 ++++++++++++ + drivers/fmc/fmc-core.c | 296 +++++++++++++++++ + drivers/fmc/fmc-dump.c | 100 ++++++ + drivers/fmc/fmc-fakedev.c | 355 +++++++++++++++++++++ + drivers/fmc/fmc-match.c | 114 +++++++ + drivers/fmc/fmc-sdb.c | 266 +++++++++++++++ + drivers/fmc/fmc-trivial.c | 107 +++++++ + drivers/fmc/fmc-write-eeprom.c | 176 ++++++++++ + drivers/fmc/fru-parse.c | 82 +++++ + drivers/hv/channel.c | 50 ++- + drivers/hv/channel_mgmt.c | 119 ++++++- + drivers/hv/connection.c | 14 + + drivers/hv/hv.c | 85 +++-- + drivers/hv/hyperv_vmbus.h | 4 + + drivers/hv/ring_buffer.c | 12 +- + drivers/hv/vmbus_drv.c | 10 +- + drivers/memory/Kconfig | 10 + + drivers/memory/Makefile | 1 + + drivers/memory/mvebu-devbus.c | 340 ++++++++++++++++++++ + drivers/memory/tegra20-mc.c | 5 +- + drivers/memory/tegra30-mc.c | 9 +- + drivers/misc/Kconfig | 1 + + drivers/misc/ad525x_dpot.c | 2 +- + drivers/misc/apds9802als.c | 5 +- + drivers/misc/apds990x.c | 37 ++- + drivers/misc/arm-charlcd.c | 5 +- + drivers/misc/bh1770glc.c | 59 ++-- + drivers/misc/bh1780gli.c | 2 +- + drivers/misc/carma/carma-fpga-program.c | 14 +- + drivers/misc/carma/carma-fpga.c | 8 +- + drivers/misc/eeprom/at24.c | 44 +-- + drivers/misc/eeprom/at25.c | 25 +- + drivers/misc/ep93xx_pwm.c | 188 +++-------- + drivers/misc/hmc6352.c | 5 +- + drivers/misc/isl29003.c | 24 +- + drivers/misc/isl29020.c | 6 +- + drivers/misc/lis3lv02d/lis3lv02d.c | 6 +- + drivers/misc/mei/amthif.c | 6 +- + drivers/misc/mei/client.c | 92 +++++- + drivers/misc/mei/client.h | 4 + + drivers/misc/mei/hbm.c | 37 ++- + drivers/misc/mei/hbm.h | 2 +- + drivers/misc/mei/hw-me.c | 3 +- + drivers/misc/mei/init.c | 18 +- + drivers/misc/mei/interrupt.c | 205 ++++-------- + drivers/misc/mei/main.c | 49 +-- + drivers/misc/mei/mei_dev.h | 29 +- + drivers/misc/mei/pci-me.c | 19 -- + drivers/misc/mei/wd.c | 6 - + drivers/misc/pch_phub.c | 44 ++- + drivers/misc/sgi-gru/gruprocfs.c | 14 +- + drivers/misc/spear13xx_pcie_gadget.c | 69 ++-- + drivers/misc/sram.c | 9 +- + drivers/misc/ti-st/st_kim.c | 6 +- + drivers/misc/ti_dac7512.c | 6 +- + drivers/misc/tsl2550.c | 4 +- + drivers/net/netconsole.c | 1 + + drivers/pcmcia/Kconfig | 4 +- + drivers/pcmcia/at91_cf.c | 176 +++++----- + drivers/pcmcia/pd6729.c | 2 + + drivers/uio/uio_aec.c | 14 +- + drivers/uio/uio_cif.c | 14 +- + drivers/uio/uio_dmem_genirq.c | 4 +- + drivers/uio/uio_netx.c | 14 +- + drivers/uio/uio_pci_generic.c | 17 +- + drivers/uio/uio_pdrv_genirq.c | 54 ++-- + drivers/uio/uio_pruss.c | 2 +- + drivers/uio/uio_sercos3.c | 14 +- + drivers/vme/bridges/vme_tsi148.c | 45 +-- + drivers/vme/vme.c | 2 + + drivers/w1/masters/w1-gpio.c | 6 - + drivers/w1/slaves/w1_ds2408.c | 1 + + drivers/w1/slaves/w1_ds2413.c | 1 + + drivers/w1/slaves/w1_ds2423.c | 1 + + drivers/w1/slaves/w1_ds2431.c | 1 + + drivers/w1/slaves/w1_ds2433.c | 1 + + drivers/w1/slaves/w1_ds2760.c | 1 + + drivers/w1/slaves/w1_ds2780.c | 1 + + drivers/w1/slaves/w1_ds2781.c | 1 + + drivers/w1/slaves/w1_ds28e04.c | 1 + + drivers/w1/slaves/w1_smem.c | 2 + + drivers/w1/slaves/w1_therm.c | 5 + + drivers/w1/w1.c | 2 + + include/linux/fmc-sdb.h | 36 +++ + include/linux/fmc.h | 237 ++++++++++++++ + include/linux/hyperv.h | 70 ++++ + include/linux/if_ether.h | 1 - + include/linux/ipmi-fru.h | 135 ++++++++ + include/linux/kernel.h | 2 + + include/linux/mfd/palmas.h | 26 +- + include/linux/sdb.h | 159 +++++++++ + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/net_utils.c | 26 ++ + net/Kconfig | 1 + + net/core/netpoll.c | 1 + + net/core/utils.c | 22 -- + tools/hv/hv_kvp_daemon.c | 58 +++- + 130 files changed, 5322 insertions(+), 919 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/atmel-at91_cf.txt + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-twl.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt + create mode 100644 Documentation/fmc/00-INDEX + create mode 100644 Documentation/fmc/API.txt + create mode 100644 Documentation/fmc/FMC-and-SDB.txt + create mode 100644 Documentation/fmc/carrier.txt + create mode 100644 Documentation/fmc/fmc-chardev.txt + create mode 100644 Documentation/fmc/fmc-fakedev.txt + create mode 100644 Documentation/fmc/fmc-trivial.txt + create mode 100644 Documentation/fmc/fmc-write-eeprom.txt + create mode 100644 Documentation/fmc/identifiers.txt + create mode 100644 Documentation/fmc/mezzanine.txt + create mode 100644 Documentation/fmc/parameters.txt + create mode 100644 drivers/extcon/extcon-palmas.c + create mode 100644 drivers/fmc/Kconfig + create mode 100644 drivers/fmc/Makefile + create mode 100644 drivers/fmc/fmc-chardev.c + create mode 100644 drivers/fmc/fmc-core.c + create mode 100644 drivers/fmc/fmc-dump.c + create mode 100644 drivers/fmc/fmc-fakedev.c + create mode 100644 drivers/fmc/fmc-match.c + create mode 100644 drivers/fmc/fmc-sdb.c + create mode 100644 drivers/fmc/fmc-trivial.c + create mode 100644 drivers/fmc/fmc-write-eeprom.c + create mode 100644 drivers/fmc/fru-parse.c + create mode 100644 drivers/memory/mvebu-devbus.c + create mode 100644 include/linux/fmc-sdb.h + create mode 100644 include/linux/fmc.h + create mode 100644 include/linux/ipmi-fru.h + create mode 100644 include/linux/sdb.h + create mode 100644 lib/net_utils.c +Merging scsi/for-next (082af1e Merge branch 'misc' into for-next) +$ git merge --no-ff scsi/for-next +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/pm8001/pm80xx_hwi.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +Removing drivers/s390/scsi/zfcp_cfdc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 16 + + Documentation/scsi/ChangeLog.megaraid_sas | 22 + + MAINTAINERS | 7 + + drivers/s390/scsi/Makefile | 2 +- + drivers/s390/scsi/zfcp_aux.c | 36 +- + drivers/s390/scsi/zfcp_ccw.c | 13 +- + drivers/s390/scsi/zfcp_cfdc.c | 446 -- + drivers/s390/scsi/zfcp_dbf.c | 11 +- + drivers/s390/scsi/zfcp_def.h | 4 - + drivers/s390/scsi/zfcp_erp.c | 3 +- + drivers/s390/scsi/zfcp_ext.h | 20 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + drivers/s390/scsi/zfcp_fsf.c | 154 +- + drivers/s390/scsi/zfcp_fsf.h | 26 - + drivers/s390/scsi/zfcp_scsi.c | 10 +- + drivers/s390/scsi/zfcp_sysfs.c | 27 +- + drivers/s390/scsi/zfcp_unit.c | 9 +- + drivers/scsi/3w-xxxx.c | 4 +- + drivers/scsi/BusLogic.c | 4452 +++++++++++--------- + drivers/scsi/BusLogic.h | 1487 ++++--- + drivers/scsi/FlashPoint.c | 626 ++- + drivers/scsi/Kconfig | 2 +- + drivers/scsi/aacraid/src.c | 3 + + drivers/scsi/aic94xx/aic94xx_task.c | 3 +- + drivers/scsi/bfa/bfa_core.c | 3 +- + drivers/scsi/bfa/bfa_defs.h | 103 +- + drivers/scsi/bfa/bfa_defs_svc.h | 77 +- + drivers/scsi/bfa/bfa_fc.h | 15 + + drivers/scsi/bfa/bfa_fcpim.c | 2 +- + drivers/scsi/bfa/bfa_fcs.c | 62 +- + drivers/scsi/bfa/bfa_fcs.h | 34 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 209 +- + drivers/scsi/bfa/bfa_fcs_rport.c | 11 +- + drivers/scsi/bfa/bfa_ioc.c | 74 +- + drivers/scsi/bfa/bfa_ioc.h | 9 +- + drivers/scsi/bfa/bfa_ioc_cb.c | 86 +- + drivers/scsi/bfa/bfa_ioc_ct.c | 46 + + drivers/scsi/bfa/bfa_svc.c | 700 ++- + drivers/scsi/bfa/bfa_svc.h | 34 +- + drivers/scsi/bfa/bfad.c | 14 +- + drivers/scsi/bfa/bfad_attr.c | 33 +- + drivers/scsi/bfa/bfad_bsg.c | 137 +- + drivers/scsi/bfa/bfad_bsg.h | 52 +- + drivers/scsi/bfa/bfad_drv.h | 2 +- + drivers/scsi/bfa/bfad_im.c | 10 +- + drivers/scsi/bfa/bfi.h | 78 +- + drivers/scsi/bfa/bfi_ms.h | 5 +- + drivers/scsi/csiostor/csio_hw.c | 91 - + drivers/scsi/csiostor/csio_hw.h | 11 - + drivers/scsi/csiostor/csio_mb.c | 77 - + drivers/scsi/csiostor/csio_mb.h | 11 - + drivers/scsi/csiostor/csio_scsi.c | 4 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 159 +- + drivers/scsi/fnic/fnic_scsi.c | 6 +- + drivers/scsi/ipr.c | 57 +- + drivers/scsi/isci/request.c | 4 +- + drivers/scsi/libiscsi.c | 18 + + drivers/scsi/libsas/sas_scsi_host.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 23 +- + drivers/scsi/lpfc/lpfc_bsg.c | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 2 +- + drivers/scsi/lpfc/lpfc_ct.c | 2 +- + drivers/scsi/lpfc/lpfc_els.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 38 +- + drivers/scsi/lpfc/lpfc_hw.h | 2 +- + drivers/scsi/lpfc/lpfc_hw4.h | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 129 +- + drivers/scsi/lpfc/lpfc_mbox.c | 2 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 125 +- + drivers/scsi/lpfc/lpfc_scsi.h | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 52 +- + drivers/scsi/lpfc/lpfc_sli4.h | 3 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/megaraid/megaraid_sas.h | 186 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 226 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 784 +++- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 148 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 35 +- + drivers/scsi/mpt2sas/mpi/mpi2.h | 6 +- + drivers/scsi/mpt2sas/mpi/mpi2_init.h | 4 +- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 8 +- + drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 9 +- + drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 10 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 59 +- + drivers/scsi/mpt2sas/mpt2sas_base.h | 7 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 143 +- + drivers/scsi/mvsas/mv_sas.c | 3 +- + drivers/scsi/pm8001/pm8001_hwi.c | 5 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 21 +- + drivers/scsi/scsi.c | 8 +- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/scsi_error.c | 7 +- + drivers/scsi/scsi_scan.c | 5 + + drivers/scsi/scsi_sysfs.c | 30 + + drivers/scsi/scsi_transport_iscsi.c | 12 + + drivers/scsi/sd.c | 77 +- + drivers/scsi/sd.h | 1 + + drivers/scsi/storvsc_drv.c | 347 +- + drivers/scsi/ufs/Kconfig | 2 +- + drivers/scsi/ufs/ufshcd-pci.c | 1 - + drivers/scsi/ufs/ufshcd-pltfrm.c | 76 +- + drivers/scsi/ufs/ufshcd.c | 537 ++- + drivers/scsi/ufs/ufshcd.h | 21 +- + drivers/scsi/ufs/ufshci.h | 5 +- + include/scsi/iscsi_if.h | 5 + + include/scsi/libiscsi.h | 4 + + include/scsi/libsas.h | 2 +- + include/scsi/scsi.h | 5 + + include/scsi/scsi_device.h | 1 + + include/scsi/scsi_devinfo.h | 1 + + 112 files changed, 7662 insertions(+), 5159 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt + delete mode 100644 drivers/s390/scsi/zfcp_cfdc.c +Merging target-updates/for-next (634d1e2 iscsi-target: missing kfree() on error path) +$ git merge --no-ff target-updates/for-next +Auto-merging drivers/target/iscsi/iscsi_target_nego.c +Auto-merging drivers/target/iscsi/iscsi_target_configfs.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/isert/ib_isert.c | 112 +++++- + drivers/scsi/qla2xxx/qla_target.c | 151 +------- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 6 +- + drivers/target/iscsi/iscsi_target.c | 490 +++++++++++++----------- + drivers/target/iscsi/iscsi_target_configfs.c | 126 +++++++ + drivers/target/iscsi/iscsi_target_core.h | 7 +- + drivers/target/iscsi/iscsi_target_nego.c | 13 +- + drivers/target/iscsi/iscsi_target_parameters.c | 3 - + drivers/target/iscsi/iscsi_target_util.c | 1 + + drivers/target/target_core_configfs.c | 13 +- + drivers/target/target_core_device.c | 5 +- + drivers/target/target_core_fabric_configfs.c | 21 +- + drivers/target/target_core_pr.c | 499 +++++++++---------------- + drivers/target/target_core_pr.h | 2 +- + drivers/target/target_core_rd.c | 5 + + drivers/target/target_core_tmr.c | 12 +- + drivers/target/target_core_transport.c | 71 +--- + drivers/vhost/scsi.c | 33 +- + include/target/iscsi/iscsi_transport.h | 12 +- + include/target/target_core_base.h | 10 +- + include/target/target_core_configfs.h | 1 + + include/target/target_core_fabric_configfs.h | 11 + + 22 files changed, 812 insertions(+), 792 deletions(-) +Merging target-merge/for-next-merge (317ddd2 Linux 3.10-rc5) +$ git merge --no-ff target-merge/for-next-merge +Already up-to-date. +Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) +$ git merge --no-ff ibft/linux-next +Already up-to-date. +Merging isci/all (6734092 isci: add a couple __iomem annotations) +$ git merge --no-ff isci/all +Already up-to-date. +Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation) +$ git merge --no-ff bcon/master +Resolved 'drivers/block/Kconfig' using previous resolution. +Auto-merging kernel/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 Documentation/networking/netconsole.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8430bbe] 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.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 --no-ff tmem/linux-next +Already up-to-date. +Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio()) +$ git merge --no-ff writeback/writeback-for-next +Already up-to-date. +Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) +$ git merge --no-ff arm-dt/devicetree/arm-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge --no-ff hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (5b81d55 pinctrl: remove bindings for pinconf options needing more thought) +$ git merge --no-ff pinctrl/for-next +Resolved 'drivers/net/ethernet/ti/davinci_mdio.c' using previous resolution. +Resolved 'drivers/pinctrl/Makefile' using previous resolution. +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/spi/spi-pl022.c +Auto-merging drivers/pinctrl/sirf/pinctrl-prima2.c +Auto-merging drivers/pinctrl/Makefile +CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile +Auto-merging drivers/pinctrl/Kconfig +Auto-merging drivers/net/ethernet/ti/davinci_mdio.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/ti/davinci_mdio.c +Auto-merging drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/i2c/busses/i2c-nomadik.c +Auto-merging MAINTAINERS +Auto-merging Documentation/pinctrl.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9a02b50] Merge remote-tracking branch 'pinctrl/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/pinctrl/fsl,vf610-pinctrl.txt | 41 + + .../bindings/pinctrl/img,tz1090-pdc-pinctrl.txt | 127 ++ + .../bindings/pinctrl/img,tz1090-pinctrl.txt | 227 +++ + .../bindings/pinctrl/marvell,dove-pinctrl.txt | 49 +- + .../bindings/pinctrl/pinctrl-bindings.txt | 48 + + .../devicetree/bindings/pinctrl/pinctrl-single.txt | 3 +- + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 153 ++ + .../bindings/pinctrl/rockchip,pinctrl.txt | 97 + + .../devicetree/bindings/pinctrl/ste,abx500.txt | 352 ++++ + Documentation/pinctrl.txt | 39 +- + MAINTAINERS | 10 + + drivers/base/pinctrl.c | 19 + + drivers/i2c/busses/i2c-nomadik.c | 90 +- + drivers/net/ethernet/ti/cpsw.c | 11 + + drivers/net/ethernet/ti/davinci_mdio.c | 10 + + drivers/pinctrl/Kconfig | 38 + + drivers/pinctrl/Makefile | 8 +- + drivers/pinctrl/core.c | 171 +- + drivers/pinctrl/mvebu/pinctrl-dove.c | 244 ++- + drivers/pinctrl/pinconf-generic.c | 104 +- + drivers/pinctrl/pinconf.c | 174 -- + drivers/pinctrl/pinconf.h | 6 + + drivers/pinctrl/pinctrl-abx500.c | 481 ++++- + drivers/pinctrl/pinctrl-at91.c | 7 +- + drivers/pinctrl/pinctrl-baytrail.c | 543 +++++ + drivers/pinctrl/pinctrl-bcm2835.c | 2 +- + drivers/pinctrl/pinctrl-coh901.c | 1 - + drivers/pinctrl/pinctrl-exynos.c | 86 +- + drivers/pinctrl/pinctrl-exynos5440.c | 13 +- + drivers/pinctrl/pinctrl-imx.c | 53 +- + drivers/pinctrl/pinctrl-imx.h | 4 + + drivers/pinctrl/pinctrl-mxs.c | 2 - + drivers/pinctrl/pinctrl-nomadik.c | 6 +- + drivers/pinctrl/pinctrl-rockchip.c | 1394 +++++++++++++ + drivers/pinctrl/pinctrl-samsung.c | 2 +- + drivers/pinctrl/pinctrl-single.c | 242 ++- + drivers/pinctrl/pinctrl-sunxi-pins.h | 2023 +++++++++++++++++++ + drivers/pinctrl/pinctrl-sunxi.c | 1520 ++------------ + drivers/pinctrl/pinctrl-sunxi.h | 68 + + drivers/pinctrl/pinctrl-tz1090-pdc.c | 1024 ++++++++++ + drivers/pinctrl/pinctrl-tz1090.c | 2072 ++++++++++++++++++++ + drivers/pinctrl/pinctrl-u300.c | 1 - + drivers/pinctrl/pinctrl-vf610.c | 338 ++++ + drivers/pinctrl/sh-pfc/core.c | 65 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 205 ++ + drivers/pinctrl/sirf/Makefile | 5 + + drivers/pinctrl/sirf/pinctrl-atlas6.c | 947 +++++++++ + .../{pinctrl-sirf.c => sirf/pinctrl-prima2.c} | 949 +-------- + drivers/pinctrl/sirf/pinctrl-sirf.c | 929 +++++++++ + drivers/pinctrl/sirf/pinctrl-sirf.h | 116 ++ + drivers/pinctrl/spear/pinctrl-plgpio.c | 9 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 6 +- + drivers/spi/spi-pl022.c | 70 +- + drivers/tty/serial/amba-pl011.c | 42 +- + include/dt-bindings/pinctrl/rockchip.h | 32 + + include/linux/pinctrl/consumer.h | 77 +- + include/linux/pinctrl/devinfo.h | 4 + + include/linux/pinctrl/pinconf-generic.h | 25 +- + include/linux/pinctrl/pinconf.h | 2 +- + include/linux/pinctrl/pinctrl.h | 4 +- + 60 files changed, 12447 insertions(+), 2943 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/ste,abx500.txt + create mode 100644 drivers/pinctrl/pinctrl-baytrail.c + create mode 100644 drivers/pinctrl/pinctrl-rockchip.c + create mode 100644 drivers/pinctrl/pinctrl-sunxi-pins.h + create mode 100644 drivers/pinctrl/pinctrl-tz1090-pdc.c + create mode 100644 drivers/pinctrl/pinctrl-tz1090.c + create mode 100644 drivers/pinctrl/pinctrl-vf610.c + create mode 100644 drivers/pinctrl/sirf/Makefile + create mode 100644 drivers/pinctrl/sirf/pinctrl-atlas6.c + rename drivers/pinctrl/{pinctrl-sirf.c => sirf/pinctrl-prima2.c} (50%) + create mode 100644 drivers/pinctrl/sirf/pinctrl-sirf.c + create mode 100644 drivers/pinctrl/sirf/pinctrl-sirf.h + create mode 100644 include/dt-bindings/pinctrl/rockchip.h +Merging vhost/linux-next (f722406 Linux 3.10-rc1) +$ git merge --no-ff vhost/linux-next +Already up-to-date. +Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) +$ git merge --no-ff memblock/memblock-kill-early_node_map +Already up-to-date. +Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO) +$ git merge --no-ff remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge --no-ff rpmsg/for-next +Already up-to-date. +Merging irqdomain/irqdomain/next (798f0fd irq: fix checkpatch error) +$ git merge --no-ff irqdomain/irqdomain/next +Resolved 'kernel/irq/irqdomain.c' using previous resolution. +Auto-merging kernel/irq/irqdomain.c +CONFLICT (content): Merge conflict in kernel/irq/irqdomain.c +Auto-merging kernel/irq/generic-chip.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 76d8ca9] Merge remote-tracking branch 'irqdomain/irqdomain/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/platforms/cell/beat_interrupt.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/x86/kernel/devicetree.c | 4 +- + include/linux/irqdomain.h | 142 +++---- + kernel/irq/generic-chip.c | 6 +- + kernel/irq/irqdomain.c | 579 +++++++++------------------ + kernel/irq/proc.c | 2 + + 7 files changed, 264 insertions(+), 473 deletions(-) +Merging gpio/gpio/next (644c8df gpio: sx150x: convert to use devm_* functions) +$ git merge --no-ff gpio/gpio/next +Auto-merging drivers/gpio/gpio-langwell.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/gpio/Kconfig | 2 +- + drivers/gpio/gpio-langwell.c | 117 +++++++++++++---------------------------- + drivers/gpio/gpio-lynxpoint.c | 1 - + drivers/gpio/gpio-ml-ioh.c | 1 + + drivers/gpio/gpio-rdc321x.c | 7 +-- + drivers/gpio/gpio-stmpe.c | 7 ++- + drivers/gpio/gpio-sx150x.c | 18 +++---- + drivers/gpio/gpio-tc3589x.c | 1 - + drivers/gpio/gpio-timberdale.c | 2 - + drivers/gpio/gpio-vx855.c | 2 - + 11 files changed, 53 insertions(+), 106 deletions(-) +Merging gpio-lw/for-next (038f0ba Gpio/trivial: replace numeric with standard PM state macros) +$ git merge --no-ff gpio-lw/for-next +Auto-merging drivers/gpio/gpio-omap.c +Auto-merging drivers/gpio/gpio-langwell.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-xilinx.txt | 48 +++++++ + drivers/gpio/Kconfig | 2 +- + drivers/gpio/devres.c | 14 +- + drivers/gpio/gpio-bt8xx.c | 2 +- + drivers/gpio/gpio-grgpio.c | 6 +- + drivers/gpio/gpio-ich.c | 8 +- + drivers/gpio/gpio-langwell.c | 69 +--------- + drivers/gpio/gpio-msm-v1.c | 14 +- + drivers/gpio/gpio-omap.c | 2 +- + drivers/gpio/gpio-rcar.c | 9 +- + drivers/gpio/gpio-sta2x11.c | 6 +- + drivers/gpio/gpio-xilinx.c | 144 ++++++++++++++++----- + drivers/gpio/gpiolib.c | 8 +- + 13 files changed, 206 insertions(+), 126 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-xilinx.txt +Merging arm-soc/for-next (abc04d5 Merge branch 'next/late' into for-next) +$ git merge --no-ff arm-soc/for-next +Auto-merging sound/soc/ux500/ux500_pcm.c +Auto-merging include/uapi/linux/serial_core.h +CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h +Auto-merging include/linux/serial_sci.h +CONFLICT (content): Merge conflict in include/linux/serial_sci.h +Removing include/linux/platform_data/pinctrl-coh901.h +Removing include/linux/platform_data/omap_ocp2scp.h +Auto-merging include/linux/platform_data/edma.h +Auto-merging include/linux/mfd/davinci_voicecodec.h +CONFLICT (content): Merge conflict in include/linux/mfd/davinci_voicecodec.h +Auto-merging include/linux/dw_apb_timer.h +Removing include/linux/clk/mvebu.h +Auto-merging drivers/watchdog/s3c2410_wdt.c +Auto-merging drivers/usb/phy/phy-rcar-usb.c +CONFLICT (content): Merge conflict in drivers/usb/phy/phy-rcar-usb.c +Auto-merging drivers/usb/phy/Kconfig +Auto-merging drivers/usb/musb/ux500_dma.c +Auto-merging drivers/usb/musb/ux500.c +Auto-merging drivers/usb/host/ehci-platform.c +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/Kconfig +CONFLICT (content): Merge conflict in drivers/usb/Kconfig +Auto-merging drivers/tty/serial/xilinx_uartps.c +CONFLICT (content): Merge conflict in drivers/tty/serial/xilinx_uartps.c +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/samsung.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/thermal/exynos_thermal.c +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/regulator/ab8500.c +Auto-merging drivers/pinctrl/sh-pfc/core.c +Auto-merging drivers/pinctrl/pinctrl-u300.c +Auto-merging drivers/pinctrl/pinctrl-samsung.c +Auto-merging drivers/pinctrl/pinctrl-nomadik.c +Auto-merging drivers/pinctrl/pinctrl-exynos.c +Auto-merging drivers/pinctrl/pinctrl-coh901.c +Auto-merging drivers/pinctrl/Makefile +Auto-merging drivers/pinctrl/Kconfig +Auto-merging drivers/pci/Kconfig +Auto-merging drivers/mtd/nand/Kconfig +Removing drivers/mtd/maps/autcpu12-nvram.c +Auto-merging drivers/mmc/host/davinci_mmc.c +Auto-merging drivers/media/platform/exynos4-is/Kconfig +Auto-merging drivers/media/platform/Kconfig +Auto-merging drivers/mailbox/omap-mbox.h +Auto-merging drivers/mailbox/omap-mailbox.c +Auto-merging drivers/mailbox/mailbox-omap2.c +Auto-merging drivers/mailbox/mailbox-omap1.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/gpio/gpio-rcar.c +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/crypto/ux500/cryp/cryp_core.c +Auto-merging drivers/cpuidle/Kconfig +Auto-merging drivers/cpufreq/s3c2412-cpufreq.c +Auto-merging drivers/cpufreq/Makefile +Auto-merging drivers/cpufreq/Kconfig.arm +Auto-merging drivers/clocksource/nomadik-mtu.c +Auto-merging drivers/clocksource/dw_apb_timer_of.c +CONFLICT (content): Merge conflict in drivers/clocksource/dw_apb_timer_of.c +Auto-merging drivers/clocksource/clksrc-dbx500-prcmu.c +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clk/samsung/clk-exynos5250.c +Removing drivers/clk/mvebu/clk.c +Removing drivers/clk/mvebu/clk-gating-ctrl.h +Removing drivers/clk/mvebu/clk-gating-ctrl.c +Removing drivers/clk/mvebu/clk-core.h +Removing drivers/clk/mvebu/clk-core.c +Removing drivers/clk/clk-zynq.c +Removing arch/arm/plat-samsung/include/plat/regs-watchdog.h +Auto-merging arch/arm/plat-samsung/include/plat/cpu-freq-core.h +Auto-merging arch/arm/mm/mmu.c +Removing arch/arm/mach-u300/u300-gpio.h +Removing arch/arm/mach-u300/timer.h +Auto-merging arch/arm/mach-u300/timer.c +CONFLICT (content): Merge conflict in arch/arm/mach-u300/timer.c +Removing arch/arm/mach-u300/spi.h +Removing arch/arm/mach-u300/spi.c +Removing arch/arm/mach-u300/include/mach/uncompress.h +Removing arch/arm/mach-u300/include/mach/u300-regs.h +Removing arch/arm/mach-u300/include/mach/timex.h +Removing arch/arm/mach-u300/include/mach/syscon.h +Removing arch/arm/mach-u300/include/mach/irqs.h +Removing arch/arm/mach-u300/include/mach/hardware.h +Removing arch/arm/mach-u300/i2c.h +Removing arch/arm/mach-u300/i2c.c +Removing arch/arm/mach-sunxi/sunxi.h +Auto-merging arch/arm/mach-spear/spear6xx.c +Removing arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h +Removing arch/arm/mach-shmobile/include/mach/memory.h +Removing arch/arm/mach-shmobile/include/mach/head-ap4evb.txt +Auto-merging arch/arm/mach-shmobile/clock-r8a7779.c +Auto-merging arch/arm/mach-shmobile/clock-r8a7778.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7778.c +Auto-merging arch/arm/mach-shmobile/clock-r8a7740.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7740.c +Removing arch/arm/mach-shmobile/board-bonito.c +Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c +Removing arch/arm/mach-shmobile/board-ap4evb.c +Auto-merging arch/arm/mach-shmobile/Kconfig +Removing arch/arm/mach-picoxcell/common.h +Removing arch/arm/mach-omap2/voltagedomains33xx_data.c +Auto-merging arch/arm/mach-omap2/timer.c +Auto-merging arch/arm/mach-omap2/omap_device.c +Removing arch/arm/mach-omap2/mux44xx.h +Removing arch/arm/mach-omap2/mux44xx.c +Removing arch/arm/mach-omap2/dma.h +Removing arch/arm/mach-omap2/board-omap4panda.c +Removing arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/arm/mach-omap2/Kconfig +Removing arch/arm/mach-omap1/include/mach/irda.h +Removing arch/arm/mach-omap1/dma.h +Auto-merging arch/arm/mach-mxs/mach-mxs.c +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mxs.c +Auto-merging arch/arm/mach-mxs/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig +Auto-merging arch/arm/mach-msm/io.c +Removing arch/arm/mach-msm/gpiomux-v2.h +Removing arch/arm/mach-msm/gpiomux-v2.c +Removing arch/arm/mach-msm/gpiomux-8x60.c +Removing arch/arm/mach-msm/core.h +Removing arch/arm/mach-msm/clock-debug.c +Removing arch/arm/mach-msm/clock-7x30.h +Auto-merging arch/arm/mach-kirkwood/include/mach/bridge-regs.h +Removing arch/arm/mach-kirkwood/db88f6281-bp-setup.c +Removing arch/arm/mach-kirkwood/board-nsa310.c +Removing arch/arm/mach-integrator/pci.c +Auto-merging arch/arm/mach-integrator/integrator_ap.c +CONFLICT (content): Merge conflict in arch/arm/mach-integrator/integrator_ap.c +Removing arch/arm/mach-imx/ulpi.c +Auto-merging arch/arm/mach-imx/mm-imx3.c +Auto-merging arch/arm/mach-imx/Kconfig +Removing arch/arm/mach-exynos/setup-usb-phy.c +Removing arch/arm/mach-exynos/setup-spi.c +Removing arch/arm/mach-exynos/setup-sdhci-gpio.c +Removing arch/arm/mach-exynos/setup-keypad.c +Removing arch/arm/mach-exynos/setup-i2c7.c +Removing arch/arm/mach-exynos/setup-i2c6.c +Removing arch/arm/mach-exynos/setup-i2c5.c +Removing arch/arm/mach-exynos/setup-i2c4.c +Removing arch/arm/mach-exynos/setup-i2c3.c +Removing arch/arm/mach-exynos/setup-i2c2.c +Removing arch/arm/mach-exynos/setup-i2c1.c +Removing arch/arm/mach-exynos/setup-i2c0.c +Removing arch/arm/mach-exynos/setup-fimd0.c +Removing arch/arm/mach-exynos/setup-fimc.c +CONFLICT (modify/delete): arch/arm/mach-exynos/mach-universal_c210.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-exynos/mach-universal_c210.c left in tree. +Removing arch/arm/mach-exynos/mach-smdkv310.c +Removing arch/arm/mach-exynos/mach-smdk4x12.c +Removing arch/arm/mach-exynos/mach-origen.c +Removing arch/arm/mach-exynos/mach-nuri.c +Removing arch/arm/mach-exynos/mach-armlex4210.c +Removing arch/arm/mach-exynos/include/mach/regs-usb-phy.h +Removing arch/arm/mach-exynos/include/mach/regs-gpio.h +Removing arch/arm/mach-exynos/include/mach/irqs.h +Removing arch/arm/mach-exynos/include/mach/gpio.h +Removing arch/arm/mach-exynos/dma.c +Removing arch/arm/mach-exynos/dev-uart.c +Removing arch/arm/mach-exynos/dev-ohci.c +Removing arch/arm/mach-exynos/dev-audio.c +Removing arch/arm/mach-exynos/dev-ahci.c +Auto-merging arch/arm/mach-exynos/Kconfig +Removing arch/arm/mach-clps711x/include/mach/syspld.h +Removing arch/arm/mach-clps711x/include/mach/memory.h +Removing arch/arm/mach-clps711x/include/mach/autcpu12.h +Removing arch/arm/mach-at91/board-usb-a926x.c +Removing arch/arm/mach-at91/board-rm9200dk.c +Auto-merging arch/arm/include/debug/u300.S +Removing arch/arm/include/asm/hardware/pci_v3.h +Auto-merging arch/arm/include/asm/cp15.h +Auto-merging arch/arm/configs/omap2plus_defconfig +Removing arch/arm/configs/bonito_defconfig +Auto-merging arch/arm/configs/at91sam9261_9g10_defconfig +Removing archRecorded preimage for 'arch/arm/mach-mxs/mach-mxs.c' +Resolved 'arch/arm/boot/dts/am335x-evmsk.dts' using previous resolution. +Resolved 'arch/arm/boot/dts/am33xx.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/sun4i-a10.dtsi' using previous resolution. +Resolved 'arch/arm/mach-integrator/integrator_ap.c' using previous resolution. +Resolved 'arch/arm/mach-mxs/Kconfig' using previous resolution. +Resolved 'arch/arm/mach-shmobile/clock-r8a7740.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/clock-r8a7778.c' using previous resolution. +Resolved 'arch/arm/mach-u300/timer.c' using previous resolution. +Resolved 'drivers/clocksource/dw_apb_timer_of.c' using previous resolution. +Resolved 'drivers/tty/serial/xilinx_uartps.c' using previous resolution. +Resolved 'drivers/usb/Kconfig' using previous resolution. +Resolved 'drivers/usb/phy/phy-rcar-usb.c' using previous resolution. +Resolved 'include/linux/mfd/davinci_voicecodec.h' using previous resolution. +Resolved 'include/linux/serial_sci.h' using previous resolution. +Resolved 'include/uapi/linux/serial_core.h' using previous resolution. +/arm/configs/at91sam9260_defconfig +Auto-merging arch/arm/configs/at91sam9260_9g20_defconfig +Removing arch/arm/configs/ap4evb_defconfig +Auto-merging arch/arm/common/edma.c +Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun4i-a10.dtsi +Auto-merging arch/arm/boot/dts/sun4i-a10-cubieboard.dts +Removing arch/arm/boot/dts/omap5-evm.dts +Auto-merging arch/arm/boot/dts/omap3-devkit8000.dts +Auto-merging arch/arm/boot/dts/imx28.dtsi +Removing arch/arm/boot/dts/imx27-phytec-phycore.dts +Auto-merging arch/arm/boot/dts/bcm11351.dtsi +Auto-merging arch/arm/boot/dts/am33xx.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/am33xx.dtsi +Auto-merging arch/arm/boot/dts/am335x-evmsk.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/am335x-evmsk.dts +Auto-merging arch/arm/boot/dts/am335x-evm.dts +Auto-merging arch/arm/boot/dts/am335x-bone.dts +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-exynos/mach-universal_c210.c +arch/arm/mach-exynos/mach-universal_c210.c: needs merge +rm 'arch/arm/mach-exynos/mach-universal_c210.c' +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-mxs/mach-mxs.c'. +[master cac8732] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/sti/overview.txt | 33 + + Documentation/arm/sti/stih415-overview.txt | 12 + + Documentation/arm/sti/stih416-overview.txt | 12 + + Documentation/arm/sunxi/README | 23 +- + Documentation/devicetree/bindings/arm/cci.txt | 172 + + .../devicetree/bindings/arm/keystone/keystone.txt | 10 + + Documentation/devicetree/bindings/arm/nspire.txt | 14 + + .../devicetree/bindings/arm/omap/omap.txt | 3 + + .../devicetree/bindings/arm/rtsm-dcscb.txt | 19 + + .../devicetree/bindings/arm/ste-nomadik.txt | 5 + + Documentation/devicetree/bindings/arm/ste-u300.txt | 46 + + Documentation/devicetree/bindings/bus/imx-weim.txt | 49 + + Documentation/devicetree/bindings/bus/ti-gpmc.txt | 1 - + .../devicetree/bindings/clock/altr_socfpga.txt | 7 + + .../devicetree/bindings/clock/clk-exynos-audss.txt | 64 + + .../devicetree/bindings/clock/exynos4-clock.txt | 3 +- + .../devicetree/bindings/clock/exynos5420-clock.txt | 201 + + .../devicetree/bindings/clock/imx5-clock.txt | 13 + + .../devicetree/bindings/clock/imx6q-clock.txt | 1 + + .../devicetree/bindings/clock/imx6sl-clock.txt | 10 + + .../bindings/clock/nvidia,tegra114-car.txt | 252 +- + .../bindings/clock/nvidia,tegra20-car.txt | 154 +- + .../bindings/clock/nvidia,tegra30-car.txt | 211 +- + .../devicetree/bindings/clock/st,nomadik.txt | 104 + + .../bindings/clock/ste-u300-syscon-clock.txt | 80 + + .../devicetree/bindings/clock/vf610-clock.txt | 26 + + .../devicetree/bindings/clock/zynq-7000.txt | 123 +- + .../devicetree/bindings/dma/ste-coh901318.txt | 32 + + .../devicetree/bindings/dma/ste-dma40.txt | 66 + + Documentation/devicetree/bindings/dma/ti-edma.txt | 34 + + .../devicetree/bindings/gpio/gpio-clps711x.txt | 28 + + .../devicetree/bindings/gpio/gpio-msm.txt | 26 + + .../devicetree/bindings/gpio/gpio-samsung.txt | 43 - + .../bindings/gpio/gpio-stericsson-coh901.txt | 7 + + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 46 + + .../devicetree/bindings/gpu/samsung-g2d.txt | 5 + + .../devicetree/bindings/i2c/i2c-st-ddci2c.txt | 15 + + .../interrupt-controller/allwinner,sun4i-ic.txt | 87 +- + .../interrupt-controller/renesas,intc-irqpin.txt | 16 + + .../interrupt-controller/sunxi/sun4i-a10.txt | 89 + + .../interrupt-controller/sunxi/sun5i-a13.txt | 55 + + .../devicetree/bindings/media/s5p-mfc.txt | 5 + + Documentation/devicetree/bindings/mfd/ab8500.txt | 2 +- + .../devicetree/bindings/mmc/bcm,kona-sdhci.txt | 16 + + .../devicetree/bindings/mtd/gpmc-nand.txt | 8 + + .../devicetree/bindings/pci/designware-pcie.txt | 73 + + .../devicetree/bindings/pci/mvebu-pci.txt | 221 ++ + Documentation/devicetree/bindings/pci/pci.txt | 9 + + .../devicetree/bindings/pci/v3-v360epc-pci.txt | 15 + + .../bindings/pinctrl/fsl,imx-pinctrl.txt | 2 +- + .../bindings/pinctrl/samsung-pinctrl.txt | 53 +- + Documentation/devicetree/bindings/rtc/dw-apb.txt | 19 + + .../devicetree/bindings/sound/samsung-i2s.txt | 46 +- + .../bindings/timer/stericsson-u300-apptimer.txt | 18 + + .../devicetree/bindings/usb/atmel-usb.txt | 82 + + .../devicetree/bindings/usb/exynos-usb.txt | 34 + + .../devicetree/bindings/usb/ux500-usb.txt | 50 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + .../devicetree/bindings/video/exynos_dp.txt | 6 + + .../bindings/watchdog/stericsson-coh901327.txt | 19 + + MAINTAINERS | 11 + + arch/arm/Kconfig | 116 +- + arch/arm/Kconfig.debug | 152 +- + arch/arm/Makefile | 7 +- + arch/arm/arm-soc-for-next-contents.txt | 345 ++ + arch/arm/boot/compressed/head-shmobile.S | 21 +- + arch/arm/boot/dts/Makefile | 43 +- + arch/arm/boot/dts/aks-cdu.dts | 12 +- + arch/arm/boot/dts/am335x-bone.dts | 118 +- + arch/arm/boot/dts/am335x-evm.dts | 264 +- + arch/arm/boot/dts/am335x-evmsk.dts | 184 +- + arch/arm/boot/dts/am33xx.dtsi | 126 +- + arch/arm/boot/dts/am3517-evm.dts | 2 +- + arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 +- + arch/arm/boot/dts/am4372.dtsi | 68 + + arch/arm/boot/dts/am43x-epos-evm.dts | 18 + + arch/arm/boot/dts/animeo_ip.dts | 18 +- + arch/arm/boot/dts/armada-370-db.dts | 1 + + arch/arm/boot/dts/armada-370-mirabox.dts | 1 + + arch/arm/boot/dts/armada-370-rd.dts | 17 + + arch/arm/boot/dts/armada-370-xp.dtsi | 23 +- + arch/arm/boot/dts/armada-370.dtsi | 4 - + arch/arm/boot/dts/armada-xp-db.dts | 34 + + arch/arm/boot/dts/armada-xp-gp.dts | 10 + + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 5 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 9 + + arch/arm/boot/dts/armada-xp.dtsi | 8 +- + arch/arm/boot/dts/at91-ariag25.dts | 27 +- + arch/arm/boot/dts/at91-foxg20.dts | 157 + + arch/arm/boot/dts/at91rm9200.dtsi | 309 +- + arch/arm/boot/dts/at91rm9200ek.dts | 20 +- + arch/arm/boot/dts/at91sam9260.dtsi | 309 +- + arch/arm/boot/dts/at91sam9263.dtsi | 249 +- + arch/arm/boot/dts/at91sam9263ek.dts | 28 +- + arch/arm/boot/dts/at91sam9g15.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g15ek.dts | 4 +- + arch/arm/boot/dts/at91sam9g20.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g20ek.dts | 6 +- + arch/arm/boot/dts/at91sam9g20ek_2mmc.dts | 10 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 32 +- + arch/arm/boot/dts/at91sam9g25.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g25ek.dts | 4 +- + arch/arm/boot/dts/at91sam9g35.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g35ek.dts | 4 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 364 +- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 47 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 248 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 18 +- + arch/arm/boot/dts/at91sam9x25.dtsi | 22 +- + arch/arm/boot/dts/at91sam9x25ek.dts | 4 +- + arch/arm/boot/dts/at91sam9x35.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x35ek.dts | 4 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 474 ++- + arch/arm/boot/dts/at91sam9x5cm.dtsi | 8 +- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 23 +- + arch/arm/boot/dts/bcm11351-brt.dts | 19 +- + arch/arm/boot/dts/bcm11351.dtsi | 39 +- + arch/arm/boot/dts/bcm2835-rpi-b.dts | 11 + + arch/arm/boot/dts/ccu8540.dts | 41 + + arch/arm/boot/dts/ccu9540.dts | 6 +- + arch/arm/boot/dts/da850-enbw-cmc.dts | 2 +- + arch/arm/boot/dts/da850-evm.dts | 2 +- + arch/arm/boot/dts/da850.dtsi | 4 +- + arch/arm/boot/dts/dbx5x0.dtsi | 231 +- + arch/arm/boot/dts/dove-cubox.dts | 51 +- + arch/arm/boot/dts/ethernut5.dts | 6 +- + arch/arm/boot/dts/evk-pro3.dts | 6 +- + arch/arm/boot/dts/exynos4.dtsi | 4 +- + arch/arm/boot/dts/exynos4210-origen.dts | 171 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 89 + + arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- + arch/arm/boot/dts/exynos4210-trats.dts | 2 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- + arch/arm/boot/dts/exynos4210.dtsi | 9 +- + arch/arm/boot/dts/exynos4212.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 199 +- + arch/arm/boot/dts/exynos4412-origen.dts | 68 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 87 +- + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 56 - + arch/arm/boot/dts/exynos4x12.dtsi | 14 +- + arch/arm/boot/dts/exynos5.dtsi | 111 + + arch/arm/boot/dts/exynos5250-arndale.dts | 33 +- + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 7 + + arch/arm/boot/dts/exynos5250-smdk5250.dts | 42 +- + arch/arm/boot/dts/exynos5250-snow.dts | 8 +- + arch/arm/boot/dts/exynos5250.dtsi | 126 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 680 ++++ + arch/arm/boot/dts/exynos5420-smdk5420.dts | 33 + + arch/arm/boot/dts/exynos5420.dtsi | 148 + + arch/arm/boot/dts/exynos5440-sd5v1.dts | 4 +- + arch/arm/boot/dts/exynos5440-ssdk5440.dts | 51 +- + arch/arm/boot/dts/exynos5440.dtsi | 112 +- + arch/arm/boot/dts/ge863-pro3.dtsi | 2 +- + arch/arm/boot/dts/href.dtsi | 61 +- + arch/arm/boot/dts/hrefprev60.dts | 10 +- + arch/arm/boot/dts/hrefv60plus.dts | 20 +- + arch/arm/boot/dts/imx23.dtsi | 8 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 37 + + arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 179 + + arch/arm/boot/dts/imx27-phytec-phycore.dts | 79 - + arch/arm/boot/dts/imx27.dtsi | 80 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 1 + + arch/arm/boot/dts/imx28-cfa10036.dts | 38 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 8 +- + arch/arm/boot/dts/imx28-cfa10055.dts | 179 + + arch/arm/boot/dts/imx28-cfa10057.dts | 191 + + arch/arm/boot/dts/imx28-m28evk.dts | 14 +- + arch/arm/boot/dts/imx28.dtsi | 43 +- + arch/arm/boot/dts/imx51-apf51.dts | 7 + + arch/arm/boot/dts/imx51.dtsi | 23 + + arch/arm/boot/dts/imx53-m53evk.dts | 259 ++ + arch/arm/boot/dts/imx53-mba53.dts | 175 +- + arch/arm/boot/dts/imx53-qsb.dts | 36 + + arch/arm/boot/dts/imx53-tqma53.dtsi | 45 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 122 + + arch/arm/boot/dts/imx53.dtsi | 297 +- + arch/arm/boot/dts/imx6dl-sabreauto.dts | 8 + + arch/arm/boot/dts/imx6dl-sabresd.dts | 1 + + arch/arm/boot/dts/imx6dl.dtsi | 114 + + arch/arm/boot/dts/imx6q-phytec-pbab01.dts | 34 + + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 74 + + arch/arm/boot/dts/imx6q-sabreauto.dts | 8 + + arch/arm/boot/dts/imx6q-sabresd.dts | 1 + + arch/arm/boot/dts/imx6q.dtsi | 104 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 41 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 66 + + arch/arm/boot/dts/imx6qdl.dtsi | 13 +- + arch/arm/boot/dts/imx6sl-evk.dts | 74 + + arch/arm/boot/dts/imx6sl.dtsi | 779 ++++ + arch/arm/boot/dts/integratorap.dts | 41 + + arch/arm/boot/dts/keystone.dts | 117 + + arch/arm/boot/dts/kirkwood-6281.dtsi | 59 + + arch/arm/boot/dts/kirkwood-6282.dtsi | 76 + + arch/arm/boot/dts/kirkwood-cloudbox.dts | 10 +- + arch/arm/boot/dts/kirkwood-db-88f6281.dts | 30 + + arch/arm/boot/dts/kirkwood-db-88f6282.dts | 34 + + arch/arm/boot/dts/kirkwood-db.dtsi | 89 + + arch/arm/boot/dts/kirkwood-dns320.dts | 7 + + arch/arm/boot/dts/kirkwood-dns325.dts | 5 + + arch/arm/boot/dts/kirkwood-dnskw.dtsi | 32 +- + arch/arm/boot/dts/kirkwood-dockstar.dts | 9 +- + arch/arm/boot/dts/kirkwood-dreamplug.dts | 12 +- + arch/arm/boot/dts/kirkwood-goflexnet.dts | 18 +- + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 10 +- + arch/arm/boot/dts/kirkwood-ib62x0.dts | 17 +- + arch/arm/boot/dts/kirkwood-iconnect.dts | 44 +- + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 15 +- + arch/arm/boot/dts/kirkwood-is2.dts | 2 + + arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 13 +- + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 26 +- + arch/arm/boot/dts/kirkwood-mplcec4.dts | 33 +- + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 30 +- + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 10 +- + arch/arm/boot/dts/kirkwood-ns2.dts | 2 + + arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 + + arch/arm/boot/dts/kirkwood-ns2max.dts | 2 + + arch/arm/boot/dts/kirkwood-ns2mini.dts | 2 + + arch/arm/boot/dts/kirkwood-nsa310.dts | 38 +- + arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 108 +- + arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 93 + + arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 43 + + arch/arm/boot/dts/kirkwood-sheevaplug.dts | 43 + + arch/arm/boot/dts/kirkwood-topkick.dts | 52 +- + arch/arm/boot/dts/kirkwood-ts219-6281.dts | 11 +- + arch/arm/boot/dts/kirkwood-ts219-6282.dts | 19 +- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 24 +- + arch/arm/boot/dts/kirkwood.dtsi | 42 +- + arch/arm/boot/dts/kizbox.dts | 16 +- + arch/arm/boot/dts/lpc32xx.dtsi | 8 +- + arch/arm/boot/dts/mpa1600.dts | 4 +- + arch/arm/boot/dts/msm8660-surf.dts | 15 +- + arch/arm/boot/dts/msm8960-cdp.dts | 13 +- + arch/arm/boot/dts/nspire-classic.dtsi | 74 + + arch/arm/boot/dts/nspire-clp.dts | 45 + + arch/arm/boot/dts/nspire-cx.dts | 112 + + arch/arm/boot/dts/nspire-tp.dts | 44 + + arch/arm/boot/dts/nspire.dtsi | 175 + + arch/arm/boot/dts/omap2.dtsi | 11 +- + arch/arm/boot/dts/omap2420-h4.dts | 2 +- + arch/arm/boot/dts/omap2420.dtsi | 2 +- + arch/arm/boot/dts/omap2430.dtsi | 2 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 48 +- + arch/arm/boot/dts/omap3-beagle.dts | 72 +- + arch/arm/boot/dts/omap3-devkit8000.dts | 11 +- + arch/arm/boot/dts/omap3-evm.dts | 7 +- + arch/arm/boot/dts/omap3-igep.dtsi | 43 +- + arch/arm/boot/dts/omap3-igep0020.dts | 111 +- + arch/arm/boot/dts/omap3-igep0030.dts | 60 +- + arch/arm/boot/dts/omap3-overo.dtsi | 20 +- + arch/arm/boot/dts/omap3-tobi.dts | 52 +- + arch/arm/boot/dts/omap3.dtsi | 11 +- + arch/arm/boot/dts/omap3430-sdp.dts | 6 +- + arch/arm/boot/dts/omap34xx.dtsi | 2 +- + arch/arm/boot/dts/omap36xx.dtsi | 2 +- + arch/arm/boot/dts/omap4-panda-a4.dts | 10 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 162 +- + arch/arm/boot/dts/omap4-panda-es.dts | 38 +- + arch/arm/boot/dts/omap4-panda.dts | 4 +- + arch/arm/boot/dts/omap4-sdp-es23plus.dts | 8 +- + arch/arm/boot/dts/omap4-sdp.dts | 126 +- + arch/arm/boot/dts/omap4-var-som.dts | 8 +- + arch/arm/boot/dts/omap4.dtsi | 131 +- + arch/arm/boot/dts/omap443x.dtsi | 8 +- + arch/arm/boot/dts/omap4460.dtsi | 15 +- + arch/arm/boot/dts/omap5-evm.dts | 261 -- + arch/arm/boot/dts/omap5-uevm.dts | 485 +++ + arch/arm/boot/dts/omap5.dtsi | 180 +- + arch/arm/boot/dts/picoxcell-pc3x2.dtsi | 8 +- + arch/arm/boot/dts/picoxcell-pc3x3.dtsi | 8 +- + arch/arm/boot/dts/pm9g45.dts | 22 +- + arch/arm/boot/dts/prima2.dtsi | 2 + + arch/arm/boot/dts/pxa2xx.dtsi | 7 +- + arch/arm/boot/dts/r8a73a4.dtsi | 6 - + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 45 + + arch/arm/boot/dts/r8a7740.dtsi | 121 + + arch/arm/boot/dts/r8a7779.dtsi | 17 + + arch/arm/boot/dts/r8a7790.dtsi | 6 - + arch/arm/boot/dts/rk3066a-clocks.dtsi | 299 ++ + arch/arm/boot/dts/rk3066a.dtsi | 390 ++ + arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 173 + + arch/arm/boot/dts/s3c2416-smdk2416.dts | 72 + + arch/arm/boot/dts/s3c2416.dtsi | 79 + + arch/arm/boot/dts/s3c24xx.dtsi | 92 + + arch/arm/boot/dts/sama5d3.dtsi | 553 +-- + arch/arm/boot/dts/sama5d31ek.dts | 6 +- + arch/arm/boot/dts/sama5d33ek.dts | 4 +- + arch/arm/boot/dts/sama5d34ek.dts | 6 +- + arch/arm/boot/dts/sama5d35ek.dts | 4 +- + arch/arm/boot/dts/sama5d3xcm.dtsi | 4 +- + arch/arm/boot/dts/sama5d3xdm.dtsi | 2 +- + arch/arm/boot/dts/sama5d3xmb.dtsi | 26 +- + arch/arm/boot/dts/sh7372.dtsi | 5 + + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 86 + + arch/arm/boot/dts/sh73a0.dtsi | 18 +- + arch/arm/boot/dts/snowball.dts | 93 +- + arch/arm/boot/dts/socfpga.dtsi | 217 +- + arch/arm/boot/dts/socfpga_cyclone5.dts | 13 + + arch/arm/boot/dts/socfpga_vt.dts | 5 + + arch/arm/boot/dts/spear13xx.dtsi | 2 + + arch/arm/boot/dts/spear3xx.dtsi | 8 +- + arch/arm/boot/dts/spear600.dtsi | 8 +- + arch/arm/boot/dts/st-pincfg.h | 71 + + arch/arm/boot/dts/ste-nomadik-s8815.dts | 69 + + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 574 ++- + arch/arm/boot/dts/ste-u300.dts | 473 +++ + arch/arm/boot/dts/stih415-b2000.dts | 15 + + arch/arm/boot/dts/stih415-b2020.dts | 15 + + arch/arm/boot/dts/stih415-clock.dtsi | 38 + + arch/arm/boot/dts/stih415-pinctrl.dtsi | 268 ++ + arch/arm/boot/dts/stih415.dtsi | 87 + + arch/arm/boot/dts/stih416-b2000.dts | 16 + + arch/arm/boot/dts/stih416-b2020.dts | 16 + + arch/arm/boot/dts/stih416-clock.dtsi | 41 + + arch/arm/boot/dts/stih416-pinctrl.dtsi | 295 ++ + arch/arm/boot/dts/stih416.dtsi | 96 + + arch/arm/boot/dts/stih41x-b2000.dtsi | 41 + + arch/arm/boot/dts/stih41x-b2020.dtsi | 42 + + arch/arm/boot/dts/stih41x.dtsi | 38 + + arch/arm/boot/dts/stuib.dtsi | 26 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 12 + + arch/arm/boot/dts/sun4i-a10.dtsi | 54 + + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 76 + + arch/arm/boot/dts/sun5i-a10s.dtsi | 286 ++ + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 18 + + arch/arm/boot/dts/sun5i-a13.dtsi | 89 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 71 +- + arch/arm/boot/dts/tegra114-pluto.dts | 2 +- + arch/arm/boot/dts/tegra114.dtsi | 277 +- + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 27 +- + arch/arm/boot/dts/tegra20-harmony.dts | 56 +- + arch/arm/boot/dts/tegra20-iris-512.dts | 4 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 12 +- + arch/arm/boot/dts/tegra20-paz00.dts | 37 +- + arch/arm/boot/dts/tegra20-plutux.dts | 12 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 47 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 11 +- + arch/arm/boot/dts/tegra20-tec.dts | 13 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 25 +- + arch/arm/boot/dts/tegra20-ventana.dts | 49 +- + arch/arm/boot/dts/tegra20-whistler.dts | 19 +- + arch/arm/boot/dts/tegra20.dtsi | 258 +- + arch/arm/boot/dts/tegra30-beaver.dts | 68 +- + arch/arm/boot/dts/tegra30-cardhu-a02.dts | 16 +- + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 18 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 47 +- + arch/arm/boot/dts/tegra30.dtsi | 288 +- + arch/arm/boot/dts/tny_a9260.dts | 4 +- + arch/arm/boot/dts/tny_a9263.dts | 4 +- + arch/arm/boot/dts/tny_a9g20.dts | 4 +- + arch/arm/boot/dts/twl4030_omap3.dtsi | 25 + + arch/arm/boot/dts/usb_a9260.dts | 13 +- + arch/arm/boot/dts/usb_a9260_common.dtsi | 6 +- + arch/arm/boot/dts/usb_a9263.dts | 22 +- + arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi | 22 +- + arch/arm/boot/dts/usb_a9g20.dts | 18 +- + arch/arm/boot/dts/usb_a9g20_common.dtsi | 27 + + arch/arm/boot/dts/usb_a9g20_lpw.dts | 31 + + arch/arm/boot/dts/vf610-pinfunc.h | 810 ++++ + arch/arm/boot/dts/vf610-twr.dts | 57 + + arch/arm/boot/dts/vf610.dtsi | 464 +++ + arch/arm/boot/dts/vt8500-bv07.dts | 4 + + arch/arm/boot/dts/vt8500.dtsi | 29 +- + arch/arm/boot/dts/wm8505-ref.dts | 4 + + arch/arm/boot/dts/wm8505.dtsi | 84 +- + arch/arm/boot/dts/wm8650-mid.dts | 3 + + arch/arm/boot/dts/wm8650.dtsi | 79 +- + arch/arm/boot/dts/wm8750-apc8750.dts | 30 + + arch/arm/boot/dts/wm8750.dtsi | 347 ++ + arch/arm/boot/dts/wm8850-w70v2.dts | 4 + + arch/arm/boot/dts/wm8850.dtsi | 94 +- + arch/arm/boot/dts/zynq-7000.dtsi | 73 +- + arch/arm/boot/dts/zynq-zc702.dts | 6 +- + arch/arm/boot/dts/zynq-zc706.dts | 35 + + arch/arm/boot/dts/zynq-zed.dts | 35 + + arch/arm/common/Kconfig | 3 + + arch/arm/common/Makefile | 1 + + arch/arm/{mach-davinci/dma.c => common/edma.c} | 368 +- + arch/arm/configs/ap4evb_defconfig | 56 - + arch/arm/configs/armadillo800eva_defconfig | 2 +- + arch/arm/configs/at91_dt_defconfig | 57 +- + arch/arm/configs/at91rm9200_defconfig | 219 +- + ...am9g20_defconfig => at91sam9260_9g20_defconfig} | 66 +- + arch/arm/configs/at91sam9260_defconfig | 91 - + ...am9261_defconfig => at91sam9261_9g10_defconfig} | 19 +- + arch/arm/configs/at91sam9263_defconfig | 40 +- + arch/arm/configs/at91sam9g45_defconfig | 94 +- + arch/arm/configs/bcm2835_defconfig | 19 +- + arch/arm/configs/bockw_defconfig | 27 +- + arch/arm/configs/bonito_defconfig | 72 - + arch/arm/configs/clps711x_defconfig | 8 +- + arch/arm/configs/exynos_defconfig | 3 + + arch/arm/configs/imx_v6_v7_defconfig | 10 + + arch/arm/configs/keystone_defconfig | 157 + + arch/arm/configs/kirkwood_defconfig | 10 +- + arch/arm/configs/kzm9g_defconfig | 3 + + arch/arm/configs/multi_v7_defconfig | 122 +- + arch/arm/configs/mvebu_defconfig | 6 +- + arch/arm/configs/nhk8815_defconfig | 6 + + arch/arm/configs/omap1_defconfig | 3 +- + arch/arm/configs/omap2plus_defconfig | 2 + + arch/arm/configs/sama5_defconfig | 35 +- + arch/arm/configs/tegra_defconfig | 23 +- + arch/arm/configs/u300_defconfig | 14 +- + arch/arm/include/asm/cp15.h | 14 + + arch/arm/include/asm/hardware/pci_v3.h | 186 - + arch/arm/include/asm/mach/pci.h | 17 +- + arch/arm/include/debug/imx-uart.h | 10 + + arch/arm/include/debug/keystone.S | 43 + + arch/arm/include/debug/mvebu.S | 5 + + arch/arm/include/debug/nspire.S | 28 + + arch/arm/include/debug/rockchip.S | 42 + + arch/arm/include/debug/sti.S | 61 + + .../mach/debug-macro.S => include/debug/u300.S} | 9 +- + arch/arm/kernel/bios32.c | 9 +- + arch/arm/mach-at91/Kconfig | 1 + + arch/arm/mach-at91/Kconfig.non_dt | 169 +- + arch/arm/mach-at91/Makefile | 6 - + arch/arm/mach-at91/at91rm9200.c | 8 +- + arch/arm/mach-at91/at91sam9260.c | 4 +- + arch/arm/mach-at91/at91sam9261.c | 4 +- + arch/arm/mach-at91/at91sam9263.c | 2 +- + arch/arm/mach-at91/at91sam9g45.c | 4 +- + arch/arm/mach-at91/at91sam9rl.c | 2 +- + arch/arm/mach-at91/at91sam9x5.c | 2 + + arch/arm/mach-at91/at91x40.c | 7 +- + arch/arm/mach-at91/board-dt-sama5.c | 3 +- + arch/arm/mach-at91/board-rm9200dk.c | 228 -- + arch/arm/mach-at91/board-sam9261ek.c | 28 +- + arch/arm/mach-at91/board-usb-a926x.c | 384 -- + arch/arm/mach-at91/clock.c | 30 +- + arch/arm/mach-at91/cpuidle.c | 2 +- + arch/arm/mach-at91/generic.h | 2 +- + arch/arm/mach-at91/include/mach/at91_pmc.h | 3 + + arch/arm/mach-at91/irq.c | 9 +- + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-at91/setup.c | 4 +- + arch/arm/mach-at91/soc.h | 1 + + arch/arm/mach-bcm/board_bcm.c | 2 - + arch/arm/mach-clps711x/Kconfig | 3 +- + arch/arm/mach-clps711x/Makefile | 5 +- + arch/arm/mach-clps711x/board-autcpu12.c | 133 +- + arch/arm/mach-clps711x/board-cdb89712.c | 3 + + arch/arm/mach-clps711x/board-clep7312.c | 1 + + arch/arm/mach-clps711x/board-edb7211.c | 34 +- + arch/arm/mach-clps711x/board-fortunet.c | 1 + + arch/arm/mach-clps711x/board-p720t.c | 254 +- + arch/arm/mach-clps711x/common.c | 89 +- + arch/arm/mach-clps711x/common.h | 1 + + arch/arm/mach-clps711x/devices.c | 68 + + arch/arm/mach-clps711x/devices.h | 12 + + arch/arm/mach-clps711x/include/mach/autcpu12.h | 59 - + arch/arm/mach-clps711x/include/mach/clps711x.h | 88 +- + arch/arm/mach-clps711x/include/mach/hardware.h | 7 - + arch/arm/mach-clps711x/include/mach/memory.h | 41 - + arch/arm/mach-clps711x/include/mach/syspld.h | 116 - + arch/arm/mach-davinci/Makefile | 2 +- + arch/arm/mach-davinci/board-sffsdr.c | 1 - + arch/arm/mach-davinci/board-tnetv107x-evm.c | 2 +- + arch/arm/mach-davinci/davinci.h | 30 +- + arch/arm/mach-davinci/devices-da8xx.c | 8 +- + arch/arm/mach-davinci/devices-tnetv107x.c | 6 +- + arch/arm/mach-davinci/devices.c | 6 +- + arch/arm/mach-davinci/dm355.c | 6 +- + arch/arm/mach-davinci/dm365.c | 6 +- + arch/arm/mach-davinci/dm644x.c | 6 +- + arch/arm/mach-davinci/dm646x.c | 6 +- + arch/arm/mach-davinci/include/mach/cp_intc.h | 4 +- + arch/arm/mach-davinci/include/mach/da8xx.h | 18 +- + arch/arm/mach-davinci/include/mach/tnetv107x.h | 6 +- + arch/arm/mach-dove/Kconfig | 3 +- + arch/arm/mach-dove/board-dt.c | 3 +- + arch/arm/mach-dove/common.c | 1 - + arch/arm/mach-exynos/Kconfig | 362 +- + arch/arm/mach-exynos/Makefile | 33 - + arch/arm/mach-exynos/common.c | 565 +-- + arch/arm/mach-exynos/common.h | 4 +- + arch/arm/mach-exynos/dev-ahci.c | 255 -- + arch/arm/mach-exynos/dev-audio.c | 254 -- + arch/arm/mach-exynos/dev-ohci.c | 52 - + arch/arm/mach-exynos/dev-uart.c | 55 - + arch/arm/mach-exynos/dma.c | 322 -- + arch/arm/mach-exynos/firmware.c | 22 +- + arch/arm/mach-exynos/include/mach/gpio.h | 289 -- + arch/arm/mach-exynos/include/mach/irqs.h | 476 --- + arch/arm/mach-exynos/include/mach/map.h | 214 -- + arch/arm/mach-exynos/include/mach/pm-core.h | 12 +- + arch/arm/mach-exynos/include/mach/regs-gpio.h | 40 - + arch/arm/mach-exynos/include/mach/regs-usb-phy.h | 74 - + arch/arm/mach-exynos/include/mach/uncompress.h | 10 +- + arch/arm/mach-exynos/mach-armlex4210.c | 207 - + arch/arm/mach-exynos/mach-exynos4-dt.c | 8 +- + arch/arm/mach-exynos/mach-exynos5-dt.c | 9 +- + arch/arm/mach-exynos/mach-nuri.c | 1388 ------- + arch/arm/mach-exynos/mach-origen.c | 823 ---- + arch/arm/mach-exynos/mach-smdk4x12.c | 396 -- + arch/arm/mach-exynos/mach-smdkv310.c | 444 --- + arch/arm/mach-exynos/mach-universal_c210.c | 1155 ------ + arch/arm/mach-exynos/platsmp.c | 14 +- + arch/arm/mach-exynos/pm.c | 1 - + arch/arm/mach-exynos/pm_domains.c | 101 +- + arch/arm/mach-exynos/setup-fimc.c | 44 - + arch/arm/mach-exynos/setup-fimd0.c | 43 - + arch/arm/mach-exynos/setup-i2c0.c | 29 - + arch/arm/mach-exynos/setup-i2c1.c | 23 - + arch/arm/mach-exynos/setup-i2c2.c | 23 - + arch/arm/mach-exynos/setup-i2c3.c | 23 - + arch/arm/mach-exynos/setup-i2c4.c | 23 - + arch/arm/mach-exynos/setup-i2c5.c | 23 - + arch/arm/mach-exynos/setup-i2c6.c | 23 - + arch/arm/mach-exynos/setup-i2c7.c | 23 - + arch/arm/mach-exynos/setup-keypad.c | 36 - + arch/arm/mach-exynos/setup-sdhci-gpio.c | 152 - + arch/arm/mach-exynos/setup-spi.c | 45 - + arch/arm/mach-exynos/setup-usb-phy.c | 223 -- + arch/arm/mach-highbank/highbank.c | 1 - + arch/arm/mach-imx/Kconfig | 65 +- + arch/arm/mach-imx/Makefile | 4 +- + arch/arm/mach-imx/clk-imx51-imx53.c | 75 +- + arch/arm/mach-imx/clk-imx6q.c | 48 +- + arch/arm/mach-imx/clk-imx6sl.c | 267 ++ + arch/arm/mach-imx/clk-pllv3.c | 10 - + arch/arm/mach-imx/clk-vf610.c | 319 ++ + arch/arm/mach-imx/clk.c | 35 + + arch/arm/mach-imx/clk.h | 4 +- + arch/arm/mach-imx/common.h | 2 +- + arch/arm/mach-imx/hardware.h | 1 + + arch/arm/mach-imx/imx25-dt.c | 2 + + arch/arm/mach-imx/imx27-dt.c | 2 + + arch/arm/mach-imx/imx31-dt.c | 2 + + arch/arm/mach-imx/imx51-dt.c | 2 + + arch/arm/mach-imx/irq-common.c | 1 + + arch/arm/mach-imx/mach-imx53.c | 17 +- + arch/arm/mach-imx/mach-imx6q.c | 81 +- + arch/arm/mach-imx/mach-imx6sl.c | 52 + + arch/arm/mach-imx/mach-pca100.c | 4 +- + arch/arm/mach-imx/mach-vf610.c | 48 + + arch/arm/mach-imx/mm-imx1.c | 2 +- + arch/arm/mach-imx/mm-imx21.c | 2 +- + arch/arm/mach-imx/mm-imx25.c | 2 +- + arch/arm/mach-imx/mm-imx27.c | 2 +- + arch/arm/mach-imx/mm-imx3.c | 4 +- + arch/arm/mach-imx/mm-imx5.c | 3 +- + arch/arm/mach-imx/system.c | 47 +- + arch/arm/mach-imx/ulpi.c | 118 - + arch/arm/mach-imx/ulpi.h | 11 +- + arch/arm/mach-integrator/Makefile | 2 +- + arch/arm/mach-integrator/include/mach/platform.h | 23 - + arch/arm/mach-integrator/integrator_ap.c | 31 +- + arch/arm/mach-integrator/pci.c | 113 - + arch/arm/mach-integrator/pci_v3.c | 564 ++- + arch/arm/mach-integrator/pci_v3.h | 2 + + arch/arm/mach-keystone/Kconfig | 15 + + arch/arm/mach-keystone/Makefile | 6 + + arch/arm/mach-keystone/Makefile.boot | 1 + + arch/arm/mach-keystone/keystone.c | 75 + + arch/arm/mach-keystone/keystone.h | 23 + + arch/arm/mach-keystone/platsmp.c | 43 + + arch/arm/mach-keystone/smc.S | 29 + + arch/arm/mach-kirkwood/Kconfig | 33 +- + arch/arm/mach-kirkwood/Makefile | 4 +- + arch/arm/mach-kirkwood/board-db88f628x-bp.c | 24 + + arch/arm/mach-kirkwood/board-dt.c | 22 +- + arch/arm/mach-kirkwood/board-iconnect.c | 8 - + arch/arm/mach-kirkwood/board-lsxl.c | 16 - + arch/arm/mach-kirkwood/board-mplcec4.c | 1 - + arch/arm/mach-kirkwood/board-nsa310.c | 25 - + arch/arm/mach-kirkwood/board-readynas.c | 1 - + arch/arm/mach-kirkwood/board-sheevaplug.c | 27 + + arch/arm/mach-kirkwood/board-ts219.c | 3 - + arch/arm/mach-kirkwood/common.c | 47 +- + arch/arm/mach-kirkwood/common.h | 13 + + arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 108 - + arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 2 + + arch/arm/mach-kirkwood/pcie.c | 22 + + arch/arm/mach-msm/Kconfig | 13 +- + arch/arm/mach-msm/Makefile | 16 +- + arch/arm/mach-msm/board-dt-8660.c | 2 - + arch/arm/mach-msm/board-dt-8960.c | 2 - + arch/arm/mach-msm/board-halibut.c | 2 +- + arch/arm/mach-msm/board-msm7x30.c | 2 +- + arch/arm/mach-msm/board-qsd8x50.c | 2 +- + arch/arm/mach-msm/board-trout-panel.c | 19 +- + arch/arm/mach-msm/board-trout.c | 3 +- + arch/arm/mach-msm/clock-7x30.h | 155 - + arch/arm/mach-msm/clock-debug.c | 130 - + arch/arm/mach-msm/clock-pcom.c | 149 +- + arch/arm/mach-msm/clock-pcom.h | 31 +- + arch/arm/mach-msm/clock.c | 166 +- + arch/arm/mach-msm/clock.h | 51 +- + arch/arm/mach-msm/core.h | 2 - + arch/arm/mach-msm/devices-msm7x00.c | 12 +- + arch/arm/mach-msm/devices-msm7x30.c | 15 +- + arch/arm/mach-msm/devices-qsd8x50.c | 12 +- + arch/arm/mach-msm/devices.h | 15 +- + arch/arm/mach-msm/dma.c | 5 +- + arch/arm/mach-msm/gpiomux-8x60.c | 19 - + arch/arm/mach-msm/gpiomux-v2.c | 25 - + arch/arm/mach-msm/gpiomux-v2.h | 61 - + arch/arm/mach-msm/gpiomux.c | 15 + + arch/arm/mach-msm/gpiomux.h | 5 - + arch/arm/mach-msm/include/mach/board.h | 5 - + arch/arm/mach-msm/include/mach/clk.h | 9 - + arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 7 - + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 6 - + arch/arm/mach-msm/include/mach/msm_iomap.h | 2 - + arch/arm/mach-msm/io.c | 4 - + arch/arm/mach-mvebu/Kconfig | 7 +- + arch/arm/mach-mvebu/armada-370-xp.c | 57 +- + arch/arm/mach-mvebu/armada-370-xp.h | 10 - + arch/arm/mach-mvebu/coherency.c | 45 +- + arch/arm/mach-mvebu/coherency.h | 4 - + arch/arm/mach-mvebu/common.h | 2 + + arch/arm/mach-mvebu/headsmp.S | 16 +- + arch/arm/mach-mvebu/platsmp.c | 10 +- + arch/arm/mach-mxs/Kconfig | 3 +- + arch/arm/mach-mxs/mach-mxs.c | 130 +- + arch/arm/mach-mxs/pm.h | 4 + + arch/arm/mach-nomadik/Kconfig | 1 + + arch/arm/mach-nomadik/cpu-8815.c | 75 +- + arch/arm/mach-nspire/Kconfig | 16 + + arch/arm/mach-nspire/Makefile | 2 + + arch/arm/mach-nspire/Makefile.boot | 0 + arch/arm/mach-nspire/clcd.c | 119 + + arch/arm/mach-nspire/clcd.h | 14 + + arch/arm/mach-nspire/mmio.h | 20 + + arch/arm/mach-nspire/nspire.c | 89 + + arch/arm/mach-omap1/Makefile | 4 - + arch/arm/mach-omap1/board-h2.c | 36 - + arch/arm/mach-omap1/board-nokia770.c | 10 + + arch/arm/mach-omap1/board-palmte.c | 31 - + arch/arm/mach-omap1/board-palmtt.c | 30 - + arch/arm/mach-omap1/board-palmz71.c | 31 - + arch/arm/mach-omap1/board-sx1.c | 36 - + arch/arm/mach-omap1/devices.c | 9 +- + arch/arm/mach-omap1/dma.c | 2 - + arch/arm/mach-omap1/dma.h | 42 - + arch/arm/mach-omap1/include/mach/irda.h | 33 - + arch/arm/mach-omap1/lcd_dma.c | 2 - + arch/arm/mach-omap1/mcbsp.c | 33 +- + arch/arm/mach-omap2/Kconfig | 31 +- + arch/arm/mach-omap2/Makefile | 26 +- + arch/arm/mach-omap2/am33xx.h | 1 + + arch/arm/mach-omap2/board-4430sdp.c | 765 ---- + arch/arm/mach-omap2/board-cm-t35.c | 3 +- + arch/arm/mach-omap2/board-devkit8000.c | 1 + + arch/arm/mach-omap2/board-flash.c | 3 + + arch/arm/mach-omap2/board-generic.c | 16 + + arch/arm/mach-omap2/board-ldp.c | 3 +- + arch/arm/mach-omap2/board-omap3evm.c | 4 + + arch/arm/mach-omap2/board-omap3pandora.c | 1 + + arch/arm/mach-omap2/board-omap4panda.c | 455 --- + arch/arm/mach-omap2/board-overo.c | 3 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 1 + + arch/arm/mach-omap2/cclock33xx_data.c | 79 +- + arch/arm/mach-omap2/cclock3xxx_data.c | 11 - + arch/arm/mach-omap2/clockdomain.h | 1 + + arch/arm/mach-omap2/clockdomains54xx_data.c | 464 +++ + arch/arm/mach-omap2/cm-regbits-54xx.h | 1737 +++++++++ + arch/arm/mach-omap2/cm1_44xx.h | 7 +- + arch/arm/mach-omap2/cm1_54xx.h | 213 ++ + arch/arm/mach-omap2/cm2_44xx.h | 7 +- + arch/arm/mach-omap2/cm2_54xx.h | 389 ++ + arch/arm/mach-omap2/cm33xx.h | 2 +- + arch/arm/mach-omap2/cm_44xx_54xx.h | 36 + + arch/arm/mach-omap2/common.h | 5 +- + arch/arm/mach-omap2/control.c | 1 + + arch/arm/mach-omap2/control.h | 12 + + arch/arm/mach-omap2/devices.c | 157 +- + arch/arm/mach-omap2/dma.h | 61 - + arch/arm/mach-omap2/gpmc-nand.c | 44 +- + arch/arm/mach-omap2/gpmc.c | 82 +- + arch/arm/mach-omap2/hsmmc.c | 103 +- + arch/arm/mach-omap2/id.c | 34 +- + arch/arm/mach-omap2/io.c | 26 +- + arch/arm/mach-omap2/mux.h | 3 - + arch/arm/mach-omap2/mux44xx.c | 1356 ------- + arch/arm/mach-omap2/mux44xx.h | 298 -- + arch/arm/mach-omap2/omap-headsmp.S | 8 +- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 69 +- + arch/arm/mach-omap2/omap-smp.c | 6 +- + arch/arm/mach-omap2/omap4-common.c | 16 - + arch/arm/mach-omap2/omap4-restart.c | 27 + + arch/arm/mach-omap2/omap_device.c | 9 +- + arch/arm/mach-omap2/omap_device.h | 10 - + arch/arm/mach-omap2/omap_hwmod.h | 1 + + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 14 + + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 13 + + .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 21 +- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 1077 +----- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 32 +- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1544 +------- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2150 +++++++++++ + arch/arm/mach-omap2/pm44xx.c | 58 +- + arch/arm/mach-omap2/powerdomain.c | 5 + + arch/arm/mach-omap2/powerdomain.h | 3 + + arch/arm/mach-omap2/powerdomains3xxx_data.c | 62 + + arch/arm/mach-omap2/powerdomains54xx_data.c | 331 ++ + arch/arm/mach-omap2/prcm-common.h | 11 + + arch/arm/mach-omap2/prcm44xx.h | 6 + + arch/arm/mach-omap2/prcm_mpu44xx.h | 14 +- + arch/arm/mach-omap2/prcm_mpu54xx.h | 87 + + arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h | 36 + + arch/arm/mach-omap2/prm-regbits-54xx.h | 2701 +++++++++++++ + arch/arm/mach-omap2/prm33xx.c | 7 + + arch/arm/mach-omap2/prm44xx.h | 33 +- + arch/arm/mach-omap2/prm44xx_54xx.h | 58 + + arch/arm/mach-omap2/prm54xx.h | 421 ++ + arch/arm/mach-omap2/scrm54xx.h | 231 ++ + arch/arm/mach-omap2/serial.c | 10 +- + arch/arm/mach-omap2/soc.h | 26 + + arch/arm/mach-omap2/sram.c | 3 + + arch/arm/mach-omap2/timer.c | 2 +- + arch/arm/mach-omap2/twl-common.c | 1 + + arch/arm/mach-omap2/usb-host.c | 300 +- + arch/arm/mach-omap2/usb-musb.c | 3 - + arch/arm/mach-omap2/voltage.h | 2 +- + arch/arm/mach-omap2/voltagedomains33xx_data.c | 43 - + arch/arm/mach-omap2/voltagedomains54xx_data.c | 92 + + arch/arm/mach-picoxcell/Kconfig | 1 - + arch/arm/mach-picoxcell/common.c | 10 - + arch/arm/mach-picoxcell/common.h | 17 - + arch/arm/mach-prima2/common.c | 21 +- + arch/arm/mach-prima2/pm.c | 2 +- + arch/arm/mach-rockchip/Kconfig | 16 + + arch/arm/mach-rockchip/Makefile | 1 + + arch/arm/mach-rockchip/rockchip.c | 52 + + arch/arm/mach-s3c24xx/Kconfig | 80 +- + arch/arm/mach-s3c24xx/Makefile | 7 +- + arch/arm/mach-s3c24xx/dma-s3c2412.c | 56 +- + arch/arm/mach-s3c24xx/dma-s3c2443.c | 3 +- + arch/arm/mach-s3c24xx/dma.c | 3 - + arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0 + arch/arm/mach-s3c24xx/include/mach/uncompress.h | 3 + + arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +- + arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 91 + + arch/arm/mach-s3c24xx/s3c2410.c | 3 +- + arch/arm/mach-s3c24xx/s3c244x.c | 3 +- + arch/arm/mach-s3c64xx/common.c | 8 +- + arch/arm/mach-s3c64xx/include/mach/uncompress.h | 3 + + arch/arm/mach-s5p64x0/common.c | 4 +- + arch/arm/mach-s5p64x0/include/mach/uncompress.h | 162 +- + arch/arm/mach-s5pc100/common.c | 3 +- + arch/arm/mach-s5pc100/include/mach/uncompress.h | 2 + + arch/arm/mach-s5pv210/include/mach/uncompress.h | 2 + + arch/arm/mach-shmobile/Kconfig | 75 +- + arch/arm/mach-shmobile/Makefile | 3 +- + arch/arm/mach-shmobile/Makefile.boot | 18 +- + arch/arm/mach-shmobile/board-ap4evb.c | 1332 ------- + arch/arm/mach-shmobile/board-ape6evm.c | 15 + + .../board-armadillo800eva-reference.c | 213 ++ + arch/arm/mach-shmobile/board-armadillo800eva.c | 116 +- + arch/arm/mach-shmobile/board-bockw.c | 181 +- + arch/arm/mach-shmobile/board-bonito.c | 495 --- + arch/arm/mach-shmobile/board-kzm9d.c | 2 +- + arch/arm/mach-shmobile/board-kzm9g-reference.c | 1 - + arch/arm/mach-shmobile/board-kzm9g.c | 204 +- + arch/arm/mach-shmobile/board-lager.c | 64 + + arch/arm/mach-shmobile/board-mackerel.c | 171 +- + arch/arm/mach-shmobile/board-marzen.c | 191 +- + arch/arm/mach-shmobile/clock-r8a73a4.c | 387 +- + arch/arm/mach-shmobile/clock-r8a7740.c | 11 +- + arch/arm/mach-shmobile/clock-r8a7778.c | 183 +- + arch/arm/mach-shmobile/clock-r8a7779.c | 4 +- + arch/arm/mach-shmobile/clock-r8a7790.c | 255 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 111 +- + arch/arm/mach-shmobile/headsmp-scu.S | 29 +- + arch/arm/mach-shmobile/headsmp.S | 13 +- + arch/arm/mach-shmobile/include/mach/clock.h | 8 +- + arch/arm/mach-shmobile/include/mach/common.h | 6 +- + .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 93 - + arch/arm/mach-shmobile/include/mach/irqs.h | 5 + + arch/arm/mach-shmobile/include/mach/memory.h | 7 - + arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h | 29 - + arch/arm/mach-shmobile/include/mach/mmc.h | 4 +- + arch/arm/mach-shmobile/include/mach/r8a7740.h | 491 +-- + arch/arm/mach-shmobile/include/mach/r8a7778.h | 11 + + arch/arm/mach-shmobile/include/mach/r8a7779.h | 3 + + arch/arm/mach-shmobile/include/mach/sh7372.h | 393 +- + arch/arm/mach-shmobile/include/mach/zboot.h | 6 +- + arch/arm/mach-shmobile/intc-r8a7740.c | 24 +- + arch/arm/mach-shmobile/pm-sh7372.c | 3 + + arch/arm/mach-shmobile/setup-r8a7740.c | 78 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 262 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 215 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 60 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 95 +- + arch/arm/mach-shmobile/sleep-sh7372.S | 5 +- + arch/arm/mach-shmobile/smp-emev2.c | 6 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 6 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 6 +- + arch/arm/mach-socfpga/Kconfig | 2 +- + arch/arm/mach-socfpga/socfpga.c | 2 - + arch/arm/mach-spear/spear1310.c | 2 - + arch/arm/mach-spear/spear1340.c | 2 - + arch/arm/mach-spear/spear300.c | 2 - + arch/arm/mach-spear/spear310.c | 2 - + arch/arm/mach-spear/spear320.c | 2 - + arch/arm/mach-spear/spear6xx.c | 2 - + arch/arm/mach-sti/Kconfig | 45 + + arch/arm/mach-sti/Makefile | 2 + + arch/arm/mach-sti/board-dt.c | 48 + + arch/arm/mach-sti/headsmp.S | 44 + + arch/arm/mach-sti/platsmp.c | 117 + + arch/arm/mach-sti/smp.h | 17 + + arch/arm/mach-sunxi/sunxi.c | 20 +- + arch/arm/mach-sunxi/sunxi.h | 20 - + arch/arm/mach-tegra/Makefile | 1 + + arch/arm/mach-tegra/common.c | 2 + + arch/arm/mach-tegra/common.h | 1 + + arch/arm/mach-tegra/cpuidle-tegra20.c | 10 +- + arch/arm/mach-tegra/cpuidle-tegra30.c | 10 +- + arch/arm/mach-tegra/cpuidle.c | 19 +- + arch/arm/mach-tegra/cpuidle.h | 15 +- + arch/arm/mach-tegra/flowctrl.h | 1 + + arch/arm/mach-tegra/fuse.h | 22 +- + arch/arm/mach-tegra/hotplug.c | 13 + + arch/arm/mach-tegra/platsmp.c | 26 +- + arch/arm/mach-tegra/pm.c | 25 +- + arch/arm/mach-tegra/pm.h | 4 +- + arch/arm/mach-tegra/pmc.c | 2 +- + arch/arm/mach-tegra/reset-handler.S | 51 +- + arch/arm/mach-tegra/sleep-tegra30.S | 30 +- + arch/arm/mach-tegra/sleep.S | 8 +- + arch/arm/mach-tegra/sleep.h | 35 +- + arch/arm/mach-tegra/tegra2_emc.c | 2 +- + arch/arm/mach-u300/Kconfig | 32 +- + arch/arm/mach-u300/Makefile | 2 - + arch/arm/mach-u300/core.c | 759 ++-- + arch/arm/mach-u300/dummyspichip.c | 20 +- + arch/arm/mach-u300/i2c.c | 285 -- + arch/arm/mach-u300/i2c.h | 23 - + arch/arm/mach-u300/include/mach/hardware.h | 5 - + arch/arm/mach-u300/include/mach/irqs.h | 80 - + arch/arm/mach-u300/include/mach/syscon.h | 592 --- + arch/arm/mach-u300/include/mach/timex.h | 17 - + arch/arm/mach-u300/include/mach/u300-regs.h | 165 - + arch/arm/mach-u300/include/mach/uncompress.h | 45 - + arch/arm/mach-u300/regulator.c | 67 +- + arch/arm/mach-u300/spi.c | 102 - + arch/arm/mach-u300/spi.h | 26 - + arch/arm/mach-u300/timer.c | 113 +- + arch/arm/mach-u300/timer.h | 1 - + arch/arm/mach-u300/u300-gpio.h | 70 - + arch/arm/mach-ux500/board-mop500-audio.c | 68 +- + arch/arm/mach-ux500/board-mop500-pins.c | 283 +- + arch/arm/mach-ux500/board-mop500-regulators.c | 1 - + arch/arm/mach-ux500/board-mop500-sdi.c | 90 +- + arch/arm/mach-ux500/board-mop500.c | 94 +- + arch/arm/mach-ux500/board-mop500.h | 2 +- + arch/arm/mach-ux500/cache-l2x0.c | 3 +- + arch/arm/mach-ux500/cpu-db8500.c | 92 +- + arch/arm/mach-ux500/db8500-regs.h | 3 +- + arch/arm/mach-ux500/devices-db8500.c | 125 +- + arch/arm/mach-ux500/id.c | 6 +- + arch/arm/mach-ux500/ste-dma40-db8500.h | 193 +- + arch/arm/mach-ux500/usb.c | 47 +- + arch/arm/mach-vexpress/Kconfig | 9 + + arch/arm/mach-vexpress/Makefile | 1 + + arch/arm/mach-vexpress/core.h | 2 + + arch/arm/mach-vexpress/dcscb.c | 253 ++ + arch/arm/mach-vexpress/dcscb_setup.S | 38 + + arch/arm/mach-vexpress/platsmp.c | 20 + + arch/arm/mach-vexpress/v2m.c | 3 +- + arch/arm/mach-virt/virt.c | 2 - + arch/arm/mach-vt8500/vt8500.c | 2 - + arch/arm/mach-zynq/common.c | 3 - + arch/arm/mach-zynq/platsmp.c | 52 +- + arch/arm/mach-zynq/slcr.c | 2 +- + arch/arm/mm/mmu.c | 2 + + arch/arm/plat-omap/Kconfig | 16 - + arch/arm/plat-omap/Makefile | 3 - + arch/arm/plat-omap/dma.c | 11 +- + arch/arm/plat-samsung/Kconfig | 53 +- + arch/arm/plat-samsung/Makefile | 12 +- + arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 +- + arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +- + arch/arm/plat-samsung/include/plat/cpu.h | 8 + + arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 5 - + arch/arm/plat-samsung/include/plat/pm.h | 5 + + arch/arm/plat-samsung/include/plat/regs-watchdog.h | 41 - + arch/arm/plat-samsung/include/plat/uncompress.h | 21 +- + .../arm/plat-samsung/include/plat/watchdog-reset.h | 38 +- + arch/arm/plat-samsung/init.c | 8 +- + arch/arm/plat-samsung/pm-gpio.c | 5 +- + arch/arm/plat-samsung/pm.c | 8 +- + arch/arm/plat-samsung/s5p-dev-mfc.c | 11 +- + arch/arm/plat-samsung/watchdog-reset.c | 97 + + drivers/bus/Kconfig | 16 + + drivers/bus/Makefile | 3 + + drivers/bus/arm-cci.c | 533 +++ + drivers/bus/imx-weim.c | 138 + + drivers/bus/mvebu-mbus.c | 8 +- + drivers/bus/omap-ocp2scp.c | 60 - + drivers/clk/Makefile | 4 +- + drivers/clk/clk-nomadik.c | 576 ++- + drivers/clk/clk-u300.c | 718 +++- + drivers/clk/clk-zynq.c | 378 -- + drivers/clk/mvebu/Kconfig | 25 +- + drivers/clk/mvebu/Makefile | 8 +- + drivers/clk/mvebu/armada-370.c | 176 + + drivers/clk/mvebu/armada-xp.c | 210 + + drivers/clk/mvebu/clk-core.c | 675 ---- + drivers/clk/mvebu/clk-core.h | 18 - + drivers/clk/mvebu/clk-gating-ctrl.c | 250 -- + drivers/clk/mvebu/clk-gating-ctrl.h | 22 - + drivers/clk/mvebu/clk.c | 23 - + drivers/clk/mvebu/common.c | 163 + + drivers/clk/mvebu/common.h | 48 + + drivers/clk/mvebu/dove.c | 194 + + drivers/clk/mvebu/kirkwood.c | 247 ++ + drivers/clk/samsung/Makefile | 2 + + drivers/clk/samsung/clk-exynos-audss.c | 133 + + drivers/clk/samsung/clk-exynos4.c | 9 +- + drivers/clk/samsung/clk-exynos5250.c | 5 +- + drivers/clk/samsung/clk-exynos5420.c | 762 ++++ + drivers/clk/socfpga/clk.c | 194 +- + drivers/clk/tegra/clk-tegra114.c | 23 +- + drivers/clk/zynq/Makefile | 3 + + drivers/clk/zynq/clkc.c | 533 +++ + drivers/clk/zynq/pll.c | 235 ++ + drivers/clocksource/Kconfig | 2 + + drivers/clocksource/bcm_kona_timer.c | 15 +- + drivers/clocksource/cadence_ttc_timer.c | 23 +- + drivers/clocksource/clksrc-dbx500-prcmu.c | 11 +- + drivers/clocksource/dw_apb_timer_of.c | 95 +- + drivers/clocksource/exynos_mct.c | 35 +- + drivers/clocksource/nomadik-mtu.c | 60 +- + drivers/cpufreq/Kconfig.arm | 58 + + drivers/cpufreq/Makefile | 5 + + .../cpufreq/s3c2410-cpufreq.c | 0 + .../cpufreq/s3c2412-cpufreq.c | 3 +- + .../cpufreq/s3c2440-cpufreq.c | 0 + .../cpufreq/s3c24xx-cpufreq-debugfs.c | 0 + .../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0 + drivers/cpuidle/Kconfig | 1 + + drivers/cpuidle/cpuidle-calxeda.c | 14 - + drivers/crypto/ux500/cryp/cryp.c | 4 +- + drivers/crypto/ux500/cryp/cryp.h | 7 +- + drivers/crypto/ux500/cryp/cryp_core.c | 63 +- + drivers/crypto/ux500/hash/hash_alg.h | 5 +- + drivers/crypto/ux500/hash/hash_core.c | 63 +- + drivers/dma/Kconfig | 2 +- + drivers/dma/coh901318.c | 43 + + drivers/dma/edma.c | 2 +- + drivers/dma/ste_dma40.c | 533 +-- + drivers/dma/ste_dma40_ll.c | 189 +- + drivers/dma/ste_dma40_ll.h | 3 +- + drivers/gpio/Kconfig | 14 +- + drivers/gpio/Makefile | 2 +- + drivers/gpio/gpio-clps711x.c | 236 +- + drivers/gpio/gpio-msm-v2.c | 195 +- + drivers/gpio/gpio-rcar.c | 91 +- + drivers/gpio/gpio-samsung.c | 67 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-stu300.c | 16 +- + drivers/iommu/msm_iommu_dev.c | 20 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 9 +- + drivers/irqchip/irq-renesas-irqc.c | 4 +- + drivers/mailbox/Kconfig | 34 + + drivers/mailbox/Makefile | 6 + + .../mailbox.c => drivers/mailbox/mailbox-omap1.c | 12 +- + .../mailbox.c => drivers/mailbox/mailbox-omap2.c | 276 +- + .../mailbox.c => drivers/mailbox/omap-mailbox.c | 54 +- + .../plat/mailbox.h => drivers/mailbox/omap-mbox.h | 70 +- + drivers/media/platform/Kconfig | 6 +- + drivers/media/platform/exynos4-is/Kconfig | 3 +- + drivers/media/platform/s5p-tv/Kconfig | 2 +- + drivers/mfd/syscon.c | 3 + + drivers/mmc/host/davinci_mmc.c | 1 + + drivers/mmc/host/msm_sdcc.c | 14 +- + drivers/mtd/maps/Kconfig | 7 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/autcpu12-nvram.c | 129 - + drivers/mtd/nand/Kconfig | 2 +- + drivers/of/address.c | 67 + + drivers/of/of_pci.c | 59 +- + drivers/pci/Kconfig | 2 + + drivers/pci/Makefile | 3 + + drivers/pci/host/Kconfig | 17 + + drivers/pci/host/Makefile | 2 + + drivers/pci/host/pci-mvebu.c | 914 +++++ + drivers/pci/host/pcie-designware.c | 1057 ++++++ + drivers/pinctrl/Kconfig | 10 +- + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-coh901.c | 35 +- + drivers/pinctrl/pinctrl-exynos.c | 118 + + drivers/pinctrl/pinctrl-nomadik.c | 6 +- + drivers/pinctrl/pinctrl-s3c24xx.c | 651 ++++ + drivers/pinctrl/pinctrl-samsung.c | 12 + + drivers/pinctrl/pinctrl-samsung.h | 5 + + drivers/pinctrl/pinctrl-u300.c | 7 + + drivers/pinctrl/sh-pfc/Kconfig | 13 +- + drivers/pinctrl/sh-pfc/Makefile | 2 + + drivers/pinctrl/sh-pfc/core.c | 22 +- + drivers/pinctrl/sh-pfc/core.h | 4 + + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 198 + + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 1923 +++++++--- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 2783 ++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 493 ++- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 4014 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-sh7372.c | 1652 ++++++-- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 742 ++-- + drivers/pinctrl/sh-pfc/sh_pfc.h | 4 +- + drivers/regulator/ab8500.c | 8 +- + drivers/remoteproc/Kconfig | 3 +- + drivers/remoteproc/omap_remoteproc.c | 2 +- + drivers/rtc/rtc-coh901331.c | 6 + + drivers/scsi/nsp32.c | 2 +- + drivers/spi/Kconfig | 2 +- + drivers/staging/tidspbridge/Kconfig | 3 +- + .../tidspbridge/include/dspbridge/host_os.h | 2 +- + drivers/thermal/exynos_thermal.c | 3 +- + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/msm_serial.c | 35 +- + drivers/tty/serial/samsung.c | 4 +- + drivers/tty/serial/sh-sci.c | 104 +- + drivers/tty/serial/xilinx_uartps.c | 85 +- + drivers/usb/gadget/Kconfig | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 264 +- + drivers/usb/gadget/atmel_usba_udc.h | 2 + + drivers/usb/host/Kconfig | 2 +- + drivers/usb/host/ehci-platform.c | 6 + + drivers/usb/musb/ux500.c | 61 +- + drivers/usb/musb/ux500_dma.c | 59 +- + drivers/usb/phy/Kconfig | 10 +- + drivers/usb/phy/phy-msm-usb.c | 38 +- + drivers/usb/phy/phy-rcar-usb.c | 128 +- + drivers/watchdog/coh901327_wdt.c | 12 +- + drivers/watchdog/s3c2410_wdt.c | 17 +- + include/dt-bindings/clk/exynos-audss-clk.h | 25 + + include/dt-bindings/clock/imx6sl-clock.h | 148 + + include/dt-bindings/clock/tegra114-car.h | 342 ++ + include/dt-bindings/clock/tegra20-car.h | 158 + + include/dt-bindings/clock/tegra30-car.h | 265 ++ + include/dt-bindings/clock/vf610-clock.h | 163 + + include/dt-bindings/gpio/tegra-gpio.h | 50 + + include/dt-bindings/pinctrl/am33xx.h | 42 + + include/dt-bindings/pinctrl/at91.h | 35 + + include/dt-bindings/pinctrl/omap.h | 55 + + include/linux/arm-cci.h | 61 + + include/linux/clk/mvebu.h | 22 - + include/linux/clk/zynq.h | 8 +- + include/linux/dw_apb_timer.h | 1 - + include/linux/irqchip.h | 4 + + include/linux/mfd/davinci_voicecodec.h | 2 +- + include/linux/mfd/syscon/clps711x.h | 94 + + include/linux/of_address.h | 48 + + include/linux/of_pci.h | 2 + + include/linux/omap-mailbox.h | 29 + + include/linux/platform_data/dma-ste-dma40.h | 41 +- + .../mach => include/linux/platform_data}/edma.h | 94 +- + include/linux/platform_data/gpio-rcar.h | 5 +- + include/linux/platform_data/mailbox-omap.h | 58 + + include/linux/platform_data/omap_ocp2scp.h | 31 - + include/linux/platform_data/pinctrl-coh901.h | 22 - + include/linux/platform_data/spi-davinci.h | 2 +- + include/linux/platform_data/usb-musb-ux500.h | 5 +- + include/linux/platform_data/usb-rcar-phy.h | 28 + + include/linux/serial_sci.h | 12 +- + include/linux/usb/ehci_pdriver.h | 4 + + include/uapi/linux/serial_core.h | 3 + + lib/build_OID_registry | 2 - + sound/soc/davinci/davinci-evm.c | 1 + + sound/soc/davinci/davinci-pcm.c | 1 + + sound/soc/davinci/davinci-pcm.h | 2 +- + sound/soc/ux500/ux500_pcm.c | 10 +- + 1068 files changed, 60978 insertions(+), 34355 deletions(-) + create mode 100644 Documentation/arm/sti/overview.txt + create mode 100644 Documentation/arm/sti/stih415-overview.txt + create mode 100644 Documentation/arm/sti/stih416-overview.txt + create mode 100644 Documentation/devicetree/bindings/arm/cci.txt + create mode 100644 Documentation/devicetree/bindings/arm/keystone/keystone.txt + create mode 100644 Documentation/devicetree/bindings/arm/nspire.txt + create mode 100644 Documentation/devicetree/bindings/arm/rtsm-dcscb.txt + create mode 100644 Documentation/devicetree/bindings/arm/ste-u300.txt + create mode 100644 Documentation/devicetree/bindings/bus/imx-weim.txt + create mode 100644 Documentation/devicetree/bindings/clock/clk-exynos-audss.txt + create mode 100644 Documentation/devicetree/bindings/clock/exynos5420-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx6sl-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/st,nomadik.txt + create mode 100644 Documentation/devicetree/bindings/clock/ste-u300-syscon-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/vf610-clock.txt + create mode 100644 Documentation/devicetree/bindings/dma/ste-coh901318.txt + create mode 100644 Documentation/devicetree/bindings/dma/ste-dma40.txt + create mode 100644 Documentation/devicetree/bindings/dma/ti-edma.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-clps711x.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-stericsson-coh901.txt + create mode 100644 Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-st-ddci2c.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/sunxi/sun4i-a10.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/sunxi/sun5i-a13.txt + create mode 100644 Documentation/devicetree/bindings/mmc/bcm,kona-sdhci.txt + create mode 100644 Documentation/devicetree/bindings/pci/designware-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/mvebu-pci.txt + create mode 100644 Documentation/devicetree/bindings/pci/pci.txt + create mode 100644 Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt + create mode 100644 Documentation/devicetree/bindings/timer/stericsson-u300-apptimer.txt + create mode 100644 Documentation/devicetree/bindings/usb/ux500-usb.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/stericsson-coh901327.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am4372.dtsi + create mode 100644 arch/arm/boot/dts/am43x-epos-evm.dts + create mode 100644 arch/arm/boot/dts/at91-foxg20.dts + create mode 100644 arch/arm/boot/dts/ccu8540.dts + create mode 100644 arch/arm/boot/dts/exynos5.dtsi + create mode 100644 arch/arm/boot/dts/exynos5420-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/exynos5420-smdk5420.dts + create mode 100644 arch/arm/boot/dts/exynos5420.dtsi + create mode 100644 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts + create mode 100644 arch/arm/boot/dts/imx27-phytec-phycore-som.dts + delete mode 100644 arch/arm/boot/dts/imx27-phytec-phycore.dts + create mode 100644 arch/arm/boot/dts/imx28-cfa10055.dts + create mode 100644 arch/arm/boot/dts/imx28-cfa10057.dts + create mode 100644 arch/arm/boot/dts/imx53-m53evk.dts + create mode 100644 arch/arm/boot/dts/imx53-tx53.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-phytec-pbab01.dts + create mode 100644 arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi + create mode 100644 arch/arm/boot/dts/imx6sl-evk.dts + create mode 100644 arch/arm/boot/dts/imx6sl.dtsi + create mode 100644 arch/arm/boot/dts/keystone.dts + create mode 100644 arch/arm/boot/dts/kirkwood-db-88f6281.dts + create mode 100644 arch/arm/boot/dts/kirkwood-db-88f6282.dts + create mode 100644 arch/arm/boot/dts/kirkwood-db.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts + create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug.dts + create mode 100644 arch/arm/boot/dts/nspire-classic.dtsi + create mode 100644 arch/arm/boot/dts/nspire-clp.dts + create mode 100644 arch/arm/boot/dts/nspire-cx.dts + create mode 100644 arch/arm/boot/dts/nspire-tp.dts + create mode 100644 arch/arm/boot/dts/nspire.dtsi + delete mode 100644 arch/arm/boot/dts/omap5-evm.dts + create mode 100644 arch/arm/boot/dts/omap5-uevm.dts + create mode 100644 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts + create mode 100644 arch/arm/boot/dts/rk3066a-clocks.dtsi + create mode 100644 arch/arm/boot/dts/rk3066a.dtsi + create mode 100644 arch/arm/boot/dts/s3c2416-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/s3c2416-smdk2416.dts + create mode 100644 arch/arm/boot/dts/s3c2416.dtsi + create mode 100644 arch/arm/boot/dts/s3c24xx.dtsi + create mode 100644 arch/arm/boot/dts/st-pincfg.h + create mode 100644 arch/arm/boot/dts/ste-u300.dts + create mode 100644 arch/arm/boot/dts/stih415-b2000.dts + create mode 100644 arch/arm/boot/dts/stih415-b2020.dts + create mode 100644 arch/arm/boot/dts/stih415-clock.dtsi + create mode 100644 arch/arm/boot/dts/stih415-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stih415.dtsi + create mode 100644 arch/arm/boot/dts/stih416-b2000.dts + create mode 100644 arch/arm/boot/dts/stih416-b2020.dts + create mode 100644 arch/arm/boot/dts/stih416-clock.dtsi + create mode 100644 arch/arm/boot/dts/stih416-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/stih416.dtsi + create mode 100644 arch/arm/boot/dts/stih41x-b2000.dtsi + create mode 100644 arch/arm/boot/dts/stih41x-b2020.dtsi + create mode 100644 arch/arm/boot/dts/stih41x.dtsi + create mode 100644 arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts + create mode 100644 arch/arm/boot/dts/sun5i-a10s.dtsi + create mode 100644 arch/arm/boot/dts/twl4030_omap3.dtsi + create mode 100644 arch/arm/boot/dts/usb_a9g20_common.dtsi + create mode 100644 arch/arm/boot/dts/usb_a9g20_lpw.dts + create mode 100644 arch/arm/boot/dts/vf610-pinfunc.h + create mode 100644 arch/arm/boot/dts/vf610-twr.dts + create mode 100644 arch/arm/boot/dts/vf610.dtsi + create mode 100644 arch/arm/boot/dts/wm8750-apc8750.dts + create mode 100644 arch/arm/boot/dts/wm8750.dtsi + create mode 100644 arch/arm/boot/dts/zynq-zc706.dts + create mode 100644 arch/arm/boot/dts/zynq-zed.dts + rename arch/arm/{mach-davinci/dma.c => common/edma.c} (86%) + delete mode 100644 arch/arm/configs/ap4evb_defconfig + rename arch/arm/configs/{at91sam9g20_defconfig => at91sam9260_9g20_defconfig} (67%) + delete mode 100644 arch/arm/configs/at91sam9260_defconfig + rename arch/arm/configs/{at91sam9261_defconfig => at91sam9261_9g10_defconfig} (91%) + delete mode 100644 arch/arm/configs/bonito_defconfig + create mode 100644 arch/arm/configs/keystone_defconfig + delete mode 100644 arch/arm/include/asm/hardware/pci_v3.h + create mode 100644 arch/arm/include/debug/keystone.S + create mode 100644 arch/arm/include/debug/nspire.S + create mode 100644 arch/arm/include/debug/rockchip.S + create mode 100644 arch/arm/include/debug/sti.S + rename arch/arm/{mach-u300/include/mach/debug-macro.S => include/debug/u300.S} (78%) + delete mode 100644 arch/arm/mach-at91/board-rm9200dk.c + delete mode 100644 arch/arm/mach-at91/board-usb-a926x.c + create mode 100644 arch/arm/mach-clps711x/devices.c + create mode 100644 arch/arm/mach-clps711x/devices.h + delete mode 100644 arch/arm/mach-clps711x/include/mach/autcpu12.h + delete mode 100644 arch/arm/mach-clps711x/include/mach/memory.h + delete mode 100644 arch/arm/mach-clps711x/include/mach/syspld.h + delete mode 100644 arch/arm/mach-exynos/dev-ahci.c + delete mode 100644 arch/arm/mach-exynos/dev-audio.c + delete mode 100644 arch/arm/mach-exynos/dev-ohci.c + delete mode 100644 arch/arm/mach-exynos/dev-uart.c + delete mode 100644 arch/arm/mach-exynos/dma.c + delete mode 100644 arch/arm/mach-exynos/include/mach/gpio.h + delete mode 100644 arch/arm/mach-exynos/include/mach/irqs.h + delete mode 100644 arch/arm/mach-exynos/include/mach/regs-gpio.h + delete mode 100644 arch/arm/mach-exynos/include/mach/regs-usb-phy.h + delete mode 100644 arch/arm/mach-exynos/mach-armlex4210.c + delete mode 100644 arch/arm/mach-exynos/mach-nuri.c + delete mode 100644 arch/arm/mach-exynos/mach-origen.c + delete mode 100644 arch/arm/mach-exynos/mach-smdk4x12.c + delete mode 100644 arch/arm/mach-exynos/mach-smdkv310.c + delete mode 100644 arch/arm/mach-exynos/mach-universal_c210.c + delete mode 100644 arch/arm/mach-exynos/setup-fimc.c + delete mode 100644 arch/arm/mach-exynos/setup-fimd0.c + delete mode 100644 arch/arm/mach-exynos/setup-i2c0.c + delete mode 100644 arch/arm/mach-exynos/setup-i2c1.c + delete mode 100644 arch/arm/mach-exynos/setup-i2c2.c + delete mode 100644 arch/arm/mach-exynos/setup-i2c3.c + delete mode 100644 arch/arm/mach-exynos/setup-i2c4.c + delete mode 100644 arch/arm/mach-exynos/setup-i2c5.c + delete mode 100644 arch/arm/mach-exynos/setup-i2c6.c + delete mode 100644 arch/arm/mach-exynos/setup-i2c7.c + delete mode 100644 arch/arm/mach-exynos/setup-keypad.c + delete mode 100644 arch/arm/mach-exynos/setup-sdhci-gpio.c + delete mode 100644 arch/arm/mach-exynos/setup-spi.c + delete mode 100644 arch/arm/mach-exynos/setup-usb-phy.c + create mode 100644 arch/arm/mach-imx/clk-imx6sl.c + create mode 100644 arch/arm/mach-imx/clk-vf610.c + create mode 100644 arch/arm/mach-imx/mach-imx6sl.c + create mode 100644 arch/arm/mach-imx/mach-vf610.c + delete mode 100644 arch/arm/mach-imx/ulpi.c + delete mode 100644 arch/arm/mach-integrator/pci.c + create mode 100644 arch/arm/mach-integrator/pci_v3.h + create mode 100644 arch/arm/mach-keystone/Kconfig + create mode 100644 arch/arm/mach-keystone/Makefile + create mode 100644 arch/arm/mach-keystone/Makefile.boot + create mode 100644 arch/arm/mach-keystone/keystone.c + create mode 100644 arch/arm/mach-keystone/keystone.h + create mode 100644 arch/arm/mach-keystone/platsmp.c + create mode 100644 arch/arm/mach-keystone/smc.S + create mode 100644 arch/arm/mach-kirkwood/board-db88f628x-bp.c + delete mode 100644 arch/arm/mach-kirkwood/board-nsa310.c + create mode 100644 arch/arm/mach-kirkwood/board-sheevaplug.c + delete mode 100644 arch/arm/mach-kirkwood/db88f6281-bp-setup.c + delete mode 100644 arch/arm/mach-msm/clock-7x30.h + delete mode 100644 arch/arm/mach-msm/clock-debug.c + delete mode 100644 arch/arm/mach-msm/core.h + delete mode 100644 arch/arm/mach-msm/gpiomux-8x60.c + delete mode 100644 arch/arm/mach-msm/gpiomux-v2.c + delete mode 100644 arch/arm/mach-msm/gpiomux-v2.h + create mode 100644 arch/arm/mach-nspire/Kconfig + create mode 100644 arch/arm/mach-nspire/Makefile + create mode 100644 arch/arm/mach-nspire/Makefile.boot + create mode 100644 arch/arm/mach-nspire/clcd.c + create mode 100644 arch/arm/mach-nspire/clcd.h + create mode 100644 arch/arm/mach-nspire/mmio.h + create mode 100644 arch/arm/mach-nspire/nspire.c + delete mode 100644 arch/arm/mach-omap1/dma.h + delete mode 100644 arch/arm/mach-omap1/include/mach/irda.h + delete mode 100644 arch/arm/mach-omap2/board-4430sdp.c + delete mode 100644 arch/arm/mach-omap2/board-omap4panda.c + create mode 100644 arch/arm/mach-omap2/clockdomains54xx_data.c + create mode 100644 arch/arm/mach-omap2/cm-regbits-54xx.h + create mode 100644 arch/arm/mach-omap2/cm1_54xx.h + create mode 100644 arch/arm/mach-omap2/cm2_54xx.h + create mode 100644 arch/arm/mach-omap2/cm_44xx_54xx.h + delete mode 100644 arch/arm/mach-omap2/dma.h + delete mode 100644 arch/arm/mach-omap2/mux44xx.c + delete mode 100644 arch/arm/mach-omap2/mux44xx.h + create mode 100644 arch/arm/mach-omap2/omap4-restart.c + create mode 100644 arch/arm/mach-omap2/omap_hwmod_54xx_data.c + create mode 100644 arch/arm/mach-omap2/powerdomains54xx_data.c + create mode 100644 arch/arm/mach-omap2/prcm_mpu54xx.h + create mode 100644 arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h + create mode 100644 arch/arm/mach-omap2/prm-regbits-54xx.h + create mode 100644 arch/arm/mach-omap2/prm44xx_54xx.h + create mode 100644 arch/arm/mach-omap2/prm54xx.h + create mode 100644 arch/arm/mach-omap2/scrm54xx.h + delete mode 100644 arch/arm/mach-omap2/voltagedomains33xx_data.c + create mode 100644 arch/arm/mach-omap2/voltagedomains54xx_data.c + delete mode 100644 arch/arm/mach-picoxcell/common.h + create mode 100644 arch/arm/mach-rockchip/Kconfig + create mode 100644 arch/arm/mach-rockchip/Makefile + create mode 100644 arch/arm/mach-rockchip/rockchip.c + rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%) + create mode 100644 arch/arm/mach-s3c24xx/mach-s3c2416-dt.c + delete mode 100644 arch/arm/mach-shmobile/board-ap4evb.c + create mode 100644 arch/arm/mach-shmobile/board-armadillo800eva-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-bonito.c + delete mode 100644 arch/arm/mach-shmobile/include/mach/head-ap4evb.txt + delete mode 100644 arch/arm/mach-shmobile/include/mach/memory.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-ap4eb.h + create mode 100644 arch/arm/mach-sti/Kconfig + create mode 100644 arch/arm/mach-sti/Makefile + create mode 100644 arch/arm/mach-sti/board-dt.c + create mode 100644 arch/arm/mach-sti/headsmp.S + create mode 100644 arch/arm/mach-sti/platsmp.c + create mode 100644 arch/arm/mach-sti/smp.h + delete mode 100644 arch/arm/mach-sunxi/sunxi.h + delete mode 100644 arch/arm/mach-u300/i2c.c + delete mode 100644 arch/arm/mach-u300/i2c.h + delete mode 100644 arch/arm/mach-u300/include/mach/hardware.h + delete mode 100644 arch/arm/mach-u300/include/mach/irqs.h + delete mode 100644 arch/arm/mach-u300/include/mach/syscon.h + delete mode 100644 arch/arm/mach-u300/include/mach/timex.h + delete mode 100644 arch/arm/mach-u300/include/mach/u300-regs.h + delete mode 100644 arch/arm/mach-u300/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-u300/spi.c + delete mode 100644 arch/arm/mach-u300/spi.h + delete mode 100644 arch/arm/mach-u300/timer.h + delete mode 100644 arch/arm/mach-u300/u300-gpio.h + create mode 100644 arch/arm/mach-vexpress/dcscb.c + create mode 100644 arch/arm/mach-vexpress/dcscb_setup.S + delete mode 100644 arch/arm/plat-samsung/include/plat/regs-watchdog.h + create mode 100644 arch/arm/plat-samsung/watchdog-reset.c + create mode 100644 drivers/bus/arm-cci.c + create mode 100644 drivers/bus/imx-weim.c + delete mode 100644 drivers/clk/clk-zynq.c + create mode 100644 drivers/clk/mvebu/armada-370.c + create mode 100644 drivers/clk/mvebu/armada-xp.c + delete mode 100644 drivers/clk/mvebu/clk-core.c + delete mode 100644 drivers/clk/mvebu/clk-core.h + delete mode 100644 drivers/clk/mvebu/clk-gating-ctrl.c + delete mode 100644 drivers/clk/mvebu/clk-gating-ctrl.h + delete mode 100644 drivers/clk/mvebu/clk.c + create mode 100644 drivers/clk/mvebu/common.c + create mode 100644 drivers/clk/mvebu/common.h + create mode 100644 drivers/clk/mvebu/dove.c + create mode 100644 drivers/clk/mvebu/kirkwood.c + create mode 100644 drivers/clk/samsung/clk-exynos-audss.c + create mode 100644 drivers/clk/samsung/clk-exynos5420.c + create mode 100644 drivers/clk/zynq/Makefile + create mode 100644 drivers/clk/zynq/clkc.c + create mode 100644 drivers/clk/zynq/pll.c + rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => drivers/cpufreq/s3c2410-cpufreq.c (100%) + rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => drivers/cpufreq/s3c2412-cpufreq.c (99%) + rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => drivers/cpufreq/s3c2440-cpufreq.c (100%) + rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%) + rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c (100%) + rename arch/arm/mach-omap1/mailbox.c => drivers/mailbox/mailbox-omap1.c (94%) + rename arch/arm/mach-omap2/mailbox.c => drivers/mailbox/mailbox-omap2.c (59%) + rename arch/arm/plat-omap/mailbox.c => drivers/mailbox/omap-mailbox.c (92%) + rename arch/arm/plat-omap/include/plat/mailbox.h => drivers/mailbox/omap-mbox.h (54%) + delete mode 100644 drivers/mtd/maps/autcpu12-nvram.c + create mode 100644 drivers/pci/host/Kconfig + create mode 100644 drivers/pci/host/Makefile + create mode 100644 drivers/pci/host/pci-mvebu.c + create mode 100644 drivers/pci/host/pcie-designware.c + create mode 100644 drivers/pinctrl/pinctrl-s3c24xx.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7778.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7790.c + create mode 100644 include/dt-bindings/clk/exynos-audss-clk.h + create mode 100644 include/dt-bindings/clock/imx6sl-clock.h + create mode 100644 include/dt-bindings/clock/tegra114-car.h + create mode 100644 include/dt-bindings/clock/tegra20-car.h + create mode 100644 include/dt-bindings/clock/tegra30-car.h + create mode 100644 include/dt-bindings/clock/vf610-clock.h + create mode 100644 include/dt-bindings/gpio/tegra-gpio.h + create mode 100644 include/dt-bindings/pinctrl/am33xx.h + create mode 100644 include/dt-bindings/pinctrl/at91.h + create mode 100644 include/dt-bindings/pinctrl/omap.h + create mode 100644 include/linux/arm-cci.h + delete mode 100644 include/linux/clk/mvebu.h + create mode 100644 include/linux/mfd/syscon/clps711x.h + create mode 100644 include/linux/omap-mailbox.h + rename {arch/arm/mach-davinci/include/mach => include/linux/platform_data}/edma.h (58%) + create mode 100644 include/linux/platform_data/mailbox-omap.h + delete mode 100644 include/linux/platform_data/omap_ocp2scp.h + delete mode 100644 include/linux/platform_data/pinctrl-coh901.h + create mode 100644 include/linux/platform_data/usb-rcar-phy.h +Merging bcm2835/for-next (7d13205 Linux 3.10-rc6) +$ git merge --no-ff bcm2835/for-next +Already up-to-date. +Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function) +$ git merge --no-ff cortex/for-next +Merge made by the 'recursive' strategy. + arch/arm/kernel/entry-v7m.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge --no-ff ep93xx/ep93xx-for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (20b0129 Merge branches 'imx/fixes', 'imx/soc' and 'imx/dt' into for-next) +$ git merge --no-ff imx-mxs/for-next +Auto-merging arch/arm/boot/dts/imx6q.dtsi +Auto-merging arch/arm/boot/dts/imx6dl.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/imx27-clock.txt | 1 + + arch/arm/boot/dts/imx25.dtsi | 21 +++- + arch/arm/boot/dts/imx27-apf27dev.dts | 5 + + arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 2 +- + arch/arm/boot/dts/imx27.dtsi | 56 +++++++-- + arch/arm/boot/dts/imx31.dtsi | 7 ++ + arch/arm/boot/dts/imx51-babbage.dts | 1 + + arch/arm/boot/dts/imx51.dtsi | 76 ++++++++++-- + arch/arm/boot/dts/imx53.dtsi | 52 ++++---- + arch/arm/boot/dts/imx6dl.dtsi | 131 ++++++++++++++++++++- + arch/arm/boot/dts/imx6q.dtsi | 11 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 16 +++ + arch/arm/boot/dts/imx6qdl.dtsi | 25 +++- + arch/arm/configs/imx_v6_v7_defconfig | 3 + + arch/arm/mach-imx/mach-imx6q.c | 65 +++++++++- + arch/arm/mach-imx/mx27.h | 2 +- + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 16 +-- + 17 files changed, 414 insertions(+), 76 deletions(-) +Merging ixp4xx/next (19f949f Linux 3.8) +$ git merge --no-ff ixp4xx/next +Already up-to-date. +Merging msm/for-next (d701eda ARM: dts: msm: Fix merge resolution) +$ git merge --no-ff msm/for-next +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (04864c6 Merge branch 'mvebu/regmap' into for-next) +$ git merge --no-ff mvebu/for-next +Resolved 'arch/arm/boot/dts/kirkwood-6281.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/kirkwood-6281.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/kirkwood-6281.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8003ced] Merge remote-tracking branch 'mvebu/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging renesas/next (5841e87 Merge branch 'heads/phy-rcar-usb' into next) +$ git merge --no-ff renesas/next +Resolved 'arch/arm/mach-shmobile/board-bockw.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/clock-r8a7778.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/include/mach/r8a7778.h' using previous resolution. +Auto-merging arch/arm/mach-shmobile/setup-r8a7778.c +Auto-merging arch/arm/mach-shmobile/include/mach/r8a7778.h +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7778.h +Auto-merging arch/arm/mach-shmobile/clock-r8a7778.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7778.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 +Auto-merging arch/arm/mach-shmobile/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e763b01] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 22 +++ + arch/arm/boot/dts/r8a73a4.dtsi | 81 ++++++++++ + arch/arm/mach-shmobile/Kconfig | 2 + + arch/arm/mach-shmobile/board-armadillo800eva.c | 9 -- + arch/arm/mach-shmobile/clock-r8a73a4.c | 197 ++++++++++++++++++++++++- + arch/arm/mach-shmobile/clock-r8a7790.c | 4 + + arch/arm/mach-shmobile/setup-r8a73a4.c | 1 + + arch/arm/mach-shmobile/setup-r8a7778.c | 24 +-- + arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++ + drivers/clocksource/sh_cmt.c | 72 +++++---- + 10 files changed, 363 insertions(+), 61 deletions(-) +Merging samsung/for-next (65ef7e0 Merge tag 'soc-exynos5420-2' into for-next) +$ git merge --no-ff samsung/for-next +Resolved 'arch/arm/Kconfig' using previous resolution. +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d46c2c8] Merge remote-tracking branch 'samsung/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging tegra/for-next (7d13205 Linux 3.10-rc6) +$ git merge --no-ff tegra/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (5b91a98 ARM: dma: Drop __GFP_COMP for iommu dma memory allocations) +$ git merge --no-ff dma-mapping/dma-mapping-next +Auto-merging arch/arm/mm/dma-mapping.c +Merge made by the 'recursive' strategy. + arch/arm/mm/dma-mapping.c | 40 ++++++++++++++++++++++++++++++++-------- + 1 file changed, 32 insertions(+), 8 deletions(-) +Merging pwm/for-next (b388f15 pwm: pwm-tiehrpwm: Use clk_enable/disable instead clk_prepare/unprepare.) +$ git merge --no-ff pwm/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-pwm | 79 ++++ + .../devicetree/bindings/pwm/nxp,pca9685-pwm.txt | 27 ++ + Documentation/pwm.txt | 37 ++ + MAINTAINERS | 4 +- + drivers/pwm/Kconfig | 23 + + drivers/pwm/Makefile | 3 + + drivers/pwm/core.c | 29 +- + drivers/pwm/pwm-atmel-tcb.c | 5 +- + drivers/pwm/pwm-bfin.c | 1 + + drivers/pwm/pwm-imx.c | 1 + + drivers/pwm/pwm-lpc32xx.c | 1 + + drivers/pwm/pwm-mxs.c | 7 +- + drivers/pwm/pwm-pca9685.c | 300 +++++++++++++ + drivers/pwm/pwm-puv3.c | 1 + + drivers/pwm/pwm-renesas-tpu.c | 474 +++++++++++++++++++++ + drivers/pwm/pwm-spear.c | 1 + + drivers/pwm/pwm-tegra.c | 1 + + drivers/pwm/pwm-tiehrpwm.c | 13 +- + drivers/pwm/sysfs.c | 352 +++++++++++++++ + include/linux/platform_data/pwm-renesas-tpu.h | 16 + + include/linux/pwm.h | 29 +- + 21 files changed, 1387 insertions(+), 17 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-pwm + create mode 100644 Documentation/devicetree/bindings/pwm/nxp,pca9685-pwm.txt + create mode 100644 drivers/pwm/pwm-pca9685.c + create mode 100644 drivers/pwm/pwm-renesas-tpu.c + create mode 100644 drivers/pwm/sysfs.c + create mode 100644 include/linux/platform_data/pwm-renesas-tpu.h +Merging dma-buf/for-next (844ce9f Merge tag 'mmc-fixes-for-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc) +$ git merge --no-ff dma-buf/for-next +Already up-to-date. +Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem) +$ git merge --no-ff userns/for-next +Auto-merging fs/proc/root.c +Merge made by the 'recursive' strategy. + fs/proc/root.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines) +$ git merge --no-ff 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 --no-ff signal/for-next +Already up-to-date. +Merging clk/clk-next (45e3ec3 clk: tegra: fix ifdef for tegra_periph_reset_assert inline) +$ git merge --no-ff clk/clk-next +Resolved 'drivers/clk/tegra/clk-tegra114.c' using previous resolution. +Auto-merging drivers/mfd/dbx500-prcmu-regs.h +Auto-merging drivers/mfd/db8500-prcmu.c +Auto-merging drivers/clk/tegra/clk-tegra30.c +Auto-merging drivers/clk/tegra/clk-tegra114.c +CONFLICT (content): Merge conflict in drivers/clk/tegra/clk-tegra114.c +Auto-merging drivers/clk/samsung/clk-exynos4.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clk/clk-vt8500.c +Auto-merging drivers/clk/clk-si5351.c +Auto-merging drivers/clk/Makefile +Auto-merging arch/powerpc/platforms/Kconfig.cputype +Auto-merging arch/arm/mach-tegra/common.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/clock/silabs,si5351.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3246983] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/nspire-clock.txt | 24 + + .../devicetree/bindings/clock/rockchip.txt | 74 +++ + .../devicetree/bindings/clock/silabs,si5351.txt | 5 + + Documentation/devicetree/bindings/clock/sunxi.txt | 117 +---- + .../bindings/clock/sunxi/sun4i-a10-gates.txt | 93 ++++ + .../bindings/clock/sunxi/sun5i-a13-gates.txt | 58 +++ + Documentation/devicetree/bindings/clock/vt8500.txt | 2 + + MAINTAINERS | 5 +- + arch/arm/mach-tegra/common.c | 4 +- + arch/arm/mach-ux500/cpu.c | 6 +- + arch/powerpc/platforms/Kconfig.cputype | 1 + + drivers/clk/Kconfig | 10 +- + drivers/clk/Makefile | 3 + + drivers/clk/clk-divider.c | 25 +- + drivers/clk/clk-gate.c | 25 +- + drivers/clk/clk-mux.c | 17 +- + drivers/clk/clk-nspire.c | 153 ++++++ + drivers/clk/clk-ppc-corenet.c | 280 ++++++++++ + drivers/clk/clk-si5351.c | 79 ++- + drivers/clk/clk-si5351.h | 1 + + drivers/clk/clk-twl6040.c | 4 +- + drivers/clk/clk-vt8500.c | 75 ++- + drivers/clk/clk-wm831x.c | 14 +- + drivers/clk/clk.c | 100 ++-- + drivers/clk/rockchip/Makefile | 5 + + drivers/clk/rockchip/clk-rockchip.c | 94 ++++ + drivers/clk/samsung/clk-exynos4.c | 21 +- + drivers/clk/samsung/clk.h | 3 + + drivers/clk/sunxi/clk-sunxi.c | 35 +- + drivers/clk/tegra/clk-pll.c | 281 +++++----- + drivers/clk/tegra/clk-tegra114.c | 270 +++++++++- + drivers/clk/tegra/clk-tegra20.c | 3 +- + drivers/clk/tegra/clk-tegra30.c | 25 +- + drivers/clk/tegra/clk.c | 12 - + drivers/clk/tegra/clk.h | 62 +-- + drivers/clk/ux500/abx500-clk.c | 8 +- + drivers/clk/ux500/u8540_clk.c | 564 ++++++++++++++++++++- + drivers/clk/ux500/u9540_clk.c | 4 +- + drivers/clk/versatile/clk-vexpress-osc.c | 4 +- + drivers/mfd/db8500-prcmu.c | 1 + + drivers/mfd/dbx500-prcmu-regs.h | 1 + + include/linux/clk-provider.h | 62 ++- + include/linux/clk/tegra.h | 6 +- + include/linux/mfd/abx500/ab8500-sysctrl.h | 4 +- + include/linux/mfd/dbx500-prcmu.h | 12 + + include/linux/platform_data/clk-ux500.h | 6 +- + include/linux/platform_data/si5351.h | 18 + + 47 files changed, 2261 insertions(+), 415 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nspire-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/rockchip.txt + create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun4i-a10-gates.txt + create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun5i-a13-gates.txt + create mode 100644 drivers/clk/clk-nspire.c + create mode 100644 drivers/clk/clk-ppc-corenet.c + create mode 100644 drivers/clk/rockchip/Makefile + create mode 100644 drivers/clk/rockchip/clk-rockchip.c +Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) +$ git merge --no-ff 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 --no-ff 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 --no-ff arm64-hugepages/for-next/hugepages +Resolved 'arch/arm64/Kconfig' using previous resolution. +Resolved 'arch/arm64/include/asm/pgtable-hwdef.h' using previous resolution. +Resolved 'arch/arm64/include/asm/pgtable.h' using previous resolution. +Auto-merging mm/hugetlb.c +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/huge_mm.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/pgtable-hwdef.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/pgtable-hwdef.h +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 419cb62] Merge remote-tracking branch 'arm64-hugepages/for-next/hugepages' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/Kconfig | 17 +++ + arch/arm64/include/asm/hugetlb.h | 117 ++++++++++++++++++ + arch/arm64/include/asm/pgtable-hwdef.h | 13 +- + arch/arm64/include/asm/pgtable.h | 96 ++++++++++++--- + arch/arm64/include/asm/tlb.h | 6 + + arch/arm64/include/asm/tlbflush.h | 2 + + arch/arm64/mm/Makefile | 1 + + arch/arm64/mm/fault.c | 19 +-- + arch/arm64/mm/hugetlbpage.c | 70 +++++++++++ + arch/arm64/mm/mmu.c | 19 ++- + arch/x86/Kconfig | 6 + + arch/x86/mm/hugetlbpage.c | 187 ---------------------------- + include/linux/huge_mm.h | 2 +- + include/linux/hugetlb.h | 4 + + mm/hugetlb.c | 219 +++++++++++++++++++++++++++++++-- + 15 files changed, 543 insertions(+), 235 deletions(-) + create mode 100644 arch/arm64/include/asm/hugetlb.h + create mode 100644 arch/arm64/mm/hugetlbpage.c +Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) +Merging akpm-current/current (4194f6e drivers/dma/pl330.c: fix locking in pl330_free_chan_resources()) +$ git merge akpm-current/current +Auto-merging drivers/dma/pl330.c +Merge made by the 'recursive' strategy. + arch/c6x/mm/init.c | 1 + + drivers/dma/pl330.c | 4 ++-- + include/linux/smp.h | 20 ++++++++------------ + 3 files changed, 11 insertions(+), 14 deletions(-) +$ 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: drivers/platform/x86/intel_ips.c: convert to module_pci_driver +Applying: sound/soc/codecs/si476x.c: don't use 0bNNN +Applying: x86: make 'mem=' option to work for efi platform +Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record +Applying: kernel/auditfilter.c: fixing build warning +Applying: kernel/auditfilter.c: fix leak in audit_add_rule() error path +Applying: audit: Fix decimal constant description +Applying: drivers/pcmcia/pd6729.c: convert to module_pci_driver +Applying: drivers/pcmcia/yenta_socket.c: convert to module_pci_driver +Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress +Applying: drm/cirrus: correct register values for 16bpp +Applying: drm/nouveau: make vga_switcheroo code depend on VGA_SWITCHEROO +Applying: drivers/video/acornfb.c: remove dead code +Applying: cyber2000fb: avoid palette corruption at higher clocks +Applying: fanotify: info leak in copy_event_to_user() +Applying: fanotify: fix races when adding/removing marks +Applying: fanotify: put duplicate code for adding vfsmount/inode marks into an own function +Applying: dnotify: replace dnotify_mark_mutex with mark mutex of dnotify_group +Applying: inotify: fix race when adding a new watch +Applying: fsnotify: update comments concerning locking scheme +Applying: drivers/iommu/msm_iommu_dev.c: fix leak and clean up error paths +Applying: drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix +Applying: posix_cpu_timer: consolidate expiry time type +Applying: posix_cpu_timers: consolidate timer list cleanups +Applying: posix_cpu_timers: consolidate expired timers check +Applying: selftests: add basic posix timers selftests +Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule() +Applying: posix_timers: fix racy timer delta caching on task exit +Applying: kernel/timer.c: fix jiffies wrap behavior of round_jiffies*() +Applying: hrtimer: one more expiry time overflow check in hrtimer_interrupt +Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic() +Applying: drivers/ide/delkin_cb.c: convert to module_pci_driver +Applying: drivers/mtd/chips/gen_probe.c: refactor call to request_module() +Applying: virtio_balloon: leak_balloon(): only tell host if we got pages deflated +Applying: configfs: use capped length for ->store_attribute() +Applying: drivers/net/ethernet/ibm/ehea/ehea_main.c: add alias entry for portN properties +Applying: mISDN: add support for group membership check +Applying: drivers/atm/he.c: convert to module_pci_driver +Applying: isdn: clean up debug format string usage +Applying: fs/ocfs2/dlm/dlmrecovery.c: remove duplicate declarations +Applying: fs/ocfs2/dlm/dlmrecovery.c:dlm_request_all_locks(): ret should be int instead of enum +Applying: ocfs2: should not use le32_add_cpu to set ocfs2_dinode i_flags +Applying: ocfs2: add missing dlm_put() in dlm_begin_reco_handler() +Applying: ocfs2: remove unecessary variable needs_checkpoint +Applying: ocfs2: fix mutex_unlock and possible memory leak in ocfs2_remove_btree_range +Applying: fs/ocfs2/journal.h: add bits_wanted while calculating credits in ocfs2_calc_extend_credits +Applying: fs/ocfs2/cluster/tcp.c: free sc->sc_page in sc_kref_release() +Applying: ocfs2: xattr: remove useless free space checking +Applying: ocfs2: should call ocfs2_journal_access_di() before ocfs2_delete_entry() in ocfs2_orphan_del() +Applying: ocfs2: dlmlock_master() should return DLM_NORMAL after adding lock to blocked list +Applying: ocfs2: need rollback when journal_access failed in ocfs2_orphan_add() +Applying: ocfs2: rework transaction rollback in ocfs2_relink_block_group() +Applying: ocfs2-rework-transaction-rollback-in-ocfs2_relink_block_group-fix +Applying: ocfs2: fix readonly issue in ocfs2_unlink() +Applying: ocfs2-fix-readonly-issue-in-ocfs2_unlink-fix +Applying: ocfs2: llseek requires ocfs2 inode lock for the file in SEEK_END +Applying: ocfs2: fix issue that ocfs2_setattr() does not deal with new_i_size==i_size +Applying: softirq: use _RET_IP_ +Applying: include/linux/sched.h: don't use task->pid/tgid in same_thread_group/has_group_leader_pid +Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros +Applying: lglock: update lockdep annotations to report recursive local locks +Applying: drivers/scsi/a100u2w.c: convert to module_pci_driver +Applying: drivers/scsi/dc395x.c: convert to module_pci_driver +Applying: drivers/scsi/dmx3191d.c: convert to module_pci_driver +Applying: drivers/scsi/initio.c: convert to module_pci_driver +Applying: drivers/scsi/mvumi.c: convert to module_pci_driver +Applying: drivers/net/irda/donauboe.c: convert to module_pci_driver +Applying: drivers/cdrom/gdrom.c: fix device number leak +Applying: block/compat_ioctl.c: do not leak info to user-space +Applying: drivers/cdrom/cdrom.c: use kzalloc() for failing hardware +Applying: block: do not pass disk names as format strings +Applying: block: restore /proc/partitions to not display non-partitionable removable devices +Applying: fs/file_table.c:fput(): add comment +Applying: fput: turn "list_head delayed_fput_list" into llist_head +Applying: llist: fix/simplify llist_add() and llist_add_batch() +Applying: llist: llist_add() can use llist_add_batch() +Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic +Applying: crypto: sanitize argument for format string +Applying: clear_refs: sanitize accepted commands declaration +Applying: clear_refs: introduce private struct for mm_walk +Applying: pagemap: introduce pagemap_entry_t without pmshift bits +Applying: pagemap-introduce-pagemap_entry_t-without-pmshift-bits-v4 +Applying: mm: soft-dirty bits for user memory changes tracking +Applying: soft-dirty: call mmu notifiers when write-protecting ptes +Applying: pagemap: prepare to reuse constant bits with page-shift +Applying: mm, memcg: don't take task_lock in task_in_mem_cgroup +Applying: mm: remove free_area_cache +Applying: mm: remove compressed copy from zram in-memory +Applying: mm-remove-compressed-copy-from-zram-in-memory-fix +Applying: non-swapcache pages in end_swap_bio_read() +Applying: mm-remove-compressed-copy-from-zram-in-memory-fix-2-fix +Applying: swap: add a simple detector for inappropriate swapin readahead +Applying: swap: swapin_nr_pages() can be static +Applying: mm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT +Applying: ncpfs: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT +Applying: uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT +Applying: mm/page_alloc: factor out setting of pcp->high and pcp->batch +Applying: mm/page_alloc: prevent concurrent updaters of pcp ->batch and ->high +Applying: mm/page_alloc: insert memory barriers to allow async update of pcp batch and high +Applying: mm/page_alloc: protect pcp->batch accesses with ACCESS_ONCE +Applying: mm/page_alloc: convert zone_pcp_update() to rely on memory barriers instead of stop_machine() +Applying: mm/page_alloc: when handling percpu_pagelist_fraction, don't unneedly recalulate high +Applying: mm/page_alloc: factor setup_pageset() into pageset_init() and pageset_set_batch() +Applying: mm/page_alloc: relocate comment to be directly above code it refers to. +Applying: mm/page_alloc: factor zone_pageset_init() out of setup_zone_pageset() +Applying: mm/page_alloc: in zone_pcp_update(), uze zone_pageset_init() +Applying: mm/page_alloc: rename setup_pagelist_highmark() to match naming of pageset_set_batch() +Applying: mm/page_alloc: don't re-init pageset in zone_pcp_update() +Applying: mm: vmscan: limit the number of pages kswapd reclaims at each priority +Applying: mm: vmscan: obey proportional scanning requirements for kswapd +Applying: mm: vmscan: flatten kswapd priority loop +Applying: mm: vmscan: decide whether to compact the pgdat based on reclaim progress +Applying: mm: vmscan: do not allow kswapd to scan at maximum priority +Applying: mm: vmscan: have kswapd writeback pages based on dirty pages encountered, not priority +Applying: mm: vmscan: block kswapd if it is encountering pages under writeback +Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback-fix +Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback-fix-2 +Applying: mm: vmscan: check if kswapd should writepage once per pgdat scan +Applying: mm: vmscan: move logic from balance_pgdat() to kswapd_shrink_zone() +Applying: mm: vmscan: stall page reclaim and writeback pages based on dirty/writepage pages encountered +Applying: mm: vmscan: stall page reclaim after a list of pages have been processed +Applying: mm: vmscan: set zone flags before blocking +Applying: mm: vmscan: move direct reclaim wait_iff_congested into shrink_list +Applying: mm: vmscan: treat pages marked for immediate reclaim as zone congestion +Applying: mm: vmscan: take page buffers dirty and locked state into account +Applying: fs: nfs: inform the VM about pages being committed or unstable +Applying: mm: fix comment referring to non-existent size_seqlock, change to span_seqlock +Applying: mmzone: note that node_size_lock should be manipulated via pgdat_resize_lock() +Applying: memory_hotplug: use pgdat_resize_lock() in online_pages() +Applying: memory_hotplug: use pgdat_resize_lock() in __offline_pages() +Applying: memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix +Applying: include/linux/mm.h: add PAGE_ALIGNED() helper +Applying: vmcore: clean up read_vmcore() +Applying: vmcore: allocate buffer for ELF headers on page-size alignment +Applying: vmcore-allocate-buffer-for-elf-headers-on-page-size-alignment-fix +Applying: vmcore: treat memory chunks referenced by PT_LOAD program header entries in page-size boundary in vmcore_list +Applying: vmalloc: make find_vm_area check in range +Applying: vmalloc: introduce remap_vmalloc_range_partial +Applying: vmalloc-introduce-remap_vmalloc_range_partial-fix +Applying: vmcore: allocate ELF note segment in the 2nd kernel vmalloc memory +Applying: vmcore-allocate-elf-note-segment-in-the-2nd-kernel-vmalloc-memory-fix +Applying: vmcore: allow user process to remap ELF note segment buffer +Applying: vmcore-allow-user-process-to-remap-elf-note-segment-buffer-fix +Applying: vmcore: calculate vmcore file size from buffer size and total size of vmcore objects +Applying: vmcore: support mmap() on /proc/vmcore +Applying: vmcore-support-mmap-on-proc-vmcore-fix +Applying: vmcore: disable mmap_vmcore() if CONFIG_MMU is not defined +Applying: memcg: update TODO list in Documentation +Applying: mm: add tracepoints for LRU activation and insertions +Applying: mm: pagevec: defer deciding which LRU to add a page to until pagevec drain time +Applying: mm: activate !PageLRU pages on mark_page_accessed if page is on local pagevec +Applying: mm: remove lru parameter from __pagevec_lru_add and remove parts of pagevec API +Applying: mm: remove lru parameter from __lru_cache_add and lru_cache_add_lru +Applying: mm: Clear page active before releasing pages +Applying: mm/vmscan.c: 'lru' may be used without initialized after the patch "3abf380..." in next-20130607 tree +Applying: mm/page_alloc.c: add additional checking and return value for the 'table->data' +Applying: mm/nommu.c: add additional check for vread() just like vwrite() has done +Applying: mm/memory-failure.c: fix memory leak in successful soft offlining +Applying: mm/memory_hotplug.c: change normal message to use pr_debug +Applying: mm/memory-hotplug: fix lowmem count overflow when offline pages +Applying: mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix +Applying: mm/pageblock: remove get/set_pageblock_flags +Applying: mm/hugetlb: remove hugetlb_prefault +Applying: mm/hugetlb: use already existing interface huge_page_shift +Applying: mm: tune vm_committed_as percpu_counter batching size +Applying: mm-tune-vm_committed_as-percpu_counter-batching-size-fix +Applying: swap: discard while swapping only if SWAP_FLAG_DISCARD_PAGES +Applying: swap-discard-while-swapping-only-if-swap_flag_discard_pages-fix +Applying: mm: change signature of free_reserved_area() to fix building warnings +Applying: mm: enhance free_reserved_area() to support poisoning memory with zero +Applying: mm/ARM64: kill poison_init_mem() +Applying: mm/x86: use free_reserved_area() to simplify code +Applying: mm/tile: use common help functions to free reserved pages +Applying: mm: fix some trivial typos in comments +Applying: mm: use managed_pages to calculate default zonelist order +Applying: mm: accurately calculate zone->managed_pages for highmem zones +Applying: mm: use a dedicated lock to protect totalram_pages and zone->managed_pages +Applying: mm-use-a-dedicated-lock-to-protect-totalram_pages-and-zone-managed_pages-fix +Applying: mm: make __free_pages_bootmem() only available at boot time +Applying: mm: correctly update zone->managed_pages +Applying: mm-correctly-update-zone-managed_pages-fix +Applying: mm-correctly-update-zone-managed_pages-fix-fix +Applying: mm-correctly-update-zone-managed_pages-fix-fix-fix +Applying: mm: concentrate modification of totalram_pages into the mm core +Applying: mm: report available pages as "MemTotal" for each NUMA node +Applying: memcg: Kconfig info update +Applying: mm: Fix the TLB range flushed when __tlb_remove_page() runs out of slots +Applying: vmlinux.lds: add comments for global variables and clean up useless declarations +Applying: avr32: normalize global variables exported by vmlinux.lds +Applying: c6x: normalize global variables exported by vmlinux.lds +Applying: h8300: normalize global variables exported by vmlinux.lds +Applying: score: normalize global variables exported by vmlinux.lds +Applying: tile: normalize global variables exported by vmlinux.lds +Applying: UML: normalize global variables exported by vmlinux.lds +Applying: mm: introduce helper function mem_init_print_info() to simplify mem_init() +Applying: mm: use totalram_pages instead of num_physpages at runtime +Applying: mm/hotplug: prepare for removing num_physpages +Applying: mm/alpha: prepare for removing num_physpages and simplify mem_init() +Applying: mm/ARC: prepare for removing num_physpages and simplify mem_init() +Applying: mm/ARM: prepare for removing num_physpages and simplify mem_init() +Applying: mm/ARM64: prepare for removing num_physpages and simplify mem_init() +Applying: mm/AVR32: prepare for removing num_physpages and simplify mem_init() +Applying: mm/blackfin: prepare for removing num_physpages and simplify mem_init() +Applying: mm/c6x: prepare for removing num_physpages and simplify mem_init() +Applying: mm/cris: prepare for removing num_physpages and simplify mem_init() +Applying: mm/frv: prepare for removing num_physpages and simplify mem_init() +Applying: mm/h8300: prepare for removing num_physpages and simplify mem_init() +Applying: mm/hexagon: prepare for removing num_physpages and simplify mem_init() +Applying: mm/IA64: prepare for removing num_physpages and simplify mem_init() +Applying: mm/m32r: prepare for removing num_physpages and simplify mem_init() +Applying: mm/m68k: prepare for removing num_physpages and simplify mem_init() +Applying: mm/metag: prepare for removing num_physpages and simplify mem_init() +Applying: mm/microblaze: prepare for removing num_physpages and simplify mem_init() +Applying: mm, arch: fix two errors in calling mem_init_print_info() +Applying: mm/MIPS: prepare for removing num_physpages and simplify mem_init() +Applying: mm/mn10300: prepare for removing num_physpages and simplify mem_init() +Applying: mm/openrisc: prepare for removing num_physpages and simplify mem_init() +Applying: mm/PARISC: prepare for removing num_physpages and simplify mem_init() +Applying: mm/ppc: prepare for removing num_physpages and simplify mem_init() +Applying: mm/s390: prepare for removing num_physpages and simplify mem_init() +Applying: mm/score: prepare for removing num_physpages and simplify mem_init() +Applying: mm/SH: prepare for removing num_physpages and simplify mem_init() +Applying: mm/SPARC: prepare for removing num_physpages and simplify mem_init() +Applying: mm/tile: prepare for removing num_physpages and simplify mem_init() +Applying: mm/um: prepare for removing num_physpages and simplify mem_init() +Applying: mm/unicore32: prepare for removing num_physpages and simplify mem_init() +Applying: mm/x86: prepare for removing num_physpages and simplify mem_init() +Applying: mm/xtensa: prepare for removing num_physpages and simplify mem_init() +Applying: mm: kill global variable num_physpages +Applying: mm: introduce helper function set_max_mapnr() +Applying: mm/AVR32: prepare for killing free_all_bootmem_node() +Applying: mm/IA64: prepare for killing free_all_bootmem_node() +Applying: mm/m32r: prepare for killing free_all_bootmem_node() +Applying: mm/m68k: prepare for killing free_all_bootmem_node() +Applying: mm/metag: prepare for killing free_all_bootmem_node() +Applying: mm/MIPS: prepare for killing free_all_bootmem_node() +Applying: mm/PARISC: prepare for killing free_all_bootmem_node() +Applying: mm/PPC: prepare for killing free_all_bootmem_node() +Applying: mm/SH: prepare for killing free_all_bootmem_node() +Applying: mm: kill free_all_bootmem_node() +Applying: mm/alpha: unify mem_init() for both UMA and NUMA architectures +Applying: mm/m68k: fix build warning of unused variable +Applying: mm/ALPHA: clean up unused VALID_PAGE() +Applying: mm/ARM: fix stale comment about VALID_PAGE() +Applying: mm/CRIS: clean up unused VALID_PAGE() +Applying: mm/microblaze: clean up unused VALID_PAGE() +Applying: mm/unicore32: fix stale comment about VALID_PAGE() +Applying: sparsemem: add BUILD_BUG_ON when sizeof mem_section is non-power-of-2 +Applying: documentation: update address_space_operations +Applying: documentation: document the is_dirty_writeback aops callback +Applying: mm, vmalloc: only call setup_vmalloc_vm() only in __get_vm_area_node() +Applying: mm, vmalloc: call setup_vmalloc_vm() instead of insert_vmalloc_vm() +Applying: mm, vmalloc: remove insert_vmalloc_vm() +Applying: mm, vmalloc: use clamp() to simplify code +Applying: mm: memcontrol: factor out reclaim iterator loading and updating +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: 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: 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: 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: mm: mremap: validate input before taking lock +Applying: memcg: clean up memcg->nodeinfo +Applying: mm: invoke oom-killer from remaining unconverted page fault handlers +Applying: mm: remove duplicated call of get_pfn_range_for_nid +Applying: mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2 +Applying: mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2-fix +Applying: mm/vmalloc.c: unbreak __vunmap() +Applying: mm/vmalloc.c: remove dead code in vb_alloc +Applying: mm/vmalloc.c: remove unused purge_fragmented_blocks_thiscpu +Applying: mm/vmalloc.c: remove alloc_map from vmap_block +Applying: mm/vmalloc.c: emit the failure message before return +Applying: mm/vmalloc.c: rename VM_UNLIST to VM_UNINITIALIZED +Applying: mm/vmalloc.c: check VM_UNINITIALIZED flag in s_show instead of show_numa_info +Applying: memcg: also test for skip accounting at the page allocation level +Applying: memcg: do not account memory used for cache creation +Applying: include/linux/gfp.h: fix the comment for GFP_ZONE_TABLE +Applying: zbud: add to mm/ +Applying: zswap: init under_reclaim +Applying: zswap: add to mm/ +Applying: zswap: fix Kconfig to depend on CRYPTO=y +Applying: zswap: add documentation +Applying: MAINTAINERS: add zswap and zbud maintainer +Applying: mm/page_alloc.c: remove zone_type argument of build_zonelists_node +Applying: mm: remove unused functions is_{normal_idx, normal, dma32, dma} +Applying: mm/page_alloc.c: remove unlikely() from the current_order test +Applying: vfree: don't schedule free_work() if llist_add() returns false +Applying: mm: remove unused __put_page() +Applying: mm/sparse.c: put clear_hwpoisoned_pages within CONFIG_MEMORY_HOTREMOVE +Applying: fs/fs-writeback.c: : make wb_do_writeback() as static +Applying: mm/writeback: remove wb_reason_name +Applying: mm/writeback: don't check force_wait to handle bdi->work_list +Applying: mm/writeback: commit reason of WB_REASON_FORKER_THREAD mismatch name +Applying: mm/page_alloc: fix doc for numa_zonelist_order +Applying: mm/thp: fix doc for transparent huge zero page +Applying: mm/pgtable: don't accumulate addr during pgd prepopulate pmd +Applying: mm: remove unused VM_<READfoo> macros and expand other in-place +Applying: mm/vmalloc.c: fix an overflow bug in alloc_vmap_area() +Applying: page migration: fix wrong comment in address_space_operations.migratepage() +Applying: mm/memblock.c: fix wrong comment in __next_free_mem_range() +Applying: mm/memory_hotplug.c: fix a comment typo in register_page_bootmem_info_node() +Applying: mm: vmscan: avoid direct reclaim scanning at maximum priority +Applying: mm: vmscan: do not scale writeback pages when deciding whether to set ZONE_WRITEBACK +Applying: include/linux/mmzone.h: cleanups +Applying: mm: memmap_init_zone() performance improvement +Applying: drop_caches: add some documentation and info message +Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev +Applying: mm/dmapool.c: fix null dev in dma_pool_create() +Applying: mm: add vm event counters for balloon pages compaction +Applying: arch/frv/kernel/traps.c: using vsnprintf() instead of vsprintf() +Applying: arch/frv/kernel/setup.c: use strncmp() instead of memcmp() +Applying: err.h: IS_ERR() can accept __user pointers +Applying: clean up scary strncpy(dst, src, strlen(src)) uses +Applying: clean-up-scary-strncpydst-src-strlensrc-uses-fix +Applying: drivers: avoid format string in dev_set_name +Applying: drivers: avoid format strings in names passed to alloc_workqueue() +Applying: drivers: avoid parsing names as kthread_run() format strings +Applying: dump_stack: serialize the output from dump_stack() +Applying: dump_stack-serialize-the-output-from-dump_stack-fix +Applying: panic: add cpu/pid to warn_slowpath_common in WARNING printk()s +Applying: panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix +Applying: kernel/sys.c: sys_reboot(): fix malformed panic message +Applying: kernel/sys.c:do_sysinfo(): use get_monotonic_boottime() +Applying: dmi: add support for exact DMI matches in addition to substring matching +Applying: drm/i915: quirk away phantom LVDS on Intel's D510MO mainboard +Applying: drm/i915: quirk away phantom LVDS on Intel's D525MW mainboard +Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq +Applying: drivers/dma: remove unused support for MEMSET operations +Applying: drivers/misc/sgi-gru/grufault.c: fix a sanity test in gru_set_context_option() +Applying: MAINTAINERS: fix tape driver file mappings +Applying: backlight: atmel-pwm-bl: remove unnecessary platform_set_drvdata() +Applying: backlight: ep93xx: remove unnecessary platform_set_drvdata() +Applying: backlight: lp8788: remove unnecessary platform_set_drvdata() +Applying: backlight: pcf50633: remove unnecessary platform_set_drvdata() +Applying: backlight: add devm_backlight_device_{register,unregister}() +Applying: lcd: add devm_lcd_device_{register,unregister}() +Applying: MAINTAINERS: add Backlight subsystem co-maintainer +Applying: backlight: convert from legacy pm ops to dev_pm_ops +Applying: backlight: add CONFIG_PM_SLEEP to suspend/resume functions +Applying: rbtree: remove unneeded include +Applying: rbtree-remove-unneeded-include-fix +Applying: radeon: remove redundant __list_for_each definition from mkregtable.c +Applying: ipw2200: convert __list_for_each usage to list_for_each +Applying: list: remove __list_for_each() +Applying: checkpatch: change CamelCase test and make it --strict +Applying: checkpatch: warn when using gcc's binary constant ("0b") extension +Applying: checkpatch: add --strict preference for p = kmalloc(sizeof(*p)... +Applying: checkpatch: remove quote from CamelCase test +Applying: checkpatch: improve network block comment test and message +Applying: checkpatch: warn when networking block comment lines don't start with * +Applying: checkpatch: warn on comparisons to jiffies +Applying: checkpatch: warn on comparisons to get_jiffies_64() +Applying: checkpatch: reduce false positive rate of "complex macros" +Applying: checkpatch: add a placeholder to check blank lines before declarations +Applying: checkpatch: don't warn on blank lines before/after braces as often +Applying: checkpatch: add a --strict test for comparison to true/false +Applying: checkpatch: improve "no space after cast" test +Applying: checkpatch: create an EXPERIMENTAL --fix option to correct patches +Applying: checkpatch: move test for space before semicolon after operator spacing +Applying: checkpatch: ignore SI unit CamelCase variants like "_uV" +Applying: checkpatch: ignore existing CamelCase uses from include/... +Applying: checkpatch: allow longer logging function names +Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting +Applying: init: remove permanent string buffer from do_one_initcall() +Applying: insert missing space in printk line of root_delay +Applying: kprobes: handle empty/invalid input to debugfs "enabled" file +Applying: autofs4: allow autofs to work outside the initial PID namespace +Applying: autofs4: translate pids to the right namespace for the daemon +Applying: rtc: rtc-88pm80x: remove unnecessary platform_set_drvdata() +Applying: drivers/rtc/rtc-v3020.c: remove redundant goto +Applying: drivers/rtc/interface.c: fix checkpatch errors +Applying: drivers/rtc/rtc-at32ap700x.c: fix checkpatch error +Applying: drivers/rtc/rtc-at91rm9200.c: include <linux/uaccess.h> +Applying: drivers/rtc/rtc-cmos.c: fix whitespace related errors +Applying: drivers/rtc/rtc-davinci.c: fix whitespace warning +Applying: drivers/rtc/rtc-ds1305.c: add missing braces around sizeof +Applying: drivers/rtc/rtc-ds1374.c: fix spacing related issues +Applying: drivers/rtc/rtc-ds1511.c: fix issues related to spaces and braces +Applying: drivers/rtc/rtc-ds3234.c: fix whitespace issue +Applying: drivers/rtc/rtc-fm3130.c: fix whitespace related issue +Applying: drivers/rtc/rtc-m41t80.c: fix spacing related issue +Applying: drivers/rtc/rtc-max6902.c: remove unwanted spaces +Applying: drivers/rtc/rtc-max77686.c: remove space before semicolon +Applying: drivers/rtc/rtc-max8997.c: remove space before semicolon +Applying: drivers/rtc/rtc-mpc5121.c: remove space before tab +Applying: drivers/rtc/rtc-msm6242.c: use pr_warn +Applying: drivers/rtc/rtc-mxc.c: fix checkpatch error +Applying: drivers/rtc/rtc-omap.c: include <linux/io.h> instead of <asm/io.h> +Applying: drivers/rtc/rtc-pcf2123.c: remove space before tabs +Applying: drivers/rtc/rtc-pcf8583.c: move assignment outside if condition +Applying: drivers/rtc/rtc-rs5c313.c: include <linux/io.h> instead of <asm/io.h> +Applying: drivers/rtc/rtc-rs5c313.c: fix spacing related issues +Applying: drivers/rtc/rtc-v3020.c: fix spacing issues +Applying: drivers/rtc/rtc-vr41xx.c: fix spacing issues +Applying: drivers/rtc/rtc-x1205.c: fix checkpatch issues +Applying: rtc: rtc-88pm860x: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-ab3100: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-ab8500: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-at32ap700x: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-at91rm9200: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-at91sam9: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-au1xxx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-bfin: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-bq4802: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-coh901331: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-da9052: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-da9055: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-davinci: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-dm355evm: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-ds1302: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-ep93xx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-jz4740: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-lp8788: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-lpc32xx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-ls1x: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-m48t59: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-max8925: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-max8998: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-mc13xxx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-msm6242: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-mxc: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-nuc900: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-pcap: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-pm8xxx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-s3c: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-sa1100: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-sh: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-spear: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-stmp3xxx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-twl: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-vr41xx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-vt8500: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-m48t86: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-puv3: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-tile: remove unnecessary platform_set_drvdata() +Applying: drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq +Applying: drivers/rtc/rtc-m48t86.c: remove empty function +Applying: drivers/rtc/rtc-tile.c: remove empty function +Applying: drivers/rtc/rtc-nuc900.c: remove empty function +Applying: drivers/rtc/rtc-msm6242.c: remove empty function +Applying: drivers/rtc/rtc-max8998.c: remove empty function +Applying: drivers/rtc/rtc-max8925.c: remove empty function +Applying: drivers/rtc/rtc-ls1x.c: remove empty function +Applying: drivers/rtc/rtc-lp8788.c: remove empty function +Applying: drivers/rtc/rtc-ds1302.c: remove empty function +Applying: drivers/rtc/rtc-dm355evm.c: remove empty function +Applying: drivers/rtc/rtc-da9055.c: remove empty function +Applying: drivers/rtc/rtc-da9052.c: remove empty function +Applying: drivers/rtc/rtc-bq4802.c: remove empty function +Applying: drivers/rtc/rtc-au1xxx.c: remove empty function +Applying: drivers/rtc/rtc-ab3100.c: remove empty function +Applying: rtc: rtc-hid-sensor-time: allow full years (16bit) in HID reports +Applying: rtc: rtc-hid-sensor-time: allow 16 and 32 bit values for all attributes. +Applying: rtc: add ability to push out an existing wakealarm using sysfs +Applying: drivers/rtc/rtc-vr41xx.c: fix error return code in rtc_probe() +Applying: rtc: rtc-ds1307: use devm_*() functions +Applying: rtc: rtc-jz4740: use devm_*() functions +Applying: rtc: rtc-mpc5121: use devm_*() functions +Applying: rtc: rtc-m48t59: use devm_*() functions +Applying: rtc: rtc-pm8xxx: use devm_*() functions +Applying: rtc: rtc-pxa: use devm_*() functions +Applying: rtc: rtc-rx8025: use devm_*() functions +Applying: rtc: rtc-sh: use devm_*() functions +Applying: rtc: rtc-coh901331: use platform_{get,set}_drvdata() +Applying: rtc: rtc-rc5t583: use platform_{get,set}_drvdata() +Applying: drivers/rtc/rtc-bq32k.c: remove empty function +Applying: drivers/rtc/rtc-ds1216.c: remove empty function +Applying: drivers/rtc/rtc-ds1286.c: remove empty function +Applying: drivers/rtc/rtc-ds1672.c: remove empty function +Applying: drivers/rtc/rtc-ds3234.c: remove empty function +Applying: drivers/rtc/rtc-ds1390.c: remove empty function +Applying: drivers/rtc/rtc-efi.c: remove empty function +Applying: drivers/rtc/rtc-em3027.c: remove empty function +Applying: drivers/rtc/rtc-fm3130.c: remove empty function +Applying: drivers/rtc/rtc-isl12022.c: remove empty function +Applying: drivers/rtc/rtc-m41t93.c: remove empty function +Applying: drivers/rtc/rtc-m48t35.c: remove empty function +Applying: drivers/rtc/rtc-generic.c: remove empty function +Applying: drivers/rtc/rtc-m41t94.c: remove empty function +Applying: drivers/rtc/rtc-max6902.c: remove empty function +Applying: drivers/rtc/rtc-max6900.c: remove empty function +Applying: drivers/rtc/rtc-max8907.c: remove empty function +Applying: drivers/rtc/rtc-max77686.c: remove empty function +Applying: drivers/rtc/rtc-max8997.c: remove empty function +Applying: drivers/rtc/rtc-pcf8523.c: remove empty function +Applying: drivers/rtc/rtc-pcf8563.c: remove empty function +Applying: drivers/rtc/rtc-pcf8583.c: remove empty function +Applying: drivers/rtc/rtc-ps3.c: remove empty function +Applying: drivers/rtc/rtc-rs5c313.c: remove empty function +Applying: drivers/rtc/rtc-rv3029c2.c: remove empty function +Applying: drivers/rtc/rtc-rx4581.c: remove empty function +Applying: drivers/rtc/rtc-rs5c348.c: remove empty function +Applying: drivers/rtc/rtc-rx8581.c: remove empty function +Applying: drivers/rtc/rtc-snvs.c: remove empty function +Applying: drivers/rtc/rtc-starfire.c: remove empty function +Applying: drivers/rtc/rtc-sun4v.c: remove empty function +Applying: drivers/rtc/rtc-tps80031.c: remove empty function +Applying: drivers/rtc/rtc-wm831x.c: remove empty function +Applying: drivers/rtc/rtc-ab8500.c: add second resolution to rtc driver +Applying: drivers/rtc/rtc-ds1302.c: handle write protection +Applying: drivers/rtc/rtc-mpc5121.c: use platform_{get,set}_drvdata() +Applying: drivers/rtc/rtc-da9052.c: use PTR_RET() +Applying: drivers/rtc/rtc-isl12022.c: use PTR_RET() +Applying: drivers/rtc/rtc-m48t35.c: use PTR_RET() +Applying: drivers/rtc/rtc-pcf8563.c: use PTR_RET() +Applying: drivers/rtc/rtc-pcf8583.c: use PTR_RET() +Applying: drivers/rtc/rtc-twl.c: ensure IRQ is wakeup enabled +Applying: drivers/rtc/rtc-cmos.c: work around bios clearing rtc control +Applying: drivers/rtc/rtc-twl.c: fix rtc_reg_map initialization +Applying: drivers/rtc/rtc-twl.c: cleanup with module_platform_driver() conversion +Applying: drivers/rtc/interface.c: return -EBUSY, not -EACCES when device is busy +Applying: drivers/rtc/rtc-pcf2123.c: replace strict_strtoul() with kstrtoul() +Applying: drivers/rtc/class: convert from Legacy pm ops to dev_pm_ops +Applying: nilfs2: implement calculation of free inodes count +Applying: ] nilfs2: use atomic64_t type for inodes_count and blocks_count fields in nilfs_root struct +Applying: fs/fat: use fat_msg() to replace printk() in __fat_fs_error() +Applying: fat: additions to support fat_fallocate +Applying: fat-additions-to-support-fat_fallocate-fix +Applying: Documentation/CodingStyle: allow multiple return statements per function +Applying: docbook: add futexes to kernel-locking docbook +Applying: ptrace/x86: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" +Applying: ptrace/powerpc: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" +Applying: ptrace/arm: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" +Applying: ptrace/sh: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" +Applying: ptrace: revert "Prepare to fix racy accesses on task breakpoints" +Applying: ptrace/x86: simplify the "disable" logic in ptrace_write_dr7() +Applying: ptrace/x86: dont delay "disable" till second pass in ptrace_write_dr7() +Applying: ptrace/x86: introduce ptrace_register_breakpoint() +Applying: ptrace/x86: ptrace_write_dr7() should create bp if !disabled +Applying: ptrace/x86: cleanup ptrace_set_debugreg() +Applying: ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child) +Applying: ptrace/x86: flush_ptrace_hw_breakpoint() shoule clear the virtual debug registers +Applying: x86: kill TIF_DEBUG +Applying: ptrace: add ability to get/set signal-blocked mask +Applying: ptrace-add-ability-to-get-set-signal-blocked-mask-fix +Applying: signals: eventpoll: do not use sigprocmask() +Applying: signals: eventpoll: set ->saved_sigmask at the start +Applying: usermodehelper: kill the sub_info->path[0] check +Applying: coredump: format_corename() can leak cn->corename +Applying: coredump: introduce cn_vprintf() +Applying: coredump: cn_vprintf() has no reason to call vsnprintf() twice +Applying: coredump: kill cn_escape(), introduce cn_esc_printf() +Applying: coredump: kill call_count, add core_name_size +Applying: coredump: '% at the end' shouldn't bypass core_uses_pid logic +Applying: coredump: avoid the uninitialized cn->corename if core_pattern is empty +Applying: fs/exec.c:de_thread(): use change_pid() rather than detach_pid/attach_pid +Applying: move-exit_task_namespaces-outside-of-exit_notify-fix +Applying: exit.c: unexport __set_special_pids() +Applying: fs/proc/uptime.c:uptime_proc_show(): use get_monotonic_boottime() +Applying: fs/proc/kcore.c: using strlcpy() instead of strncpy() +Applying: fork: reorder permissions when violating number of processes limits +Applying: kernel/fork.c:copy_process(): unify CLONE_THREAD-or-thread_group_leader code +Applying: kernel/fork.c:copy_process(): don't add the uninitialized child to thread/task/pid lists +Applying: kernel/fork.c:copy_process(): consolidate the lockless CLONE_THREAD checks +Applying: fs/exec.c: do_execve_common(): use current_user() +Applying: fs/exec.c:de_thread: mt-exec should update ->real_start_time +Applying: /dev/oldmem: Remove the interface +Applying: dev-oldmem-remove-the-interface-fix +Applying: Documentation/kdump/kdump.txt: remove /dev/oldmem description +Applying: mips: remove savemaxmem parameter setup +Applying: powerpc: Remove savemaxmem parameter setup +Applying: ia64: remove setting for saved_max_pfn +Applying: s390: remove setting for saved_max_pfn +Applying: idr: print a stack dump after ida_remove warning +Applying: idr-print-a-stack-dump-after-ida_remove-warning-fix +Applying: ipc/shmc.c: eliminate ugly 80-col tricks +Applying: ipc: move rcu lock out of ipc_addid +Applying: ipc: restore rcu locking in ipc_addid +Applying: ipc: introduce ipc object locking helpers +Applying: ipc: close open coded spin lock calls +Applying: ipc: move locking out of ipcctl_pre_down_nolock +Applying: ipc,msg: shorten critical region in msgctl_down +Applying: ipc,msg: introduce msgctl_nolock +Applying: ipc,msg: introduce lockless functions to obtain the ipc object +Applying: ipc,msg: make msgctl_nolock lockless +Applying: ipc,msg: shorten critical region in msgsnd +Applying: ipc,msg: shorten critical region in msgrcv +Applying: ipc,msq: fix race in msgrcv(2) +Applying: ipc: remove unused functions +Applying: ipc/util.c, ipc_rcu_alloc: cacheline align allocation +Applying: ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation-checkpatch-fixes +Applying: ipc/sem.c: cacheline align the semaphore structures +Applying: ipc/sem: separate wait-for-zero and alter tasks into seperate queues +Applying: ipc/sem.c: scan complex wait-for-zero after undefined updates +Applying: ipc/sem.c: always use only one queue for alter operations +Applying: ipc/sem.c: replace shared sem_otime with per-semaphore value +Applying: ipc/sem.c: rename try_atomic_semop() to perform_atomic_semop(), docu update +Applying: mwave: fix info leak in mwave_ioctl() +Applying: partitions/msdos.c: end-of-line whitespace and semicolon cleanup +Applying: partitions: add aix lvm partition support files +Applying: partitions-add-aix-lvm-partition-support-files-v2 +Applying: partitions-add-aix-lvm-partition-support-files-checkpatch-fixes +Applying: partitions-add-aix-lvm-partition-support-files: compile aix.c if configured +Applying: partitions-add-aix-lvm-partition-support-files: add the AIX_PARTITION entry +Applying: partitions/msdos: enumerate also AIX LVM partitions +Applying: rapidio/switches: remove tsi500 driver +Applying: drivers/rapidio/rio-scan.c: make functions static +Applying: kernel/pid.c: move statement +Applying: nbd: remove bogus BUG_ON in NBD_CLEAR_QUE +Applying: nbd: correct disconnect behavior +Applying: Documentation/accounting/getdelays.c: avoid strncpy in accounting tool +Applying: documentation-accounting-getdelaysc-avoid-strncpy-in-accounting-tool-fix +Applying: drivers/parport/share.c: use kzalloc +Applying: drivers/pps/clients/pps-gpio.c: convert to devm_* helpers +Applying: drivers/pps/clients/pps-gpio.c: convert to module_platform_driver +Applying: pps-gpio: add device-tree binding and support +Applying: drivers/memstick/host/jmb38x_ms: convert to module_pci_driver +Applying: drivers/memstick/host/r592.c: convert to module_pci_driver +Applying: drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode +Applying: drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix +Applying: relay: fix timer madness +Applying: aio: fix wrong comment in aio_complete() +Applying: kernel/resource.c: remove the unneeded assignment in function __find_resource +Applying: reboot: remove -stable friendly PF_THREAD_BOUND define +Applying: reboot: move shutdown/reboot related functions to kernel/reboot.c +Applying: reboot: checkpatch.pl the new kernel/reboot.c file +Applying: reboot: x86: prepare reboot_mode for moving to generic kernel code +Applying: reboot: unicore32: prepare reboot_mode for moving to generic kernel code +Applying: reboot: arm: remove unused restart_mode fields from some arm subarchs +Applying: reboot: arm: prepare reboot_mode for moving to generic kernel code +Applying: reboot: arm: change reboot_mode to use enum reboot_mode +Applying: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix +Applying: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix +Applying: reboot: move arch/x86 reboot= handling to generic kernel +Applying: lib: add weak clz/ctz functions +Applying: decompressor: add LZ4 decompressor module +Applying: lib: add support for LZ4-compressed kernel +Applying: kbuild: fix for updated LZ4 tool with the new streaming format +Applying: arm: add support for LZ4-compressed kernel +Using index info to reconstruct a base tree... +M arch/arm/boot/compressed/Makefile +Falling back to patching base and 3-way merge... +Auto-merging arch/arm/boot/compressed/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile +Failed to merge in the changes. +Patch failed at 0667 arm: add support for LZ4-compressed kernel +The copy of the patch that failed is found in: + /home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ git rebase --continue +Applying: arm: Remove enforced Os flag for LZ4 decompressor +Using index info to reconstruct a base tree... +M arch/arm/boot/compressed/Makefile +Falling back to patching base and 3-way merge... +Auto-merging arch/arm/boot/compressed/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile +Failed to merge in the changes. +Patch failed at 0668 arm: Remove enforced Os flag for LZ4 decompressor +The copy of the patch that failed is found in: + /home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ git rebase --continue +Applying: x86: add support for LZ4-compressed kernel +Applying: x86, doc: Add LZ4 magic number for the new compression +Applying: lib: add lz4 compressor module +Applying: lib-add-lz4-compressor-module-fix +Applying: crypto: add lz4 Cryptographic API +Applying: crypto-add-lz4-cryptographic-api-fix +Applying: lib/scatterlist: factor out sg_miter_get_next_page() from sg_miter_next() +Applying: lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer() +Applying: crypto: talitos: use sg_pcopy_to_buffer() +Applying: scsi_debug: fix do_device_access() with wrap around range +Applying: lib/scatterlist: error handling in __sg_alloc_table() +Applying: scripts/sortextable.c: fix building on non-Linux systems +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: staging/lustre: replace num_physpages with totalram_pages +Applying: ARM: use enum reboot_type on new platforms +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + c3e91e6...cbbc4a7 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (cbbc4a7 ARM: use enum reboot_type on new platforms) +$ git merge --no-ff akpm/master +Removing drivers/rapidio/switches/tsi500.c +Removing crypto/async_tx/async_memset.c +Merge made by the 'recursive' strategy. + Documentation/CodingStyle | 3 +- + Documentation/DocBook/kernel-locking.tmpl | 7 +- + Documentation/accounting/getdelays.c | 4 +- + Documentation/cgroups/memory.txt | 7 +- + Documentation/crypto/async-tx-api.txt | 1 - + Documentation/devices.txt | 3 +- + Documentation/devicetree/bindings/pps/pps-gpio.txt | 20 + + Documentation/filesystems/proc.txt | 7 +- + Documentation/filesystems/vfs.txt | 25 +- + Documentation/kdump/kdump.txt | 31 +- + Documentation/kernel-parameters.txt | 14 +- + Documentation/rtc.txt | 7 +- + Documentation/sysctl/vm.txt | 35 +- + Documentation/vm/pagemap.txt | 3 +- + Documentation/vm/soft-dirty.txt | 36 + + Documentation/vm/transhuge.txt | 4 +- + Documentation/vm/zswap.txt | 68 ++ + Documentation/x86/boot.txt | 7 +- + MAINTAINERS | 23 +- + arch/Kconfig | 3 + + arch/alpha/include/asm/mmzone.h | 2 - + arch/alpha/kernel/sys_nautilus.c | 4 +- + arch/alpha/mm/init.c | 41 +- + arch/alpha/mm/numa.c | 40 - + arch/arc/mm/fault.c | 6 +- + arch/arc/mm/init.c | 42 +- + arch/arm/Kconfig | 1 + + arch/arm/boot/compressed/.gitignore | 1 + + arch/arm/boot/compressed/Makefile | 3 +- + arch/arm/boot/compressed/decompress.c | 4 + + arch/arm/boot/compressed/piggy.lz4.S | 6 + + arch/arm/include/asm/hardware/iop3xx.h | 3 +- + arch/arm/include/asm/mach/arch.h | 5 +- + arch/arm/include/asm/memory.h | 6 - + arch/arm/include/asm/system_misc.h | 3 +- + arch/arm/kernel/process.c | 15 +- + arch/arm/kernel/ptrace.c | 8 - + arch/arm/kernel/setup.c | 6 +- + arch/arm/mach-at91/at91rm9200.c | 3 +- + arch/arm/mach-at91/generic.h | 5 +- + arch/arm/mach-bcm2835/bcm2835.c | 4 +- + arch/arm/mach-clps711x/common.c | 2 +- + arch/arm/mach-clps711x/common.h | 4 +- + arch/arm/mach-cns3xxx/core.h | 4 +- + arch/arm/mach-cns3xxx/pm.c | 2 +- + arch/arm/mach-davinci/devices-da8xx.c | 3 +- + arch/arm/mach-davinci/devices.c | 3 +- + arch/arm/mach-davinci/include/mach/common.h | 3 +- + arch/arm/mach-davinci/include/mach/da8xx.h | 3 +- + arch/arm/mach-davinci/include/mach/tnetv107x.h | 3 +- + arch/arm/mach-davinci/tnetv107x.c | 3 +- + arch/arm/mach-dove/common.c | 2 +- + arch/arm/mach-dove/common.h | 4 +- + arch/arm/mach-ebsa110/core.c | 3 +- + arch/arm/mach-ep93xx/core.c | 3 +- + arch/arm/mach-ep93xx/include/mach/platform.h | 4 +- + arch/arm/mach-exynos/common.c | 4 +- + arch/arm/mach-exynos/common.h | 5 +- + arch/arm/mach-footbridge/cats-hw.c | 2 +- + arch/arm/mach-footbridge/common.c | 4 +- + arch/arm/mach-footbridge/common.h | 3 +- + arch/arm/mach-footbridge/netwinder-hw.c | 4 +- + arch/arm/mach-highbank/core.h | 4 +- + arch/arm/mach-highbank/system.c | 5 +- + arch/arm/mach-imx/common.h | 4 +- + arch/arm/mach-imx/mach-imx6q.c | 3 +- + arch/arm/mach-imx/system.c | 2 +- + arch/arm/mach-integrator/common.h | 3 +- + arch/arm/mach-integrator/core.c | 2 +- + arch/arm/mach-iop13xx/include/mach/iop13xx.h | 5 +- + arch/arm/mach-iop13xx/setup.c | 5 +- + arch/arm/mach-iop32x/n2100.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 4 +- + arch/arm/mach-ixp4xx/dsmg600-setup.c | 1 + + arch/arm/mach-ixp4xx/include/mach/platform.h | 4 +- + arch/arm/mach-keystone/keystone.c | 3 +- + arch/arm/mach-kirkwood/common.c | 3 +- + arch/arm/mach-kirkwood/common.h | 4 +- + arch/arm/mach-ks8695/generic.h | 2 +- + arch/arm/mach-ks8695/time.c | 4 +- + arch/arm/mach-lpc32xx/common.c | 6 +- + arch/arm/mach-lpc32xx/common.h | 3 +- + arch/arm/mach-mmp/common.c | 2 +- + arch/arm/mach-mmp/common.h | 3 +- + arch/arm/mach-mmp/include/mach/pxa168.h | 4 +- + arch/arm/mach-mmp/pxa168.c | 2 +- + arch/arm/mach-mv78xx0/common.c | 2 +- + arch/arm/mach-mv78xx0/common.h | 4 +- + arch/arm/mach-mvebu/common.h | 4 +- + arch/arm/mach-mvebu/system-controller.c | 3 +- + arch/arm/mach-mxs/mach-mxs.c | 3 +- + arch/arm/mach-netx/generic.c | 3 +- + arch/arm/mach-netx/generic.h | 4 +- + arch/arm/mach-nomadik/cpu-8815.c | 2 +- + arch/arm/mach-omap1/board-voiceblue.c | 3 +- + arch/arm/mach-omap1/common.h | 3 +- + arch/arm/mach-omap1/reset.c | 3 +- + arch/arm/mach-omap2/am33xx-restart.c | 3 +- + arch/arm/mach-omap2/common.h | 17 +- + arch/arm/mach-omap2/omap2-restart.c | 2 +- + arch/arm/mach-omap2/omap3-restart.c | 3 +- + arch/arm/mach-omap2/omap4-common.c | 1 + + arch/arm/mach-omap2/omap4-restart.c | 3 +- + arch/arm/mach-orion5x/common.c | 2 +- + arch/arm/mach-orion5x/common.h | 4 +- + arch/arm/mach-orion5x/ls-chl-setup.c | 2 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +- + arch/arm/mach-orion5x/lsmini-setup.c | 2 +- + arch/arm/mach-picoxcell/common.c | 3 +- + arch/arm/mach-prima2/common.h | 4 +- + arch/arm/mach-prima2/rstc.c | 3 +- + arch/arm/mach-pxa/corgi.c | 6 +- + arch/arm/mach-pxa/generic.h | 4 +- + arch/arm/mach-pxa/mioa701.c | 8 +- + arch/arm/mach-pxa/poodle.c | 2 +- + arch/arm/mach-pxa/reset.c | 8 +- + arch/arm/mach-pxa/spitz.c | 8 +- + arch/arm/mach-pxa/tosa.c | 6 +- + arch/arm/mach-realview/realview_eb.c | 3 +- + arch/arm/mach-realview/realview_pb1176.c | 3 +- + arch/arm/mach-realview/realview_pb11mp.c | 3 +- + arch/arm/mach-realview/realview_pba8.c | 3 +- + arch/arm/mach-realview/realview_pbx.c | 3 +- + arch/arm/mach-rpc/riscpc.c | 3 +- + arch/arm/mach-s3c24xx/common.h | 12 +- + arch/arm/mach-s3c24xx/s3c2410.c | 5 +- + arch/arm/mach-s3c24xx/s3c2412.c | 5 +- + arch/arm/mach-s3c24xx/s3c2416.c | 5 +- + arch/arm/mach-s3c24xx/s3c2443.c | 5 +- + arch/arm/mach-s3c24xx/s3c244x.c | 5 +- + arch/arm/mach-s3c64xx/common.c | 5 +- + arch/arm/mach-s3c64xx/common.h | 4 +- + arch/arm/mach-s5p64x0/common.c | 5 +- + arch/arm/mach-s5p64x0/common.h | 4 +- + arch/arm/mach-s5pc100/common.c | 5 +- + arch/arm/mach-s5pc100/common.h | 4 +- + arch/arm/mach-s5pv210/common.c | 2 +- + arch/arm/mach-s5pv210/common.h | 4 +- + arch/arm/mach-sa1100/generic.c | 5 +- + arch/arm/mach-sa1100/generic.h | 3 +- + arch/arm/mach-shark/core.c | 3 +- + arch/arm/mach-shmobile/board-armadillo800eva.c | 3 +- + arch/arm/mach-shmobile/board-kzm9g.c | 3 +- + arch/arm/mach-socfpga/socfpga.c | 5 +- + arch/arm/mach-spear/generic.h | 4 +- + arch/arm/mach-spear/restart.c | 5 +- + arch/arm/mach-sunxi/sunxi.c | 3 +- + arch/arm/mach-tegra/board.h | 3 +- + arch/arm/mach-tegra/common.c | 3 +- + arch/arm/mach-u300/core.c | 6 +- + arch/arm/mach-versatile/core.c | 3 +- + arch/arm/mach-versatile/core.h | 3 +- + arch/arm/mach-vt8500/vt8500.c | 3 +- + arch/arm/mach-w90x900/cpu.c | 4 +- + arch/arm/mach-w90x900/nuc9xx.h | 5 +- + arch/arm/mach-zynq/common.c | 3 +- + arch/arm/mm/init.c | 58 +- + arch/arm/mm/mmap.c | 2 - + arch/arm/plat-iop/adma.c | 2 - + arch/arm/plat-iop/gpio.c | 1 + + arch/arm/plat-iop/restart.c | 2 +- + arch/arm/plat-orion/common.c | 5 - + arch/arm64/mm/init.c | 65 +- + arch/arm64/mm/mmap.c | 2 - + arch/avr32/kernel/setup.c | 2 +- + arch/avr32/kernel/vmlinux.lds.S | 4 +- + arch/avr32/mm/init.c | 52 +- + arch/blackfin/mm/init.c | 44 +- + arch/c6x/kernel/vmlinux.lds.S | 4 +- + arch/c6x/mm/init.c | 17 +- + arch/cris/include/asm/page.h | 1 - + arch/cris/mm/init.c | 37 +- + arch/frv/kernel/setup.c | 15 +- + arch/frv/kernel/traps.c | 2 +- + arch/frv/mm/init.c | 57 +- + arch/h8300/boot/compressed/misc.c | 1 - + arch/h8300/kernel/vmlinux.lds.S | 2 + + arch/h8300/mm/init.c | 44 +- + arch/hexagon/mm/init.c | 6 +- + arch/ia64/kernel/efi.c | 5 - + arch/ia64/mm/contig.c | 11 - + arch/ia64/mm/discontig.c | 3 - + arch/ia64/mm/init.c | 41 +- + arch/m32r/mm/discontig.c | 6 +- + arch/m32r/mm/init.c | 68 +- + arch/m68k/mm/init.c | 48 +- + arch/metag/mm/fault.c | 6 +- + arch/metag/mm/init.c | 32 +- + arch/microblaze/include/asm/page.h | 1 - + arch/microblaze/mm/init.c | 57 +- + arch/mips/kernel/crash_dump.c | 10 - + arch/mips/mm/init.c | 62 +- + arch/mips/mm/mmap.c | 2 - + arch/mips/pci/pci-lantiq.c | 2 +- + arch/mips/sgi-ip27/ip27-memory.c | 33 +- + arch/mn10300/mm/fault.c | 7 +- + arch/mn10300/mm/init.c | 33 +- + arch/openrisc/mm/fault.c | 8 +- + arch/openrisc/mm/init.c | 48 +- + arch/parisc/mm/init.c | 60 +- + arch/powerpc/kernel/crash_dump.c | 10 - + arch/powerpc/kernel/kvm.c | 9 +- + arch/powerpc/kernel/ptrace.c | 30 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/mm/mem.c | 59 +- + arch/powerpc/mm/mmap.c | 2 - + arch/s390/kernel/setup.c | 4 - + arch/s390/mm/init.c | 24 +- + arch/s390/mm/mmap.c | 4 - + arch/score/kernel/vmlinux.lds.S | 1 + + arch/score/mm/fault.c | 8 +- + arch/score/mm/init.c | 31 +- + arch/sh/kernel/ptrace_32.c | 4 - + arch/sh/mm/init.c | 43 +- + arch/sparc/kernel/leon_smp.c | 3 - + arch/sparc/kernel/sys_sparc_64.c | 2 - + arch/sparc/mm/init_32.c | 37 +- + arch/sparc/mm/init_64.c | 26 +- + arch/tile/include/asm/sections.h | 2 +- + arch/tile/kernel/setup.c | 20 +- + arch/tile/kernel/vmlinux.lds.S | 4 +- + arch/tile/mm/fault.c | 8 +- + arch/tile/mm/init.c | 26 +- + arch/tile/mm/mmap.c | 2 - + arch/um/include/asm/common.lds.S | 1 - + arch/um/kernel/dyn.lds.S | 6 +- + arch/um/kernel/mem.c | 8 +- + arch/um/kernel/uml.lds.S | 7 +- + arch/unicore32/include/asm/memory.h | 6 - + arch/unicore32/kernel/process.c | 14 +- + arch/unicore32/kernel/setup.h | 2 +- + arch/unicore32/mm/init.c | 55 +- + arch/unicore32/mm/mmu.c | 2 +- + arch/x86/Kconfig | 2 + + arch/x86/boot/compressed/Makefile | 6 +- + arch/x86/boot/compressed/misc.c | 4 + + arch/x86/ia32/ia32_aout.c | 2 - + arch/x86/include/asm/e820.h | 2 + + arch/x86/include/asm/emergency-restart.h | 12 - + arch/x86/include/asm/pgtable.h | 24 +- + arch/x86/include/asm/pgtable_types.h | 12 + + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/e820.c | 72 +- + arch/x86/kernel/hw_breakpoint.c | 3 + + arch/x86/kernel/ptrace.c | 204 ++--- + arch/x86/kernel/reboot.c | 117 +-- + arch/x86/kernel/setup.c | 2 - + arch/x86/kvm/mmu.c | 25 +- + arch/x86/mm/highmem_32.c | 6 + + arch/x86/mm/init.c | 14 +- + arch/x86/mm/init_32.c | 32 +- + arch/x86/mm/init_64.c | 45 +- + arch/x86/mm/mmap.c | 2 - + arch/x86/mm/numa_32.c | 2 - + arch/x86/mm/pgtable.c | 4 +- + arch/x86/platform/efi/efi.c | 15 +- + arch/xtensa/mm/init.c | 33 +- + block/compat_ioctl.c | 1 + + block/genhd.c | 4 +- + block/partitions/Kconfig | 11 + + block/partitions/Makefile | 1 + + block/partitions/aix.c | 293 +++++++ + block/partitions/aix.h | 1 + + block/partitions/msdos.c | 17 +- + crypto/Kconfig | 16 + + crypto/Makefile | 2 + + crypto/algapi.c | 3 +- + crypto/async_tx/Kconfig | 4 - + crypto/async_tx/Makefile | 1 - + crypto/async_tx/async_memset.c | 89 -- + crypto/lz4.c | 106 +++ + crypto/lz4hc.c | 106 +++ + crypto/pcrypt.c | 4 +- + drivers/acpi/sysfs.c | 3 +- + drivers/atm/he.c | 13 +- + drivers/base/attribute_container.c | 2 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/block/mtip32xx/mtip32xx.c | 3 +- + drivers/block/nbd.c | 11 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/cdrom/cdrom.c | 2 +- + drivers/cdrom/gdrom.c | 2 +- + drivers/char/mem.c | 47 - + drivers/char/mwave/tp3780i.c | 1 + + drivers/crypto/talitos.c | 60 +- + drivers/devfreq/devfreq.c | 2 +- + drivers/dma/dmaengine.c | 7 - + drivers/dma/ioat/dma.c | 3 +- + drivers/dma/ioat/dma_v2.h | 1 - + drivers/dma/ioat/dma_v3.c | 114 +-- + drivers/dma/ioat/hw.h | 27 - + drivers/dma/iop-adma.c | 66 +- + drivers/dma/mv_xor.c | 60 +- + drivers/dma/mv_xor.h | 1 - + drivers/dma/ppc4xx/adma.c | 47 - + drivers/extcon/extcon-class.c | 2 +- + drivers/firmware/dmi_scan.c | 12 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 8 + + drivers/gpu/drm/i915/i915_dma.c | 4 +- + drivers/gpu/drm/i915/i915_gem.c | 78 +- + drivers/gpu/drm/i915/intel_lvds.c | 16 + + drivers/gpu/drm/nouveau/nouveau_acpi.c | 5 + + drivers/gpu/drm/radeon/mkregtable.c | 13 - + drivers/gpu/drm/ttm/ttm_page_alloc.c | 44 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 51 +- + drivers/hsi/hsi.c | 2 +- + drivers/hwmon/adt7470.c | 2 +- + drivers/ide/delkin_cb.c | 13 +- + drivers/ide/ide-cd.c | 2 +- + drivers/ide/ide-gd.c | 2 +- + drivers/ide/ide-probe.c | 4 +- + drivers/ide/ide-tape.c | 2 +- + drivers/infiniband/core/cm.c | 5 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/iommu/msm_iommu_dev.c | 24 +- + 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/dsp_pipeline.c | 2 +- + drivers/isdn/mISDN/socket.c | 9 + + drivers/md/bcache/btree.c | 45 +- + drivers/md/bcache/sysfs.c | 2 +- + drivers/md/dm-bufio.c | 64 +- + drivers/media/i2c/tvaudio.c | 3 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/ivtv/ivtv-driver.c | 2 +- + drivers/media/platform/vivi.c | 3 +- + drivers/memstick/host/jmb38x_ms.c | 13 +- + drivers/memstick/host/r592.c | 13 +- + drivers/message/i2o/driver.c | 4 +- + drivers/misc/sgi-gru/grufault.c | 5 +- + drivers/mtd/chips/gen_probe.c | 4 +- + drivers/mtd/mtdcore.c | 2 +- + drivers/mtd/ubi/build.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 14 +- + drivers/net/irda/donauboe.c | 15 +- + drivers/net/wireless/airo.c | 3 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +- + drivers/net/wireless/rtlwifi/base.c | 2 +- + drivers/parport/share.c | 3 +- + drivers/pci/hotplug/pciehp_hpc.c | 4 +- + drivers/pci/hotplug/shpchp_core.c | 3 +- + drivers/pcmcia/pd6729.c | 13 +- + drivers/pcmcia/yenta_socket.c | 16 +- + drivers/platform/x86/intel_ips.c | 13 +- + drivers/platform/x86/wmi.c | 2 +- + drivers/power/reset/restart-poweroff.c | 3 +- + drivers/power/reset/vexpress-poweroff.c | 2 +- + drivers/pps/clients/pps-gpio.c | 165 ++-- + drivers/rapidio/rio-scan.c | 4 +- + drivers/rapidio/switches/Kconfig | 7 - + drivers/rapidio/switches/Makefile | 1 - + drivers/rapidio/switches/tsi500.c | 78 -- + drivers/rtc/class.c | 12 +- + drivers/rtc/interface.c | 26 +- + drivers/rtc/rtc-88pm80x.c | 1 - + drivers/rtc/rtc-88pm860x.c | 1 - + drivers/rtc/rtc-ab3100.c | 7 - + drivers/rtc/rtc-ab8500.c | 65 +- + drivers/rtc/rtc-at32ap700x.c | 22 +- + drivers/rtc/rtc-at91rm9200.c | 4 +- + drivers/rtc/rtc-at91sam9.c | 19 +- + drivers/rtc/rtc-au1xxx.c | 8 - + drivers/rtc/rtc-bfin.c | 1 - + drivers/rtc/rtc-bq32k.c | 6 - + drivers/rtc/rtc-bq4802.c | 8 - + drivers/rtc/rtc-cmos.c | 41 +- + drivers/rtc/rtc-coh901331.c | 9 +- + drivers/rtc/rtc-da9052.c | 14 +- + drivers/rtc/rtc-da9055.c | 8 - + drivers/rtc/rtc-davinci.c | 13 +- + drivers/rtc/rtc-dm355evm.c | 7 - + drivers/rtc/rtc-ds1216.c | 6 - + drivers/rtc/rtc-ds1286.c | 6 - + drivers/rtc/rtc-ds1302.c | 15 +- + drivers/rtc/rtc-ds1305.c | 32 +- + drivers/rtc/rtc-ds1307.c | 43 +- + drivers/rtc/rtc-ds1374.c | 11 +- + drivers/rtc/rtc-ds1390.c | 6 - + drivers/rtc/rtc-ds1511.c | 93 +- + drivers/rtc/rtc-ds1672.c | 6 - + drivers/rtc/rtc-ds3234.c | 8 +- + drivers/rtc/rtc-efi.c | 6 - + drivers/rtc/rtc-em3027.c | 6 - + drivers/rtc/rtc-ep93xx.c | 2 - + drivers/rtc/rtc-fm3130.c | 8 +- + drivers/rtc/rtc-generic.c | 6 - + drivers/rtc/rtc-hid-sensor-time.c | 48 +- + drivers/rtc/rtc-isl12022.c | 12 +- + drivers/rtc/rtc-jz4740.c | 68 +- + drivers/rtc/rtc-lp8788.c | 8 - + drivers/rtc/rtc-lpc32xx.c | 3 - + drivers/rtc/rtc-ls1x.c | 8 - + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-m41t93.c | 7 - + drivers/rtc/rtc-m41t94.c | 6 - + drivers/rtc/rtc-m48t35.c | 12 +- + drivers/rtc/rtc-m48t59.c | 54 +- + drivers/rtc/rtc-m48t86.c | 8 - + drivers/rtc/rtc-max6900.c | 6 - + drivers/rtc/rtc-max6902.c | 12 +- + drivers/rtc/rtc-max77686.c | 8 +- + drivers/rtc/rtc-max8907.c | 6 - + drivers/rtc/rtc-max8925.c | 13 +- + drivers/rtc/rtc-max8997.c | 8 +- + drivers/rtc/rtc-max8998.c | 12 +- + drivers/rtc/rtc-mc13xxx.c | 4 - + drivers/rtc/rtc-mpc5121.c | 20 +- + drivers/rtc/rtc-msm6242.c | 21 +- + drivers/rtc/rtc-mxc.c | 7 +- + drivers/rtc/rtc-nuc900.c | 8 - + drivers/rtc/rtc-omap.c | 4 +- + drivers/rtc/rtc-pcap.c | 13 +- + drivers/rtc/rtc-pcf2123.c | 25 +- + drivers/rtc/rtc-pcf8523.c | 6 - + drivers/rtc/rtc-pcf8563.c | 12 +- + drivers/rtc/rtc-pcf8583.c | 15 +- + drivers/rtc/rtc-pm8xxx.c | 29 +- + drivers/rtc/rtc-ps3.c | 6 - + drivers/rtc/rtc-puv3.c | 1 - + drivers/rtc/rtc-pxa.c | 43 +- + drivers/rtc/rtc-rc5t583.c | 2 +- + drivers/rtc/rtc-rp5c01.c | 12 +- + drivers/rtc/rtc-rs5c313.c | 24 +- + drivers/rtc/rtc-rs5c348.c | 6 - + drivers/rtc/rtc-rv3029c2.c | 8 +- + drivers/rtc/rtc-rx4581.c | 6 - + drivers/rtc/rtc-rx8025.c | 18 +- + drivers/rtc/rtc-rx8581.c | 6 - + drivers/rtc/rtc-s3c.c | 9 +- + drivers/rtc/rtc-sa1100.c | 8 +- + drivers/rtc/rtc-sh.c | 74 +- + drivers/rtc/rtc-snvs.c | 6 - + drivers/rtc/rtc-spear.c | 1 - + drivers/rtc/rtc-starfire.c | 6 - + drivers/rtc/rtc-stmp3xxx.c | 13 +- + drivers/rtc/rtc-sun4v.c | 6 - + drivers/rtc/rtc-sysfs.c | 20 +- + drivers/rtc/rtc-tile.c | 11 - + drivers/rtc/rtc-tps80031.c | 6 - + drivers/rtc/rtc-twl.c | 40 +- + drivers/rtc/rtc-v3020.c | 18 +- + drivers/rtc/rtc-vr41xx.c | 16 +- + drivers/rtc/rtc-vt8500.c | 2 - + drivers/rtc/rtc-wm831x.c | 6 - + drivers/rtc/rtc-x1205.c | 33 +- + drivers/s390/net/qeth_l3_sys.c | 6 +- + drivers/scsi/a100u2w.c | 12 +- + drivers/scsi/aacraid/commctrl.c | 3 +- + drivers/scsi/aacraid/commsup.c | 3 +- + drivers/scsi/be2iscsi/be_main.c | 2 +- + drivers/scsi/dc395x.c | 24 +- + drivers/scsi/dmx3191d.c | 13 +- + drivers/scsi/initio.c | 13 +- + drivers/scsi/mvumi.c | 20 +- + drivers/scsi/osd/osd_uld.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/scsi_debug.c | 48 +- + drivers/scsi/scsi_transport_fc.c | 6 +- + drivers/scsi/sd.c | 2 +- + drivers/spi/spi.c | 2 +- + drivers/staging/android/ashmem.c | 44 +- + drivers/staging/android/lowmemorykiller.c | 43 +- + drivers/staging/android/timed_output.c | 2 +- + drivers/staging/dgrp/dgrp_sysfs.c | 2 +- + .../lustre/include/linux/libcfs/linux/linux-mem.h | 42 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 10 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 139 +-- + .../lustre/lustre/libcfs/linux/linux-tracefile.c | 2 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 8 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 6 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 100 ++- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 80 +- + drivers/staging/rtl8712/os_intfs.c | 2 +- + drivers/staging/tidspbridge/rmgr/drv_interface.c | 3 +- + drivers/staging/zcache/zcache-main.c | 29 +- + drivers/uio/uio.c | 2 +- + drivers/usb/atm/usbatm.c | 5 +- + drivers/usb/gadget/amd5536udc.c | 4 +- + drivers/uwb/lc-dev.c | 2 +- + drivers/video/acornfb.c | 266 +----- + drivers/video/acornfb.h | 29 - + drivers/video/backlight/atmel-pwm-bl.c | 2 - + drivers/video/backlight/backlight.c | 87 +- + drivers/video/backlight/ep93xx_bl.c | 1 - + drivers/video/backlight/lcd.c | 72 +- + drivers/video/backlight/lp8788_bl.c | 1 - + drivers/video/backlight/pcf50633-backlight.c | 2 - + drivers/video/cyber2000fb.c | 3 + + drivers/video/output.c | 2 +- + drivers/virtio/virtio_balloon.c | 10 +- + drivers/w1/slaves/w1_ds2408.c | 30 + + drivers/xen/balloon.c | 23 +- + drivers/xen/xenbus/xenbus_probe.c | 2 +- + fs/aio.c | 2 +- + fs/autofs4/autofs_i.h | 4 +- + fs/autofs4/dev-ioctl.c | 16 +- + fs/autofs4/inode.c | 33 +- + fs/autofs4/waitq.c | 16 +- + fs/binfmt_aout.c | 2 - + fs/binfmt_elf.c | 23 +- + fs/block_dev.c | 1 + + fs/buffer.c | 34 + + fs/cachefiles/rdwr.c | 30 +- + fs/configfs/file.c | 2 +- + fs/coredump.c | 121 ++- + fs/dcache.c | 279 +++--- + fs/drop_caches.c | 3 + + fs/eventpoll.c | 38 +- + fs/exec.c | 7 +- + fs/ext3/inode.c | 1 + + fs/ext4/extents_status.c | 32 +- + fs/fat/file.c | 108 ++- + fs/fat/inode.c | 54 ++ + fs/fat/misc.c | 5 +- + fs/file_table.c | 30 +- + fs/fs-writeback.c | 10 +- + fs/fuse/inode.c | 2 +- + fs/gfs2/glock.c | 30 +- + fs/gfs2/main.c | 3 +- + fs/gfs2/quota.c | 18 +- + fs/gfs2/quota.h | 6 +- + fs/hppfs/hppfs.c | 11 +- + fs/inode.c | 193 ++--- + fs/internal.h | 6 +- + fs/lockd/svc.c | 2 +- + fs/mbcache.c | 49 +- + fs/ncpfs/mmap.c | 2 +- + fs/nfs/callback.c | 5 +- + fs/nfs/dir.c | 23 +- + fs/nfs/file.c | 30 + + fs/nfs/internal.h | 6 +- + fs/nfs/nfs4state.c | 2 +- + fs/nfs/super.c | 3 +- + fs/nfsd/nfscache.c | 32 +- + fs/nilfs2/alloc.c | 63 ++ + fs/nilfs2/alloc.h | 2 + + fs/nilfs2/ifile.c | 22 + + fs/nilfs2/ifile.h | 2 + + fs/nilfs2/inode.c | 8 +- + fs/nilfs2/segment.c | 4 +- + fs/nilfs2/super.c | 31 +- + fs/nilfs2/the_nilfs.c | 4 +- + fs/nilfs2/the_nilfs.h | 4 +- + fs/notify/dnotify/dnotify.c | 25 +- + fs/notify/fanotify/fanotify_user.c | 89 +- + fs/notify/inotify/inotify_user.c | 13 +- + fs/notify/mark.c | 50 +- + fs/ocfs2/alloc.c | 10 +- + fs/ocfs2/cluster/tcp.c | 3 + + fs/ocfs2/dlm/dlmlock.c | 1 + + fs/ocfs2/dlm/dlmrecovery.c | 7 +- + fs/ocfs2/file.c | 18 +- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/namei.c | 76 +- + fs/ocfs2/ocfs2.h | 1 - + fs/ocfs2/suballoc.c | 37 +- + fs/ocfs2/super.c | 6 +- + fs/ocfs2/xattr.c | 7 - + fs/proc/kcore.c | 2 +- + fs/proc/task_mmu.c | 145 +++- + fs/proc/uptime.c | 3 +- + fs/proc/vmcore.c | 694 ++++++++++----- + fs/quota/dquot.c | 34 +- + fs/super.c | 111 ++- + fs/ubifs/shrinker.c | 29 +- + fs/ubifs/super.c | 3 +- + fs/ubifs/ubifs.h | 5 +- + 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 | 285 ++++--- + fs/xfs/xfs_qm.h | 4 +- + fs/xfs/xfs_super.c | 12 +- + include/asm-generic/pgtable.h | 22 + + include/asm-generic/sections.h | 21 +- + include/linux/async_tx.h | 4 - + include/linux/audit.h | 26 +- + include/linux/backlight.h | 6 + + include/linux/balloon_compaction.h | 7 + + include/linux/bootmem.h | 2 +- + include/linux/buffer_head.h | 3 + + include/linux/dcache.h | 14 +- + include/linux/decompress/unlz4.h | 10 + + include/linux/dmaengine.h | 5 - + include/linux/err.h | 10 +- + include/linux/fs.h | 32 +- + include/linux/gfp.h | 2 +- + include/linux/hardirq.h | 5 + + include/linux/hugetlb.h | 2 - + include/linux/lcd.h | 5 + + include/linux/list.h | 11 - + include/linux/list_lru.h | 131 +++ + include/linux/llist.h | 19 +- + include/linux/lockdep.h | 92 +- + include/linux/lz4.h | 87 ++ + include/linux/memcontrol.h | 9 +- + include/linux/mm.h | 49 +- + include/linux/mm_types.h | 3 - + include/linux/mman.h | 8 +- + include/linux/mmzone.h | 79 +- + include/linux/mod_devicetable.h | 6 +- + include/linux/nbd.h | 1 + + include/linux/page-flags.h | 4 +- + include/linux/pageblock-flags.h | 6 - + include/linux/pagevec.h | 34 +- + include/linux/pid.h | 6 +- + include/linux/posix-timers.h | 16 +- + include/linux/ptrace.h | 10 - + include/linux/rbtree.h | 1 - + include/linux/reboot.h | 27 +- + include/linux/scatterlist.h | 5 + + include/linux/sched.h | 15 +- + include/linux/sem.h | 6 +- + include/linux/shrinker.h | 54 +- + include/linux/swap.h | 24 +- + include/linux/vexpress.h | 1 + + include/linux/vm_event_item.h | 7 +- + include/linux/vmalloc.h | 16 +- + include/linux/workqueue.h | 7 +- + include/linux/writeback.h | 8 +- + include/linux/zbud.h | 22 + + include/trace/events/pagemap.h | 89 ++ + include/trace/events/vmscan.h | 4 +- + include/uapi/linux/fs.h | 6 +- + include/uapi/linux/ptrace.h | 3 + + init/Kconfig | 19 +- + init/do_mounts.c | 2 +- + init/main.c | 3 +- + ipc/mqueue.c | 2 + + ipc/msg.c | 226 +++-- + ipc/sem.c | 442 +++++++--- + ipc/shm.c | 34 +- + ipc/util.c | 36 +- + ipc/util.h | 22 +- + kernel/Makefile | 2 +- + kernel/audit.h | 1 + + kernel/auditfilter.c | 8 +- + kernel/auditsc.c | 12 +- + kernel/exit.c | 13 +- + kernel/fork.c | 70 +- + kernel/hrtimer.c | 2 + + kernel/kmod.c | 11 +- + kernel/kprobes.c | 3 + + kernel/lglock.c | 12 +- + kernel/panic.c | 5 +- + kernel/pid.c | 14 +- + kernel/posix-cpu-timers.c | 395 +++------ + kernel/power/snapshot.c | 4 +- + kernel/ptrace.c | 61 +- + kernel/rcutree.c | 2 +- + kernel/reboot.c | 419 +++++++++ + kernel/relay.c | 14 +- + kernel/resource.c | 1 - + kernel/smp.c | 11 +- + kernel/softirq.c | 10 +- + kernel/sys.c | 352 +------- + kernel/sysctl.c | 6 +- + kernel/timer.c | 4 +- + kernel/watchdog.c | 10 +- + lib/Kconfig | 13 + + lib/Makefile | 6 +- + lib/clz_ctz.c | 58 ++ + lib/decompress.c | 5 + + lib/decompress_unlz4.c | 187 ++++ + lib/dump_stack.c | 47 +- + lib/idr.c | 7 +- + lib/interval_tree.c | 1 + + lib/llist.c | 15 +- + lib/lz4/Makefile | 3 + + lib/lz4/lz4_compress.c | 443 ++++++++++ + lib/lz4/lz4_decompress.c | 326 +++++++ + lib/lz4/lz4defs.h | 156 ++++ + lib/lz4/lz4hc_compress.c | 539 ++++++++++++ + lib/scatterlist.c | 133 ++- + mm/Kconfig | 42 + + mm/Makefile | 4 +- + mm/backing-dev.c | 5 +- + mm/balloon_compaction.c | 2 + + mm/bootmem.c | 39 +- + mm/dmapool.c | 5 +- + mm/filemap.c | 6 +- + mm/huge_memory.c | 19 +- + mm/hugetlb.c | 4 +- + mm/internal.h | 5 - + mm/list_lru.c | 144 ++++ + mm/memblock.c | 2 +- + mm/memcontrol.c | 147 ++-- + mm/memory-failure.c | 24 +- + mm/memory.c | 15 +- + mm/memory_hotplug.c | 52 +- + mm/migrate.c | 1 + + mm/mm_init.c | 47 + + mm/mmap.c | 34 +- + mm/mremap.c | 20 +- + mm/nobootmem.c | 35 +- + mm/nommu.c | 10 +- + mm/page_alloc.c | 365 +++++--- + mm/page_io.c | 50 +- + mm/rmap.c | 9 +- + mm/sparse.c | 5 +- + mm/swap.c | 106 ++- + mm/swap_state.c | 63 +- + mm/swapfile.c | 55 +- + mm/util.c | 1 - + mm/vmalloc.c | 164 ++-- + mm/vmscan.c | 848 +++++++++++------- + mm/vmstat.c | 9 +- + mm/zbud.c | 527 ++++++++++++ + mm/zswap.c | 943 +++++++++++++++++++++ + net/bluetooth/hci_core.c | 9 +- + net/ipv4/inet_fragment.c | 2 +- + net/mac80211/main.c | 2 +- + net/sunrpc/auth.c | 41 +- + net/sunrpc/svc.c | 2 +- + scripts/Makefile.lib | 5 + + scripts/checkpatch.pl | 610 ++++++++++--- + sound/soc/codecs/si476x.c | 6 +- + sound/sound_core.c | 2 +- + tools/include/tools/be_byteshift.h | 34 +- + tools/include/tools/le_byteshift.h | 34 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/timers/Makefile | 8 + + tools/testing/selftests/timers/posix_timers.c | 221 +++++ + usr/Kconfig | 9 + + 753 files changed, 12974 insertions(+), 8147 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pps/pps-gpio.txt + create mode 100644 Documentation/vm/soft-dirty.txt + create mode 100644 Documentation/vm/zswap.txt + create mode 100644 arch/arm/boot/compressed/piggy.lz4.S + create mode 100644 block/partitions/aix.c + create mode 100644 block/partitions/aix.h + delete mode 100644 crypto/async_tx/async_memset.c + create mode 100644 crypto/lz4.c + create mode 100644 crypto/lz4hc.c + delete mode 100644 drivers/rapidio/switches/tsi500.c + create mode 100644 include/linux/decompress/unlz4.h + create mode 100644 include/linux/list_lru.h + create mode 100644 include/linux/lz4.h + create mode 100644 include/linux/zbud.h + create mode 100644 include/trace/events/pagemap.h + create mode 100644 kernel/reboot.c + create mode 100644 lib/clz_ctz.c + create mode 100644 lib/decompress_unlz4.c + create mode 100644 lib/lz4/Makefile + create mode 100644 lib/lz4/lz4_compress.c + create mode 100644 lib/lz4/lz4_decompress.c + create mode 100644 lib/lz4/lz4defs.h + create mode 100644 lib/lz4/lz4hc_compress.c + create mode 100644 mm/list_lru.c + create mode 100644 mm/zbud.c + create mode 100644 mm/zswap.c + create mode 100644 tools/testing/selftests/timers/Makefile + create mode 100644 tools/testing/selftests/timers/posix_timers.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b cpuinit remotes/origin/cpuinit/master +Switched to a new branch 'cpuinit' +$ git rebase --onto master remotes/origin/cpuinit/master-base +First, rewinding head to replay your work on top of it... +Applying: init.h: remove __cpuinit sections from the kernel +Applying: modpost: remove all traces of cpuinit/cpuexit sections +Applying: alpha: delete __cpuinit usage from all users +Applying: powerpc: delete __cpuinit usage from all users +Applying: parisc: delete __cpuinit usage from all users +Applying: MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code +Applying: arm: delete __cpuinit/__CPUINIT usage from all ARM users +Applying: sparc: delete __cpuinit/__CPUINIT usage from all users +Applying: arm64: delete __cpuinit usage from all users +Applying: blackfin: delete __cpuinit usage from all blackfin files +Applying: s390: delete __cpuinit usage from all s390 files +Applying: sh: delete __cpuinit usage from all sh files +Applying: tile: delete __cpuinit usage from all tile files +Applying: metag: delete __cpuinit usage from all metag files +Applying: cris: delete __cpuinit usage from all cris files +Applying: frv: delete __cpuinit usage from all frv files +Applying: hexagon: delete __cpuinit usage from all hexagon files +Applying: m32r: delete __cpuinit usage from all m32r files +Applying: openrisc: delete __cpuinit usage from all openrisc files +Applying: xtensa: delete __cpuinit usage from all xtensa files +Applying: score: delete __cpuinit usage from all score files +Applying: x86: delete __cpuinit usage from all x86 files +Applying: clocksource+irqchip: delete __cpuinit usage from all related files +Applying: cpufreq: delete __cpuinit usage from all cpufreq files +Applying: hwmon: delete __cpuinit usage from all hwmon files +Applying: acpi: delete __cpuinit usage from all acpi files +Applying: net: delete __cpuinit usage from all net files +Applying: rcu: delete __cpuinit usage from all rcu files +Applying: kernel: delete __cpuinit usage from all core kernel files +Applying: drivers: delete __cpuinit usage from all remaining drivers files +Applying: block: delete __cpuinit usage from all block files +$ cd ../next +$ git fetch -f ../rebase-tmp cpuinit:cpuinit/master +From ../rebase-tmp + + f069eb7...6274495d7 cpuinit -> cpuinit/master (forced update) +$ rm -rf ../rebase-tmp +Merging cpuinit/master (6274495d7 block: delete __cpuinit usage from all block files) +$ git merge --no-ff cpuinit/master +Merge made by the 'recursive' strategy. + Documentation/cpu-hotplug.txt | 6 +- + arch/alpha/kernel/smp.c | 10 +- + arch/alpha/kernel/traps.c | 4 +- + arch/arm/common/mcpm_platsmp.c | 4 +- + arch/arm/include/asm/arch_timer.h | 2 +- + arch/arm/kernel/head-common.S | 1 - + arch/arm/kernel/head-nommu.S | 1 - + arch/arm/kernel/head.S | 1 - + arch/arm/kernel/hw_breakpoint.c | 4 +- + arch/arm/kernel/perf_event_cpu.c | 6 +- + arch/arm/kernel/psci_smp.c | 3 +- + arch/arm/kernel/smp.c | 18 ++-- + arch/arm/kernel/smp_twd.c | 6 +- + arch/arm/lib/delay.c | 2 +- + arch/arm/mach-exynos/headsmp.S | 2 - + arch/arm/mach-exynos/platsmp.c | 4 +- + arch/arm/mach-highbank/platsmp.c | 2 +- + arch/arm/mach-imx/platsmp.c | 2 +- + arch/arm/mach-keystone/platsmp.c | 2 +- + arch/arm/mach-msm/headsmp.S | 2 - + arch/arm/mach-msm/platsmp.c | 6 +- + arch/arm/mach-msm/timer.c | 4 +- + arch/arm/mach-mvebu/coherency.c | 2 +- + arch/arm/mach-mvebu/headsmp.S | 2 - + arch/arm/mach-mvebu/platsmp.c | 5 +- + arch/arm/mach-omap2/omap-headsmp.S | 2 - + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +- + arch/arm/mach-omap2/omap-smp.c | 4 +- + arch/arm/mach-omap2/omap-wakeupgen.c | 4 +- + arch/arm/mach-prima2/headsmp.S | 2 - + arch/arm/mach-prima2/platsmp.c | 4 +- + arch/arm/mach-shmobile/headsmp-scu.S | 1 - + arch/arm/mach-shmobile/headsmp.S | 2 - + arch/arm/mach-shmobile/smp-emev2.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 2 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- + arch/arm/mach-socfpga/headsmp.S | 1 - + arch/arm/mach-socfpga/platsmp.c | 2 +- + arch/arm/mach-spear/generic.h | 2 +- + arch/arm/mach-spear/platsmp.c | 4 +- + arch/arm/mach-sti/platsmp.c | 6 +- + arch/arm/mach-tegra/platsmp.c | 4 +- + arch/arm/mach-tegra/pm.c | 2 +- + arch/arm/mach-ux500/platsmp.c | 4 +- + arch/arm/mach-zynq/common.h | 2 +- + arch/arm/mach-zynq/headsmp.S | 2 - + arch/arm/mach-zynq/platsmp.c | 6 +- + arch/arm/mm/proc-arm1020.S | 2 - + arch/arm/mm/proc-arm1020e.S | 2 - + arch/arm/mm/proc-arm1022.S | 2 - + arch/arm/mm/proc-arm1026.S | 3 - + arch/arm/mm/proc-arm720.S | 2 - + arch/arm/mm/proc-arm740.S | 2 - + arch/arm/mm/proc-arm7tdmi.S | 2 - + arch/arm/mm/proc-arm920.S | 2 - + arch/arm/mm/proc-arm922.S | 2 - + arch/arm/mm/proc-arm925.S | 2 - + arch/arm/mm/proc-arm926.S | 2 - + arch/arm/mm/proc-arm940.S | 2 - + arch/arm/mm/proc-arm946.S | 2 - + arch/arm/mm/proc-arm9tdmi.S | 2 - + arch/arm/mm/proc-fa526.S | 2 - + arch/arm/mm/proc-feroceon.S | 2 - + arch/arm/mm/proc-mohawk.S | 2 - + arch/arm/mm/proc-sa110.S | 2 - + arch/arm/mm/proc-sa1100.S | 2 - + arch/arm/mm/proc-v6.S | 2 - + arch/arm/mm/proc-v7-2level.S | 4 - + arch/arm/mm/proc-v7-3level.S | 4 - + arch/arm/mm/proc-v7.S | 2 - + arch/arm/mm/proc-xsc3.S | 2 - + arch/arm/mm/proc-xscale.S | 2 - + arch/arm/plat-versatile/platsmp.c | 6 +- + arch/arm64/include/asm/arch_timer.h | 2 +- + arch/arm64/kernel/debug-monitors.c | 6 +- + arch/arm64/kernel/hw_breakpoint.c | 4 +- + arch/arm64/kernel/smp.c | 8 +- + arch/blackfin/kernel/perf_event.c | 2 +- + arch/blackfin/kernel/setup.c | 4 +- + arch/blackfin/mach-bf561/smp.c | 6 +- + arch/blackfin/mach-common/cache-c.c | 4 +- + arch/blackfin/mach-common/ints-priority.c | 2 +- + arch/blackfin/mach-common/smp.c | 12 +-- + arch/cris/arch-v32/kernel/smp.c | 2 +- + arch/frv/kernel/setup.c | 2 +- + arch/hexagon/kernel/setup.c | 2 +- + arch/hexagon/kernel/smp.c | 4 +- + arch/m32r/kernel/smpboot.c | 2 +- + arch/metag/kernel/perf/perf_event.c | 6 +- + arch/metag/kernel/smp.c | 22 ++-- + arch/metag/kernel/traps.c | 2 +- + arch/mips/ath79/setup.c | 2 +- + arch/mips/cavium-octeon/octeon-irq.c | 12 +-- + arch/mips/cavium-octeon/smp.c | 6 +- + arch/mips/include/asm/uasm.h | 37 +++---- + arch/mips/kernel/bmips_vec.S | 4 - + arch/mips/kernel/cevt-bcm1480.c | 2 +- + arch/mips/kernel/cevt-gic.c | 2 +- + arch/mips/kernel/cevt-r4k.c | 2 +- + arch/mips/kernel/cevt-sb1250.c | 2 +- + arch/mips/kernel/cevt-smtc.c | 2 +- + arch/mips/kernel/cpu-bugs64.c | 2 +- + arch/mips/kernel/cpu-probe.c | 14 +-- + arch/mips/kernel/head.S | 4 - + arch/mips/kernel/smp-bmips.c | 6 +- + arch/mips/kernel/smp-mt.c | 6 +- + arch/mips/kernel/smp-up.c | 6 +- + arch/mips/kernel/smp.c | 6 +- + arch/mips/kernel/smtc.c | 2 +- + arch/mips/kernel/spram.c | 14 +-- + arch/mips/kernel/sync-r4k.c | 12 +-- + arch/mips/kernel/traps.c | 12 +-- + arch/mips/kernel/watch.c | 2 +- + arch/mips/lantiq/irq.c | 2 +- + arch/mips/lib/uncached.c | 2 +- + arch/mips/mm/c-octeon.c | 6 +- + arch/mips/mm/c-r3k.c | 8 +- + arch/mips/mm/c-r4k.c | 34 +++--- + arch/mips/mm/c-tx39.c | 2 +- + arch/mips/mm/cache.c | 2 +- + arch/mips/mm/cex-sb1.S | 4 - + arch/mips/mm/page.c | 40 +++---- + arch/mips/mm/sc-ip22.c | 2 +- + arch/mips/mm/sc-mips.c | 2 +- + arch/mips/mm/sc-r5k.c | 2 +- + arch/mips/mm/sc-rm7k.c | 12 +-- + arch/mips/mm/tlb-r3k.c | 2 +- + arch/mips/mm/tlb-r4k.c | 4 +- + arch/mips/mm/tlb-r8k.c | 4 +- + arch/mips/mm/tlbex.c | 144 ++++++++++++-------------- + arch/mips/mm/uasm-micromips.c | 10 +- + arch/mips/mm/uasm-mips.c | 10 +- + arch/mips/mm/uasm.c | 106 +++++++++---------- + arch/mips/mti-malta/malta-smtc.c | 6 +- + arch/mips/mti-malta/malta-time.c | 2 +- + arch/mips/mti-sead3/sead3-time.c | 2 +- + arch/mips/netlogic/common/smp.c | 4 +- + arch/mips/netlogic/common/smpboot.S | 4 - + arch/mips/netlogic/common/time.c | 2 +- + arch/mips/netlogic/xlr/wakeup.c | 2 +- + arch/mips/pci/pci-ip27.c | 2 +- + arch/mips/pmcs-msp71xx/msp_smtc.c | 7 +- + arch/mips/pmcs-msp71xx/msp_time.c | 2 +- + arch/mips/pnx833x/common/interrupts.c | 2 +- + arch/mips/powertv/time.c | 2 +- + arch/mips/ralink/irq.c | 2 +- + arch/mips/sgi-ip27/ip27-init.c | 4 +- + arch/mips/sgi-ip27/ip27-smp.c | 6 +- + arch/mips/sgi-ip27/ip27-timer.c | 6 +- + arch/mips/sgi-ip27/ip27-xtalk.c | 6 +- + arch/mips/sibyte/bcm1480/smp.c | 8 +- + arch/mips/sibyte/sb1250/smp.c | 8 +- + arch/openrisc/kernel/setup.c | 2 +- + arch/parisc/kernel/firmware.c | 14 +-- + arch/parisc/kernel/hardware.c | 2 +- + arch/parisc/kernel/processor.c | 6 +- + arch/parisc/kernel/smp.c | 8 +- + arch/powerpc/include/asm/rtas.h | 4 +- + arch/powerpc/include/asm/vdso.h | 2 +- + arch/powerpc/kernel/cacheinfo.c | 36 ++++--- + arch/powerpc/kernel/rtas.c | 4 +- + arch/powerpc/kernel/smp.c | 4 +- + arch/powerpc/kernel/sysfs.c | 6 +- + arch/powerpc/kernel/time.c | 1 - + arch/powerpc/kernel/vdso.c | 2 +- + arch/powerpc/mm/44x_mmu.c | 6 +- + arch/powerpc/mm/hash_utils_64.c | 2 +- + arch/powerpc/mm/mmu_context_nohash.c | 6 +- + arch/powerpc/mm/numa.c | 7 +- + arch/powerpc/mm/tlb_nohash.c | 2 +- + arch/powerpc/perf/core-book3s.c | 4 +- + arch/powerpc/platforms/44x/currituck.c | 4 +- + arch/powerpc/platforms/44x/iss4xx.c | 4 +- + arch/powerpc/platforms/85xx/smp.c | 6 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/powernv/smp.c | 2 +- + arch/s390/kernel/cache.c | 15 ++- + arch/s390/kernel/perf_cpum_cf.c | 4 +- + arch/s390/kernel/processor.c | 2 +- + arch/s390/kernel/smp.c | 17 ++- + arch/s390/kernel/sysinfo.c | 2 +- + arch/s390/kernel/vtime.c | 6 +- + arch/s390/mm/fault.c | 4 +- + arch/score/mm/tlb-score.c | 2 +- + arch/sh/kernel/cpu/init.c | 18 ++-- + arch/sh/kernel/cpu/sh2/probe.c | 2 +- + arch/sh/kernel/cpu/sh2a/probe.c | 2 +- + arch/sh/kernel/cpu/sh3/probe.c | 2 +- + arch/sh/kernel/cpu/sh4/probe.c | 2 +- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +- + arch/sh/kernel/cpu/sh5/probe.c | 2 +- + arch/sh/kernel/perf_event.c | 4 +- + arch/sh/kernel/process.c | 2 +- + arch/sh/kernel/setup.c | 2 +- + arch/sh/kernel/smp.c | 8 +- + arch/sh/kernel/traps_32.c | 2 +- + arch/sh/kernel/traps_64.c | 2 +- + arch/sh/mm/tlb-sh5.c | 2 +- + arch/sparc/kernel/ds.c | 11 +- + arch/sparc/kernel/entry.h | 2 +- + arch/sparc/kernel/hvtramp.S | 1 - + arch/sparc/kernel/irq_64.c | 5 +- + arch/sparc/kernel/leon_smp.c | 10 +- + arch/sparc/kernel/mdesc.c | 34 +++--- + arch/sparc/kernel/smp_32.c | 20 ++-- + arch/sparc/kernel/smp_64.c | 9 +- + arch/sparc/kernel/sun4d_smp.c | 6 +- + arch/sparc/kernel/sun4m_smp.c | 6 +- + arch/sparc/kernel/sysfs.c | 4 +- + arch/sparc/kernel/trampoline_32.S | 3 - + arch/sparc/kernel/trampoline_64.S | 2 - + arch/sparc/mm/init_64.c | 2 +- + arch/sparc/mm/srmmu.c | 12 +-- + arch/tile/kernel/irq.c | 2 +- + arch/tile/kernel/messaging.c | 2 +- + arch/tile/kernel/setup.c | 12 +-- + arch/tile/kernel/smpboot.c | 8 +- + arch/tile/kernel/time.c | 2 +- + arch/x86/include/asm/cpu.h | 2 +- + arch/x86/include/asm/microcode.h | 4 +- + arch/x86/include/asm/microcode_amd.h | 4 +- + arch/x86/include/asm/microcode_intel.h | 4 +- + arch/x86/include/asm/mmconfig.h | 4 +- + arch/x86/include/asm/mpspec.h | 2 +- + arch/x86/include/asm/numa.h | 6 +- + arch/x86/include/asm/processor.h | 2 +- + arch/x86/include/asm/prom.h | 2 +- + arch/x86/include/asm/smp.h | 2 +- + arch/x86/kernel/acpi/boot.c | 6 +- + arch/x86/kernel/apic/apic.c | 30 +++--- + arch/x86/kernel/apic/apic_numachip.c | 2 +- + arch/x86/kernel/apic/es7000_32.c | 2 +- + arch/x86/kernel/apic/numaq_32.c | 2 +- + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 14 +-- + arch/x86/kernel/cpu/amd.c | 33 +++--- + arch/x86/kernel/cpu/centaur.c | 26 ++--- + arch/x86/kernel/cpu/common.c | 64 ++++++------ + arch/x86/kernel/cpu/cyrix.c | 40 +++---- + arch/x86/kernel/cpu/hypervisor.c | 2 +- + arch/x86/kernel/cpu/intel.c | 30 +++--- + arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++----- + arch/x86/kernel/cpu/mcheck/mce.c | 23 ++-- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 ++- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 +- + arch/x86/kernel/cpu/perf_event.c | 2 +- + arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +- + arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++--- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++-- + arch/x86/kernel/cpu/rdrand.c | 2 +- + arch/x86/kernel/cpu/scattered.c | 4 +- + arch/x86/kernel/cpu/topology.c | 2 +- + arch/x86/kernel/cpu/transmeta.c | 6 +- + arch/x86/kernel/cpu/umc.c | 2 +- + arch/x86/kernel/cpu/vmware.c | 2 +- + arch/x86/kernel/cpuid.c | 7 +- + arch/x86/kernel/devicetree.c | 2 +- + arch/x86/kernel/head_32.S | 1 - + arch/x86/kernel/i387.c | 10 +- + arch/x86/kernel/irq_32.c | 2 +- + arch/x86/kernel/kvm.c | 10 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/microcode_amd_early.c | 8 +- + arch/x86/kernel/microcode_core.c | 2 +- + arch/x86/kernel/microcode_core_early.c | 6 +- + arch/x86/kernel/microcode_intel_early.c | 26 ++--- + arch/x86/kernel/mmconf-fam10h_64.c | 12 +-- + arch/x86/kernel/msr.c | 6 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/setup.c | 2 +- + arch/x86/kernel/smpboot.c | 28 ++--- + arch/x86/kernel/tboot.c | 6 +- + arch/x86/kernel/tsc.c | 4 +- + arch/x86/kernel/tsc_sync.c | 18 ++-- + arch/x86/kernel/vsyscall_64.c | 6 +- + arch/x86/kernel/x86_init.c | 4 +- + arch/x86/kernel/xsave.c | 4 +- + arch/x86/mm/mmio-mod.c | 4 +- + arch/x86/mm/numa.c | 12 +-- + arch/x86/mm/numa_emulation.c | 12 +-- + arch/x86/mm/setup_nx.c | 4 +- + arch/x86/pci/amd_bus.c | 8 +- + arch/x86/platform/ce4100/ce4100.c | 2 +- + arch/x86/platform/mrst/mrst.c | 4 +- + arch/x86/xen/enlighten.c | 6 +- + arch/x86/xen/setup.c | 6 +- + arch/x86/xen/smp.c | 12 +-- + arch/x86/xen/spinlock.c | 2 +- + arch/x86/xen/xen-ops.h | 2 +- + arch/xtensa/kernel/time.c | 2 +- + block/blk-iopoll.c | 6 +- + block/blk-softirq.c | 6 +- + drivers/acpi/acpi_processor.c | 2 +- + drivers/acpi/processor_core.c | 8 +- + drivers/acpi/processor_driver.c | 8 +- + drivers/acpi/processor_idle.c | 6 +- + drivers/base/cpu.c | 2 +- + drivers/base/topology.c | 10 +- + drivers/clocksource/arm_arch_timer.c | 8 +- + drivers/clocksource/exynos_mct.c | 4 +- + drivers/clocksource/metag_generic.c | 6 +- + drivers/clocksource/time-armada-370-xp.c | 4 +- + drivers/clocksource/timer-marco.c | 4 +- + drivers/cpufreq/cpufreq.c | 2 +- + drivers/cpufreq/cpufreq_stats.c | 2 +- + drivers/cpufreq/dbx500-cpufreq.c | 2 +- + drivers/cpufreq/intel_pstate.c | 4 +- + drivers/cpufreq/longhaul.c | 6 +- + drivers/cpufreq/longhaul.h | 26 ++--- + drivers/cpufreq/longrun.c | 6 +- + drivers/cpufreq/omap-cpufreq.c | 2 +- + drivers/cpufreq/powernow-k7.c | 8 +- + drivers/cpufreq/powernow-k8.c | 6 +- + drivers/hwmon/coretemp.c | 39 ++++--- + drivers/hwmon/via-cputemp.c | 8 +- + drivers/irqchip/irq-gic.c | 8 +- + drivers/oprofile/timer_int.c | 4 +- + drivers/xen/xen-acpi-cpuhotplug.c | 2 +- + include/asm-generic/vmlinux.lds.h | 12 --- + include/linux/cpu.h | 2 +- + include/linux/init.h | 19 ++-- + include/linux/perf_event.h | 2 +- + init/calibrate.c | 13 ++- + kernel/cpu.c | 6 +- + kernel/events/core.c | 4 +- + kernel/fork.c | 2 +- + kernel/hrtimer.c | 6 +- + kernel/printk.c | 2 +- + kernel/profile.c | 2 +- + kernel/rcutorture.c | 6 +- + kernel/rcutree.c | 6 +- + kernel/rcutree.h | 4 +- + kernel/rcutree_plugin.h | 6 +- + kernel/relay.c | 2 +- + kernel/sched/core.c | 12 +-- + kernel/sched/fair.c | 2 +- + kernel/smp.c | 2 +- + kernel/smpboot.c | 2 +- + kernel/softirq.c | 8 +- + kernel/time/tick-sched.c | 2 +- + kernel/timer.c | 10 +- + kernel/workqueue.c | 4 +- + lib/Kconfig.debug | 2 +- + lib/earlycpio.c | 2 +- + lib/percpu_counter.c | 2 +- + mm/memcontrol.c | 2 +- + mm/page-writeback.c | 4 +- + mm/slab.c | 10 +- + mm/slub.c | 4 +- + mm/vmstat.c | 6 +- + net/core/flow.c | 4 +- + net/iucv/iucv.c | 2 +- + scripts/mod/modpost.c | 52 ++-------- + 353 files changed, 1144 insertions(+), 1329 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..85139381b1ed --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 1aaf6d3d3d1e95f4be07e32dd84aa1c93855fbbd +Unchanged quilt series jdelvare-hwmon +Importing device-mapper based on v3.10-rc1 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..4e62234be06e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20130701 |