diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-03 14:02:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-03 14:02:19 +1000 |
| commit | 21e901d2128640f6a698bdaf1d375cec4ef257b0 (patch) | |
| tree | 52fefffc118595984b15741b655dbd2459fd8405 | |
| parent | 6f127d4fcee90eefdabfc98c37e6760672f05e26 (diff) | |
Add linux-next specific files for 20130503next-20130503
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 226 | ||||
| -rw-r--r-- | Next/Trees | 228 | ||||
| -rw-r--r-- | Next/merge.log | 7459 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7918 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..54a6251fd96e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,226 @@ +Name SHA1 +---- ---- +origin 0279b3c0ada1d78882f24acf94ac4595bd657a89 +fixes 0279b3c0ada1d78882f24acf94ac4595bd657a89 +kbuild-current a54292f58fc16e3d09aecea16de3e58a898dde97 +arc-current 561daec404c9a783b5c11822084452dcebfbd0cf +arm-current 1783d4574619aea9ff5d94e6506f288547fc6737 +m68k-current e00c73ee05dc38ecaccced55d4f5fc58b0b769f7 +powerpc-merge 5676005acf26ab7e924a8438ea4746e47d405762 +sparc 0fbd06761f5c17cc9b20e02af60fd7ee9c895996 +net af5c6df704af46f2cfebea329887f3d70ccb7b3d +ipsec da241efcd9c3da2af6ba20055c7e158ec725005c +sound-current c5a4698d1ecde258abe185dc37a1085255751c7b +pci-current d46fc8bea7db02fb9c0e473c5d802e767338591a +wireless a8a48e60a468084ef6ec23c78e8903c9e0ba7a4c +driver-core.current c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +tty.current c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +usb.current c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +staging.current c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +char-misc.current c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +input-current bf61c8840efe60fd8f91446860b63338fb424158 +md-current 32f9f570d04461a41bdcd5c1d93b41ebc5ce182a +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current 3862de1f6c442d53bd828d39f86d07d933a70605 +ide bf6b4388c61cf88c6faa19cc45390fd36be8fb66 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +irqdomain-current a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 +devicetree-current ab28698d33af05abab0bcf8021eafe38f7434f24 +spi-current 0d2d0cc5216db678070efc911ef47f4cb53b4aad +gpio-current e97f9b5277afeabb54892ebc6f68500098467ba1 +rr-fixes c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +mfd-fixes 31880c37c11e28cb81c70757e38392b42e695dc6 +vfio-fixes 904c680c7bf016a8619a045850937427f8d7368c +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 07961ac7c0ee8b546658717034fe692fd12eefa9 +arm 0d240c95c4d78cdbbe981f993c41443bee539248 +arm-perf ab87304f8c7c625174aea467d67a89bde01ed5e7 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +xilinx 64e3fd3c96fe3416879c8ea985e606f80a28dea5 +arm64 16c85a1fd73eade2ae290d759924c09b4595f504 +blackfin f656c240ae07c48ddf8552e83b64692121044c42 +c6x f934af05cb1bf20558542185299394a69060b829 +cris 32ade6a282a36aae1803b190bae452f1e46f6b6c +hexagon 426d29ccb2a8d44c18d3167327ee82b38287e7bf +ia64 797f6a684f28dbb00f9e9719315574e344fcbf53 +m68k e00c73ee05dc38ecaccced55d4f5fc58b0b769f7 +m68knommu 2842e5b00e99b30404f9af1c1b367c8e467b5c6c +metag 164c013858a2e89b450cd8021a8be896f9e05697 +microblaze 01cc2cb1c9ee0eb0b813cc3a4404220d11160493 +mips 8b14c94544cfa9b6d606a5656dce4a6c117b3d6f +openrisc 6af609515d788bd4c94116344f00601b058f75a6 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +powerpc 54d5999d98f2ab36ad71b9ef4d82cf5f399205f5 +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx fdeaf0e20e9f3999c5cb129e821595fe927bf259 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 8fad2b22a0f52067ef08f2de75897441500dd101 +sh 37284bd93103ae36b5ea274a985d688fb16f7a38 +sparc-next 07df841877195765d958df146f614fc7bdedd5e3 +tile 9fc1894c9883439245b225d16100d6a55b25373a +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa 4e34bf689fa23122f3d90bf0f92e6239e4b1d9e0 +btrfs 6aec51f7d1db54c0e4c36f051dc77b52edadda85 +ceph b5b09be30cf99f9c699e825629f02e3bce555d44 +cifs bf81710c4b6e2df2cc047f7c8e1f342511904b74 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs f6161aa153581da4a3867a2d1a7caf4be19b6ec9 +ext3 e162b2f835eeda0d255bd463753b5eb823735205 +ext4 0d606e2c9fccdd4e67febf1e2da500e1bfe9e045 +f2fs 42e49df33bacafc20434e39fc127c9722c9f8691 +fuse 60b9df7a54804a965850db00beec4d3a2c002536 +gfs2 222cb538f5f18741466dc27cc6cf4375bccf1f89 +jfs 73aaa22d5ffb2630456bac2f9a4ed9b81d0d7271 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs df1bc00867309f8b6956cfcabaafa8225d181df7 +nfsd 676e4ebd5f2c3b4fd1d2bff79b68385c23c5c105 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +ubifs c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +xfs cab09a81fbefcb21db5213a84461d421946f6eb8 +vfs ac3e3c5b1164397656df81b9e9ab4991184d3236 +pci d4f09c5d7fbabd1389a5f03f5c9329d790f544e3 +hid 46b189707e62ec1a6c1fc5181b355360931679f3 +i2c c39e8e4354ce4daf23336de5daa28a3b01f00aa6 +jdelvare-hwmon c662b7afe9c164955bad44706e642c720d62f994 +hwmon-staging 6445e6600fa632448cac64e71119310378464ad9 +v4l-dvb 1d62caa36bbc0affb8137aa8ddb69f7ee944ca19 +kbuild fc2cf6b59f6e29def05b5cf2294e3b4efc1bdb5f +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata 2cc1144a31f76d4a9fb48bec5d6ba1359f980813 +infiniband f1258ea852252acb95ac2d0906d40805105d7b50 +pstore bd08ec33b5c23833581e5a36b2a69ccae6b39a28 +pm 371deb9500831ad1afbf9ea00e373f650deaed2f +idle 5c99726b5faaf1ba4ca80c39d319f419c227f803 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +cpuidle 817c876374a090391e7f2873a8b6076537f42253 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal de6558dc964f6a3243218f17d8032ad810864e2b +ieee1394 6fe9efb9c9fbce690018c31e652924ae28019868 +ubi f6161aa153581da4a3867a2d1a7caf4be19b6ec9 +dlm 900083183959107159f962b83b3b439d53796499 +swiotlb af51a9f1848ff50079a10def56a2c064f326af22 +scsi d522844a315233162dd715c620c14ac47110eeca +target-updates 04b59babc0ddd2adaebe6ee3064b4d1b4eeecb7f +target-merge b8d26b3be8b33682cf163274ed07479a70554633 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +slave-dma 9667bcf51b3ce0d95d847b978528834c96a86657 +dmaengine 41ef2d5678d83af030125550329b6ae8b74618fa +net-next 99c6bcf46d2233d33e441834e958ed0bc22b190a +ipsec-next 05600a799f6c67b139f2bc565e358b913b230cf5 +wireless-next a8a48e60a468084ef6ec23c78e8903c9e0ba7a4c +bluetooth 173d9a27c8e7a231b03dbc61b992e1a4c5bdc135 +mtd cdb6404cc53a166a1e3b0179bd8d1f4070beff41 +l2-mtd 98927a242f6cb70e85a5330cee99572eaaf49291 +crypto 3862de1f6c442d53bd828d39f86d07d933a70605 +drm f49e7259a4ea3a9ac42fc1c70c86d5e50e800731 +drm-intel 17aa6be9579eb204b426eeae146a43bf3dd05078 +sound 4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e +sound-asoc ee668c02edb7ea84763c3975cbafd34a8d5a27d4 +modules a53a11f35762ff1d5e268adedf2ab9ce313f871d +virtio 01d779a14ef800b74684d9692add4944df052461 +input 0c6a61657da78098472fd0eb71cc01f2387fa1bb +input-mt 194664eecd213375ef585b258379be26836edec0 +cgroup 2a0010af17b1739ef8ea8cf02647a127241ee674 +block 410fa266d656f40182ca0cdbc22df481116b6d55 +device-mapper adf9566bc25071b9d5b92af29542735b086febc4 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc e4404fab2e0b70287a471a1e760c9338ce683fde +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 14e50c6a9bc2b283bb4021026226268312ceefdd +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 1fef8be59b01d0cb4e34563674607ade2c002e9a +mfd 99f4c6b66a9ae362d21e6df95d04bc74e04d285e +battery 6b170807cd5cac8dc6353f47a88ccb14bbf76c4f +fbdev a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 e72b7536e4e1e44e56dba50205d5a5092bf1d3c0 +regulator 6c922f87b94fed2844d694e8e104a9e5bc7ee889 +security b7ae9f064bec903bd4a9f257a35da4d1e9bbcc99 +selinux c2d7b247f0c028d325a5da5b9611b60ba160f237 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 69c66127e28a18d28a356a742e24e69e5e937ecb +dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351 +iommu 0c4513be3d01a854867446ee793748409cc0ebdf +vfio 664e9386bd05dbdfecfb28d6cf2fde983aabc65c +osd 861d66601acda6d7a2038fb3c95f68009128003a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 071361d3473ebb8142907470ff12d59c59f6be72 +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +edac de4772c621487fd4cadb4138f2481297c8e0cb0d +edac-amd 9713faecff3d071de1208b081d4943b002e9cb1c +devicetree d347bc5157444874055592579dc068ff1c01818e +dt-rh a2b9ea73967386ec5e524ab206bd549d5aafea17 +spi 00ab5392cbc3f87ddfeada311e22f55dfb0bc5c6 +spi-mb f557c98b168a2860bfc7dedf4b4e3bafb59dc267 +tip 979830a23f330af187ca38a0046803763159452b +ftrace 4c69e6ea415a35eb7f0fc8ee9390c8f7436492a2 +rcu a9be8541220913f9b0ccecdf60262941a32f3e08 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 4cee4b72f1e2600e19779a14d4d9a4f4016ce49f +kvm-arm b8022d70409590eec66cc856d0c13a0b394d42a2 +kvm-ppc 5975a2e0950291a6bfe9fd5880e7952ff87764be +oprofile 23995bbee01d75f09f72b1380bd6045a5b02947b +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495 +xen-two 6461b071ddda668f314f3f37fb26b05613a51493 +xen-arm 9bc25a1d5f95f97e9e378620a46e954d3f842641 +percpu a1b2a555d6375f1ed34d0a1761b540de3a8727c6 +workqueues 46aed11562eba414d68f14298451dc41240ed00b +drivers-x86 e6e522461d358891050522ddb4fbfe9c253947b4 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 38a817965d2d624b0db68f3bf5ae783ad7f2087a +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds df92d5ff5e70999274f53884cc2c40ae620a109a +driver-core 0d1d392f011b284bb4af0411b2d36e5d04e0f058 +tty 45efcb2d32d35f6509543e477568842d8467035d +usb 4626b8daf9bb00ce6b4d533c1a155211ad880f32 +usb-gadget added5fce61e97087a4a25270694c542c5ed1ba9 +staging a0eeed40100b2eca57afdf99d76c57dedd218a8a +char-misc 0e27263926699fcbbd574cff4dd6920007a50e8a +bcon e284f3493206d4268267db4557c7ee6f89ed2314 +tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 +writeback ed84825b785ceb932af7dd5aa08614801721320b +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl d463f82d22f90096d1352de3837b1602a3410b5d +vhost 8afa6e02683e4b20e11a4712d332a6b4545759dd +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc b9777859ec015a78dae1476e317d04f851bfdd0d +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +irqdomain 560aa5394d2db5437b2deb3bb897655f0fd99f61 +gpio 753c5983ddd38022a680a36f5d66b23b185c9b62 +gpio-lw ab6ec0fb8901ce4359269ac56c691ffcb5071ccb +gen-gpio f4c54050640e7afa4749875cf9b900d42db361c0 +mailbox c497eba5247728c67ba0e0de0907723dd114134a +arm-soc c2d498d6c408b4ed226f9ad4ac9b544b0204d8d9 +bcm2835 31880c37c11e28cb81c70757e38392b42e695dc6 +cortex 4477ca45fb368880bf77b10ed3b24b03f0cc82da +ep93xx 7ec44295ef66efcac08433298661a18008883885 +imx-mxs 3795b569ba9ea8fbcd1a5d4bd1936aec3fdf91a7 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm 1df357aeed24c63dcbdd2eef01b359d89e83286d +renesas cda9c036109fd0ab01e915b0c7ae84d35b152a9a +samsung e0f8f91f8ba3cd538124b16fbca3fbcb4f6654dd +tegra c0c1cb1b0b6450a008f8d509625780fde792510f +dma-mapping a937536b868b8369b98967929045f1df54234323 +pwm affb923df96d6c927f9a3dfb0e6f4be940b185cd +dma-buf b89e35636bc75b72d15a1af6d49798802aff77d5 +userns 78008c404acd8e731d1e06618cc5995961e847a6 +ktest df5f7c66013c46cec9aa8156af257bc5eb29b5c5 +signal 99e621f796d7f0341a51e8cdf32b81663b10b448 +clk 1e435256d625c203660f0105f1155cd2af283051 +random b980955236922ae6106774511c5c05003d3ad225 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm-current 0fbd06761f5c17cc9b20e02af60fd7ee9c895996 +akpm 5e032f67ae9d946cbbe5f1087fca0b652b2e3892 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..49becb5a45bc --- /dev/null +++ b/Next/Trees @@ -0,0 +1,228 @@ +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://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon 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 +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#testing +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 +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/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.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 +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 +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 +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#drm-intel-next-queued +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://github.com/schandinat/linux-2.6.git#fbdev-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog-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 +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 +gen-gpio git git://github.com/Gnurou/linux.git#for_next +mailbox git git://github.com/sumananna/mailbox.git#dbx500-prcmu-mailbox +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 +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 +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..cc273e646e12 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7459 @@ +$ date +Friday 3 May 09:54:17 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b9394d8 Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip +Merging origin/master (0279b3c Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge origin/master +Updating b9394d8..0279b3c +Fast-forward + .../bindings/arm/altera/socfpga-clk-manager.txt | 11 + + .../devicetree/bindings/arm/bcm/bcm,kona-timer.txt | 19 + + .../devicetree/bindings/arm/msm/timer.txt | 41 +- + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 67 +- + .../devicetree/bindings/clock/altr_socfpga.txt | 18 + + .../devicetree/bindings/clock/imx27-clock.txt | 117 + + .../devicetree/bindings/crypto/fsl-imx-sahara.txt | 15 + + .../devicetree/bindings/hwrng/timeriomem_rng.txt | 18 + + .../bindings/i2c/i2c-arb-gpio-challenge.txt | 80 + + ...lwinner,sunxi-ic.txt => allwinner,sun4i-ic.txt} | 4 +- + .../devicetree/bindings/mmc/davinci_mmc.txt | 33 + + .../bindings/pinctrl/fsl,imx-pinctrl.txt | 6 +- + .../bindings/pinctrl/fsl,imx35-pinctrl.txt | 955 +- + .../bindings/pinctrl/fsl,imx51-pinctrl.txt | 759 +- + .../bindings/pinctrl/fsl,imx53-pinctrl.txt | 1174 +-- + .../bindings/pinctrl/fsl,imx6dl-pinctrl.txt | 38 + + .../bindings/pinctrl/fsl,imx6q-pinctrl.txt | 1596 +--- + .../bindings/pinctrl/fsl,imx6sl-pinctrl.txt | 39 + + .../devicetree/bindings/powerpc/fsl/cpus.txt | 22 + + .../devicetree/bindings/rng/brcm,bcm2835.txt | 13 + + ...r,sunxi-timer.txt => allwinner,sun4i-timer.txt} | 4 +- + .../devicetree/bindings/timer/fsl,imxgpt.txt | 18 + + .../watchdog/{sunxi-wdt.txt => sun4i-wdt.txt} | 6 +- + .../filesystems/xfs-self-describing-metadata.txt | 350 + + Documentation/hw_random.txt | 2 +- + Documentation/kernel-parameters.txt | 6 + + Documentation/powerpc/00-INDEX | 4 - + Documentation/powerpc/ptrace.txt | 1 + + Documentation/powerpc/sound.txt | 81 - + Documentation/powerpc/zImage_layout.txt | 47 - + Documentation/virtual/00-INDEX | 3 - + Documentation/virtual/virtio-spec.txt | 3210 ------- + MAINTAINERS | 2 +- + Makefile | 2 +- + REPORTING-BUGS | 162 +- + arch/alpha/kernel/srm_env.c | 93 +- + arch/arm/Kconfig | 154 +- + arch/arm/Kconfig.debug | 39 + + arch/arm/Makefile | 6 +- + arch/arm/boot/dts/Makefile | 16 +- + arch/arm/boot/dts/armada-370-db.dts | 17 + + arch/arm/boot/dts/armada-370-mirabox.dts | 64 + + arch/arm/boot/dts/armada-370-rd.dts | 11 + + arch/arm/boot/dts/armada-370-xp.dtsi | 45 + + arch/arm/boot/dts/armada-370.dtsi | 58 + + arch/arm/boot/dts/armada-xp-db.dts | 33 + + arch/arm/boot/dts/armada-xp-gp.dts | 50 + + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 104 + + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 122 + + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 188 + + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 38 + + arch/arm/boot/dts/armada-xp.dtsi | 6 + + arch/arm/boot/dts/at91-ariag25.dts | 171 + + arch/arm/boot/dts/at91rm9200.dtsi | 28 + + arch/arm/boot/dts/at91sam9260.dtsi | 19 +- + arch/arm/boot/dts/at91sam9263ek.dts | 2 - + arch/arm/boot/dts/at91sam9g15.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g15ek.dts | 2 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 - + arch/arm/boot/dts/at91sam9g25.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g25ek.dts | 9 + + arch/arm/boot/dts/at91sam9g35.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g35ek.dts | 9 + + arch/arm/boot/dts/at91sam9g45.dtsi | 3 + + arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 - + arch/arm/boot/dts/at91sam9n12ek.dts | 2 - + arch/arm/boot/dts/at91sam9x25.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x25ek.dts | 14 + + arch/arm/boot/dts/at91sam9x35.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x35ek.dts | 9 + + arch/arm/boot/dts/at91sam9x5.dtsi | 70 + + arch/arm/boot/dts/at91sam9x5cm.dtsi | 20 + + arch/arm/boot/dts/at91sam9x5ek.dtsi | 15 +- + arch/arm/boot/dts/atlas6-evb.dts | 78 + + arch/arm/boot/dts/atlas6.dtsi | 668 ++ + arch/arm/boot/dts/bcm11351.dtsi | 8 + + arch/arm/boot/dts/bcm2835.dtsi | 22 + + arch/arm/boot/dts/da850-evm.dts | 70 + + arch/arm/boot/dts/da850.dtsi | 15 + + arch/arm/boot/dts/dbx5x0.dtsi | 7 +- + arch/arm/boot/dts/dove.dtsi | 5 + + arch/arm/boot/dts/href.dtsi | 1 + + arch/arm/boot/dts/hrefprev60.dts | 10 +- + arch/arm/boot/dts/imx23.dtsi | 5 +- + arch/arm/boot/dts/imx25-karo-tx25.dts | 2 +- + arch/arm/boot/dts/imx25-pdk.dts | 2 +- + arch/arm/boot/dts/imx25.dtsi | 2 +- + arch/arm/boot/dts/imx27-apf27.dts | 2 +- + arch/arm/boot/dts/imx27-apf27dev.dts | 60 + + arch/arm/boot/dts/imx27-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycore.dts | 8 +- + arch/arm/boot/dts/imx27.dtsi | 82 +- + arch/arm/boot/dts/imx28.dtsi | 5 +- + arch/arm/boot/dts/imx31-bug.dts | 2 +- + arch/arm/boot/dts/imx31.dtsi | 18 +- + arch/arm/boot/dts/imx35-pinfunc.h | 970 +++ + arch/arm/boot/dts/imx51-apf51.dts | 2 +- + arch/arm/boot/dts/imx51-apf51dev.dts | 97 + + arch/arm/boot/dts/imx51-babbage.dts | 16 +- + arch/arm/boot/dts/imx51-pinfunc.h | 773 ++ + arch/arm/boot/dts/imx51.dtsi | 343 +- + arch/arm/boot/dts/imx53-ard.dts | 70 +- + arch/arm/boot/dts/imx53-evk.dts | 18 +- + arch/arm/boot/dts/imx53-mba53.dts | 82 +- + arch/arm/boot/dts/imx53-pinfunc.h | 1189 +++ + arch/arm/boot/dts/imx53-qsb.dts | 22 +- + arch/arm/boot/dts/imx53-smd.dts | 16 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 32 +- + arch/arm/boot/dts/imx53.dtsi | 256 +- + arch/arm/boot/dts/imx6dl-pinfunc.h | 1085 +++ + arch/arm/boot/dts/imx6dl-sabreauto.dts | 31 + + arch/arm/boot/dts/imx6dl-sabresd.dts | 35 + + arch/arm/boot/dts/imx6dl-wandboard.dts | 44 + + arch/arm/boot/dts/imx6dl.dtsi | 125 +- + arch/arm/boot/dts/imx6q-arm2.dts | 8 +- + arch/arm/boot/dts/imx6q-pinfunc.h | 1041 +++ + arch/arm/boot/dts/imx6q-sabreauto.dts | 33 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 18 +- + arch/arm/boot/dts/imx6q-sabresd.dts | 67 +- + arch/arm/boot/dts/imx6q-sbc6x.dts | 44 + + arch/arm/boot/dts/imx6q.dtsi | 280 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 38 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 87 + + arch/arm/boot/dts/imx6qdl.dtsi | 33 +- + arch/arm/boot/dts/imx6sl-pinfunc.h | 1077 +++ + arch/arm/boot/dts/include/dt-bindings | 1 + + arch/arm/boot/dts/kirkwood-6282.dtsi | 6 + + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 4 + + arch/arm/boot/dts/mpa1600.dts | 69 + + arch/arm/boot/dts/msm8660-surf.dts | 20 +- + arch/arm/boot/dts/msm8960-cdp.dts | 22 +- + arch/arm/boot/dts/orion5x.dtsi | 33 + + arch/arm/boot/dts/r8a7779.dtsi | 98 + + arch/arm/boot/dts/sama5d3.dtsi | 1031 +++ + arch/arm/boot/dts/sama5d31ek.dts | 51 + + arch/arm/boot/dts/sama5d33ek.dts | 44 + + arch/arm/boot/dts/sama5d34ek.dts | 61 + + arch/arm/boot/dts/sama5d35ek.dts | 56 + + arch/arm/boot/dts/sama5d3xcm.dtsi | 91 + + arch/arm/boot/dts/sama5d3xdm.dtsi | 42 + + arch/arm/boot/dts/sama5d3xmb.dtsi | 166 + + arch/arm/boot/dts/skeleton64.dtsi | 13 + + arch/arm/boot/dts/snowball.dts | 4 + + arch/arm/boot/dts/socfpga.dtsi | 157 + + arch/arm/boot/dts/socfpga_cyclone5.dts | 8 + + arch/arm/boot/dts/socfpga_vt.dts | 8 + + arch/arm/boot/dts/stuib.dtsi | 2 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 32 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 6 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 32 + + arch/arm/boot/dts/sun4i-a10.dtsi | 253 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 24 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 193 +- + arch/arm/boot/dts/sunxi.dtsi | 82 - + arch/arm/boot/dts/tegra114-dalmore.dts | 13 + + arch/arm/boot/dts/tegra114-pluto.dts | 13 + + arch/arm/boot/dts/tegra114.dtsi | 4 +- + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 15 +- + arch/arm/boot/dts/tegra20-harmony.dts | 17 +- + arch/arm/boot/dts/tegra20-paz00.dts | 15 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 15 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 15 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 15 +- + arch/arm/boot/dts/tegra20-ventana.dts | 15 +- + arch/arm/boot/dts/tegra20-whistler.dts | 14 + + arch/arm/boot/dts/tegra20.dtsi | 4 + + arch/arm/boot/dts/tegra30-beaver.dts | 15 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 15 +- + arch/arm/boot/dts/tegra30.dtsi | 6 +- + arch/arm/boot/dts/tps6507x.dtsi | 47 + + arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 2 +- + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 2 +- + arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 2 +- + arch/arm/boot/dts/wm8505.dtsi | 31 + + arch/arm/boot/dts/zynq-7000.dtsi | 7 + + arch/arm/configs/ape6evm_defconfig | 95 + + arch/arm/configs/armadillo800eva_defconfig | 8 +- + arch/arm/configs/at91_dt_defconfig | 2 +- + arch/arm/configs/at91sam9260_defconfig | 2 +- + arch/arm/configs/at91sam9g20_defconfig | 2 +- + arch/arm/configs/at91sam9g45_defconfig | 2 +- + arch/arm/configs/bcm2835_defconfig | 11 +- + arch/arm/configs/cns3420vb_defconfig | 3 + + arch/arm/configs/dove_defconfig | 2 + + arch/arm/configs/h7201_defconfig | 27 - + arch/arm/configs/h7202_defconfig | 47 - + arch/arm/configs/kirkwood_defconfig | 2 + + arch/arm/configs/kzm9g_defconfig | 2 - + arch/arm/configs/lpc32xx_defconfig | 21 +- + arch/arm/configs/mackerel_defconfig | 4 + + arch/arm/configs/marzen_defconfig | 8 + + arch/arm/configs/multi_v7_defconfig | 23 + + arch/arm/configs/mvebu_defconfig | 9 + + arch/arm/configs/mxs_defconfig | 7 +- + arch/arm/configs/nhk8815_defconfig | 42 +- + arch/arm/configs/sama5_defconfig | 181 + + arch/arm/configs/spear3xx_defconfig | 2 + + arch/arm/configs/spear6xx_defconfig | 1 + + arch/arm/configs/tegra_defconfig | 18 +- + arch/arm/configs/u8500_defconfig | 4 +- + arch/arm/include/asm/irq.h | 5 + + arch/arm/include/asm/mach/irq.h | 36 - + arch/arm/include/asm/smp_twd.h | 8 - + .../mach/debug-macro.S => include/debug/bcm2835.S} | 3 +- + .../mach/debug-macro.S => include/debug/cns3xxx.S} | 0 + .../mach/debug-macro.S => include/debug/exynos.S} | 12 +- + .../mach/debug-macro.S => include/debug/mxs.S} | 9 +- + .../mach/debug-macro.S => include/debug/nomadik.S} | 0 + .../plat/debug-macro.S => include/debug/samsung.S} | 0 + .../include/mach/uart.h => include/debug/sirf.S} | 29 +- + arch/arm/include/debug/ux500.S | 48 + + arch/arm/kernel/atags_proc.c | 28 +- + arch/arm/kernel/irq.c | 6 +- + arch/arm/kernel/smp_twd.c | 17 +- + arch/arm/kernel/swp_emulate.c | 43 +- + arch/arm/mach-at91/Kconfig | 453 +- + arch/arm/mach-at91/Kconfig.non_dt | 399 + + arch/arm/mach-at91/Makefile | 11 +- + arch/arm/mach-at91/at91_rstc.h | 2 +- + arch/arm/mach-at91/at91_shdwc.h | 2 +- + arch/arm/mach-at91/at91rm9200.c | 3 +- + arch/arm/mach-at91/at91sam9260.c | 2 +- + arch/arm/mach-at91/at91sam9261.c | 2 +- + arch/arm/mach-at91/at91sam9263.c | 2 +- + arch/arm/mach-at91/at91sam9g45.c | 2 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 14 +- + arch/arm/mach-at91/at91sam9n12.c | 2 +- + arch/arm/mach-at91/at91sam9rl.c | 2 +- + arch/arm/mach-at91/at91sam9x5.c | 2 +- + arch/arm/mach-at91/at91x40_time.c | 2 +- + .../{board-rm9200-dt.c => board-dt-rm9200.c} | 0 + arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} | 0 + arch/arm/mach-at91/board-dt-sama5.c | 86 + + arch/arm/mach-at91/clock.c | 109 +- + arch/arm/mach-at91/clock.h | 2 + + arch/arm/mach-at91/gpio.c | 3 +- + arch/arm/mach-at91/include/mach/at91_dbgu.h | 3 - + arch/arm/mach-at91/include/mach/at91_matrix.h | 2 +- + arch/arm/mach-at91/include/mach/at91_pmc.h | 18 +- + arch/arm/mach-at91/include/mach/at91_st.h | 2 +- + arch/arm/mach-at91/include/mach/cpu.h | 20 + + arch/arm/mach-at91/include/mach/sama5d3.h | 73 + + arch/arm/mach-at91/sama5d3.c | 377 + + arch/arm/mach-at91/setup.c | 35 +- + arch/arm/mach-at91/soc.h | 7 +- + arch/arm/mach-bcm2835/Kconfig | 15 + + arch/arm/mach-bcm2835/Makefile.boot | 1 - + arch/arm/mach-bcm2835/bcm2835.c | 6 +- + arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h | 29 - + arch/arm/mach-bcm2835/include/mach/gpio.h | 1 - + arch/arm/mach-bcm2835/include/mach/timex.h | 26 - + arch/arm/mach-bcm2835/include/mach/uncompress.h | 44 - + arch/arm/mach-cns3xxx/Kconfig | 12 + + arch/arm/mach-cns3xxx/Makefile | 8 +- + arch/arm/mach-cns3xxx/cns3420vb.c | 6 +- + arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h | 34 +- + arch/arm/mach-cns3xxx/core.c | 131 +- + arch/arm/mach-cns3xxx/devices.c | 5 +- + arch/arm/mach-cns3xxx/include/mach/irqs.h | 24 - + arch/arm/mach-cns3xxx/include/mach/timex.h | 12 - + arch/arm/mach-cns3xxx/include/mach/uncompress.h | 53 - + arch/arm/mach-cns3xxx/pcie.c | 2 +- + arch/arm/mach-cns3xxx/pm.c | 4 +- + arch/arm/mach-cns3xxx/{include/mach => }/pm.h | 0 + arch/arm/mach-davinci/board-da830-evm.c | 1 - + arch/arm/mach-davinci/board-da850-evm.c | 2 - + arch/arm/mach-davinci/board-dm355-evm.c | 1 - + arch/arm/mach-davinci/board-dm365-evm.c | 1 - + arch/arm/mach-davinci/board-dm644x-evm.c | 1 - + arch/arm/mach-davinci/board-neuros-osd2.c | 1 - + arch/arm/mach-davinci/board-omapl138-hawk.c | 1 - + arch/arm/mach-davinci/board-tnetv107x-evm.c | 1 - + arch/arm/mach-davinci/clock.c | 21 +- + arch/arm/mach-davinci/clock.h | 2 + + arch/arm/mach-davinci/da830.c | 2 +- + arch/arm/mach-davinci/da850.c | 50 +- + arch/arm/mach-davinci/da8xx-dt.c | 5 +- + arch/arm/mach-davinci/devices-da8xx.c | 92 +- + arch/arm/mach-davinci/devices-tnetv107x.c | 4 +- + arch/arm/mach-davinci/devices.c | 6 +- + arch/arm/mach-davinci/dm355.c | 4 +- + arch/arm/mach-davinci/dm365.c | 4 +- + arch/arm/mach-davinci/dm644x.c | 2 +- + arch/arm/mach-davinci/include/mach/da8xx.h | 5 + + arch/arm/mach-davinci/include/mach/debug-macro.S | 2 - + arch/arm/mach-davinci/pm.c | 1 + + arch/arm/mach-davinci/sram.c | 4 +- + arch/arm/mach-davinci/tnetv107x.c | 4 +- + arch/arm/mach-davinci/usb.c | 1 + + arch/arm/mach-exynos/Kconfig | 30 +- + arch/arm/mach-exynos/common.c | 4 +- + arch/arm/mach-exynos/cpuidle.c | 58 +- + arch/arm/mach-exynos/dev-ohci.c | 2 +- + arch/arm/mach-exynos/dev-uart.c | 1 + + arch/arm/mach-exynos/include/mach/irqs.h | 5 +- + arch/arm/mach-exynos/include/mach/pm-core.h | 9 +- + arch/arm/mach-exynos/mach-armlex4210.c | 1 + + arch/arm/mach-exynos/mach-nuri.c | 1 + + arch/arm/mach-exynos/mach-origen.c | 3 +- + arch/arm/mach-exynos/mach-smdk4x12.c | 1 + + arch/arm/mach-exynos/mach-smdkv310.c | 3 +- + arch/arm/mach-exynos/platsmp.c | 8 - + arch/arm/mach-exynos/setup-sdhci-gpio.c | 2 +- + arch/arm/mach-gemini/Makefile | 2 +- + arch/arm/mach-gemini/board-nas4220b.c | 1 + + arch/arm/mach-gemini/board-rut1xx.c | 2 + + arch/arm/mach-gemini/board-wbd111.c | 1 + + arch/arm/mach-gemini/board-wbd222.c | 1 + + arch/arm/mach-gemini/common.h | 2 + + arch/arm/mach-gemini/gpio.c | 19 +- + arch/arm/mach-gemini/include/mach/hardware.h | 2 +- + arch/arm/mach-gemini/irq.c | 4 +- + arch/arm/mach-gemini/mm.c | 22 +- + .../mach-gemini/{include/mach/system.h => reset.c} | 2 +- + arch/arm/mach-h720x/Kconfig | 40 - + arch/arm/mach-h720x/Makefile | 16 - + arch/arm/mach-h720x/Makefile.boot | 2 - + arch/arm/mach-h720x/common.c | 268 - + arch/arm/mach-h720x/common.h | 30 - + arch/arm/mach-h720x/cpu-h7201.c | 57 - + arch/arm/mach-h720x/cpu-h7202.c | 225 - + arch/arm/mach-h720x/h7201-eval.c | 38 - + arch/arm/mach-h720x/h7202-eval.c | 81 - + arch/arm/mach-h720x/include/mach/boards.h | 53 - + arch/arm/mach-h720x/include/mach/debug-macro.S | 40 - + arch/arm/mach-h720x/include/mach/entry-macro.S | 57 - + arch/arm/mach-h720x/include/mach/h7201-regs.h | 67 - + arch/arm/mach-h720x/include/mach/h7202-regs.h | 155 - + arch/arm/mach-h720x/include/mach/hardware.h | 190 - + arch/arm/mach-h720x/include/mach/irqs.h | 116 - + arch/arm/mach-h720x/include/mach/isa-dma.h | 19 - + arch/arm/mach-h720x/include/mach/uncompress.h | 36 - + arch/arm/mach-highbank/Kconfig | 1 + + arch/arm/mach-highbank/highbank.c | 5 +- + arch/arm/mach-highbank/platsmp.c | 7 - + arch/arm/mach-imx/Kconfig | 23 +- + arch/arm/mach-imx/Makefile | 3 +- + arch/arm/mach-imx/Makefile.boot | 35 - + arch/arm/mach-imx/avic.c | 6 +- + arch/arm/mach-imx/clk-busy.c | 2 +- + arch/arm/mach-imx/clk-gate2.c | 1 + + arch/arm/mach-imx/clk-imx27.c | 13 +- + arch/arm/mach-imx/clk-imx51-imx53.c | 9 +- + arch/arm/mach-imx/clk-pllv1.c | 2 +- + arch/arm/mach-imx/clk-pllv2.c | 2 +- + arch/arm/mach-imx/clk.c | 1 + + arch/arm/mach-imx/common.h | 3 - + arch/arm/mach-imx/cpu-imx5.c | 1 + + arch/arm/mach-imx/cpu.c | 1 + + arch/arm/mach-imx/cpu_op-mx51.c | 31 - + arch/arm/mach-imx/cpu_op-mx51.h | 14 - + arch/arm/mach-imx/cpufreq.c | 202 - + arch/arm/mach-imx/devices/Kconfig | 4 - + arch/arm/mach-imx/devices/Makefile | 1 - + arch/arm/mach-imx/devices/devices-common.h | 10 - + arch/arm/mach-imx/devices/platform-ahci-imx.c | 157 - + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 4 +- + arch/arm/mach-imx/gpc.c | 1 + + arch/arm/mach-imx/hardware.h | 1 - + arch/arm/mach-imx/imx27-dt.c | 22 +- + arch/arm/mach-imx/imx51-dt.c | 3 + + arch/arm/mach-imx/iomux-imx31.c | 2 +- + arch/arm/mach-imx/irq-common.c | 19 - + arch/arm/mach-imx/mach-cpuimx27.c | 4 +- + arch/arm/mach-imx/mach-cpuimx51sd.c | 5 - + arch/arm/mach-imx/mach-imx6q.c | 9 +- + arch/arm/mach-imx/mach-mx51_babbage.c | 4 - + arch/arm/mach-imx/mm-imx3.c | 2 +- + arch/arm/mach-imx/mm-imx5.c | 2 + + arch/arm/mach-imx/mx6q.h | 31 - + arch/arm/mach-imx/platsmp.c | 12 - + arch/arm/mach-imx/src.c | 5 +- + arch/arm/mach-imx/tzic.c | 2 +- + arch/arm/mach-kirkwood/board-guruplug.c | 6 - + arch/arm/mach-l7200/include/mach/debug-macro.S | 38 - + arch/arm/mach-msm/Kconfig | 7 +- + arch/arm/mach-msm/board-halibut.c | 1 + + arch/arm/mach-msm/board-msm7x30.c | 1 + + arch/arm/mach-msm/board-qsd8x50.c | 1 + + arch/arm/mach-msm/board-trout.c | 1 + + arch/arm/mach-msm/devices-msm7x00.c | 31 + + arch/arm/mach-msm/devices-msm7x30.c | 31 + + arch/arm/mach-msm/devices-qsd8x50.c | 31 + + arch/arm/mach-msm/devices.h | 4 + + arch/arm/mach-msm/dma.c | 26 + + arch/arm/mach-msm/include/mach/cpu.h | 54 - + arch/arm/mach-msm/include/mach/dma.h | 26 - + arch/arm/mach-msm/include/mach/uncompress.h | 2 +- + arch/arm/mach-msm/last_radio_log.c | 20 +- + arch/arm/mach-msm/platsmp.c | 8 - + arch/arm/mach-msm/timer.c | 110 +- + arch/arm/mach-mxs/Kconfig | 24 +- + arch/arm/mach-mxs/Makefile | 6 +- + arch/arm/mach-mxs/Makefile.boot | 1 - + arch/arm/mach-mxs/include/mach/common.h | 29 - + arch/arm/mach-mxs/include/mach/digctl.h | 22 - + arch/arm/mach-mxs/include/mach/hardware.h | 23 - + arch/arm/mach-mxs/include/mach/mx23.h | 169 - + arch/arm/mach-mxs/include/mach/mx28.h | 225 - + arch/arm/mach-mxs/include/mach/mxs.h | 117 - + arch/arm/mach-mxs/include/mach/timex.h | 21 - + arch/arm/mach-mxs/include/mach/uncompress.h | 76 - + arch/arm/mach-mxs/mach-mxs.c | 188 +- + arch/arm/mach-mxs/mm.c | 52 - + arch/arm/mach-mxs/ocotp.c | 93 - + arch/arm/mach-mxs/pm.c | 4 +- + .../include/mach/timex.h => mach-mxs/pm.h} | 9 +- + arch/arm/mach-mxs/system.c | 139 - + arch/arm/mach-nomadik/Kconfig | 25 +- + arch/arm/mach-nomadik/Makefile.boot | 4 - + arch/arm/mach-nomadik/cpu-8815.c | 1 - + arch/arm/mach-nomadik/include/mach/irqs.h | 79 - + arch/arm/mach-nomadik/include/mach/timex.h | 6 - + arch/arm/mach-nomadik/include/mach/uncompress.h | 60 - + arch/arm/mach-omap1/Kconfig | 6 - + arch/arm/mach-omap1/dma.h | 41 - + arch/arm/mach-omap1/pm.c | 78 +- + arch/arm/mach-omap2/Kconfig | 12 +- + arch/arm/mach-omap2/board-2430sdp.c | 2 +- + arch/arm/mach-omap2/board-h4.c | 2 +- + arch/arm/mach-omap2/cclock2420_data.c | 283 +- + arch/arm/mach-omap2/cclock2430_data.c | 313 +- + arch/arm/mach-omap2/cclock33xx_data.c | 181 +- + arch/arm/mach-omap2/cclock3xxx_data.c | 687 +- + arch/arm/mach-omap2/cclock44xx_data.c | 517 +- + arch/arm/mach-omap2/clock.c | 17 +- + arch/arm/mach-omap2/clock.h | 20 +- + arch/arm/mach-omap2/common.h | 8 + + arch/arm/mach-omap2/cpuidle34xx.c | 3 - + arch/arm/mach-omap2/cpuidle44xx.c | 8 +- + arch/arm/mach-omap2/devices.c | 149 +- + arch/arm/mach-omap2/dma.h | 70 - + arch/arm/mach-omap2/dpll3xxx.c | 30 +- + arch/arm/mach-omap2/dsp.c | 4 +- + arch/arm/mach-omap2/id.c | 107 +- + arch/arm/mach-omap2/io.c | 43 +- + arch/arm/mach-omap2/omap-hotplug.c | 6 - + arch/arm/mach-omap2/omap-smp.c | 76 +- + arch/arm/mach-omap2/omap4-common.c | 26 +- + arch/arm/mach-omap2/omap4-sar-layout.h | 28 +- + arch/arm/mach-omap2/omap54xx.h | 1 + + arch/arm/mach-omap2/omap_hwmod.c | 4 - + arch/arm/mach-omap2/omap_hwmod.h | 6 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 + + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 + + .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 36 + + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 81 + + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 107 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 172 +- + arch/arm/mach-omap2/omap_hwmod_common_data.h | 4 + + arch/arm/mach-omap2/pm24xx.c | 11 +- + arch/arm/mach-omap2/pm34xx.c | 9 +- + arch/arm/mach-omap2/pm44xx.c | 20 +- + arch/arm/mach-omap2/powerdomain.c | 18 +- + arch/arm/mach-omap2/prm44xx.c | 6 +- + arch/arm/mach-omap2/soc.h | 2 + + arch/arm/mach-omap2/timer.c | 7 +- + arch/arm/mach-orion5x/common.c | 1 + + arch/arm/mach-orion5x/pci.c | 7 +- + arch/arm/mach-prima2/Kconfig | 23 +- + arch/arm/mach-prima2/Makefile | 5 +- + arch/arm/mach-prima2/common.c | 37 +- + arch/arm/mach-prima2/common.h | 4 +- + arch/arm/mach-prima2/include/mach/clkdev.h | 15 - + arch/arm/mach-prima2/include/mach/debug-macro.S | 29 - + arch/arm/mach-prima2/include/mach/entry-macro.S | 22 - + arch/arm/mach-prima2/include/mach/hardware.h | 15 - + arch/arm/mach-prima2/include/mach/irqs.h | 17 - + arch/arm/mach-prima2/include/mach/map.h | 18 - + arch/arm/mach-prima2/include/mach/timex.h | 14 - + arch/arm/mach-prima2/include/mach/uncompress.h | 41 - + arch/arm/mach-prima2/irq.c | 129 - + arch/arm/mach-prima2/lluart.c | 14 +- + arch/arm/mach-prima2/platsmp.c | 9 - + arch/arm/mach-realview/Kconfig | 8 + + arch/arm/mach-s3c24xx/Kconfig | 22 +- + arch/arm/mach-s3c24xx/bast-irq.c | 2 - + arch/arm/mach-s3c24xx/clock-s3c2410.c | 1 - + arch/arm/mach-s3c24xx/clock-s3c2412.c | 1 - + arch/arm/mach-s3c24xx/clock-s3c2416.c | 1 - + arch/arm/mach-s3c24xx/clock-s3c2443.c | 1 - + arch/arm/mach-s3c24xx/common-smdk.c | 3 +- + .../include/plat => mach-s3c24xx}/common-smdk.h | 3 +- + arch/arm/mach-s3c24xx/common.c | 7 +- + arch/arm/mach-s3c24xx/common.h | 90 +- + arch/arm/mach-s3c24xx/dma-s3c2410.c | 1 - + arch/arm/mach-s3c24xx/dma-s3c2412.c | 1 - + arch/arm/mach-s3c24xx/dma-s3c2440.c | 1 - + arch/arm/mach-s3c24xx/dma-s3c2443.c | 1 - + arch/arm/mach-s3c24xx/include/mach/debug-macro.S | 2 +- + arch/arm/mach-s3c24xx/include/mach/dma.h | 1 - + arch/arm/mach-s3c24xx/include/mach/regs-sdi.h | 127 - + arch/arm/mach-s3c24xx/irq-pm.c | 7 +- + arch/arm/mach-s3c24xx/irq.c | 9 +- + arch/arm/mach-s3c24xx/mach-jive.c | 2 +- + arch/arm/mach-s3c24xx/mach-n30.c | 1 - + arch/arm/mach-s3c24xx/mach-nexcoder.c | 2 - + arch/arm/mach-s3c24xx/mach-otom.c | 1 - + arch/arm/mach-s3c24xx/mach-qt2410.c | 2 +- + arch/arm/mach-s3c24xx/mach-rx1950.c | 1 - + arch/arm/mach-s3c24xx/mach-smdk2410.c | 3 +- + arch/arm/mach-s3c24xx/mach-smdk2413.c | 5 +- + arch/arm/mach-s3c24xx/mach-smdk2416.c | 4 +- + arch/arm/mach-s3c24xx/mach-smdk2440.c | 5 +- + arch/arm/mach-s3c24xx/mach-smdk2443.c | 5 +- + arch/arm/mach-s3c24xx/mach-vstms.c | 3 +- + arch/arm/mach-s3c24xx/pm-s3c2412.c | 1 - + arch/arm/mach-s3c24xx/regs-dsc.h | 203 +- + arch/arm/mach-s3c24xx/s3c2410.c | 1 - + arch/arm/mach-s3c24xx/s3c2412.c | 1 - + arch/arm/mach-s3c24xx/s3c2416.c | 1 - + arch/arm/mach-s3c24xx/s3c2440.c | 1 - + arch/arm/mach-s3c24xx/s3c2442.c | 1 - + arch/arm/mach-s3c24xx/s3c2443.c | 1 - + arch/arm/mach-s3c24xx/s3c244x.c | 2 - + arch/arm/mach-s3c64xx/Makefile | 1 - + arch/arm/mach-s3c64xx/dma.c | 1 + + arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 +- + arch/arm/mach-s3c64xx/include/mach/dma.h | 1 - + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 1 + + arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 2 +- + arch/arm/mach-s5pc100/common.h | 9 - + arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +- + arch/arm/mach-s5pc100/setup-sdhci-gpio.c | 1 - + arch/arm/mach-s5pv210/common.h | 9 - + arch/arm/mach-s5pv210/include/mach/debug-macro.S | 2 +- + arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 1 - + arch/arm/mach-shmobile/Makefile | 7 +- + arch/arm/mach-shmobile/clock-r8a7740.c | 13 + + arch/arm/mach-shmobile/clock-r8a7779.c | 8 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 7 +- + .../{headsmp-sh73a0.S => headsmp-scu.S} | 15 +- + arch/arm/mach-shmobile/hotplug.c | 68 - + arch/arm/mach-shmobile/include/mach/common.h | 21 +- + arch/arm/mach-shmobile/include/mach/irqs.h | 1 + + arch/arm/mach-shmobile/intc-r8a7779.c | 27 +- + arch/arm/mach-shmobile/intc-sh73a0.c | 8 - + arch/arm/mach-shmobile/setup-emev2.c | 4 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 104 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 36 +- + arch/arm/mach-shmobile/smp-emev2.c | 93 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 136 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 43 +- + arch/arm/mach-socfpga/core.h | 11 + + arch/arm/mach-socfpga/platsmp.c | 15 - + arch/arm/mach-socfpga/socfpga.c | 16 +- + arch/arm/mach-spear/Kconfig | 105 + + arch/arm/mach-spear/Makefile | 26 + + .../{mach-spear13xx => mach-spear}/Makefile.boot | 0 + .../include/mach => mach-spear}/generic.h | 30 +- + arch/arm/{mach-spear13xx => mach-spear}/headsmp.S | 0 + arch/arm/{mach-spear13xx => mach-spear}/hotplug.c | 0 + .../plat => mach-spear/include/mach}/debug-macro.S | 0 + .../include/mach/irqs.h | 22 +- + .../include/mach/misc_regs.h | 2 +- + arch/arm/mach-spear/include/mach/spear.h | 95 + + .../plat => mach-spear/include/mach}/timex.h | 0 + .../plat => mach-spear/include/mach}/uncompress.h | 0 + arch/arm/{plat-spear => mach-spear}/pl080.c | 0 + .../include/plat => mach-spear}/pl080.h | 0 + arch/arm/{mach-spear13xx => mach-spear}/platsmp.c | 10 +- + arch/arm/{plat-spear => mach-spear}/restart.c | 5 +- + .../arm/{mach-spear13xx => mach-spear}/spear1310.c | 4 +- + .../arm/{mach-spear13xx => mach-spear}/spear1340.c | 5 +- + .../mach/dma.h => mach-spear/spear13xx-dma.h} | 0 + .../arm/{mach-spear13xx => mach-spear}/spear13xx.c | 13 +- + arch/arm/{mach-spear3xx => mach-spear}/spear300.c | 4 +- + arch/arm/{mach-spear3xx => mach-spear}/spear310.c | 4 +- + arch/arm/{mach-spear3xx => mach-spear}/spear320.c | 7 +- + arch/arm/{mach-spear3xx => mach-spear}/spear3xx.c | 17 +- + arch/arm/{mach-spear6xx => mach-spear}/spear6xx.c | 25 +- + arch/arm/{plat-spear => mach-spear}/time.c | 2 +- + arch/arm/mach-spear13xx/Kconfig | 20 - + arch/arm/mach-spear13xx/Makefile | 10 - + arch/arm/mach-spear13xx/include/mach/debug-macro.S | 14 - + arch/arm/mach-spear13xx/include/mach/hardware.h | 1 - + arch/arm/mach-spear13xx/include/mach/irqs.h | 20 - + arch/arm/mach-spear13xx/include/mach/spear.h | 54 - + arch/arm/mach-spear13xx/include/mach/timex.h | 19 - + arch/arm/mach-spear13xx/include/mach/uncompress.h | 19 - + arch/arm/mach-spear3xx/Kconfig | 26 - + arch/arm/mach-spear3xx/Makefile | 15 - + arch/arm/mach-spear3xx/Makefile.boot | 3 - + arch/arm/mach-spear3xx/include/mach/debug-macro.S | 14 - + arch/arm/mach-spear3xx/include/mach/generic.h | 36 - + arch/arm/mach-spear3xx/include/mach/hardware.h | 1 - + arch/arm/mach-spear3xx/include/mach/irqs.h | 19 - + arch/arm/mach-spear3xx/include/mach/spear.h | 60 - + arch/arm/mach-spear3xx/include/mach/timex.h | 19 - + arch/arm/mach-spear3xx/include/mach/uncompress.h | 19 - + arch/arm/mach-spear6xx/Kconfig | 10 - + arch/arm/mach-spear6xx/Makefile | 6 - + arch/arm/mach-spear6xx/Makefile.boot | 3 - + arch/arm/mach-spear6xx/include/mach/debug-macro.S | 14 - + arch/arm/mach-spear6xx/include/mach/generic.h | 23 - + arch/arm/mach-spear6xx/include/mach/hardware.h | 1 - + arch/arm/mach-spear6xx/include/mach/misc_regs.h | 22 - + arch/arm/mach-spear6xx/include/mach/spear.h | 46 - + arch/arm/mach-spear6xx/include/mach/timex.h | 19 - + arch/arm/mach-spear6xx/include/mach/uncompress.h | 19 - + arch/arm/mach-sunxi/Kconfig | 5 +- + arch/arm/mach-sunxi/sunxi.c | 74 +- + arch/arm/mach-tegra/Kconfig | 29 +- + arch/arm/mach-tegra/Makefile | 7 +- + arch/arm/mach-tegra/Makefile.boot | 3 - + arch/arm/mach-tegra/board-dt-tegra114.c | 46 - + arch/arm/mach-tegra/board-dt-tegra30.c | 60 - + arch/arm/mach-tegra/board-harmony-pcie.c | 7 +- + arch/arm/mach-tegra/board.h | 5 +- + arch/arm/mach-tegra/common.c | 33 +- + arch/arm/mach-tegra/cpuidle-tegra20.c | 6 +- + arch/arm/mach-tegra/cpuidle-tegra30.c | 10 +- + arch/arm/mach-tegra/fuse.c | 4 + + arch/arm/mach-tegra/fuse.h | 7 + + arch/arm/mach-tegra/headsmp.S | 3 - + arch/arm/mach-tegra/hotplug.c | 23 +- + arch/arm/mach-tegra/include/mach/timex.h | 26 - + arch/arm/mach-tegra/include/mach/uncompress.h | 175 - + arch/arm/mach-tegra/irq.c | 96 +- + arch/arm/mach-tegra/irq.h | 6 + + arch/arm/mach-tegra/pcie.c | 3 +- + arch/arm/mach-tegra/platsmp.c | 127 +- + arch/arm/mach-tegra/pm.c | 162 +- + arch/arm/mach-tegra/pm.h | 17 +- + arch/arm/mach-tegra/pmc.c | 310 +- + arch/arm/mach-tegra/pmc.h | 18 + + arch/arm/mach-tegra/powergate.c | 7 +- + arch/arm/mach-tegra/reset-handler.S | 49 +- + arch/arm/mach-tegra/sleep-tegra20.S | 2 +- + arch/arm/mach-tegra/sleep-tegra30.S | 4 +- + arch/arm/mach-tegra/sleep.h | 12 +- + .../arm/mach-tegra/{board-dt-tegra20.c => tegra.c} | 47 +- + arch/arm/mach-tegra/tegra114_speedo.c | 104 + + arch/arm/mach-u300/include/mach/u300-regs.h | 2 +- + arch/arm/mach-ux500/Kconfig | 16 + + arch/arm/mach-ux500/Makefile | 4 +- + arch/arm/mach-ux500/board-mop500-audio.c | 7 +- + arch/arm/mach-ux500/board-mop500-pins.c | 2 - + arch/arm/mach-ux500/board-mop500-regulators.c | 14 + + arch/arm/mach-ux500/board-mop500-regulators.h | 1 + + arch/arm/mach-ux500/board-mop500-sdi.c | 55 +- + arch/arm/mach-ux500/board-mop500-u8500uib.c | 9 +- + arch/arm/mach-ux500/board-mop500-uib.c | 1 - + arch/arm/mach-ux500/board-mop500.c | 111 +- + arch/arm/mach-ux500/board-mop500.h | 4 +- + arch/arm/mach-ux500/cache-l2x0.c | 6 +- + arch/arm/mach-ux500/cpu-db8500.c | 13 +- + arch/arm/mach-ux500/cpu.c | 33 +- + arch/arm/mach-ux500/cpuidle.c | 5 +- + .../mach-ux500/{include/mach => }/db8500-regs.h | 28 + + arch/arm/mach-ux500/devices-common.c | 3 +- + arch/arm/mach-ux500/devices-db8500.c | 8 +- + arch/arm/mach-ux500/devices-db8500.h | 3 +- + arch/arm/mach-ux500/devices.c | 5 +- + arch/arm/mach-ux500/{include/mach => }/devices.h | 0 + arch/arm/mach-ux500/hotplug.c | 2 +- + arch/arm/mach-ux500/id.c | 4 +- + arch/arm/mach-ux500/include/mach/debug-macro.S | 39 - + arch/arm/mach-ux500/include/mach/hardware.h | 47 - + arch/arm/mach-ux500/include/mach/timex.h | 6 - + arch/arm/mach-ux500/include/mach/uncompress.h | 57 - + .../{include/mach => }/irqs-board-mop500.h | 0 + .../mach-ux500/{include/mach => }/irqs-db8500.h | 25 - + arch/arm/mach-ux500/{include/mach => }/irqs.h | 6 +- + arch/arm/mach-ux500/platsmp.c | 12 +- + arch/arm/mach-ux500/pm.c | 167 + + arch/arm/mach-ux500/{include/mach => }/setup.h | 0 + arch/arm/mach-ux500/timer.c | 9 +- + arch/arm/mach-ux500/usb.c | 2 +- + arch/arm/mach-vexpress/Kconfig | 2 + + arch/arm/mach-vexpress/v2m.c | 6 +- + arch/arm/mach-virt/platsmp.c | 8 - + arch/arm/mach-zynq/Kconfig | 2 + + arch/arm/plat-orion/Makefile | 6 +- + arch/arm/plat-orion/pcie.c | 10 +- + arch/arm/plat-samsung/Kconfig | 14 - + arch/arm/plat-samsung/devs.c | 46 - + arch/arm/plat-samsung/dma-ops.c | 10 +- + arch/arm/plat-samsung/include/plat/dma-ops.h | 1 - + arch/arm/plat-samsung/include/plat/dma-pl330.h | 1 - + arch/arm/plat-samsung/include/plat/irq.h | 116 - + arch/arm/plat-samsung/include/plat/regs-iic.h | 56 - + arch/arm/plat-samsung/include/plat/rtc-core.h | 2 +- + arch/arm/plat-samsung/include/plat/s3c2410.h | 31 - + arch/arm/plat-samsung/include/plat/s3c2412.h | 32 - + arch/arm/plat-samsung/include/plat/s3c2416.h | 37 - + arch/arm/plat-samsung/include/plat/s3c2443.h | 36 - + arch/arm/plat-samsung/include/plat/s3c244x.h | 42 - + arch/arm/plat-samsung/include/plat/sdhci.h | 60 +- + arch/arm/plat-samsung/irq-vic-timer.c | 4 +- + arch/arm/plat-samsung/pm.c | 1 + + arch/arm/plat-samsung/s5p-dev-mfc.c | 42 +- + arch/arm/plat-samsung/s5p-irq-gpioint.c | 3 +- + arch/arm/plat-samsung/s5p-irq.c | 1 + + arch/arm/plat-samsung/s5p-sleep.S | 9 + + arch/arm/plat-samsung/setup-mipiphy.c | 3 + + arch/arm/plat-spear/Kconfig | 47 - + arch/arm/plat-spear/Makefile | 9 - + arch/arm/plat-versatile/platsmp.c | 8 - + arch/blackfin/kernel/cplbinfo.c | 4 +- + arch/cris/arch-v10/kernel/fasttimer.c | 301 +- + arch/cris/arch-v32/kernel/fasttimer.c | 299 +- + arch/h8300/kernel/gpio.c | 35 +- + arch/ia64/kernel/palinfo.c | 502 +- + arch/ia64/kernel/salinfo.c | 57 +- + arch/ia64/sn/kernel/sn2/prominfo_proc.c | 146 +- + arch/metag/mm/Kconfig | 5 - + arch/mips/kernel/smtc-proc.c | 64 +- + arch/mips/lasat/picvue_proc.c | 4 +- + arch/mips/mm/init.c | 1 + + arch/mips/pci/ops-pmcmsp.c | 95 +- + arch/mips/sibyte/sb1250/bus_watcher.c | 81 +- + arch/parisc/kernel/pdc_chassis.c | 47 +- + arch/powerpc/Kconfig | 20 +- + arch/powerpc/boot/dts/ac14xx.dts | 392 + + arch/powerpc/boot/dts/b4420qds.dts | 50 + + arch/powerpc/boot/dts/b4860qds.dts | 61 + + arch/powerpc/boot/dts/b4qds.dts | 169 + + arch/powerpc/boot/dts/fsl/b4420si-post.dtsi | 98 + + arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi | 73 + + arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 142 + + arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi | 83 + + arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 268 + + arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi | 1 + + arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi | 1 + + arch/powerpc/boot/dts/fsl/e6500_power_isa.dtsi | 65 + + arch/powerpc/boot/dts/fsl/p1023si-post.dtsi | 1 + + arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi | 1 + + arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi | 41 + + arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi | 41 + + arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi | 41 + + arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi | 41 + + arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi | 1 + + arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi | 1 + + .../{qoriq-sec4.1-0.dtsi => qoriq-sec5.0-0.dtsi} | 27 +- + arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi | 1 + + arch/powerpc/boot/dts/fsl/qoriq-sec5.3-0.dtsi | 119 + + arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 442 + + arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 128 + + arch/powerpc/boot/dts/mpc5121.dtsi | 2 +- + arch/powerpc/boot/dts/mpc5121ads.dts | 2 +- + arch/powerpc/boot/dts/mpc5125twr.dts | 233 + + arch/powerpc/boot/dts/mpc8536ds_36b.dts | 6 +- + arch/powerpc/boot/dts/p1021rdb-pc.dtsi | 12 +- + arch/powerpc/boot/dts/p1025rdb_36b.dts | 5 + + arch/powerpc/boot/dts/pdm360ng.dts | 2 +- + arch/powerpc/boot/dts/t4240qds.dts | 224 + + arch/powerpc/configs/corenet64_smp_defconfig | 46 +- + arch/powerpc/configs/mpc512x_defconfig | 2 +- + arch/powerpc/configs/mpc85xx_defconfig | 40 +- + arch/powerpc/configs/mpc85xx_smp_defconfig | 32 + + arch/powerpc/configs/ps3_defconfig | 2 +- + arch/powerpc/include/asm/bitops.h | 11 +- + arch/powerpc/include/asm/cputable.h | 11 +- + arch/powerpc/include/asm/dma.h | 5 - + arch/powerpc/include/asm/elf.h | 1 + + arch/powerpc/include/asm/exception-64s.h | 2 +- + arch/powerpc/include/asm/firmware.h | 6 +- + arch/powerpc/include/asm/hardirq.h | 3 + + arch/powerpc/include/asm/hugetlb.h | 30 + + arch/powerpc/include/asm/io.h | 4 - + arch/powerpc/include/asm/kvm_asm.h | 4 + + arch/powerpc/include/asm/machdep.h | 3 +- + arch/powerpc/include/asm/mmu-book3e.h | 22 + + arch/powerpc/include/asm/mmu-hash64.h | 60 +- + arch/powerpc/include/asm/opal.h | 2 + + arch/powerpc/include/asm/page.h | 19 + + arch/powerpc/include/asm/page_64.h | 3 +- + arch/powerpc/include/asm/parport.h | 4 +- + arch/powerpc/include/asm/pci-bridge.h | 11 +- + arch/powerpc/include/asm/perf_event_server.h | 9 + + arch/powerpc/include/asm/pgalloc-32.h | 45 + + arch/powerpc/include/asm/pgalloc-64.h | 158 +- + arch/powerpc/include/asm/pgalloc.h | 46 +- + arch/powerpc/include/asm/pgtable-ppc64-64k.h | 6 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 3 +- + arch/powerpc/include/asm/pgtable.h | 8 + + arch/powerpc/include/asm/ppc-opcode.h | 8 + + arch/powerpc/include/asm/processor.h | 12 +- + arch/powerpc/include/asm/prom.h | 69 + + arch/powerpc/include/asm/ptrace.h | 3 +- + arch/powerpc/include/asm/reg.h | 23 + + arch/powerpc/include/asm/rtas.h | 6 + + arch/powerpc/include/asm/smp.h | 2 + + arch/powerpc/include/asm/topology.h | 5 + + arch/powerpc/include/asm/xics.h | 1 + + arch/powerpc/include/uapi/asm/ptrace.h | 1 + + arch/powerpc/kernel/asm-offsets.c | 3 + + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 16 + + arch/powerpc/kernel/cpu_setup_power.S | 31 +- + arch/powerpc/kernel/cputable.c | 9 +- + arch/powerpc/kernel/dbell.c | 2 + + arch/powerpc/kernel/entry_64.S | 20 +- + arch/powerpc/kernel/epapr_hcalls.S | 2 + + arch/powerpc/kernel/exceptions-64e.S | 47 + + arch/powerpc/kernel/exceptions-64s.S | 22 +- + arch/powerpc/kernel/head_44x.S | 2 + + arch/powerpc/kernel/head_64.S | 1 + + arch/powerpc/kernel/head_booke.h | 21 +- + arch/powerpc/kernel/head_fsl_booke.S | 2 + + arch/powerpc/kernel/idle_book3e.S | 32 +- + arch/powerpc/kernel/iommu.c | 2 +- + arch/powerpc/kernel/irq.c | 12 + + arch/powerpc/kernel/kgdb.c | 2 +- + arch/powerpc/kernel/lparcfg.c | 12 +- + arch/powerpc/kernel/pci-common.c | 56 +- + arch/powerpc/kernel/proc_powerpc.c | 21 +- + arch/powerpc/kernel/process.c | 8 +- + arch/powerpc/kernel/prom_init.c | 98 +- + arch/powerpc/kernel/ptrace.c | 31 +- + arch/powerpc/kernel/ptrace32.c | 15 +- + arch/powerpc/kernel/rtas_flash.c | 497 +- + arch/powerpc/kernel/rtas_pci.c | 4 +- + arch/powerpc/kernel/rtasd.c | 49 +- + arch/powerpc/kernel/setup-common.c | 6 - + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/time.c | 4 +- + arch/powerpc/kernel/vdso.c | 4 + + arch/powerpc/kernel/vdso32/gettimeofday.S | 26 + + arch/powerpc/kernel/vdso32/vdso32.lds.S | 1 + + arch/powerpc/kernel/vdso64/gettimeofday.S | 26 + + arch/powerpc/kernel/vdso64/vdso64.lds.S | 1 + + arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- + arch/powerpc/kvm/book3s_64_vio.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 10 +- + arch/powerpc/kvm/book3s_hv_interrupts.S | 6 + + arch/powerpc/mm/gup.c | 18 +- + arch/powerpc/mm/hash_low_64.S | 22 +- + arch/powerpc/mm/hash_native_64.c | 178 +- + arch/powerpc/mm/hash_utils_64.c | 183 +- + arch/powerpc/mm/hugetlbpage-hash64.c | 33 +- + arch/powerpc/mm/hugetlbpage.c | 192 +- + arch/powerpc/mm/icswx.c | 2 +- + arch/powerpc/mm/init_64.c | 3 +- + arch/powerpc/mm/mem.c | 3 +- + arch/powerpc/mm/mmu_context_hash64.c | 37 + + arch/powerpc/mm/numa.c | 278 +- + arch/powerpc/mm/pgtable_64.c | 118 + + arch/powerpc/mm/slice.c | 223 +- + arch/powerpc/mm/tlb_nohash.c | 18 +- + arch/powerpc/perf/Makefile | 5 +- + arch/powerpc/perf/bhrb.S | 44 + + arch/powerpc/perf/core-book3s.c | 231 +- + arch/powerpc/perf/power5+-pmu.c | 2 +- + arch/powerpc/perf/power5-pmu.c | 1 + + arch/powerpc/perf/power8-pmu.c | 592 ++ + arch/powerpc/platforms/40x/Kconfig | 7 - + arch/powerpc/platforms/512x/Kconfig | 8 +- + arch/powerpc/platforms/512x/Makefile | 2 +- + arch/powerpc/platforms/512x/clock.c | 9 +- + arch/powerpc/platforms/512x/mpc512x.h | 1 + + .../512x/{mpc5121_generic.c => mpc512x_generic.c} | 12 +- + arch/powerpc/platforms/512x/mpc512x_shared.c | 33 +- + arch/powerpc/platforms/85xx/Kconfig | 34 + + arch/powerpc/platforms/85xx/Makefile | 2 + + arch/powerpc/platforms/85xx/b4_qds.c | 102 + + arch/powerpc/platforms/85xx/corenet_ds.c | 5 +- + arch/powerpc/platforms/85xx/smp.c | 2 +- + arch/powerpc/platforms/85xx/t4240_qds.c | 98 + + arch/powerpc/platforms/Kconfig | 4 +- + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/platforms/cell/beat_htab.c | 26 +- + arch/powerpc/platforms/cell/pmu.c | 2 +- + arch/powerpc/platforms/cell/spufs/file.c | 4 +- + arch/powerpc/platforms/cell/spufs/inode.c | 1 + + arch/powerpc/platforms/embedded6xx/Kconfig | 5 - + arch/powerpc/platforms/powernv/Kconfig | 5 + + arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + + arch/powerpc/platforms/powernv/pci-ioda.c | 307 +- + arch/powerpc/platforms/powernv/pci-p5ioc2.c | 15 +- + arch/powerpc/platforms/powernv/pci.c | 113 +- + arch/powerpc/platforms/powernv/pci.h | 26 +- + arch/powerpc/platforms/prep/Kconfig | 23 - + arch/powerpc/platforms/ps3/htab.c | 8 +- + arch/powerpc/platforms/ps3/time.c | 4 +- + arch/powerpc/platforms/pseries/firmware.c | 54 +- + arch/powerpc/platforms/pseries/iommu.c | 26 + + arch/powerpc/platforms/pseries/lpar.c | 8 +- + arch/powerpc/platforms/pseries/mobility.c | 41 +- + arch/powerpc/platforms/pseries/plpar_wrappers.h | 15 +- + arch/powerpc/platforms/pseries/pseries.h | 5 +- + arch/powerpc/platforms/pseries/reconfig.c | 2 +- + arch/powerpc/platforms/pseries/scanlog.c | 32 +- + arch/powerpc/platforms/pseries/setup.c | 40 +- + arch/powerpc/platforms/wsp/Kconfig | 5 - + arch/powerpc/sysdev/Kconfig | 1 + + arch/powerpc/sysdev/fsl_msi.c | 4 +- + arch/powerpc/sysdev/fsl_pci.c | 114 +- + arch/powerpc/sysdev/fsl_pci.h | 13 + + arch/powerpc/sysdev/indirect_pci.c | 10 +- + arch/powerpc/sysdev/qe_lib/Kconfig | 2 +- + arch/powerpc/sysdev/rtc_cmos_setup.c | 5 +- + arch/powerpc/sysdev/xics/icp-native.c | 2 +- + arch/powerpc/xmon/xmon.c | 2 +- + arch/s390/kernel/compat_wrapper.S | 16 - + arch/s390/kernel/irq.c | 6 +- + arch/s390/kernel/os_info.c | 1 + + arch/s390/kernel/syscalls.S | 4 +- + arch/score/mm/init.c | 2 +- + arch/sh/drivers/dma/dma-api.c | 28 +- + arch/sh/mm/Kconfig | 7 - + arch/sh/mm/alignment.c | 2 +- + arch/sparc/kernel/ioport.c | 2 +- + arch/sparc/kernel/sun4d_irq.c | 1 + + arch/tile/kernel/hardwall.c | 2 +- + arch/um/drivers/mconsole_kern.c | 3 +- + arch/x86/crypto/Makefile | 57 +- + arch/x86/crypto/aesni-intel_asm.S | 117 + + arch/x86/crypto/aesni-intel_glue.c | 80 + + 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-avx-asm_64.S | 180 +- + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 1368 +++ + arch/x86/crypto/camellia_aesni_avx2_glue.c | 586 ++ + arch/x86/crypto/camellia_aesni_avx_glue.c | 104 +- + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 48 +- + arch/x86/crypto/cast6_avx_glue.c | 91 +- + arch/x86/crypto/crc32-pclmul_asm.S | 6 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 10 +- + arch/x86/crypto/glue_helper-asm-avx.S | 61 +- + arch/x86/crypto/glue_helper-asm-avx2.S | 180 + + arch/x86/crypto/glue_helper.c | 97 +- + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 45 +- + arch/x86/crypto/serpent-avx2-asm_64.S | 800 ++ + arch/x86/crypto/serpent_avx2_glue.c | 562 ++ + arch/x86/crypto/serpent_avx_glue.c | 145 +- + arch/x86/crypto/sha256-avx-asm.S | 496 ++ + arch/x86/crypto/sha256-avx2-asm.S | 772 ++ + arch/x86/crypto/sha256-ssse3-asm.S | 506 ++ + arch/x86/crypto/sha256_ssse3_glue.c | 275 + + arch/x86/crypto/sha512-avx-asm.S | 423 + + arch/x86/crypto/sha512-avx2-asm.S | 743 ++ + arch/x86/crypto/sha512-ssse3-asm.S | 421 + + arch/x86/crypto/sha512_ssse3_glue.c | 282 + + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 48 +- + arch/x86/crypto/twofish-avx2-asm_64.S | 600 ++ + arch/x86/crypto/twofish_avx2_glue.c | 584 ++ + arch/x86/crypto/twofish_avx_glue.c | 101 +- + arch/x86/ia32/ia32_aout.c | 30 +- + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/include/asm/crypto/blowfish.h | 43 + + arch/x86/include/asm/crypto/camellia.h | 19 + + arch/x86/include/asm/crypto/glue_helper.h | 24 + + arch/x86/include/asm/crypto/serpent-avx.h | 29 + + arch/x86/include/asm/crypto/twofish.h | 18 + + arch/x86/include/asm/lguest.h | 17 +- + arch/x86/include/asm/suspend_32.h | 1 + + arch/x86/include/asm/suspend_64.h | 2 + + arch/x86/kernel/asm-offsets_32.c | 3 + + arch/x86/kernel/asm-offsets_64.c | 1 + + arch/x86/kernel/head64.c | 3 +- + arch/x86/kernel/head_64.S | 1 + + arch/x86/mm/init_64.c | 1 + + arch/x86/platform/efi/efi.c | 1 + + arch/x86/platform/efi/efi_64.c | 1 + + arch/x86/power/cpu.c | 15 +- + arch/x86/power/hibernate_asm_32.S | 4 + + arch/x86/power/hibernate_asm_64.S | 3 + + arch/xtensa/platforms/iss/simdisk.c | 36 +- + block/blk-integrity.c | 2 +- + block/blk-merge.c | 2 +- + crypto/Kconfig | 133 +- + crypto/Makefile | 1 + + crypto/cmac.c | 315 + + crypto/crypto_user.c | 4 +- + crypto/gcm.c | 116 +- + crypto/sha256_generic.c | 11 +- + crypto/sha512_generic.c | 13 +- + crypto/tcrypt.c | 30 +- + crypto/testmgr.c | 95 +- + crypto/testmgr.h | 1314 ++- + drivers/Makefile | 2 +- + drivers/acpi/ac.c | 2 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/button.c | 2 +- + drivers/acpi/proc.c | 4 +- + drivers/acpi/sbs.c | 29 +- + drivers/ata/sata_svw.c | 29 +- + drivers/block/DAC960.c | 8 +- + drivers/block/cciss.c | 2 +- + drivers/block/cciss_scsi.c | 96 +- + drivers/block/cpqarray.c | 2 +- + drivers/block/drbd/drbd_proc.c | 2 +- + drivers/block/loop.c | 2 + + drivers/block/pktcdvd.c | 2 +- + drivers/block/ps3vram.c | 2 +- + drivers/block/virtio_blk.c | 148 +- + drivers/char/ds1620.c | 34 +- + drivers/char/efirtc.c | 83 +- + drivers/char/genrtc.c | 48 +- + drivers/char/hw_random/Kconfig | 12 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/bcm2835-rng.c | 113 + + drivers/char/hw_random/exynos-rng.c | 3 +- + drivers/char/hw_random/mxc-rnga.c | 21 +- + drivers/char/hw_random/timeriomem-rng.c | 190 +- + drivers/char/hw_random/virtio-rng.c | 2 +- + drivers/char/ipmi/ipmi_msghandler.c | 8 +- + drivers/char/ipmi/ipmi_si_intf.c | 6 +- + drivers/char/virtio_console.c | 14 +- + drivers/clk/mxs/clk-imx23.c | 42 +- + drivers/clk/mxs/clk-imx28.c | 42 +- + drivers/clk/socfpga/clk.c | 163 +- + drivers/clk/spear/spear1310_clock.c | 64 +- + drivers/clk/spear/spear1340_clock.c | 63 +- + drivers/clk/spear/spear3xx_clock.c | 60 +- + drivers/clk/spear/spear6xx_clock.c | 31 +- + drivers/clk/tegra/clk-tegra20.c | 36 +- + drivers/clk/tegra/clk-tegra30.c | 3 +- + drivers/clk/ux500/clk-prcc.c | 1 - + drivers/clk/ux500/u8500_clk.c | 145 +- + drivers/clocksource/Kconfig | 2 +- + drivers/clocksource/Makefile | 5 +- + drivers/clocksource/bcm2835_timer.c | 12 +- + drivers/clocksource/clksrc-dbx500-prcmu.c | 3 - + drivers/clocksource/clksrc-of.c | 5 +- + .../timer.c => drivers/clocksource/mxs_timer.c | 36 +- + drivers/clocksource/nomadik-mtu.c | 4 +- + .../clocksource/{sunxi_timer.c => sun4i_timer.c} | 94 +- + drivers/clocksource/tegra20_timer.c | 75 +- + .../clocksource}/timer-marco.c | 25 +- + .../clocksource}/timer-prima2.c | 42 +- + drivers/clocksource/vt8500_timer.c | 16 +- + drivers/crypto/Kconfig | 18 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/atmel-aes.c | 471 +- + drivers/crypto/atmel-sha-regs.h | 7 +- + drivers/crypto/atmel-sha.c | 586 +- + drivers/crypto/atmel-tdes-regs.h | 2 + + drivers/crypto/atmel-tdes.c | 394 +- + drivers/crypto/bfin_crc.c | 6 +- + drivers/crypto/caam/Kconfig | 2 +- + drivers/crypto/caam/caamalg.c | 6 + + drivers/crypto/caam/caamhash.c | 4 +- + drivers/crypto/caam/ctrl.c | 3 + + drivers/crypto/caam/error.c | 10 +- + drivers/crypto/caam/intern.h | 1 + + drivers/crypto/caam/jr.c | 4 + + drivers/crypto/caam/key_gen.c | 2 +- + drivers/crypto/caam/key_gen.h | 2 +- + drivers/crypto/caam/regs.h | 4 +- + drivers/crypto/omap-aes.c | 15 +- + drivers/crypto/omap-sham.c | 15 +- + drivers/crypto/picoxcell_crypto.c | 4 +- + drivers/crypto/sahara.c | 1070 +++ + drivers/crypto/ux500/cryp/cryp.c | 2 - + drivers/crypto/ux500/cryp/cryp_core.c | 1 - + drivers/crypto/ux500/hash/hash_core.c | 7 +- + drivers/firmware/efi/efi-pstore.c | 1 + + drivers/firmware/efi/efivars.c | 1 + + drivers/gpio/gpio-msm-v1.c | 220 +- + drivers/gpio/gpio-msm-v2.c | 3 +- + drivers/gpio/gpio-mxc.c | 2 +- + drivers/gpio/gpio-omap.c | 3 +- + drivers/gpio/gpio-pl061.c | 2 +- + drivers/gpio/gpio-pxa.c | 3 +- + drivers/gpio/gpio-tegra.c | 24 +- + drivers/gpu/drm/drm_proc.c | 43 +- + drivers/gpu/drm/drm_stub.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 3 +- + drivers/i2c/busses/i2c-amd756-s4882.c | 6 +- + drivers/i2c/busses/i2c-at91.c | 58 +- + drivers/i2c/busses/i2c-cbus-gpio.c | 4 +- + drivers/i2c/busses/i2c-davinci.c | 77 +- + drivers/i2c/busses/i2c-designware-core.c | 39 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 73 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 83 +- + drivers/i2c/busses/i2c-gpio.c | 75 +- + drivers/i2c/busses/i2c-intel-mid.c | 3 +- + drivers/i2c/busses/i2c-ismt.c | 2 +- + drivers/i2c/busses/i2c-mv64xxx.c | 5 +- + drivers/i2c/busses/i2c-mxs.c | 104 +- + drivers/i2c/busses/i2c-nforce2-s4985.c | 6 +- + drivers/i2c/busses/i2c-octeon.c | 10 +- + drivers/i2c/busses/i2c-powermac.c | 10 +- + drivers/i2c/busses/i2c-puv3.c | 10 +- + drivers/i2c/busses/i2c-pxa.c | 20 +- + drivers/i2c/busses/i2c-s3c2410.c | 48 +- + drivers/i2c/busses/i2c-tegra.c | 26 +- + drivers/i2c/busses/i2c-viperboard.c | 5 +- + drivers/i2c/busses/i2c-xiic.c | 6 +- + drivers/i2c/i2c-core.c | 246 +- + drivers/i2c/i2c-mux.c | 9 +- + drivers/i2c/muxes/Kconfig | 12 + + drivers/i2c/muxes/Makefile | 2 + + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 251 + + drivers/i2c/muxes/i2c-mux-gpio.c | 17 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +- + drivers/ide/ide-cd.c | 2 +- + drivers/ide/ide-disk_proc.c | 8 +- + drivers/ide/ide-floppy_proc.c | 2 +- + drivers/ide/ide-proc.c | 22 +- + drivers/ide/ide-tape.c | 2 +- + drivers/input/misc/hp_sdc_rtc.c | 58 +- + drivers/irqchip/Makefile | 4 +- + drivers/irqchip/exynos-combiner.c | 1 + + drivers/irqchip/irq-gic.c | 36 +- + .../mach-mxs/icoll.c => drivers/irqchip/irq-mxs.c | 24 +- + drivers/irqchip/irq-sirfsoc.c | 126 + + drivers/irqchip/irq-sun4i.c | 149 + + drivers/irqchip/irq-sunxi.c | 151 - + drivers/irqchip/irq-vic.c | 3 +- + drivers/isdn/gigaset/capi.c | 2 +- + drivers/isdn/hardware/avm/b1.c | 2 +- + drivers/isdn/hardware/avm/b1dma.c | 2 +- + drivers/isdn/hardware/avm/c4.c | 2 +- + drivers/isdn/hardware/eicon/divasproc.c | 12 +- + drivers/isdn/hysdn/hycapi.c | 2 +- + drivers/isdn/hysdn/hysdn_procconf.c | 32 +- + drivers/isdn/hysdn/hysdn_proclog.c | 71 +- + drivers/isdn/mISDN/timerdev.c | 76 +- + drivers/lguest/Kconfig | 5 +- + drivers/lguest/core.c | 67 +- + drivers/lguest/lg.h | 6 +- + drivers/lguest/lguest_user.c | 6 +- + drivers/lguest/page_tables.c | 567 +- + drivers/lguest/x86/core.c | 7 +- + drivers/macintosh/smu.c | 6 +- + drivers/macintosh/via-pmu.c | 7 +- + drivers/media/dvb-core/dvb_frontend.c | 5 +- + drivers/media/dvb-core/dvb_net.c | 5 +- + drivers/media/pci/bt8xx/bttv-i2c.c | 6 +- + drivers/media/pci/cx25821/cx25821-audio-upstream.c | 179 +- + drivers/media/pci/mantis/mantis_i2c.c | 4 +- + drivers/media/pci/ttpci/av7110_ir.c | 2 +- + drivers/media/pci/zoran/zoran_procfs.c | 4 +- + drivers/media/rc/ir-lirc-codec.c | 2 +- + drivers/media/rc/lirc_dev.c | 2 +- + drivers/message/fusion/mptbase.c | 4 +- + drivers/message/fusion/mptctl.c | 8 - + drivers/message/fusion/mptfc.c | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/fusion/mptscsih.c | 98 +- + drivers/message/fusion/mptscsih.h | 2 +- + drivers/message/fusion/mptspi.c | 2 +- + drivers/message/i2o/i2o_proc.c | 97 +- + drivers/mfd/db8500-prcmu.c | 316 +- + drivers/mfd/dbx500-prcmu-regs.h | 204 +- + drivers/misc/lis3lv02d/lis3lv02d.c | 1 - + drivers/misc/sgi-gru/gruprocfs.c | 2 +- + drivers/mmc/host/davinci_mmc.c | 88 +- + drivers/mmc/host/mmci.c | 9 + + drivers/mmc/host/msm_sdcc.c | 1 - + drivers/mmc/host/s3cmci.c | 83 +- + drivers/mmc/host/sdhci-cns3xxx.c | 1 - + .../mmc/host/sdhci-s3c-regs.h | 0 + drivers/mmc/host/sdhci-s3c.c | 5 +- + drivers/mtd/mtdcore.c | 1 + + drivers/mtd/onenand/samsung.c | 4 +- + .../mtd/onenand/samsung.h | 2 - + drivers/net/bonding/bond_procfs.c | 4 +- + drivers/net/caif/Kconfig | 14 + + drivers/net/caif/Makefile | 3 + + drivers/net/caif/caif_virtio.c | 790 ++ + drivers/net/ethernet/sfc/falcon.c | 6 +- + drivers/net/ethernet/smsc/smsc911x.c | 29 +- + drivers/net/irda/vlsi_ir.c | 4 +- + drivers/net/virtio_net.c | 77 +- + drivers/net/wireless/airo.c | 116 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 4 +- + drivers/net/wireless/atmel.c | 69 +- + drivers/net/wireless/hostap/hostap_ap.c | 375 +- + drivers/net/wireless/hostap/hostap_download.c | 68 +- + drivers/net/wireless/hostap/hostap_hw.c | 38 +- + drivers/net/wireless/hostap/hostap_proc.c | 609 +- + drivers/net/wireless/hostap/hostap_wlan.h | 3 +- + drivers/net/wireless/ray_cs.c | 2 +- + drivers/nubus/nubus.c | 55 - + drivers/nubus/proc.c | 80 +- + drivers/of/base.c | 11 +- + drivers/parisc/led.c | 4 +- + drivers/pci/probe.c | 2 +- + drivers/pci/proc.c | 34 +- + drivers/pinctrl/Kconfig | 12 +- + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/core.c | 2 +- + drivers/pinctrl/pinctrl-at91.c | 3 +- + drivers/pinctrl/pinctrl-exynos.c | 3 +- + drivers/pinctrl/pinctrl-imx.c | 126 +- + drivers/pinctrl/pinctrl-imx.h | 29 +- + drivers/pinctrl/pinctrl-imx35.c | 2088 ++--- + drivers/pinctrl/pinctrl-imx51.c | 1532 ++-- + drivers/pinctrl/pinctrl-imx53.c | 1597 +--- + drivers/pinctrl/pinctrl-imx6dl.c | 497 ++ + drivers/pinctrl/pinctrl-imx6q.c | 2301 +---- + drivers/pinctrl/pinctrl-imx6sl.c | 403 + + drivers/pinctrl/pinctrl-nomadik.c | 2 +- + drivers/pinctrl/pinctrl-sirf.c | 14 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 8 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 18 +- + drivers/pnp/isapnp/proc.c | 6 +- + drivers/pnp/pnpbios/core.c | 9 +- + drivers/pnp/pnpbios/proc.c | 4 +- + drivers/pps/clients/pps_parport.c | 1 + + drivers/rpmsg/virtio_rpmsg_bus.c | 8 +- + drivers/rtc/rtc-proc.c | 2 +- + drivers/rtc/rtc-s3c.c | 3 +- + .../plat/regs-rtc.h => drivers/rtc/rtc-s3c.h | 3 +- + drivers/rtc/rtc-stmp3xxx.c | 6 +- + drivers/s390/cio/qdio_debug.c | 2 +- + drivers/scsi/BusLogic.c | 83 +- + drivers/scsi/BusLogic.h | 1 - + drivers/scsi/NCR5380.c | 61 +- + drivers/scsi/NCR5380.h | 6 +- + drivers/scsi/a2091.c | 3 +- + drivers/scsi/a3000.c | 3 +- + drivers/scsi/advansys.c | 1164 +-- + drivers/scsi/aha152x.c | 61 +- + drivers/scsi/aha1740.c | 29 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 9 +- + drivers/scsi/aic7xxx/aic79xx_osm.h | 12 +- + drivers/scsi/aic7xxx/aic79xx_proc.c | 163 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 9 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 12 +- + drivers/scsi/aic7xxx/aic7xxx_proc.c | 153 +- + drivers/scsi/aic7xxx_old.c | 2 +- + drivers/scsi/aic7xxx_old/aic7xxx_proc.c | 221 +- + drivers/scsi/arm/acornscsi.c | 58 +- + drivers/scsi/arm/arxescsi.c | 40 +- + drivers/scsi/arm/cumana_1.c | 1 - + drivers/scsi/arm/cumana_2.c | 43 +- + drivers/scsi/arm/eesox.c | 42 +- + drivers/scsi/arm/fas216.c | 31 +- + drivers/scsi/arm/fas216.h | 6 +- + drivers/scsi/arm/oak.c | 6 +- + drivers/scsi/arm/powertec.c | 29 +- + drivers/scsi/atari_NCR5380.c | 145 +- + drivers/scsi/atari_scsi.c | 2 +- + drivers/scsi/atari_scsi.h | 2 +- + drivers/scsi/atp870u.c | 40 +- + drivers/scsi/dc395x.c | 20 +- + drivers/scsi/dpt_i2o.c | 102 +- + drivers/scsi/dtc.c | 3 +- + drivers/scsi/dtc.h | 3 +- + drivers/scsi/eata_pio.c | 56 +- + drivers/scsi/g_NCR5380.c | 51 +- + drivers/scsi/gdth.c | 3 +- + drivers/scsi/gdth.h | 3 +- + drivers/scsi/gdth_proc.c | 211 +- + drivers/scsi/gdth_proc.h | 5 - + drivers/scsi/gvp11.c | 3 +- + drivers/scsi/imm.c | 40 +- + drivers/scsi/in2000.c | 178 +- + drivers/scsi/ips.c | 238 +- + drivers/scsi/ips.h | 9 - + drivers/scsi/lpfc/lpfc_init.c | 33 +- + drivers/scsi/mac_scsi.c | 3 +- + drivers/scsi/mac_scsi.h | 3 +- + drivers/scsi/megaraid.c | 1040 +-- + drivers/scsi/megaraid.h | 17 - + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 14 - + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 14 - + drivers/scsi/mvme147.c | 3 +- + drivers/scsi/nsp32.c | 39 +- + drivers/scsi/pas16.c | 3 +- + drivers/scsi/pas16.h | 3 +- + drivers/scsi/pcmcia/nsp_cs.c | 36 +- + drivers/scsi/pcmcia/nsp_cs.h | 9 +- + drivers/scsi/pmcraid.c | 14 - + drivers/scsi/ppa.c | 36 +- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/scsi_debug.c | 53 +- + drivers/scsi/scsi_proc.c | 74 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 115 +- + drivers/scsi/t128.c | 3 +- + drivers/scsi/t128.h | 3 +- + drivers/scsi/virtio_scsi.c | 487 +- + drivers/scsi/wd33c93.c | 194 +- + drivers/scsi/wd33c93.h | 3 +- + drivers/scsi/wd7000.c | 31 +- + drivers/staging/comedi/proc.c | 55 +- + drivers/staging/csr/csr_wifi_hip_udi.c | 353 +- + drivers/staging/csr/csr_wifi_hip_unifi_udi.h | 17 +- + drivers/staging/csr/drv.c | 4 +- + drivers/staging/csr/io.c | 151 +- + drivers/staging/cxt1e1/Makefile | 3 +- + drivers/staging/cxt1e1/sbeproc.c | 460 +- + drivers/staging/cxt1e1/sbeproc.h | 14 +- + drivers/staging/dgrp/dgrp_common.c | 31 - + drivers/staging/dgrp/dgrp_common.h | 65 +- + drivers/staging/dgrp/dgrp_dpa_ops.c | 29 +- + drivers/staging/dgrp/dgrp_mon_ops.c | 26 +- + drivers/staging/dgrp/dgrp_net_ops.c | 30 +- + drivers/staging/dgrp/dgrp_ports_ops.c | 18 +- + drivers/staging/dgrp/dgrp_specproc.c | 399 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 130 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 2 +- + drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 129 +- + drivers/staging/iio/adc/mxs-lradc.c | 3 - + drivers/staging/imx-drm/ipu-v3/ipu-common.c | 2 +- + drivers/staging/keucr/scsiglue.c | 45 +- + drivers/staging/media/go7007/go7007-driver.c | 7 +- + drivers/staging/rtl8187se/r8180.h | 1 - + drivers/staging/rtl8187se/r8180_core.c | 146 +- + drivers/staging/rtl8192e/rtl8192e/Makefile | 1 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 - + drivers/staging/rtl8192e/rtl8192e/rtl_debug.c | 1029 --- + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 21 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 44 +- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 6 +- + drivers/staging/rtl8192e/rtllib_module.c | 54 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 53 +- + drivers/staging/rtl8192u/ieee80211/proc.c | 8 +- + drivers/staging/rtl8192u/r8192U.h | 1 - + drivers/staging/rtl8192u/r8192U_core.c | 211 +- + drivers/staging/rts5139/rts51x_scsi.c | 30 +- + drivers/staging/rts5139/rts51x_scsi.h | 2 - + drivers/staging/silicom/Makefile | 3 - + drivers/staging/silicom/bp_proc.c | 1327 --- + drivers/staging/silicom/{bp_mod.c => bpctl_mod.c} | 1927 ++-- + drivers/staging/ste_rmi4/Makefile | 1 - + .../staging/ste_rmi4/board-mop500-u8500uib-rmi4.c | 31 - + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 31 +- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 1 - + drivers/staging/vt6655/device_main.c | 74 +- + drivers/staging/vt6656/main_usb.c | 63 +- + drivers/staging/wlags49_h2/wl_main.c | 331 +- + drivers/target/loopback/tcm_loop.c | 9 +- + drivers/thermal/exynos_thermal.c | 2 - + drivers/tty/serial/serial_core.c | 2 +- + drivers/usb/gadget/at91_udc.c | 2 +- + drivers/usb/gadget/f_fs.c | 2 - + drivers/usb/gadget/fsl_udc_core.c | 124 +- + drivers/usb/gadget/goku_udc.c | 89 +- + drivers/usb/gadget/inode.c | 2 - + drivers/usb/gadget/lpc32xx_udc.c | 2 +- + drivers/usb/gadget/rndis.c | 4 +- + drivers/usb/host/isp1362-hcd.c | 7 +- + drivers/usb/host/ohci-exynos.c | 2 +- + drivers/usb/host/sl811-hcd.c | 2 +- + drivers/usb/misc/yurex.c | 2 - + drivers/usb/storage/scsiglue.c | 42 +- + drivers/vfio/pci/vfio_pci.c | 44 +- + drivers/vfio/pci/vfio_pci_config.c | 172 +- + drivers/vfio/pci/vfio_pci_intrs.c | 67 +- + drivers/vfio/pci/vfio_pci_private.h | 1 + + drivers/vfio/vfio.c | 117 +- + drivers/vhost/Kconfig | 18 +- + drivers/vhost/Kconfig.tcm | 6 - + drivers/vhost/Makefile | 5 +- + drivers/vhost/net.c | 255 +- + drivers/vhost/{tcm_vhost.c => scsi.c} | 255 +- + drivers/vhost/tcm_vhost.h | 128 - + drivers/vhost/test.c | 13 +- + drivers/vhost/vhost.c | 153 +- + drivers/vhost/vhost.h | 32 +- + drivers/vhost/vringh.c | 1007 +++ + drivers/video/bfin_adv7393fb.c | 43 +- + drivers/video/cirrusfb.c | 62 +- + drivers/video/pxa3xx-gcu.c | 36 +- + drivers/virtio/virtio_balloon.c | 6 +- + drivers/virtio/virtio_ring.c | 297 +- + drivers/zorro/proc.c | 6 +- + fs/Makefile | 2 +- + fs/afs/proc.c | 8 +- + fs/aio.c | 4 + + fs/binfmt_aout.c | 25 +- + fs/binfmt_elf.c | 3 + + fs/binfmt_elf_fdpic.c | 15 +- + fs/binfmt_flat.c | 37 +- + fs/btrfs/file.c | 3 - + fs/cachefiles/rdwr.c | 2 + + fs/cifs/file.c | 3 - + fs/coda/file.c | 2 + + fs/compat.c | 184 - + fs/coredump.c | 6 +- + fs/efivarfs/file.c | 1 + + fs/efivarfs/inode.c | 1 + + fs/efivarfs/super.c | 2 + + fs/exec.c | 9 + + fs/ext4/mballoc.c | 2 +- + fs/ext4/super.c | 2 +- + fs/f2fs/acl.c | 2 +- + fs/f2fs/dir.c | 2 +- + fs/f2fs/file.c | 4 +- + fs/fifo.c | 153 - + fs/file.c | 68 +- + fs/fuse/dev.c | 2 +- + fs/fuse/file.c | 2 - + fs/hpfs/file.c | 36 +- + fs/hppfs/hppfs.c | 20 +- + fs/inode.c | 2 +- + fs/internal.h | 5 + + fs/jbd2/journal.c | 2 +- + fs/mount.h | 7 + + fs/namespace.c | 341 +- + fs/nfsd/nfsctl.c | 4 +- + fs/notify/inotify/inotify_user.c | 3 - + fs/ntfs/file.c | 2 - + fs/ocfs2/file.c | 9 +- + fs/pipe.c | 458 +- + fs/pnode.c | 10 +- + fs/pnode.h | 7 +- + fs/proc/base.c | 56 +- + fs/proc/fd.h | 5 + + fs/proc/generic.c | 377 +- + fs/proc/inode.c | 283 +- + fs/proc/internal.h | 313 +- + fs/proc/kcore.c | 2 + + fs/proc/namespaces.c | 17 +- + fs/proc/proc_devtree.c | 2 +- + fs/proc/proc_net.c | 4 + + fs/proc/root.c | 2 + + fs/proc/self.c | 47 +- + fs/proc/vmcore.c | 5 +- + fs/read_write.c | 205 +- + fs/read_write.h | 5 - + fs/reiserfs/file.c | 61 +- + fs/reiserfs/procfs.c | 62 +- + fs/seq_file.c | 18 + + fs/splice.c | 14 +- + fs/xfs/Makefile | 6 +- + fs/xfs/xfs_ag.h | 56 +- + fs/xfs/xfs_alloc.c | 201 +- + fs/xfs/xfs_alloc_btree.c | 105 +- + fs/xfs/xfs_alloc_btree.h | 12 +- + fs/xfs/xfs_aops.c | 12 +- + fs/xfs/xfs_attr.c | 454 +- + fs/xfs/xfs_attr.h | 1 - + fs/xfs/xfs_attr_leaf.c | 1781 ++-- + fs/xfs/xfs_attr_leaf.h | 122 +- + fs/xfs/xfs_attr_remote.c | 541 ++ + fs/xfs/xfs_attr_remote.h | 46 + + fs/xfs/xfs_bmap.c | 9214 ++++++++++---------- + fs/xfs/xfs_bmap_btree.c | 110 +- + fs/xfs/xfs_bmap_btree.h | 19 +- + fs/xfs/xfs_btree.c | 256 +- + fs/xfs/xfs_btree.h | 64 +- + fs/xfs/xfs_buf.c | 4 +- + fs/xfs/xfs_buf_item.h | 64 +- + fs/xfs/xfs_da_btree.c | 1501 ++-- + fs/xfs/xfs_da_btree.h | 130 +- + fs/xfs/xfs_dinode.h | 43 +- + fs/xfs/xfs_dir2_block.c | 179 +- + fs/xfs/xfs_dir2_data.c | 266 +- + fs/xfs/xfs_dir2_format.h | 278 +- + fs/xfs/xfs_dir2_leaf.c | 898 +- + fs/xfs/xfs_dir2_node.c | 1007 ++- + fs/xfs/xfs_dir2_priv.h | 50 +- + fs/xfs/xfs_dir2_sf.c | 12 +- + fs/xfs/xfs_dquot.c | 160 +- + fs/xfs/xfs_dquot.h | 16 +- + fs/xfs/xfs_error.c | 4 +- + fs/xfs/xfs_extfree_item.c | 27 +- + fs/xfs/xfs_extfree_item.h | 14 +- + fs/xfs/xfs_file.c | 5 +- + fs/xfs/xfs_fsops.c | 34 +- + fs/xfs/xfs_ialloc.c | 109 +- + fs/xfs/xfs_ialloc_btree.c | 87 +- + fs/xfs/xfs_ialloc_btree.h | 9 +- + fs/xfs/xfs_inode.c | 212 +- + fs/xfs/xfs_inode.h | 31 +- + fs/xfs/xfs_inode_item.c | 2 +- + fs/xfs/xfs_iomap.c | 163 +- + fs/xfs/xfs_linux.h | 1 + + fs/xfs/xfs_log.c | 2 +- + fs/xfs/xfs_log_cil.c | 4 - + fs/xfs/xfs_log_priv.h | 1 - + fs/xfs/xfs_log_recover.c | 246 +- + fs/xfs/xfs_message.h | 26 + + fs/xfs/xfs_mount.c | 146 +- + fs/xfs/xfs_mount.h | 2 +- + fs/xfs/xfs_qm.c | 25 +- + fs/xfs/xfs_qm.h | 4 +- + fs/xfs/xfs_qm_syscalls.c | 9 +- + fs/xfs/xfs_quota.h | 11 +- + fs/xfs/xfs_sb.h | 166 +- + fs/xfs/xfs_symlink.c | 730 ++ + fs/xfs/xfs_symlink.h | 66 + + fs/xfs/xfs_trace.c | 2 +- + fs/xfs/xfs_trace.h | 24 + + fs/xfs/xfs_trans_buf.c | 63 +- + fs/xfs/xfs_trans_dquot.c | 10 +- + fs/xfs/xfs_vnodeops.c | 478 +- + include/crypto/sha.h | 5 + + include/drm/drmP.h | 5 +- + include/dt-bindings/gpio/gpio.h | 15 + + include/dt-bindings/interrupt-controller/arm-gic.h | 22 + + include/dt-bindings/interrupt-controller/irq.h | 19 + + include/linux/binfmts.h | 1 + + include/linux/cgroup.h | 2 +- + include/linux/clk/mxs.h | 16 + + include/linux/clocksource.h | 12 +- + include/linux/cpuset.h | 3 +- + include/linux/fdtable.h | 1 - + include/linux/fs.h | 19 +- + include/linux/i2c-mux.h | 2 +- + include/linux/i2c-tegra.h | 25 - + include/linux/i2c.h | 50 +- + include/linux/irqchip/arm-gic.h | 1 - + include/linux/irqchip/chained_irq.h | 52 + + include/linux/irqchip/mxs.h | 14 + + include/linux/irqchip/sunxi.h | 27 - + include/linux/kcore.h | 38 + + include/linux/math64.h | 19 +- + include/linux/mfd/db8500-prcmu.h | 10 +- + include/linux/mfd/dbx500-prcmu.h | 38 +- + include/linux/netdev_features.h | 12 +- + include/linux/nubus.h | 4 + + include/linux/of.h | 10 + + include/linux/pid_namespace.h | 1 + + include/linux/pipe_fs_i.h | 11 +- + include/linux/platform_data/arm-ux500-pm.h | 21 + + .../linux/platform_data/asoc-ux500-msp.h | 0 + include/linux/platform_data/atmel-aes.h | 22 - + include/linux/platform_data/clk-ux500.h | 3 +- + include/linux/platform_data/crypto-atmel.h | 22 + + include/linux/platform_data/mmc-davinci.h | 3 - + include/linux/platform_data/mmc-sdhci-s3c.h | 56 + + .../{usb-exynos.h => usb-ohci-exynos.h} | 0 + include/linux/proc_fs.h | 325 +- + include/linux/proc_ns.h | 74 + + include/linux/profile.h | 4 +- + include/linux/scatterlist.h | 16 + + include/linux/seq_file.h | 1 + + include/linux/signal.h | 5 + + include/linux/sunxi_timer.h | 24 - + .../powergate.h => include/linux/tegra-powergate.h | 5 - + include/linux/timeriomem-rng.h | 5 - + include/linux/tty.h | 7 + + include/linux/vfio.h | 3 + + include/linux/virtio.h | 20 + + include/linux/virtio_caif.h | 24 + + include/linux/virtio_ring.h | 57 + + include/linux/vringh.h | 225 + + include/net/bluetooth/bluetooth.h | 3 +- + include/net/lib80211.h | 4 +- + include/scsi/scsi_host.h | 6 +- + include/uapi/linux/auxvec.h | 1 + + include/uapi/linux/vfio.h | 1 + + include/uapi/linux/vhost.h | 28 + + include/uapi/linux/virtio_balloon.h | 4 +- + include/uapi/linux/virtio_ids.h | 1 + + init/version.c | 2 +- + ipc/msgutil.c | 2 +- + ipc/namespace.c | 2 +- + ipc/util.c | 105 +- + kernel/acct.c | 2 + + kernel/cgroup.c | 15 +- + kernel/configs.c | 2 +- + kernel/cpuset.c | 15 +- + kernel/exit.c | 2 +- + kernel/irq/proc.c | 20 +- + kernel/nsproxy.c | 6 +- + kernel/pid.c | 1 + + kernel/pid_namespace.c | 2 +- + kernel/profile.c | 6 +- + kernel/sched/cputime.c | 80 +- + kernel/sched/stats.c | 7 +- + kernel/user.c | 2 +- + kernel/user_namespace.c | 2 +- + kernel/utsname.c | 2 +- + lib/div64.c | 19 +- + lib/notifier-error-inject.c | 4 +- + mm/filemap.c | 2 - + mm/filemap_xip.c | 3 - + mm/vmalloc.c | 45 +- + net/8021q/vlanproc.c | 11 +- + net/9p/trans_virtio.c | 48 +- + net/atm/proc.c | 2 +- + net/bluetooth/af_bluetooth.c | 27 +- + net/bluetooth/bnep/sock.c | 2 +- + net/bluetooth/cmtp/capi.c | 2 +- + net/bluetooth/cmtp/sock.c | 2 +- + net/bluetooth/hci_sock.c | 2 +- + net/bluetooth/hidp/sock.c | 2 +- + net/bluetooth/l2cap_sock.c | 2 +- + net/bluetooth/rfcomm/sock.c | 2 +- + net/bluetooth/sco.c | 2 +- + net/can/bcm.c | 2 +- + net/can/proc.c | 2 +- + net/core/neighbour.c | 2 +- + net/core/net_namespace.c | 7 +- + net/core/pktgen.c | 12 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 10 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv6/proc.c | 5 +- + net/netfilter/x_tables.c | 6 +- + net/netfilter/xt_hashlimit.c | 16 +- + net/netfilter/xt_recent.c | 9 +- + net/socket.c | 9 - + net/sunrpc/cache.c | 24 +- + net/sunrpc/stats.c | 2 +- + net/wireless/lib80211_crypt_ccmp.c | 29 +- + net/wireless/lib80211_crypt_tkip.c | 44 +- + net/wireless/lib80211_crypt_wep.c | 5 +- + net/x25/x25_proc.c | 47 +- + net/xfrm/xfrm_algo.c | 13 + + scripts/Makefile.lib | 17 +- + scripts/basic/fixdep.c | 93 +- + security/tomoyo/common.c | 5 +- + security/tomoyo/common.h | 2 +- + security/tomoyo/securityfs_if.c | 5 +- + sound/core/info.c | 45 +- + sound/oss/dmasound/dmasound_core.c | 6 +- + sound/soc/mxs/mxs-saif.c | 5 +- + sound/soc/ux500/mop500_ab8500.c | 2 - + sound/soc/ux500/ux500_msp_dai.c | 4 +- + sound/soc/ux500/ux500_msp_i2s.c | 4 +- + sound/soc/ux500/ux500_msp_i2s.h | 2 - + sound/sound_firmware.c | 9 +- + tools/lguest/lguest.txt | 2 +- + tools/virtio/Makefile | 10 +- + tools/virtio/asm/barrier.h | 14 + + tools/virtio/linux/bug.h | 10 + + tools/virtio/linux/err.h | 26 + + tools/virtio/linux/export.h | 5 + + tools/virtio/linux/irqreturn.h | 1 + + tools/virtio/linux/kernel.h | 112 + + tools/virtio/linux/module.h | 1 + + tools/virtio/linux/printk.h | 4 + + tools/virtio/linux/ratelimit.h | 4 + + tools/virtio/linux/scatterlist.h | 189 + + tools/virtio/linux/types.h | 28 + + tools/virtio/linux/uaccess.h | 50 + + tools/virtio/linux/uio.h | 3 + + tools/virtio/linux/virtio.h | 171 +- + tools/virtio/linux/virtio_config.h | 6 + + tools/virtio/linux/virtio_ring.h | 1 + + tools/virtio/linux/vringh.h | 1 + + tools/virtio/uapi/linux/uio.h | 1 + + tools/virtio/uapi/linux/virtio_config.h | 1 + + tools/virtio/uapi/linux/virtio_ring.h | 4 + + tools/virtio/virtio_test.c | 13 +- + tools/virtio/vringh_test.c | 741 ++ + 1635 files changed, 71667 insertions(+), 51824 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-clk-manager.txt + create mode 100644 Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt + create mode 100644 Documentation/devicetree/bindings/clock/altr_socfpga.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx27-clock.txt + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt + create mode 100644 Documentation/devicetree/bindings/hwrng/timeriomem_rng.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt + rename Documentation/devicetree/bindings/interrupt-controller/{allwinner,sunxi-ic.txt => allwinner,sun4i-ic.txt} (94%) + create mode 100644 Documentation/devicetree/bindings/mmc/davinci_mmc.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6dl-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6sl-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/cpus.txt + create mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm2835.txt + rename Documentation/devicetree/bindings/timer/{allwinner,sunxi-timer.txt => allwinner,sun4i-timer.txt} (78%) + create mode 100644 Documentation/devicetree/bindings/timer/fsl,imxgpt.txt + rename Documentation/devicetree/bindings/watchdog/{sunxi-wdt.txt => sun4i-wdt.txt} (57%) + create mode 100644 Documentation/filesystems/xfs-self-describing-metadata.txt + delete mode 100644 Documentation/powerpc/sound.txt + delete mode 100644 Documentation/powerpc/zImage_layout.txt + delete mode 100644 Documentation/virtual/virtio-spec.txt + create mode 100644 arch/arm/boot/dts/at91-ariag25.dts + create mode 100644 arch/arm/boot/dts/atlas6-evb.dts + create mode 100644 arch/arm/boot/dts/atlas6.dtsi + create mode 100644 arch/arm/boot/dts/imx27-apf27dev.dts + create mode 100644 arch/arm/boot/dts/imx35-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx51-apf51dev.dts + create mode 100644 arch/arm/boot/dts/imx51-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx53-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx6dl-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx6dl-sabreauto.dts + create mode 100644 arch/arm/boot/dts/imx6dl-sabresd.dts + create mode 100644 arch/arm/boot/dts/imx6dl-wandboard.dts + create mode 100644 arch/arm/boot/dts/imx6q-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx6q-sbc6x.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-sabresd.dtsi + create mode 100644 arch/arm/boot/dts/imx6sl-pinfunc.h + create mode 120000 arch/arm/boot/dts/include/dt-bindings + create mode 100644 arch/arm/boot/dts/mpa1600.dts + create mode 100644 arch/arm/boot/dts/r8a7779.dtsi + create mode 100644 arch/arm/boot/dts/sama5d3.dtsi + create mode 100644 arch/arm/boot/dts/sama5d31ek.dts + create mode 100644 arch/arm/boot/dts/sama5d33ek.dts + create mode 100644 arch/arm/boot/dts/sama5d34ek.dts + create mode 100644 arch/arm/boot/dts/sama5d35ek.dts + create mode 100644 arch/arm/boot/dts/sama5d3xcm.dtsi + create mode 100644 arch/arm/boot/dts/sama5d3xdm.dtsi + create mode 100644 arch/arm/boot/dts/sama5d3xmb.dtsi + create mode 100644 arch/arm/boot/dts/skeleton64.dtsi + create mode 100644 arch/arm/boot/dts/sun4i-a10-mini-xplus.dts + delete mode 100644 arch/arm/boot/dts/sunxi.dtsi + create mode 100644 arch/arm/boot/dts/tps6507x.dtsi + create mode 100644 arch/arm/configs/ape6evm_defconfig + delete mode 100644 arch/arm/configs/h7201_defconfig + delete mode 100644 arch/arm/configs/h7202_defconfig + create mode 100644 arch/arm/configs/sama5_defconfig + rename arch/arm/{mach-bcm2835/include/mach/debug-macro.S => include/debug/bcm2835.S} (86%) + rename arch/arm/{mach-cns3xxx/include/mach/debug-macro.S => include/debug/cns3xxx.S} (100%) + rename arch/arm/{mach-exynos/include/mach/debug-macro.S => include/debug/exynos.S} (84%) + rename arch/arm/{mach-mxs/include/mach/debug-macro.S => include/debug/mxs.S} (77%) + rename arch/arm/{mach-nomadik/include/mach/debug-macro.S => include/debug/nomadik.S} (100%) + rename arch/arm/{plat-samsung/include/plat/debug-macro.S => include/debug/samsung.S} (100%) + rename arch/arm/{mach-prima2/include/mach/uart.h => include/debug/sirf.S} (55%) + create mode 100644 arch/arm/include/debug/ux500.S + create mode 100644 arch/arm/mach-at91/Kconfig.non_dt + rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%) + rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%) + create mode 100644 arch/arm/mach-at91/board-dt-sama5.c + create mode 100644 arch/arm/mach-at91/include/mach/sama5d3.h + create mode 100644 arch/arm/mach-at91/sama5d3.c + create mode 100644 arch/arm/mach-bcm2835/Kconfig + delete mode 100644 arch/arm/mach-bcm2835/Makefile.boot + delete mode 100644 arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h + delete mode 100644 arch/arm/mach-bcm2835/include/mach/gpio.h + delete mode 100644 arch/arm/mach-bcm2835/include/mach/timex.h + delete mode 100644 arch/arm/mach-bcm2835/include/mach/uncompress.h + rename arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h (94%) + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h + rename arch/arm/mach-cns3xxx/{include/mach => }/pm.h (100%) + rename arch/arm/mach-gemini/{include/mach/system.h => reset.c} (91%) + delete mode 100644 arch/arm/mach-h720x/Kconfig + delete mode 100644 arch/arm/mach-h720x/Makefile + delete mode 100644 arch/arm/mach-h720x/Makefile.boot + delete mode 100644 arch/arm/mach-h720x/common.c + delete mode 100644 arch/arm/mach-h720x/common.h + delete mode 100644 arch/arm/mach-h720x/cpu-h7201.c + delete mode 100644 arch/arm/mach-h720x/cpu-h7202.c + delete mode 100644 arch/arm/mach-h720x/h7201-eval.c + delete mode 100644 arch/arm/mach-h720x/h7202-eval.c + delete mode 100644 arch/arm/mach-h720x/include/mach/boards.h + delete mode 100644 arch/arm/mach-h720x/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-h720x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-h720x/include/mach/h7201-regs.h + delete mode 100644 arch/arm/mach-h720x/include/mach/h7202-regs.h + delete mode 100644 arch/arm/mach-h720x/include/mach/hardware.h + delete mode 100644 arch/arm/mach-h720x/include/mach/irqs.h + delete mode 100644 arch/arm/mach-h720x/include/mach/isa-dma.h + delete mode 100644 arch/arm/mach-h720x/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-imx/Makefile.boot + delete mode 100644 arch/arm/mach-imx/cpu_op-mx51.c + delete mode 100644 arch/arm/mach-imx/cpu_op-mx51.h + delete mode 100644 arch/arm/mach-imx/cpufreq.c + delete mode 100644 arch/arm/mach-imx/devices/platform-ahci-imx.c + delete mode 100644 arch/arm/mach-imx/mx6q.h + delete mode 100644 arch/arm/mach-l7200/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-msm/include/mach/cpu.h + delete mode 100644 arch/arm/mach-mxs/Makefile.boot + delete mode 100644 arch/arm/mach-mxs/include/mach/common.h + delete mode 100644 arch/arm/mach-mxs/include/mach/digctl.h + delete mode 100644 arch/arm/mach-mxs/include/mach/hardware.h + delete mode 100644 arch/arm/mach-mxs/include/mach/mx23.h + delete mode 100644 arch/arm/mach-mxs/include/mach/mx28.h + delete mode 100644 arch/arm/mach-mxs/include/mach/mxs.h + delete mode 100644 arch/arm/mach-mxs/include/mach/timex.h + delete mode 100644 arch/arm/mach-mxs/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-mxs/mm.c + delete mode 100644 arch/arm/mach-mxs/ocotp.c + rename arch/arm/{mach-h720x/include/mach/timex.h => mach-mxs/pm.h} (52%) + delete mode 100644 arch/arm/mach-mxs/system.c + delete mode 100644 arch/arm/mach-nomadik/Makefile.boot + delete mode 100644 arch/arm/mach-nomadik/include/mach/irqs.h + delete mode 100644 arch/arm/mach-nomadik/include/mach/timex.h + delete mode 100644 arch/arm/mach-nomadik/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-prima2/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-prima2/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-prima2/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-prima2/include/mach/hardware.h + delete mode 100644 arch/arm/mach-prima2/include/mach/irqs.h + delete mode 100644 arch/arm/mach-prima2/include/mach/map.h + delete mode 100644 arch/arm/mach-prima2/include/mach/timex.h + delete mode 100644 arch/arm/mach-prima2/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-prima2/irq.c + rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/common-smdk.h (86%) + delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-sdi.h + rename arch/arm/mach-shmobile/{headsmp-sh73a0.S => headsmp-scu.S} (85%) + delete mode 100644 arch/arm/mach-shmobile/hotplug.c + create mode 100644 arch/arm/mach-spear/Kconfig + create mode 100644 arch/arm/mach-spear/Makefile + rename arch/arm/{mach-spear13xx => mach-spear}/Makefile.boot (100%) + rename arch/arm/{mach-spear13xx/include/mach => mach-spear}/generic.h (57%) + rename arch/arm/{mach-spear13xx => mach-spear}/headsmp.S (100%) + rename arch/arm/{mach-spear13xx => mach-spear}/hotplug.c (100%) + rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/debug-macro.S (100%) + rename arch/arm/{mach-spear6xx => mach-spear}/include/mach/irqs.h (51%) + rename arch/arm/{mach-spear3xx => mach-spear}/include/mach/misc_regs.h (90%) + create mode 100644 arch/arm/mach-spear/include/mach/spear.h + rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/timex.h (100%) + rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/uncompress.h (100%) + rename arch/arm/{plat-spear => mach-spear}/pl080.c (100%) + rename arch/arm/{plat-spear/include/plat => mach-spear}/pl080.h (100%) + rename arch/arm/{mach-spear13xx => mach-spear}/platsmp.c (92%) + rename arch/arm/{plat-spear => mach-spear}/restart.c (90%) + rename arch/arm/{mach-spear13xx => mach-spear}/spear1310.c (95%) + rename arch/arm/{mach-spear13xx => mach-spear}/spear1340.c (99%) + rename arch/arm/{mach-spear13xx/include/mach/dma.h => mach-spear/spear13xx-dma.h} (100%) + rename arch/arm/{mach-spear13xx => mach-spear}/spear13xx.c (95%) + rename arch/arm/{mach-spear3xx => mach-spear}/spear300.c (98%) + rename arch/arm/{mach-spear3xx => mach-spear}/spear310.c (98%) + rename arch/arm/{mach-spear3xx => mach-spear}/spear320.c (97%) + rename arch/arm/{mach-spear3xx => mach-spear}/spear3xx.c (88%) + rename arch/arm/{mach-spear6xx => mach-spear}/spear6xx.c (93%) + rename arch/arm/{plat-spear => mach-spear}/time.c (99%) + delete mode 100644 arch/arm/mach-spear13xx/Kconfig + delete mode 100644 arch/arm/mach-spear13xx/Makefile + delete mode 100644 arch/arm/mach-spear13xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-spear13xx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-spear13xx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-spear13xx/include/mach/spear.h + delete mode 100644 arch/arm/mach-spear13xx/include/mach/timex.h + delete mode 100644 arch/arm/mach-spear13xx/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-spear3xx/Kconfig + delete mode 100644 arch/arm/mach-spear3xx/Makefile + delete mode 100644 arch/arm/mach-spear3xx/Makefile.boot + delete mode 100644 arch/arm/mach-spear3xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-spear3xx/include/mach/generic.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/spear.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/timex.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-spear6xx/Kconfig + delete mode 100644 arch/arm/mach-spear6xx/Makefile + delete mode 100644 arch/arm/mach-spear6xx/Makefile.boot + delete mode 100644 arch/arm/mach-spear6xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-spear6xx/include/mach/generic.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/misc_regs.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/spear.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/timex.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-tegra/Makefile.boot + delete mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c + delete mode 100644 arch/arm/mach-tegra/board-dt-tegra30.c + delete mode 100644 arch/arm/mach-tegra/include/mach/timex.h + delete mode 100644 arch/arm/mach-tegra/include/mach/uncompress.h + rename arch/arm/mach-tegra/{board-dt-tegra20.c => tegra.c} (75%) + create mode 100644 arch/arm/mach-tegra/tegra114_speedo.c + rename arch/arm/mach-ux500/{include/mach => }/db8500-regs.h (88%) + rename arch/arm/mach-ux500/{include/mach => }/devices.h (100%) + delete mode 100644 arch/arm/mach-ux500/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-ux500/include/mach/hardware.h + delete mode 100644 arch/arm/mach-ux500/include/mach/timex.h + delete mode 100644 arch/arm/mach-ux500/include/mach/uncompress.h + rename arch/arm/mach-ux500/{include/mach => }/irqs-board-mop500.h (100%) + rename arch/arm/mach-ux500/{include/mach => }/irqs-db8500.h (83%) + rename arch/arm/mach-ux500/{include/mach => }/irqs.h (93%) + create mode 100644 arch/arm/mach-ux500/pm.c + rename arch/arm/mach-ux500/{include/mach => }/setup.h (100%) + delete mode 100644 arch/arm/plat-samsung/include/plat/irq.h + delete mode 100644 arch/arm/plat-samsung/include/plat/regs-iic.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2410.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2412.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2416.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2443.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c244x.h + delete mode 100644 arch/arm/plat-spear/Kconfig + delete mode 100644 arch/arm/plat-spear/Makefile + create mode 100644 arch/powerpc/boot/dts/ac14xx.dts + create mode 100644 arch/powerpc/boot/dts/b4420qds.dts + create mode 100644 arch/powerpc/boot/dts/b4860qds.dts + create mode 100644 arch/powerpc/boot/dts/b4qds.dts + create mode 100644 arch/powerpc/boot/dts/fsl/b4420si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/b4860si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/b4si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/e6500_power_isa.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi + rename arch/powerpc/boot/dts/fsl/{qoriq-sec4.1-0.dtsi => qoriq-sec5.0-0.dtsi} (83%) + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.3-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/mpc5125twr.dts + create mode 100644 arch/powerpc/boot/dts/t4240qds.dts + create mode 100644 arch/powerpc/perf/bhrb.S + create mode 100644 arch/powerpc/perf/power8-pmu.c + rename arch/powerpc/platforms/512x/{mpc5121_generic.c => mpc512x_generic.c} (83%) + create mode 100644 arch/powerpc/platforms/85xx/b4_qds.c + create mode 100644 arch/powerpc/platforms/85xx/t4240_qds.c + delete mode 100644 arch/powerpc/platforms/prep/Kconfig + create mode 100644 arch/x86/crypto/blowfish-avx2-asm_64.S + create mode 100644 arch/x86/crypto/blowfish_avx2_glue.c + create mode 100644 arch/x86/crypto/camellia-aesni-avx2-asm_64.S + create mode 100644 arch/x86/crypto/camellia_aesni_avx2_glue.c + create mode 100644 arch/x86/crypto/glue_helper-asm-avx2.S + create mode 100644 arch/x86/crypto/serpent-avx2-asm_64.S + create mode 100644 arch/x86/crypto/serpent_avx2_glue.c + create mode 100644 arch/x86/crypto/sha256-avx-asm.S + create mode 100644 arch/x86/crypto/sha256-avx2-asm.S + create mode 100644 arch/x86/crypto/sha256-ssse3-asm.S + create mode 100644 arch/x86/crypto/sha256_ssse3_glue.c + create mode 100644 arch/x86/crypto/sha512-avx-asm.S + create mode 100644 arch/x86/crypto/sha512-avx2-asm.S + create mode 100644 arch/x86/crypto/sha512-ssse3-asm.S + create mode 100644 arch/x86/crypto/sha512_ssse3_glue.c + create mode 100644 arch/x86/crypto/twofish-avx2-asm_64.S + create mode 100644 arch/x86/crypto/twofish_avx2_glue.c + create mode 100644 arch/x86/include/asm/crypto/blowfish.h + create mode 100644 crypto/cmac.c + create mode 100644 drivers/char/hw_random/bcm2835-rng.c + rename arch/arm/mach-mxs/timer.c => drivers/clocksource/mxs_timer.c (91%) + rename drivers/clocksource/{sunxi_timer.c => sun4i_timer.c} (50%) + rename {arch/arm/mach-prima2 => drivers/clocksource}/timer-marco.c (94%) + rename {arch/arm/mach-prima2 => drivers/clocksource}/timer-prima2.c (90%) + create mode 100644 drivers/crypto/sahara.c + create mode 100644 drivers/i2c/muxes/i2c-arb-gpio-challenge.c + rename arch/arm/mach-mxs/icoll.c => drivers/irqchip/irq-mxs.c (89%) + create mode 100644 drivers/irqchip/irq-sirfsoc.c + create mode 100644 drivers/irqchip/irq-sun4i.c + delete mode 100644 drivers/irqchip/irq-sunxi.c + rename arch/arm/plat-samsung/include/plat/regs-sdhci.h => drivers/mmc/host/sdhci-s3c-regs.h (100%) + rename arch/arm/plat-samsung/include/plat/regs-onenand.h => drivers/mtd/onenand/samsung.h (98%) + create mode 100644 drivers/net/caif/caif_virtio.c + create mode 100644 drivers/pinctrl/pinctrl-imx6dl.c + create mode 100644 drivers/pinctrl/pinctrl-imx6sl.c + rename arch/arm/plat-samsung/include/plat/regs-rtc.h => drivers/rtc/rtc-s3c.h (97%) + delete mode 100644 drivers/staging/rtl8192e/rtl8192e/rtl_debug.c + delete mode 100644 drivers/staging/silicom/bp_proc.c + rename drivers/staging/silicom/{bp_mod.c => bpctl_mod.c} (84%) + delete mode 100644 drivers/staging/ste_rmi4/board-mop500-u8500uib-rmi4.c + delete mode 100644 drivers/vhost/Kconfig.tcm + rename drivers/vhost/{tcm_vhost.c => scsi.c} (86%) + delete mode 100644 drivers/vhost/tcm_vhost.h + create mode 100644 drivers/vhost/vringh.c + delete mode 100644 fs/fifo.c + create mode 100644 fs/xfs/xfs_attr_remote.c + create mode 100644 fs/xfs/xfs_attr_remote.h + create mode 100644 fs/xfs/xfs_symlink.c + create mode 100644 fs/xfs/xfs_symlink.h + create mode 100644 include/dt-bindings/gpio/gpio.h + create mode 100644 include/dt-bindings/interrupt-controller/arm-gic.h + create mode 100644 include/dt-bindings/interrupt-controller/irq.h + create mode 100644 include/linux/clk/mxs.h + delete mode 100644 include/linux/i2c-tegra.h + create mode 100644 include/linux/irqchip/chained_irq.h + create mode 100644 include/linux/irqchip/mxs.h + delete mode 100644 include/linux/irqchip/sunxi.h + create mode 100644 include/linux/kcore.h + create mode 100644 include/linux/platform_data/arm-ux500-pm.h + rename arch/arm/mach-ux500/include/mach/msp.h => include/linux/platform_data/asoc-ux500-msp.h (100%) + delete mode 100644 include/linux/platform_data/atmel-aes.h + create mode 100644 include/linux/platform_data/crypto-atmel.h + create mode 100644 include/linux/platform_data/mmc-sdhci-s3c.h + rename include/linux/platform_data/{usb-exynos.h => usb-ohci-exynos.h} (100%) + create mode 100644 include/linux/proc_ns.h + delete mode 100644 include/linux/sunxi_timer.h + rename arch/arm/mach-tegra/include/mach/powergate.h => include/linux/tegra-powergate.h (92%) + create mode 100644 include/linux/virtio_caif.h + create mode 100644 include/linux/vringh.h + create mode 100644 tools/virtio/asm/barrier.h + create mode 100644 tools/virtio/linux/bug.h + create mode 100644 tools/virtio/linux/err.h + create mode 100644 tools/virtio/linux/export.h + create mode 100644 tools/virtio/linux/irqreturn.h + create mode 100644 tools/virtio/linux/kernel.h + create mode 100644 tools/virtio/linux/printk.h + create mode 100644 tools/virtio/linux/ratelimit.h + create mode 100644 tools/virtio/linux/scatterlist.h + create mode 100644 tools/virtio/linux/types.h + create mode 100644 tools/virtio/linux/uaccess.h + create mode 100644 tools/virtio/linux/uio.h + create mode 100644 tools/virtio/linux/virtio_config.h + create mode 100644 tools/virtio/linux/virtio_ring.h + create mode 100644 tools/virtio/linux/vringh.h + create mode 100644 tools/virtio/uapi/linux/uio.h + create mode 100644 tools/virtio/uapi/linux/virtio_config.h + create mode 100644 tools/virtio/uapi/linux/virtio_ring.h + create mode 100644 tools/virtio/vringh_test.c +Merging fixes/master (0279b3c Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (a54292f kbuild: generate generic headers before recursing into scripts) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (561daec ARC: [mm] Lazy D-cache flush (non aliasing VIPT)) +$ git merge arc-current/for-curr +Auto-merging arch/arc/mm/init.c +Auto-merging arch/arc/kernel/troubleshoot.c +Auto-merging arch/arc/kernel/disasm.c +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 29 ++- + arch/arc/Makefile | 15 +- + arch/arc/boot/Makefile | 19 +- + arch/arc/boot/dts/Makefile | 4 +- + arch/arc/boot/dts/abilis_tb100.dtsi | 340 ++++++++++++++++++++++++++++++++ + arch/arc/boot/dts/abilis_tb100_dvk.dts | 127 ++++++++++++ + arch/arc/boot/dts/abilis_tb101.dtsi | 349 +++++++++++++++++++++++++++++++++ + arch/arc/boot/dts/abilis_tb101_dvk.dts | 127 ++++++++++++ + arch/arc/boot/dts/abilis_tb10x.dtsi | 247 +++++++++++++++++++++++ + arch/arc/boot/dts/nsimosci.dts | 77 ++++++++ + arch/arc/configs/fpga_defconfig | 3 +- + arch/arc/configs/nsimosci_defconfig | 75 +++++++ + arch/arc/configs/tb10x_defconfig | 117 +++++++++++ + arch/arc/include/asm/cacheflush.h | 16 +- + arch/arc/include/asm/irq.h | 3 +- + arch/arc/include/asm/serial.h | 10 + + arch/arc/include/asm/tlb.h | 16 +- + arch/arc/kernel/asm-offsets.c | 2 +- + arch/arc/kernel/clk.c | 2 +- + arch/arc/kernel/disasm.c | 2 +- + arch/arc/kernel/entry.S | 8 +- + arch/arc/kernel/irq.c | 25 ++- + arch/arc/kernel/kprobes.c | 1 - + arch/arc/kernel/module.c | 4 +- + arch/arc/kernel/setup.c | 36 ++-- + arch/arc/kernel/time.c | 1 - + arch/arc/kernel/traps.c | 24 +-- + arch/arc/kernel/troubleshoot.c | 50 +++-- + arch/arc/mm/cache_arc700.c | 269 ++++++------------------- + arch/arc/mm/extable.c | 4 +- + arch/arc/mm/fault.c | 1 - + arch/arc/mm/init.c | 3 - + arch/arc/mm/ioremap.c | 2 +- + arch/arc/mm/tlb.c | 22 ++- + arch/arc/plat-arcfpga/platform.c | 12 ++ + arch/arc/plat-tb10x/Kconfig | 36 ++++ + arch/arc/plat-tb10x/Makefile | 21 ++ + arch/arc/plat-tb10x/tb10x.c | 71 +++++++ + 38 files changed, 1835 insertions(+), 335 deletions(-) + create mode 100644 arch/arc/boot/dts/abilis_tb100.dtsi + create mode 100644 arch/arc/boot/dts/abilis_tb100_dvk.dts + create mode 100644 arch/arc/boot/dts/abilis_tb101.dtsi + create mode 100644 arch/arc/boot/dts/abilis_tb101_dvk.dts + create mode 100644 arch/arc/boot/dts/abilis_tb10x.dtsi + create mode 100644 arch/arc/boot/dts/nsimosci.dts + create mode 100644 arch/arc/configs/nsimosci_defconfig + create mode 100644 arch/arc/configs/tb10x_defconfig + create mode 100644 arch/arc/plat-tb10x/Kconfig + create mode 100644 arch/arc/plat-tb10x/Makefile + create mode 100644 arch/arc/plat-tb10x/tb10x.c +Merging arm-current/fixes (1783d45 ARM: 7700/2: Make cpu_init() notrace) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/kernel/setup.c | 2 +- + arch/arm/kernel/smp_tlb.c | 9 +++++---- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging m68k-current/for-linus (e00c73e m68k: Remove inline strlen() implementation) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge (5676005 powerpc/pseries/lparcfg: Fix possible overflow are more than 1026) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (0fbd067 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc/master +Already up-to-date. +Merging net/master (af5c6df drivers: net: cpsw: irq not disabled in cpsw isr in particular sequence) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/emulex/benet/be.h | 1 + + drivers/net/ethernet/emulex/benet/be_cmds.c | 35 +++++++------ + drivers/net/ethernet/emulex/benet/be_cmds.h | 2 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 1 + + drivers/net/ethernet/emulex/benet/be_main.c | 54 ++++++++++++++------ + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/xen-netback/netback.c | 69 ++++++++++++++++---------- + net/8021q/vlan_dev.c | 2 +- + net/core/dev.c | 2 +- + net/core/ethtool.c | 2 +- + 10 files changed, 109 insertions(+), 61 deletions(-) +$ git am -3 ../patches/0001-drivers-net-fix-up-for-code-movement-from-rt2x00pci..patch +Applying: drivers:net: fix up for code movement from rt2x00pci.c +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/wireless/rt2x00/rt2x00mmio.c +$ git add -A . +$ git commit -v -a --amend +[master 06d8e1d] Merge remote-tracking branch 'net/master' +Merging ipsec/master (da241ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (c5a4698 Merge tag 'asoc-maintainers-v3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (d46fc8b x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + arch/x86/pci/mrst.c | 10 ++++++---- + drivers/pci/msi.c | 6 ++++-- + 2 files changed, 10 insertions(+), 6 deletions(-) +Merging wireless/master (a8a48e6 Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (c1be5a5 Linux 3.9) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (c1be5a5 Linux 3.9) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (c1be5a5 Linux 3.9) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (c1be5a5 Linux 3.9) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (c1be5a5 Linux 3.9) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (bf61c88 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array) +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (3862de1 crypto: caam - fix job ring cleanup code) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) +$ git merge 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 dwmw2/master +Merge made by the 'recursive' strategy. + arch/m68k/include/asm/commproc.h | 17 ----- + drivers/pcmcia/m8xx_pcmcia.c | 140 ------------------------------------- + drivers/platform/x86/dell-laptop.c | 10 +-- + kernel/params.c | 5 +- + 4 files changed, 10 insertions(+), 162 deletions(-) +Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) +$ git merge irqdomain-current/irqdomain/merge +Already up-to-date. +Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) +$ git merge spi-current/spi/merge +Auto-merging include/linux/spi/spi.h +Auto-merging drivers/spi/spi.c +Auto-merging drivers/spi/spi-atmel.c +Merge made by the 'recursive' strategy. + drivers/spi/spi-atmel.c | 4 ++-- + drivers/spi/spi-davinci.c | 2 +- + drivers/spi/spi.c | 9 ++++++--- + include/linux/spi/spi.h | 4 ++-- + 4 files changed, 11 insertions(+), 8 deletions(-) +Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect) +$ git merge gpio-current/gpio/merge +Already up-to-date. +Merging rr-fixes/fixes (c1be5a5 Linux 3.9) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master (31880c3 Linux 3.9-rc6) +$ git merge mfd-fixes/master +Already up-to-date. +Merging vfio-fixes/for-linus (904c680 vfio-pci: Fix possible integer overflow) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (07961ac Linux 3.9-rc5) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (0d240c9 Merge branch 'cleanup' into for-next) +$ git merge arm/for-next +Resolved 'arch/arm/kvm/arm.c' using previous resolution. +Resolved 'arch/arm/mach-tegra/hotplug.c' using previous resolution. +Auto-merging arch/arm/mach-ux500/hotplug.c +Auto-merging arch/arm/mach-ux500/cpu.c +Auto-merging arch/arm/mach-tegra/platsmp.c +Auto-merging arch/arm/mach-tegra/hotplug.c +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/hotplug.c +Auto-merging arch/arm/mach-tegra/board-harmony-pcie.c +Auto-merging arch/arm/mach-spear/hotplug.c +Auto-merging arch/arm/mach-shmobile/smp-sh73a0.c +Auto-merging arch/arm/mach-omap2/timer.c +Auto-merging arch/arm/mach-omap2/powerdomain.c +Auto-merging arch/arm/mach-omap2/omap_hwmod.c +Auto-merging arch/arm/mach-omap2/omap-smp.c +Auto-merging arch/arm/mach-omap2/id.c +Auto-merging arch/arm/mach-omap2/clock.c +Auto-merging arch/arm/mach-exynos/mach-nuri.c +Auto-merging arch/arm/kvm/arm.c +CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/kernel/process.c +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c971d25] Merge remote-tracking branch 'arm/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/cluster-pm-race-avoidance.txt | 498 ++++++++++++ + Documentation/arm/vlocks.txt | 211 +++++ + arch/arm/Kconfig | 12 +- + arch/arm/Kconfig.debug | 11 + + arch/arm/boot/compressed/Makefile | 3 + + arch/arm/boot/compressed/debug.S | 12 + + arch/arm/boot/compressed/misc.c | 8 +- + arch/arm/common/Makefile | 3 + + arch/arm/common/mcpm_entry.c | 263 +++++++ + arch/arm/common/mcpm_head.S | 219 ++++++ + arch/arm/common/mcpm_platsmp.c | 92 +++ + arch/arm/common/vlock.S | 108 +++ + arch/arm/common/vlock.h | 29 + + arch/arm/include/asm/atomic.h | 24 + + arch/arm/include/asm/cacheflush.h | 75 ++ + arch/arm/include/asm/cp15.h | 16 +- + arch/arm/include/asm/cputype.h | 61 +- + arch/arm/include/asm/glue-df.h | 20 +- + arch/arm/include/asm/kvm_arm.h | 4 + + arch/arm/include/asm/kvm_asm.h | 2 +- + arch/arm/include/asm/kvm_emulate.h | 107 ++- + arch/arm/include/asm/kvm_host.h | 42 +- + arch/arm/include/asm/kvm_mmu.h | 67 ++ + arch/arm/include/asm/kvm_vgic.h | 1 - + arch/arm/include/asm/mach/pci.h | 11 + + arch/arm/include/asm/mcpm.h | 209 +++++ + arch/arm/include/asm/thread_info.h | 1 + + arch/arm/include/asm/tlbflush.h | 2 +- + arch/arm/include/debug/uncompress.h | 7 + + arch/arm/include/uapi/asm/kvm.h | 12 +- + arch/arm/kernel/asm-offsets.c | 12 +- + arch/arm/kernel/bios32.c | 6 + + arch/arm/kernel/entry-armv.S | 59 +- + arch/arm/kernel/entry-common.S | 8 +- + arch/arm/kernel/entry-header.S | 66 +- + arch/arm/kernel/head-common.S | 9 +- + arch/arm/kernel/head-nommu.S | 8 +- + arch/arm/kernel/process.c | 13 +- + arch/arm/kernel/return_address.c | 5 +- + arch/arm/kernel/setup.c | 2 +- + arch/arm/kernel/smp.c | 42 +- + arch/arm/kernel/smp_scu.c | 2 +- + arch/arm/kvm/Makefile | 2 +- + arch/arm/kvm/arm.c | 194 +---- + arch/arm/kvm/coproc.c | 28 +- + arch/arm/kvm/coproc.h | 4 +- + arch/arm/kvm/emulate.c | 75 +- + arch/arm/kvm/guest.c | 17 + + arch/arm/kvm/handle_exit.c | 164 ++++ + arch/arm/kvm/interrupts.S | 13 +- + arch/arm/kvm/mmio.c | 46 +- + arch/arm/kvm/mmu.c | 184 +++-- + arch/arm/kvm/vgic.c | 2 +- + arch/arm/mach-exynos/hotplug.c | 1 - + arch/arm/mach-exynos/mach-nuri.c | 2 +- + arch/arm/mach-highbank/hotplug.c | 1 - + arch/arm/mach-imx/devices/devices.c | 2 +- + arch/arm/mach-imx/hotplug.c | 2 - + arch/arm/mach-integrator/integrator_ap.c | 6 +- + arch/arm/mach-integrator/integrator_cp.c | 7 +- + arch/arm/mach-msm/hotplug.c | 4 - + arch/arm/mach-omap2/board-omap3beagle.c | 2 +- + arch/arm/mach-omap2/clock.c | 2 +- + arch/arm/mach-omap2/gpmc-onenand.c | 4 +- + arch/arm/mach-omap2/gpmc.c | 8 +- + arch/arm/mach-omap2/id.c | 4 +- + arch/arm/mach-omap2/omap-smp.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 13 +- + arch/arm/mach-omap2/omap_hwmod.c | 4 +- + arch/arm/mach-omap2/pm-debug.c | 6 +- + arch/arm/mach-omap2/powerdomain.c | 2 +- + arch/arm/mach-omap2/timer.c | 2 +- + arch/arm/mach-prima2/hotplug.c | 3 - + arch/arm/mach-realview/hotplug.c | 2 - + arch/arm/mach-shmobile/smp-sh73a0.c | 8 - + arch/arm/mach-spear/hotplug.c | 2 - + arch/arm/mach-tegra/board-harmony-pcie.c | 6 +- + arch/arm/mach-tegra/common.h | 1 - + arch/arm/mach-tegra/hotplug.c | 10 - + arch/arm/mach-tegra/platsmp.c | 1 - + arch/arm/mach-tegra/tegra2_emc.c | 2 +- + arch/arm/mach-ux500/cpu.c | 5 +- + arch/arm/mach-ux500/hotplug.c | 3 - + arch/arm/mach-vexpress/hotplug.c | 2 - + arch/arm/mm/Kconfig | 9 +- + arch/arm/mm/alignment.c | 2 + + arch/arm/mm/dma-mapping.c | 15 +- + arch/arm/mm/flush.c | 15 +- + arch/arm/mm/mmu.c | 17 + + arch/arm/mm/proc-v6.S | 2 - + arch/arm/mm/proc-v7-2level.S | 3 +- + arch/arm/mm/proc-v7-3level.S | 3 +- + arch/arm/mm/proc-v7.S | 7 +- + arch/arm/plat-omap/dmtimer.c | 12 +- + arch/arm/tools/mach-types | 991 ++++++++++-------------- + 95 files changed, 3081 insertions(+), 1205 deletions(-) + create mode 100644 Documentation/arm/cluster-pm-race-avoidance.txt + create mode 100644 Documentation/arm/vlocks.txt + create mode 100644 arch/arm/boot/compressed/debug.S + create mode 100644 arch/arm/common/mcpm_entry.c + create mode 100644 arch/arm/common/mcpm_head.S + create mode 100644 arch/arm/common/mcpm_platsmp.c + create mode 100644 arch/arm/common/vlock.S + create mode 100644 arch/arm/common/vlock.h + create mode 100644 arch/arm/include/asm/mcpm.h + create mode 100644 arch/arm/include/debug/uncompress.h + create mode 100644 arch/arm/kvm/handle_exit.c +Merging arm-perf/for-next/perf (ab87304 Merge branches 'perf/fixes' and 'hw-breakpoint' into for-next/perf) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +Already up-to-date. +Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu) +$ git merge xilinx/arm-next +Resolved 'arch/arm/mach-spear/spear13xx.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 drivers/clocksource/Kconfig +Removing arch/arm/mach-zynq/timer.c +Auto-merging arch/arm/mach-zynq/Kconfig +Auto-merging arch/arm/mach-spear/spear13xx.c +CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c +Auto-merging arch/arm/boot/dts/zynq-7000.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 516d1aa] Merge remote-tracking branch 'xilinx/arm-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/timer/cadence,ttc-timer.txt | 17 + + arch/arm/boot/dts/zynq-7000.dtsi | 52 +-- + arch/arm/boot/dts/zynq-zc702.dts | 10 - + arch/arm/mach-zynq/Kconfig | 2 + + arch/arm/mach-zynq/Makefile | 6 +- + arch/arm/mach-zynq/common.c | 68 ++-- + arch/arm/mach-zynq/common.h | 20 +- + arch/arm/mach-zynq/headsmp.S | 24 ++ + arch/arm/mach-zynq/hotplug.c | 104 +++++ + arch/arm/mach-zynq/platsmp.c | 152 +++++++ + arch/arm/mach-zynq/slcr.c | 125 ++++++ + arch/arm/mach-zynq/timer.c | 324 --------------- + drivers/clocksource/Kconfig | 3 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/cadence_ttc_timer.c | 436 +++++++++++++++++++++ + 15 files changed, 940 insertions(+), 404 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt + create mode 100644 arch/arm/mach-zynq/headsmp.S + create mode 100644 arch/arm/mach-zynq/hotplug.c + create mode 100644 arch/arm/mach-zynq/platsmp.c + create mode 100644 arch/arm/mach-zynq/slcr.c + delete mode 100644 arch/arm/mach-zynq/timer.c + create mode 100644 drivers/clocksource/cadence_ttc_timer.c +Merging arm64/upstream (16c85a1 arm64: Use acquire/release semantics instead of explicit DMB) +$ git merge arm64/upstream +Already up-to-date. +Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file) +$ git merge cris/for-next +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 (426d29c Hexagon: add v4 CS regs to core copyout macro) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (797f6a6 Add size restriction to the kdump documentation) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (e00c73e m68k: Remove inline strlen() implementation) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (2842e5b0 m68knommu: enable Timer on coldfire 532x) +$ git merge m68knommu/for-next +Auto-merging drivers/tty/serial/68328serial.c +Auto-merging arch/m68k/platform/coldfire/m53xx.c +Auto-merging arch/m68k/include/asm/m53xxsim.h +Removing arch/m68k/include/asm/dbg.h +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.cpu | 12 ++++++++++++ + arch/m68k/Kconfig.machine | 16 +++++++--------- + arch/m68k/Makefile | 1 + + arch/m68k/include/asm/dbg.h | 6 ------ + arch/m68k/include/asm/dma.h | 2 +- + arch/m68k/include/asm/m53xxacr.h | 4 ++-- + arch/m68k/include/asm/{m532xsim.h => m53xxsim.h} | 12 ++++++------ + arch/m68k/include/asm/m54xxacr.h | 7 ++++++- + arch/m68k/include/asm/mcfgpio.h | 10 +++++----- + arch/m68k/include/asm/mcfsim.h | 4 ++-- + arch/m68k/include/asm/mcftimer.h | 2 +- + arch/m68k/platform/coldfire/Makefile | 2 +- + arch/m68k/platform/coldfire/{m532x.c => m53xx.c} | 23 +++++++++++------------ + arch/m68k/platform/coldfire/timers.c | 2 +- + drivers/tty/serial/68328serial.c | 1 - + fs/romfs/mmap-nommu.c | 5 ++++- + 16 files changed, 60 insertions(+), 49 deletions(-) + delete mode 100644 arch/m68k/include/asm/dbg.h + rename arch/m68k/include/asm/{m532xsim.h => m53xxsim.h} (99%) + rename arch/m68k/platform/coldfire/{m532x.c => m53xx.c} (98%) +Merging metag/for-next (164c013 metag: defconfigs: increase log buffer 8KiB => 128KiB) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (01cc2cb microblaze: intc: set the default irq_domain) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/intc.c | 2 ++ + arch/microblaze/pci/pci-common.c | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging mips/mips-for-linux-next (8b14c94 Merge branch 'next/kvm' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/mti-sead3/sead3-cmdline.c +Removing arch/mips/mti-malta/malta-cmdline.c +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/mips/kernel/smp.c +Auto-merging arch/mips/kernel/process.c +Auto-merging arch/mips/kernel/Makefile +Removing arch/mips/include/asm/netlogic/xlp-hal/usb.h +Removing arch/mips/include/asm/mips-boards/prom.h +Auto-merging arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h +Removing arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h +Auto-merging arch/mips/bcm63xx/dev-spi.c +Auto-merging arch/mips/Kconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mips/ralink.txt | 18 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/mips/Kbuild | 4 + + arch/mips/Kconfig | 52 +- + arch/mips/Makefile | 1 + + arch/mips/alchemy/Kconfig | 3 - + arch/mips/alchemy/Platform | 22 +- + arch/mips/ath79/setup.c | 16 +- + arch/mips/bcm63xx/Kconfig | 4 + + arch/mips/bcm63xx/boards/board_bcm963xx.c | 6 +- + arch/mips/bcm63xx/clk.c | 43 +- + arch/mips/bcm63xx/cpu.c | 142 +- + arch/mips/bcm63xx/dev-flash.c | 6 + + arch/mips/bcm63xx/dev-spi.c | 26 +- + arch/mips/bcm63xx/irq.c | 22 + + arch/mips/bcm63xx/prom.c | 2 + + arch/mips/bcm63xx/reset.c | 28 + + arch/mips/bcm63xx/setup.c | 5 +- + arch/mips/cavium-octeon/octeon-irq.c | 5 +- + arch/mips/configs/malta_defconfig | 69 +- + arch/mips/configs/malta_kvm_defconfig | 456 +++++ + arch/mips/configs/malta_kvm_guest_defconfig | 453 +++++ + arch/mips/configs/maltaaprp_defconfig | 195 +++ + arch/mips/configs/maltasmtc_defconfig | 196 +++ + arch/mips/configs/maltasmvp_defconfig | 199 +++ + arch/mips/configs/maltaup_defconfig | 194 +++ + arch/mips/configs/sead3_defconfig | 3 - + arch/mips/configs/sead3micro_defconfig | 122 ++ + arch/mips/fw/lib/Makefile | 2 + + arch/mips/fw/lib/cmdline.c | 101 ++ + arch/mips/include/asm/asm.h | 2 + + arch/mips/include/asm/bootinfo.h | 1 + + arch/mips/include/asm/branch.h | 40 +- + arch/mips/include/asm/cpu-features.h | 3 + + arch/mips/include/asm/dma-mapping.h | 3 + + arch/mips/include/asm/fpu_emulator.h | 6 + + arch/mips/include/asm/fw/fw.h | 47 + + arch/mips/include/asm/gic.h | 16 +- + arch/mips/include/asm/hazards.h | 371 ++-- + arch/mips/include/asm/inst.h | 12 + + arch/mips/include/asm/irqflags.h | 153 +- + arch/mips/include/asm/kvm.h | 55 + + arch/mips/include/asm/kvm_host.h | 667 +++++++ + arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h | 11 - + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 141 +- + .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 11 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 2 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 105 +- + arch/mips/include/asm/mach-bcm63xx/ioremap.h | 1 + + arch/mips/include/asm/mach-generic/dma-coherence.h | 5 +- + arch/mips/include/asm/mach-generic/spaces.h | 9 +- + .../asm/mach-loongson/cpu-feature-overrides.h | 1 + + arch/mips/include/asm/mach-ralink/mt7620.h | 84 + + arch/mips/include/asm/mach-ralink/rt288x.h | 53 + + .../asm/mach-ralink/rt288x/cpu-feature-overrides.h | 56 + + arch/mips/include/asm/mach-ralink/rt305x.h | 27 + + .../asm/mach-ralink/rt305x/cpu-feature-overrides.h | 56 + + arch/mips/include/asm/mach-ralink/rt3883.h | 252 +++ + .../asm/mach-ralink/rt3883/cpu-feature-overrides.h | 55 + + .../include/asm/mach-sead3/cpu-feature-overrides.h | 4 + + arch/mips/include/asm/mips-boards/generic.h | 3 + + arch/mips/include/asm/mips-boards/prom.h | 47 - + arch/mips/include/asm/mips_machine.h | 4 - + arch/mips/include/asm/mipsregs.h | 19 + + arch/mips/include/asm/mmu_context.h | 101 +- + arch/mips/include/asm/netlogic/haldefs.h | 92 +- + arch/mips/include/asm/netlogic/mips-extns.h | 20 +- + arch/mips/include/asm/netlogic/xlp-hal/pic.h | 53 - + arch/mips/include/asm/netlogic/xlp-hal/usb.h | 64 - + arch/mips/include/asm/pgtable.h | 1 + + arch/mips/include/asm/processor.h | 5 + + arch/mips/include/asm/prom.h | 3 + + arch/mips/include/asm/spinlock.h | 120 +- + arch/mips/include/asm/stackframe.h | 12 +- + arch/mips/include/asm/thread_info.h | 8 +- + arch/mips/include/asm/time.h | 8 +- + arch/mips/include/asm/uaccess.h | 25 +- + arch/mips/include/asm/uasm.h | 84 +- + arch/mips/include/uapi/asm/inst.h | 564 ++++++ + arch/mips/kernel/Makefile | 3 +- + arch/mips/kernel/asm-offsets.c | 66 + + arch/mips/kernel/binfmt_elfo32.c | 4 + + arch/mips/kernel/branch.c | 178 ++ + arch/mips/kernel/cevt-gic.c | 104 ++ + arch/mips/kernel/cevt-r4k.c | 13 +- + arch/mips/kernel/cpu-probe.c | 3 + + arch/mips/kernel/csrc-gic.c | 13 +- + arch/mips/kernel/genex.S | 75 +- + arch/mips/kernel/irq-gic.c | 47 + + arch/mips/kernel/mips_machine.c | 21 - + arch/mips/kernel/proc.c | 6 +- + arch/mips/kernel/process.c | 101 ++ + arch/mips/kernel/prom.c | 31 + + arch/mips/kernel/scall32-o32.S | 9 + + arch/mips/kernel/setup.c | 20 + + arch/mips/kernel/signal.c | 9 + + arch/mips/kernel/smp-mt.c | 3 +- + arch/mips/kernel/smp.c | 1 + + arch/mips/kernel/smtc-asm.S | 3 + + arch/mips/kernel/traps.c | 318 +++- + arch/mips/kernel/unaligned.c | 1489 +++++++++++++--- + arch/mips/kvm/00README.txt | 31 + + arch/mips/kvm/Kconfig | 49 + + arch/mips/kvm/Makefile | 13 + + arch/mips/kvm/kvm_cb.c | 14 + + arch/mips/kvm/kvm_locore.S | 650 +++++++ + arch/mips/kvm/kvm_mips.c | 958 ++++++++++ + arch/mips/kvm/kvm_mips_comm.h | 23 + + arch/mips/kvm/kvm_mips_commpage.c | 37 + + arch/mips/kvm/kvm_mips_dyntrans.c | 149 ++ + arch/mips/kvm/kvm_mips_emul.c | 1829 ++++++++++++++++++++ + arch/mips/kvm/kvm_mips_int.c | 243 +++ + arch/mips/kvm/kvm_mips_int.h | 49 + + arch/mips/kvm/kvm_mips_opcode.h | 24 + + arch/mips/kvm/kvm_mips_stats.c | 82 + + arch/mips/kvm/kvm_tlb.c | 932 ++++++++++ + arch/mips/kvm/kvm_trap_emul.c | 482 ++++++ + arch/mips/kvm/trace.h | 46 + + arch/mips/lib/bitops.c | 14 +- + arch/mips/lib/dump_tlb.c | 5 +- + arch/mips/lib/memset.S | 84 +- + arch/mips/lib/mips-atomic.c | 149 +- + arch/mips/lib/r3k_dump_tlb.c | 6 +- + arch/mips/lib/strlen_user.S | 9 +- + arch/mips/lib/strncpy_user.S | 32 +- + arch/mips/lib/strnlen_user.S | 2 +- + arch/mips/math-emu/cp1emu.c | 919 +++++++++- + arch/mips/math-emu/dsemul.c | 30 +- + arch/mips/mm/Makefile | 4 +- + arch/mips/mm/c-r4k.c | 32 +- + arch/mips/mm/cache.c | 1 + + arch/mips/mm/dma-default.c | 5 +- + arch/mips/mm/page.c | 10 + + arch/mips/mm/tlb-r3k.c | 20 +- + arch/mips/mm/tlb-r4k.c | 4 +- + arch/mips/mm/tlb-r8k.c | 2 +- + arch/mips/mm/tlbex.c | 134 +- + arch/mips/mm/uasm-micromips.c | 221 +++ + arch/mips/mm/uasm-mips.c | 205 +++ + arch/mips/mm/uasm.c | 326 +--- + arch/mips/mti-malta/Makefile | 5 +- + arch/mips/mti-malta/Platform | 6 +- + arch/mips/mti-malta/malta-cmdline.c | 59 - + arch/mips/mti-malta/malta-display.c | 38 +- + arch/mips/mti-malta/malta-init.c | 153 +- + arch/mips/mti-malta/malta-int.c | 4 +- + arch/mips/mti-malta/malta-memory.c | 104 +- + arch/mips/mti-malta/malta-setup.c | 87 +- + arch/mips/mti-malta/malta-time.c | 53 +- + arch/mips/mti-sead3/Makefile | 8 +- + arch/mips/mti-sead3/leds-sead3.c | 24 +- + arch/mips/mti-sead3/sead3-cmdline.c | 46 - + arch/mips/mti-sead3/sead3-console.c | 2 +- + arch/mips/mti-sead3/sead3-display.c | 1 - + arch/mips/mti-sead3/sead3-init.c | 130 +- + arch/mips/mti-sead3/sead3-int.c | 1 - + arch/mips/mti-sead3/sead3-setup.c | 4 - + arch/mips/mti-sead3/sead3-time.c | 1 - + arch/mips/netlogic/Kconfig | 17 +- + arch/mips/netlogic/common/smp.c | 21 +- + arch/mips/netlogic/dts/Makefile | 1 + + arch/mips/netlogic/dts/xlp_evp.dts | 2 +- + arch/mips/netlogic/dts/xlp_svp.dts | 124 ++ + arch/mips/netlogic/xlp/nlm_hal.c | 62 +- + arch/mips/netlogic/xlp/setup.c | 22 +- + arch/mips/netlogic/xlp/usb-init.c | 49 +- + arch/mips/oprofile/op_model_mipsxx.c | 2 +- + arch/mips/pci/pci-ar71xx.c | 6 +- + arch/mips/pci/pci-ar724x.c | 18 +- + arch/mips/pci/pci-bcm63xx.c | 11 +- + arch/mips/ralink/Kconfig | 23 + + arch/mips/ralink/Makefile | 3 + + arch/mips/ralink/Platform | 18 + + arch/mips/ralink/common.h | 11 +- + arch/mips/ralink/dts/Makefile | 3 + + arch/mips/ralink/dts/mt7620a.dtsi | 58 + + arch/mips/ralink/dts/mt7620a_eval.dts | 16 + + arch/mips/ralink/dts/rt2880.dtsi | 58 + + arch/mips/ralink/dts/rt2880_eval.dts | 46 + + arch/mips/ralink/dts/rt3050.dtsi | 52 +- + arch/mips/ralink/dts/rt3052_eval.dts | 10 +- + arch/mips/ralink/dts/rt3883.dtsi | 58 + + arch/mips/ralink/dts/rt3883_eval.dts | 16 + + arch/mips/ralink/early_printk.c | 4 + + arch/mips/ralink/irq.c | 5 + + arch/mips/ralink/mt7620.c | 234 +++ + arch/mips/ralink/of.c | 9 + + arch/mips/ralink/rt288x.c | 143 ++ + arch/mips/ralink/rt305x.c | 70 +- + arch/mips/ralink/rt3883.c | 246 +++ + arch/mips/sgi-ip27/ip27-timer.c | 2 +- + drivers/tty/serial/bcm63xx_uart.c | 1 - + drivers/video/au1100fb.c | 22 +- + mm/bootmem.c | 1 + + virt/kvm/kvm_main.c | 2 +- + 195 files changed, 16109 insertions(+), 2283 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/ralink.txt + create mode 100644 arch/mips/configs/malta_kvm_defconfig + create mode 100644 arch/mips/configs/malta_kvm_guest_defconfig + create mode 100644 arch/mips/configs/maltaaprp_defconfig + create mode 100644 arch/mips/configs/maltasmtc_defconfig + create mode 100644 arch/mips/configs/maltasmvp_defconfig + create mode 100644 arch/mips/configs/maltaup_defconfig + create mode 100644 arch/mips/configs/sead3micro_defconfig + create mode 100644 arch/mips/fw/lib/cmdline.c + create mode 100644 arch/mips/include/asm/fw/fw.h + create mode 100644 arch/mips/include/asm/kvm.h + create mode 100644 arch/mips/include/asm/kvm_host.h + delete mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h + create mode 100644 arch/mips/include/asm/mach-ralink/mt7620.h + create mode 100644 arch/mips/include/asm/mach-ralink/rt288x.h + create mode 100644 arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-ralink/rt3883.h + create mode 100644 arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h + delete mode 100644 arch/mips/include/asm/mips-boards/prom.h + delete mode 100644 arch/mips/include/asm/netlogic/xlp-hal/usb.h + create mode 100644 arch/mips/kernel/cevt-gic.c + create mode 100644 arch/mips/kvm/00README.txt + create mode 100644 arch/mips/kvm/Kconfig + create mode 100644 arch/mips/kvm/Makefile + create mode 100644 arch/mips/kvm/kvm_cb.c + create mode 100644 arch/mips/kvm/kvm_locore.S + create mode 100644 arch/mips/kvm/kvm_mips.c + create mode 100644 arch/mips/kvm/kvm_mips_comm.h + create mode 100644 arch/mips/kvm/kvm_mips_commpage.c + create mode 100644 arch/mips/kvm/kvm_mips_dyntrans.c + create mode 100644 arch/mips/kvm/kvm_mips_emul.c + create mode 100644 arch/mips/kvm/kvm_mips_int.c + create mode 100644 arch/mips/kvm/kvm_mips_int.h + create mode 100644 arch/mips/kvm/kvm_mips_opcode.h + create mode 100644 arch/mips/kvm/kvm_mips_stats.c + create mode 100644 arch/mips/kvm/kvm_tlb.c + create mode 100644 arch/mips/kvm/kvm_trap_emul.c + create mode 100644 arch/mips/kvm/trace.h + create mode 100644 arch/mips/mm/uasm-micromips.c + create mode 100644 arch/mips/mm/uasm-mips.c + delete mode 100644 arch/mips/mti-malta/malta-cmdline.c + delete mode 100644 arch/mips/mti-sead3/sead3-cmdline.c + create mode 100644 arch/mips/netlogic/dts/xlp_svp.dts + create mode 100644 arch/mips/ralink/dts/mt7620a.dtsi + create mode 100644 arch/mips/ralink/dts/mt7620a_eval.dts + create mode 100644 arch/mips/ralink/dts/rt2880.dtsi + create mode 100644 arch/mips/ralink/dts/rt2880_eval.dts + create mode 100644 arch/mips/ralink/dts/rt3883.dtsi + create mode 100644 arch/mips/ralink/dts/rt3883_eval.dts + create mode 100644 arch/mips/ralink/mt7620.c + create mode 100644 arch/mips/ralink/rt288x.c + create mode 100644 arch/mips/ralink/rt3883.c +Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging powerpc/next (54d5999 powerpc: Fix build error for book3e) +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next (2074b1d powerpc: Fix irq distribution) +$ git merge 4xx/next +Already up-to-date. +Merging mpc5xxx/next (fdeaf0e powerpc/512x: add ifm ac14xx board) +$ git merge mpc5xxx/next +Already up-to-date. +Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) +$ git merge galak/next +Already up-to-date. +Merging s390/features (8fad2b2 s390/mm: add pte invalidation notifier for kvm) +$ git merge s390/features +Auto-merging arch/s390/mm/mem_detect.c +Merge made by the 'recursive' strategy. + Documentation/s390/CommonIO | 12 ++-- + arch/s390/include/asm/pgtable.h | 66 ++++++++++++++++--- + arch/s390/include/asm/setup.h | 3 +- + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/crash_dump.c | 2 +- + arch/s390/kernel/early.c | 1 - + arch/s390/kernel/setup.c | 43 ++++++------ + arch/s390/lib/uaccess_pt.c | 3 + + arch/s390/mm/Makefile | 2 +- + arch/s390/mm/init.c | 11 ++++ + arch/s390/{kernel => mm}/mem_detect.c | 45 +++++++++++-- + arch/s390/mm/pgtable.c | 121 ++++++++++++++++++++++++++++++++-- + drivers/s390/char/sclp_cmd.c | 20 +----- + drivers/s390/char/zcore.c | 34 +++++----- + drivers/s390/cio/blacklist.c | 28 +++++++- + drivers/s390/crypto/ap_bus.c | 17 ++--- + drivers/s390/kvm/kvm_virtio.c | 11 ++-- + 17 files changed, 315 insertions(+), 106 deletions(-) + rename arch/s390/{kernel => mm}/mem_detect.c (69%) +Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) +$ git merge sh/sh-latest +Merge made by the 'recursive' strategy. + .../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 | 3 +- + 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, 376 insertions(+), 16 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 (07df841 sparc64: Do not save/restore interrupts in get_new_mmu_context()) +$ git merge sparc-next/master +Auto-merging arch/sparc/mm/init_64.c +Auto-merging arch/sparc/kernel/Makefile +Auto-merging arch/sparc/Kconfig +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 20 +- + arch/sparc/Makefile | 1 + + arch/sparc/include/asm/cmpxchg_64.h | 1 + + arch/sparc/include/asm/head_32.h | 6 +- + arch/sparc/include/asm/hibernate.h | 23 + + arch/sparc/include/asm/leon_pci.h | 1 + + arch/sparc/include/asm/mmu_context_64.h | 2 +- + arch/sparc/include/asm/processor_64.h | 3 - + arch/sparc/kernel/Makefile | 3 +- + arch/sparc/kernel/asm-offsets.c | 15 + + arch/sparc/kernel/leon_pci.c | 2 + + arch/sparc/kernel/leon_pci_grpci1.c | 724 ++++++++++++++++++++++++++++++++ + arch/sparc/kernel/leon_pci_grpci2.c | 5 + + arch/sparc/kernel/leon_pmc.c | 4 +- + arch/sparc/mm/init_64.c | 7 +- + arch/sparc/power/Makefile | 3 + + arch/sparc/power/hibernate.c | 42 ++ + arch/sparc/power/hibernate_asm.S | 131 ++++++ + 18 files changed, 977 insertions(+), 16 deletions(-) + create mode 100644 arch/sparc/include/asm/hibernate.h + create mode 100644 arch/sparc/kernel/leon_pci_grpci1.c + create mode 100644 arch/sparc/power/Makefile + create mode 100644 arch/sparc/power/hibernate.c + create mode 100644 arch/sparc/power/hibernate_asm.S +Merging tile/master (9fc1894 arch/tile: Fix syscall return value passed to tracepoint) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (4e34bf6 xtensa: provide default platform_pcibios_init implementation) +$ git merge xtensa/for_next +Merge made by the 'recursive' strategy. + Documentation/xtensa/mmu.txt | 46 ++++++++++++ + arch/xtensa/Kconfig | 44 +++++++---- + arch/xtensa/boot/boot-elf/Makefile | 1 + + arch/xtensa/boot/boot-elf/boot.lds.S | 64 +++++++--------- + arch/xtensa/boot/boot-elf/bootstrap.S | 101 +++++++++++++++++++++---- + arch/xtensa/boot/boot-uboot/Makefile | 6 +- + arch/xtensa/include/asm/initialize_mmu.h | 107 ++++++++++++++++++++++++++ + arch/xtensa/include/asm/vectors.h | 125 +++++++++++++++++++++++++++++++ + arch/xtensa/kernel/Makefile | 2 + + arch/xtensa/kernel/head.S | 39 +++++++--- + arch/xtensa/kernel/platform.c | 1 + + arch/xtensa/kernel/vectors.S | 3 +- + arch/xtensa/kernel/vmlinux.lds.S | 48 ++++++++---- + arch/xtensa/kernel/xtensa_ksyms.c | 5 ++ + arch/xtensa/mm/mmu.c | 14 ++-- + arch/xtensa/oprofile/backtrace.c | 4 +- + arch/xtensa/platforms/iss/setup.c | 8 +- + arch/xtensa/platforms/xt2000/setup.c | 2 + + arch/xtensa/platforms/xtfpga/setup.c | 2 + + 19 files changed, 512 insertions(+), 110 deletions(-) + create mode 100644 Documentation/xtensa/mmu.txt + create mode 100644 arch/xtensa/include/asm/vectors.h +Merging btrfs/next (6aec51f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-linus-3.9) +$ git merge btrfs/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ceph/testing (b5b09be rbd: fix image request leak on parent read) +$ git merge ceph/testing +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-rbd | 20 - + drivers/block/rbd.c | 2868 ++++++++++++++++++++----------- + fs/ceph/addr.c | 222 ++- + fs/ceph/caps.c | 33 +- + fs/ceph/dir.c | 65 +- + fs/ceph/file.c | 241 +-- + fs/ceph/inode.c | 59 +- + fs/ceph/ioctl.c | 5 +- + fs/ceph/mds_client.c | 79 +- + fs/ceph/mdsmap.c | 8 +- + fs/ceph/snap.c | 3 +- + fs/ceph/super.c | 7 +- + fs/ceph/super.h | 65 +- + include/linux/ceph/auth.h | 18 + + include/linux/ceph/ceph_features.h | 2 + + include/linux/ceph/decode.h | 30 +- + include/linux/ceph/libceph.h | 31 +- + include/linux/ceph/messenger.h | 104 +- + include/linux/ceph/msgr.h | 1 + + include/linux/ceph/osd_client.h | 204 ++- + include/linux/ceph/osdmap.h | 30 +- + net/ceph/Makefile | 2 +- + net/ceph/auth.c | 117 +- + net/ceph/auth_x.c | 24 +- + net/ceph/auth_x.h | 1 + + net/ceph/ceph_common.c | 7 + + net/ceph/debugfs.c | 4 +- + net/ceph/messenger.c | 1019 +++++++---- + net/ceph/mon_client.c | 7 +- + net/ceph/osd_client.c | 1087 ++++++++---- + net/ceph/osdmap.c | 45 +- + net/ceph/snapshot.c | 78 + + 32 files changed, 4201 insertions(+), 2285 deletions(-) + create mode 100644 net/ceph/snapshot.c +Merging cifs/for-next (bf81710 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (f6161aa Linux 3.9-rc2) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset) +$ git merge ext3/for_next +Auto-merging fs/jbd/journal.c +Merge made by the 'recursive' strategy. + fs/ext3/inode.c | 3 ++- + fs/jbd/journal.c | 11 +++++++++++ + fs/jbd/transaction.c | 1 - + include/linux/jbd.h | 2 +- + 4 files changed, 14 insertions(+), 3 deletions(-) +Merging ext4/dev (0d606e2 ext4: fix type-widening bug in inode table readahead code) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (42e49df f2fs: avoid deadlock during evict after f2fs_gc) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/dir.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 4 +- + fs/f2fs/checkpoint.c | 63 ++-- + fs/f2fs/data.c | 195 ++++++----- + fs/f2fs/debug.c | 10 +- + fs/f2fs/dir.c | 110 +++--- + fs/f2fs/f2fs.h | 94 +++-- + fs/f2fs/file.c | 116 +++---- + fs/f2fs/gc.c | 124 ++++--- + fs/f2fs/gc.h | 12 +- + fs/f2fs/inode.c | 68 ++-- + fs/f2fs/namei.c | 74 ++-- + fs/f2fs/node.c | 361 +++++++++++--------- + fs/f2fs/node.h | 20 +- + fs/f2fs/recovery.c | 75 ++-- + fs/f2fs/segment.c | 137 +++++--- + fs/f2fs/segment.h | 41 ++- + fs/f2fs/super.c | 72 +++- + fs/f2fs/xattr.c | 28 +- + include/linux/f2fs_fs.h | 17 +- + include/trace/events/f2fs.h | 682 +++++++++++++++++++++++++++++++++++++ + 20 files changed, 1637 insertions(+), 666 deletions(-) + create mode 100644 include/trace/events/f2fs.h +Merging fuse/for-next (60b9df7 fuse: add flag to turn on async direct IO) +$ git merge fuse/for-next +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/dev.c +Merge made by the 'recursive' strategy. + fs/fuse/cuse.c | 10 +- + fs/fuse/dev.c | 80 +++++++++++--- + fs/fuse/dir.c | 17 +-- + fs/fuse/file.c | 272 +++++++++++++++++++++++++++++++++++++++------- + fs/fuse/fuse_i.h | 36 +++++- + fs/fuse/inode.c | 12 +- + include/uapi/linux/fuse.h | 7 +- + 7 files changed, 362 insertions(+), 72 deletions(-) +Merging gfs2/master (222cb53 GFS2: Flush work queue before clearing glock hash tables) +$ git merge gfs2/master +Already up-to-date. +Merging jfs/jfs-next (73aaa22 jfs: fix a couple races) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/inode.c | 2 +- + fs/jfs/jfs_imap.c | 2 +- + fs/jfs/jfs_logmgr.c | 3 ++- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (df1bc00 SUNRPC: Don't spam syslog with "Pseudoflavor not found" messages) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4proc.c | 4 ++-- + net/sunrpc/auth_gss/auth_gss.c | 3 +-- + net/sunrpc/clnt.c | 2 +- + 3 files changed, 4 insertions(+), 5 deletions(-) +Merging nfsd/nfsd-next (676e4eb NFSD: SECINFO doesn't handle unsupported pseudoflavors correctly) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/clnt.c +Auto-merging net/sunrpc/cache.c +Auto-merging net/sunrpc/auth_gss/auth_gss.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/00-INDEX | 2 + + Documentation/filesystems/nfs/rpc-server-gss.txt | 91 +++ + fs/nfsd/cache.h | 1 + + fs/nfsd/netns.h | 1 + + fs/nfsd/nfs4callback.c | 33 +- + fs/nfsd/nfs4proc.c | 97 +-- + fs/nfsd/nfs4state.c | 747 +++++++++++--------- + fs/nfsd/nfs4xdr.c | 109 +-- + fs/nfsd/nfscache.c | 197 ++++-- + fs/nfsd/nfsctl.c | 13 +- + fs/nfsd/state.h | 27 +- + fs/nfsd/vfs.c | 6 +- + fs/nfsd/xdr4.h | 3 +- + fs/nfsd/xdr4cb.h | 23 + + include/linux/sunrpc/clnt.h | 1 + + include/linux/sunrpc/gss_api.h | 6 + + include/linux/sunrpc/msg_prot.h | 3 + + include/linux/sunrpc/xprt.h | 1 + + net/sunrpc/auth_gss/Makefile | 3 +- + net/sunrpc/auth_gss/auth_gss.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_mech.c | 7 +- + net/sunrpc/auth_gss/gss_mech_switch.c | 7 +- + net/sunrpc/auth_gss/gss_rpc_upcall.c | 358 ++++++++++ + net/sunrpc/auth_gss/gss_rpc_upcall.h | 48 ++ + net/sunrpc/auth_gss/gss_rpc_xdr.c | 838 +++++++++++++++++++++++ + net/sunrpc/auth_gss/gss_rpc_xdr.h | 264 +++++++ + net/sunrpc/auth_gss/svcauth_gss.c | 363 +++++++++- + net/sunrpc/cache.c | 4 +- + net/sunrpc/clnt.c | 3 + + net/sunrpc/netns.h | 6 + + net/sunrpc/xprt.c | 2 + + net/sunrpc/xprtsock.c | 3 + + 32 files changed, 2701 insertions(+), 568 deletions(-) + create mode 100644 Documentation/filesystems/nfs/rpc-server-gss.txt + create mode 100644 fs/nfsd/xdr4cb.h + create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.c + create mode 100644 net/sunrpc/auth_gss/gss_rpc_upcall.h + create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.c + create mode 100644 net/sunrpc/auth_gss/gss_rpc_xdr.h +$ git am -3 ../patches/0001-SUNRPC-update-for-PDE-removal.patch +Applying: SUNRPC: update for PDE removal +$ git reset HEAD^ +Unstaged changes after reset: +M net/sunrpc/auth_gss/svcauth_gss.c +$ git add -A . +$ git commit -v -a --amend +[master 855787a] Merge remote-tracking branch 'nfsd/nfsd-next' +Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/ocfs2/cluster/heartbeat.c +Merge made by the 'recursive' strategy. + fs/ocfs2/cluster/heartbeat.c | 40 +++++++++------------------------------- + fs/ocfs2/cluster/masklog.h | 3 ++- + fs/ocfs2/dlm/dlmmaster.c | 8 +++++++- + fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ + 4 files changed, 25 insertions(+), 33 deletions(-) +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (c1be5a5 Linux 3.9) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (c1be5a5 Linux 3.9) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (cab09a8 xfs: fix da node magic number mismatches) +$ git merge xfs/for-next +Already up-to-date. +Merging vfs/for-next (ac3e3c5 don't bother with deferred freeing of fdtables) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (d4f09c5 Merge branch 'pci/gavin-msi-cleanup' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (46b1897 Merge branch 'for-3.10/hid-debug' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (c39e8e4 i2c: xiic: must always write 16-bit words to TX_FIFO) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (c662b7a hwmon: (lm75) Add support for the Dallas/Maxim DS7505) +$ git merge jdelvare-hwmon/master +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + Documentation/hwmon/lm75 | 15 ++++---- + drivers/hwmon/Kconfig | 2 +- + drivers/hwmon/lm75.c | 92 ++++++++++++++++++++++++++++++++++++++++++++---- + 3 files changed, 94 insertions(+), 15 deletions(-) +Merging hwmon-staging/hwmon-next (6445e66 hwmon: (nct6775) Fix coding style problems) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (1d62caa Merge /home/v4l/v4l/patchwork) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (fc2cf6b Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Removing scripts/headers_install.pl +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/coccinelle.txt | 11 ++++- + Documentation/kbuild/kconfig.txt | 36 +++++++++++++++ + Documentation/kbuild/makefiles.txt | 7 +-- + Makefile | 2 + + scripts/Kbuild.include | 2 +- + scripts/Makefile.headersinst | 4 +- + scripts/coccicheck | 31 +++++++------ + scripts/headers_install.pl | 63 ------------------------- + scripts/headers_install.sh | 43 +++++++++++++++++ + scripts/kconfig/Makefile | 4 +- + scripts/kconfig/conf.c | 12 ++++- + scripts/kconfig/confdata.c | 59 ++++++++++++++++++++++-- + scripts/kconfig/list.h | 40 ++++++++++++++++ + scripts/kconfig/lxdialog/check-lxdialog.sh | 6 ++- + scripts/kconfig/lxdialog/dialog.h | 7 +++ + scripts/kconfig/lxdialog/util.c | 45 +++++++++++++++++- + scripts/kconfig/mconf.c | 74 +++++++++++++++++++++++++++++- + scripts/kconfig/merge_config.sh | 10 +++- + scripts/package/Makefile | 39 ++++++---------- + scripts/package/buildtar | 2 +- + scripts/tags.sh | 4 +- + 21 files changed, 380 insertions(+), 121 deletions(-) + delete mode 100644 scripts/headers_install.pl + create mode 100644 scripts/headers_install.sh +Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/NEXT (2cc1144 sata_highbank: Rename proc_name to the module name) +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next (f1258ea Merge branches 'misc' and 'mlx4' into for-next) +$ git merge infiniband/for-next +Resolved 'drivers/infiniband/hw/cxgb4/qp.c' using previous resolution. +Auto-merging include/linux/mlx4/device.h +Auto-merging drivers/net/ethernet/mellanox/mlx4/mlx4.h +Auto-merging drivers/net/ethernet/mellanox/mlx4/mcg.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging drivers/infiniband/hw/mlx4/cq.c +Auto-merging drivers/infiniband/hw/cxgb4/qp.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb4/qp.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f84deb8] Merge remote-tracking branch 'infiniband/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/iwcm.c | 2 + + drivers/infiniband/core/verbs.c | 3 +- + drivers/infiniband/hw/cxgb3/cxio_resource.c | 4 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 +- + drivers/infiniband/hw/cxgb4/id_table.c | 4 +- + drivers/infiniband/hw/cxgb4/qp.c | 22 +++-- + drivers/infiniband/hw/ipath/ipath_verbs.c | 19 ++-- + drivers/infiniband/hw/mlx4/cq.c | 21 +++++ + drivers/infiniband/hw/mlx4/mad.c | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 6 ++ + drivers/infiniband/hw/qib/qib_sysfs.c | 6 +- + drivers/infiniband/hw/qib/qib_verbs.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 16 ++-- + drivers/net/ethernet/mellanox/mlx4/eq.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 120 +++++++++++++++--------- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 79 ---------------- + drivers/net/ethernet/mellanox/mlx4/srq.c | 15 +++ + include/linux/mlx4/device.h | 104 ++++++++++++++++++-- + include/linux/mlx4/srq.h | 2 + + 23 files changed, 272 insertions(+), 170 deletions(-) +Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) +$ git merge pstore/master +Merge made by the 'recursive' strategy. + fs/pstore/ram.c | 26 +++++++++++------- + fs/pstore/ram_core.c | 66 ++++++++++++++++++++++++++-------------------- + include/linux/pstore_ram.h | 14 +++++++--- + 3 files changed, 64 insertions(+), 42 deletions(-) +Merging pm/linux-next (371deb9 Merge branch 'pm-cpufreq') +$ git merge pm/linux-next +Already up-to-date. +Merging idle/next (5c99726b Merge branch 'fspin' into next) +$ git merge idle/next +Auto-merging include/linux/cpuidle.h +Auto-merging drivers/idle/intel_idle.c +Auto-merging arch/x86/include/uapi/asm/msr-index.h +Merge made by the 'recursive' strategy. + arch/x86/include/uapi/asm/msr-index.h | 3 + + drivers/idle/intel_idle.c | 21 ++ + include/linux/cpuidle.h | 2 +- + tools/power/fspin/Makefile | 21 ++ + tools/power/fspin/fspin.1 | 68 ++++++ + tools/power/fspin/fspin.c | 443 ++++++++++++++++++++++++++++++++++ + tools/power/x86/turbostat/turbostat.c | 54 ++++- + 7 files changed, 610 insertions(+), 2 deletions(-) + create mode 100644 tools/power/fspin/Makefile + create mode 100644 tools/power/fspin/fspin.1 + create mode 100644 tools/power/fspin/fspin.c +Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) +$ git merge apm/for-next +Already up-to-date. +Merging cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next) +$ git merge cpuidle/cpuidle-next +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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2abbaea] 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 cpupowerutils/master +Already up-to-date. +Merging thermal/next (de6558d Merge branch 'MAINTAINERS-update' of .git into next) +$ git merge thermal/next +Auto-merging include/linux/thermal.h +Auto-merging drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/exynos_thermal.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/armada-thermal.txt | 22 ++ + Documentation/thermal/exynos_thermal_emulation | 8 +- + Documentation/thermal/sysfs-api.txt | 28 +- + MAINTAINERS | 3 + + drivers/thermal/Kconfig | 28 +- + drivers/thermal/Makefile | 10 +- + drivers/thermal/armada_thermal.c | 232 ++++++++++++++++ + drivers/thermal/cpu_cooling.c | 295 +++++++++++++++------ + drivers/thermal/db8500_cpufreq_cooling.c | 2 +- + drivers/thermal/db8500_thermal.c | 19 +- + drivers/thermal/dove_thermal.c | 7 +- + drivers/thermal/exynos_thermal.c | 196 ++++++-------- + drivers/thermal/fair_share.c | 15 +- + drivers/thermal/kirkwood_thermal.c | 12 +- + drivers/thermal/rcar_thermal.c | 34 ++- + drivers/thermal/step_wise.c | 26 +- + drivers/thermal/{thermal_sys.c => thermal_core.c} | 197 +++++++++++--- + drivers/thermal/thermal_core.h | 27 ++ + drivers/thermal/user_space.c | 15 +- + include/linux/cpu_cooling.h | 25 +- + include/linux/thermal.h | 15 +- + 21 files changed, 858 insertions(+), 358 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/armada-thermal.txt + create mode 100644 drivers/thermal/armada_thermal.c + rename drivers/thermal/{thermal_sys.c => thermal_core.c} (89%) +Merging ieee1394/for-next (6fe9efb firewire: ohci: dump_stack() for PHY regs read/write failures) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/core-cdev.c | 27 ++--- + drivers/firewire/core-device.c | 4 +- + drivers/firewire/net.c | 7 +- + drivers/firewire/ohci.c | 270 +++++++++++++++++++++++------------------ + drivers/firewire/sbp2.c | 10 +- + 5 files changed, 166 insertions(+), 152 deletions(-) +Merging ubi/linux-next (f6161aa Linux 3.9-rc2) +$ git merge ubi/linux-next +Already up-to-date. +Merging dlm/next (9000831 dlm: avoid unnecessary posix unlock) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging scsi/for-next (d522844 [SCSI] qla4xxx: Fix iocb_cnt calculation in qla4xxx_send_mbox_iocb()) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Merge made by the 'recursive' strategy. + drivers/scsi/be2iscsi/be.h | 2 +- + drivers/scsi/be2iscsi/be_cmds.c | 172 +++++-- + drivers/scsi/be2iscsi/be_cmds.h | 27 +- + drivers/scsi/be2iscsi/be_iscsi.c | 70 ++- + drivers/scsi/be2iscsi/be_iscsi.h | 2 +- + drivers/scsi/be2iscsi/be_main.c | 375 ++++++++------ + drivers/scsi/be2iscsi/be_main.h | 29 +- + drivers/scsi/be2iscsi/be_mgmt.c | 43 +- + drivers/scsi/be2iscsi/be_mgmt.h | 35 +- + drivers/scsi/bnx2fc/bnx2fc.h | 8 +- + drivers/scsi/bnx2fc/bnx2fc_els.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 55 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 8 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 9 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +- + drivers/scsi/csiostor/csio_lnode.h | 2 +- + drivers/scsi/csiostor/csio_rnode.h | 2 +- + drivers/scsi/fnic/fnic.h | 34 +- + drivers/scsi/fnic/fnic_fcs.c | 564 ++++++++++++++++++++- + drivers/scsi/fnic/fnic_fip.h | 68 +++ + drivers/scsi/fnic/fnic_main.c | 51 +- + drivers/scsi/fnic/vnic_dev.c | 10 + + drivers/scsi/fnic/vnic_dev.h | 2 + + drivers/scsi/fnic/vnic_devcmd.h | 67 +++ + drivers/scsi/ibmvscsi/ibmvfc.c | 85 +++- + drivers/scsi/ibmvscsi/ibmvfc.h | 7 +- + drivers/scsi/ipr.c | 16 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/lpfc/lpfc.h | 24 +- + drivers/scsi/lpfc/lpfc_attr.c | 166 ++++++- + drivers/scsi/lpfc/lpfc_bsg.c | 39 +- + drivers/scsi/lpfc/lpfc_crtn.h | 1 + + drivers/scsi/lpfc/lpfc_ct.c | 3 +- + drivers/scsi/lpfc/lpfc_els.c | 113 ++++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 91 +++- + drivers/scsi/lpfc/lpfc_hw.h | 1 + + drivers/scsi/lpfc/lpfc_hw4.h | 7 +- + drivers/scsi/lpfc/lpfc_init.c | 607 +++++++++++++++++++---- + drivers/scsi/lpfc/lpfc_logmsg.h | 1 + + drivers/scsi/lpfc/lpfc_mbox.c | 9 +- + drivers/scsi/lpfc/lpfc_mem.c | 14 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 25 +- + drivers/scsi/lpfc/lpfc_scsi.c | 798 ++++++++++++++++++++++-------- + drivers/scsi/lpfc/lpfc_sli.c | 106 ++-- + drivers/scsi/lpfc/lpfc_sli4.h | 21 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 25 +- + drivers/scsi/lpfc/lpfc_vport.h | 1 + + drivers/scsi/megaraid/megaraid_sas_base.c | 3 +- + drivers/scsi/qla2xxx/qla_mr.c | 6 +- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/qla4xxx/ql4_iocb.c | 1 + + drivers/scsi/qla4xxx/ql4_os.c | 39 +- + drivers/scsi/qla4xxx/ql4_version.h | 2 +- + drivers/scsi/scsi_debug.c | 97 ++-- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/scsi/sd.c | 20 + + drivers/scsi/sd.h | 1 + + drivers/scsi/sd_dif.c | 8 - + drivers/scsi/ufs/Kconfig | 11 + + drivers/scsi/ufs/Makefile | 1 + + drivers/scsi/ufs/ufshcd-pltfrm.c | 217 ++++++++ + drivers/scsi/ufs/ufshcd.c | 2 +- + include/linux/pci_ids.h | 6 +- + include/scsi/osd_protocol.h | 2 +- + 65 files changed, 3399 insertions(+), 826 deletions(-) + create mode 100644 drivers/scsi/fnic/fnic_fip.h + create mode 100644 drivers/scsi/ufs/ufshcd-pltfrm.c +Merging target-updates/for-next (04b59ba tcm_vhost: Enable VIRTIO_SCSI_F_HOTPLUG) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (b8d26b3 iser-target: Add iSCSI Extensions for RDMA (iSER) target driver) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) +$ git merge ibft/linux-next +Already up-to-date. +Merging isci/all (6734092 isci: add a couple __iomem annotations) +$ git merge isci/all +Already up-to-date. +Merging slave-dma/next (9667bcf Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/at_hdmac.c +Merge made by the 'recursive' strategy. + Documentation/acpi/enumeration.txt | 77 ++ + .../devicetree/bindings/dma/atmel-dma.txt | 35 +- + Documentation/dmatest.txt | 81 ++ + arch/arm/mach-omap2/dma.c | 4 + + drivers/dma/Kconfig | 16 +- + drivers/dma/Makefile | 3 +- + drivers/dma/acpi-dma.c | 279 +++++++ + drivers/dma/at_hdmac.c | 97 ++- + drivers/dma/at_hdmac_regs.h | 4 + + drivers/dma/coh901318.c | 4 +- + drivers/dma/dmaengine.c | 17 +- + drivers/dma/dmatest.c | 887 +++++++++++++++++--- + drivers/dma/dw_dmac.c | 203 ++--- + drivers/dma/dw_dmac_regs.h | 6 +- + drivers/dma/imx-dma.c | 7 +- + drivers/dma/imx-sdma.c | 4 +- + drivers/dma/ioat/dma.c | 8 +- + drivers/dma/ioat/dma.h | 53 +- + drivers/dma/ioat/dma_v2.h | 2 + + drivers/dma/ioat/dma_v3.c | 912 ++++++++++++++++++--- + drivers/dma/ioat/hw.h | 88 +- + drivers/dma/ioat/pci.c | 20 + + drivers/dma/ioat/registers.h | 4 + + drivers/dma/ipu/ipu_idmac.c | 6 +- + drivers/dma/of-dma.c | 96 +-- + drivers/dma/omap-dma.c | 38 +- + drivers/dma/pch_dma.c | 2 +- + drivers/dma/pl330.c | 10 +- + drivers/dma/sh/Kconfig | 24 + + drivers/dma/sh/Makefile | 3 +- + drivers/dma/sh/sudmac.c | 428 ++++++++++ + drivers/dma/sirf-dma.c | 24 +- + drivers/dma/tegra20-apb-dma.c | 87 +- + drivers/dma/timb_dma.c | 2 +- + drivers/dma/txx9dmac.c | 8 +- + include/linux/acpi_dma.h | 116 +++ + include/linux/dmaengine.h | 15 +- + include/linux/of_dma.h | 10 +- + include/linux/sudmac.h | 52 ++ + 39 files changed, 3215 insertions(+), 517 deletions(-) + create mode 100644 Documentation/dmatest.txt + create mode 100644 drivers/dma/acpi-dma.c + create mode 100644 drivers/dma/sh/Kconfig + create mode 100644 drivers/dma/sh/sudmac.c + create mode 100644 include/linux/acpi_dma.h + create mode 100644 include/linux/sudmac.h +Merging dmaengine/next (41ef2d5 Linux 3.9-rc7) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (99c6bcf Merge tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (a8a48e6 Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (173d9a2 Bluetooth: Fix multiple LE socket handling) +$ git merge bluetooth/master +Auto-merging net/bluetooth/l2cap_sock.c +Merge made by the 'recursive' strategy. + include/net/bluetooth/l2cap.h | 2 +- + net/bluetooth/l2cap_core.c | 121 ++++++++++++++++++++++++++++-------------- + net/bluetooth/l2cap_sock.c | 4 +- + 3 files changed, 84 insertions(+), 43 deletions(-) +Merging mtd/master (cdb6404 mtd: omap2: Use module_platform_driver()) +$ git merge mtd/master +Auto-merging drivers/ssb/driver_mipscore.c +Removing drivers/mtd/onenand/onenand_sim.c +Removing drivers/mtd/nand/rtc_from4.c +Removing drivers/mtd/nand/ppchameleonevb.c +Removing drivers/mtd/nand/h1910.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/mtd/mtdchar.c +Removing drivers/mtd/maps/tqm8xxl.c +Removing drivers/mtd/maps/rpxlite.c +Removing drivers/mtd/maps/mbx860.c +Removing drivers/mtd/maps/ixp2000.c +Removing drivers/mtd/maps/h720x-flash.c +Removing drivers/mtd/maps/dmv182.c +Removing drivers/mtd/maps/dilnetpc.c +Removing drivers/mtd/maps/dbox2-flash.c +Removing drivers/mtd/devices/docprobe.c +Removing drivers/mtd/devices/docecc.c +Removing drivers/mtd/devices/doc2001plus.c +Removing drivers/mtd/devices/doc2001.c +Removing drivers/mtd/devices/doc2000.c +Auto-merging arch/cris/arch-v32/drivers/Kconfig +Auto-merging arch/cris/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-mtd | 6 +- + .../devicetree/bindings/mtd/partition.txt | 36 +- + arch/arm/mach-pxa/Kconfig | 1 - + arch/cris/Kconfig | 1 - + arch/cris/arch-v32/drivers/Kconfig | 1 - + drivers/bcma/driver_mips.c | 2 +- + drivers/mtd/Kconfig | 13 - + drivers/mtd/Makefile | 3 +- + drivers/mtd/chips/Kconfig | 1 - + drivers/mtd/devices/Kconfig | 64 -- + drivers/mtd/devices/Makefile | 5 - + drivers/mtd/devices/bcm47xxsflash.c | 13 +- + drivers/mtd/devices/bcm47xxsflash.h | 59 + + drivers/mtd/devices/doc2000.c | 1178 -------------------- + drivers/mtd/devices/doc2001.c | 824 -------------- + drivers/mtd/devices/doc2001plus.c | 1080 ------------------ + drivers/mtd/devices/docecc.c | 521 --------- + drivers/mtd/devices/docg3.c | 15 +- + drivers/mtd/devices/docprobe.c | 325 ------ + drivers/mtd/devices/elm.c | 9 +- + drivers/mtd/devices/m25p80.c | 25 +- + drivers/mtd/devices/mtd_dataflash.c | 4 +- + drivers/mtd/maps/Kconfig | 77 -- + drivers/mtd/maps/Makefile | 8 - + drivers/mtd/maps/bfin-async-flash.c | 3 +- + drivers/mtd/maps/ck804xrom.c | 3 +- + drivers/mtd/maps/dbox2-flash.c | 123 -- + drivers/mtd/maps/dc21285.c | 3 +- + drivers/mtd/maps/dilnetpc.c | 496 --------- + drivers/mtd/maps/dmv182.c | 146 --- + drivers/mtd/maps/gpio-addr-flash.c | 3 +- + drivers/mtd/maps/h720x-flash.c | 120 -- + drivers/mtd/maps/impa7.c | 7 +- + drivers/mtd/maps/intel_vr_nor.c | 4 +- + drivers/mtd/maps/ixp2000.c | 253 ----- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/maps/lantiq-flash.c | 3 +- + drivers/mtd/maps/mbx860.c | 98 -- + drivers/mtd/maps/pci.c | 3 +- + drivers/mtd/maps/physmap.c | 17 +- + drivers/mtd/maps/physmap_of.c | 16 +- + drivers/mtd/maps/plat-ram.c | 2 +- + drivers/mtd/maps/pxa2xx-flash.c | 4 +- + drivers/mtd/maps/rbtx4939-flash.c | 5 +- + drivers/mtd/maps/rpxlite.c | 64 -- + drivers/mtd/maps/sa1100-flash.c | 2 +- + drivers/mtd/maps/solutionengine.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 249 ----- + drivers/mtd/maps/tsunami_flash.c | 5 +- + drivers/mtd/mtdchar.c | 52 +- + drivers/mtd/mtdcore.c | 26 +- + drivers/mtd/mtdcore.h | 30 +- + drivers/mtd/mtdpart.c | 4 +- + drivers/mtd/nand/Kconfig | 30 - + drivers/mtd/nand/Makefile | 3 - + drivers/mtd/nand/atmel_nand.c | 15 +- + drivers/mtd/nand/bf5xx_nand.c | 16 +- + drivers/mtd/nand/cafe_nand.c | 10 +- + drivers/mtd/nand/davinci_nand.c | 16 +- + drivers/mtd/nand/denali_dt.c | 18 +- + drivers/mtd/nand/docg4.c | 13 +- + drivers/mtd/nand/fsmc_nand.c | 13 +- + drivers/mtd/nand/gpio.c | 8 +- + drivers/mtd/nand/h1910.c | 167 --- + drivers/mtd/nand/lpc32xx_mlc.c | 4 +- + drivers/mtd/nand/nand_base.c | 233 ++-- + drivers/mtd/nand/nand_bbt.c | 25 - + drivers/mtd/nand/nand_ids.c | 242 ++-- + drivers/mtd/nand/nandsim.c | 24 +- + drivers/mtd/nand/nuc900_nand.c | 9 - + drivers/mtd/nand/omap2.c | 9 +- + drivers/mtd/nand/orion_nand.c | 13 +- + drivers/mtd/nand/ppchameleonevb.c | 403 ------- + drivers/mtd/nand/pxa3xx_nand.c | 2 +- + drivers/mtd/nand/rtc_from4.c | 624 ----------- + drivers/mtd/nand/sh_flctl.c | 16 +- + drivers/mtd/nand/sm_common.c | 62 +- + drivers/mtd/nand/txx9ndfmc.c | 13 +- + drivers/mtd/ofpart.c | 7 +- + drivers/mtd/onenand/Kconfig | 7 - + drivers/mtd/onenand/Makefile | 3 - + drivers/mtd/onenand/omap2.c | 14 +- + drivers/mtd/onenand/onenand_sim.c | 564 ---------- + drivers/ssb/driver_mipscore.c | 2 +- + include/linux/mtd/mtd.h | 8 +- + include/linux/mtd/nand.h | 121 +- + include/linux/mtd/physmap.h | 2 +- + include/linux/mtd/plat-ram.h | 4 +- + include/linux/platform_data/elm.h | 2 +- + 89 files changed, 602 insertions(+), 8136 deletions(-) + delete mode 100644 drivers/mtd/devices/doc2000.c + delete mode 100644 drivers/mtd/devices/doc2001.c + delete mode 100644 drivers/mtd/devices/doc2001plus.c + delete mode 100644 drivers/mtd/devices/docecc.c + delete mode 100644 drivers/mtd/devices/docprobe.c + delete mode 100644 drivers/mtd/maps/dbox2-flash.c + delete mode 100644 drivers/mtd/maps/dilnetpc.c + delete mode 100644 drivers/mtd/maps/dmv182.c + delete mode 100644 drivers/mtd/maps/h720x-flash.c + delete mode 100644 drivers/mtd/maps/ixp2000.c + delete mode 100644 drivers/mtd/maps/mbx860.c + delete mode 100644 drivers/mtd/maps/rpxlite.c + delete mode 100644 drivers/mtd/maps/tqm8xxl.c + delete mode 100644 drivers/mtd/nand/h1910.c + delete mode 100644 drivers/mtd/nand/ppchameleonevb.c + delete mode 100644 drivers/mtd/nand/rtc_from4.c + delete mode 100644 drivers/mtd/onenand/onenand_sim.c +Merging l2-mtd/master (98927a2 mtd: get the ECC info from the parameter page for ONFI nand) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/nand_base.c | 5 +++++ + include/linux/mtd/nand.h | 7 ++++++- + 2 files changed, 11 insertions(+), 1 deletion(-) +Merging crypto/master (3862de1 crypto: caam - fix job ring cleanup code) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (f49e725 drm/nouveau: fix build with nv50->nvc0) +$ git merge drm/drm-next +Removing include/video/omap-panel-tfp410.h +Removing include/video/omap-panel-picodlp.h +Removing include/video/omap-panel-nokia-dsi.h +Removing include/video/omap-panel-n8x0.h +Removing include/video/omap-panel-generic-dpi.h +Auto-merging include/linux/scatterlist.h +Auto-merging include/drm/drmP.h +Auto-merging drivers/video/omap2/omapfb/omapfb-main.c +Auto-merging drivers/video/fbmem.c +Auto-merging drivers/video/Kconfig +Auto-merging drivers/gpu/host1x/drm/hdmi.c +Auto-merging drivers/gpu/host1x/drm/drm.h +Auto-merging drivers/gpu/host1x/drm/dc.c +Auto-merging drivers/gpu/host1x/drm/Kconfig +Auto-merging drivers/gpu/drm/tilcdc/tilcdc_panel.c +Removing drivers/gpu/drm/tegra/host1x.c +Removing drivers/gpu/drm/tegra/fb.c +Removing drivers/gpu/drm/tegra/drm.c +Removing drivers/gpu/drm/tegra/Makefile +Auto-merging drivers/gpu/drm/nouveau/nv50_display.c +Removing drivers/gpu/drm/nouveau/nouveau_irq.h +Removing drivers/gpu/drm/nouveau/nouveau_irq.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/tvnv04.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/hw.h +Auto-merging drivers/gpu/drm/nouveau/dispnv04/hw.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/disp.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/dfp.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/dac.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/cursor.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/crtc.c +Auto-merging drivers/gpu/drm/nouveau/dispnv04/arb.c +Auto-merging drivers/gpu/drm/nouveau/core/include/engine/device.h +Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nve0.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nvc0.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv50.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv40.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv30.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv20.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv10.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/device/nv04.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/device/base.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_mode.c +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/drm_modes.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging arch/arm/mach-omap2/board-omap3beagle.c +Auto-merging arch/arm/mach-omap2/board-h4.c +Auto-merging arch/arm/mach-omap2/board-2430sdp.c +Removing Documentation/devicetree/bindings/drm/exynos/g2d.txt +Merge made by the 'recursive' strategy. + Documentation/EDID/1600x1200.S | 44 + + Documentation/EDID/HOWTO.txt | 12 +- + .../devicetree/bindings/drm/exynos/g2d.txt | 22 - + arch/arm/mach-omap2/board-2430sdp.c | 2 +- + arch/arm/mach-omap2/board-3430sdp.c | 2 +- + arch/arm/mach-omap2/board-am3517evm.c | 3 +- + arch/arm/mach-omap2/board-cm-t35.c | 3 +- + arch/arm/mach-omap2/board-devkit8000.c | 3 +- + arch/arm/mach-omap2/board-h4.c | 2 +- + arch/arm/mach-omap2/board-igep0020.c | 2 +- + arch/arm/mach-omap2/board-ldp.c | 2 +- + arch/arm/mach-omap2/board-omap3beagle.c | 2 +- + arch/arm/mach-omap2/board-omap3evm.c | 2 +- + arch/arm/mach-omap2/board-omap3stalker.c | 3 +- + arch/arm/mach-omap2/board-overo.c | 3 +- + arch/arm/mach-omap2/dss-common.c | 4 +- + drivers/gpu/Makefile | 1 + + drivers/gpu/drm/Kconfig | 4 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/drm_cache.c | 7 +- + drivers/gpu/drm/drm_crtc.c | 411 ++---- + drivers/gpu/drm/drm_crtc_helper.c | 3 + + drivers/gpu/drm/drm_drv.c | 9 +- + drivers/gpu/drm/drm_edid.c | 279 +++- + drivers/gpu/drm/drm_edid_load.c | 21 +- + drivers/gpu/drm/drm_fb_helper.c | 23 +- + drivers/gpu/drm/drm_gem.c | 4 +- + drivers/gpu/drm/drm_modes.c | 22 +- + drivers/gpu/drm/drm_pci.c | 10 +- + drivers/gpu/drm/drm_prime.c | 99 +- + drivers/gpu/drm/drm_vm.c | 1 + + drivers/gpu/drm/exynos/Kconfig | 6 +- + drivers/gpu/drm/exynos/exynos_drm_connector.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 9 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 12 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 273 ++-- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 39 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 54 +- + drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 3 - + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 27 + + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 712 ++++----- + drivers/gpu/drm/exynos/exynos_mixer.c | 22 +- + drivers/gpu/drm/exynos/regs-fimc.h | 7 +- + drivers/gpu/drm/gma500/Kconfig | 13 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 1 + + drivers/gpu/drm/gma500/framebuffer.c | 6 +- + drivers/gpu/drm/gma500/gtt.c | 52 +- + drivers/gpu/drm/gma500/gtt.h | 2 +- + drivers/gpu/drm/gma500/intel_bios.c | 3 +- + drivers/gpu/drm/gma500/intel_bios.h | 6 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 7 +- + drivers/gpu/drm/gma500/power.c | 17 + + drivers/gpu/drm/gma500/power.h | 3 + + drivers/gpu/drm/gma500/psb_drv.c | 3 + + drivers/gpu/drm/gma500/psb_drv.h | 1 - + drivers/gpu/drm/gma500/psb_intel_display.c | 154 +- + drivers/gpu/drm/gma500/psb_intel_display.h | 3 - + drivers/gpu/drm/gma500/psb_intel_drv.h | 8 - + drivers/gpu/drm/gma500/psb_intel_reg.h | 1 - + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 33 + + drivers/gpu/drm/gma500/psb_irq.c | 2 +- + drivers/gpu/drm/gma500/psb_irq.h | 6 +- + drivers/gpu/drm/i915/i915_debugfs.c | 433 ++---- + drivers/gpu/drm/i915/i915_dma.c | 90 +- + drivers/gpu/drm/i915/i915_drv.c | 206 ++- + drivers/gpu/drm/i915/i915_drv.h | 94 +- + drivers/gpu/drm/i915/i915_gem.c | 135 +- + drivers/gpu/drm/i915/i915_gem_context.c | 7 + + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 18 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 36 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 262 ++-- + drivers/gpu/drm/i915/i915_gem_stolen.c | 65 + + drivers/gpu/drm/i915/i915_gem_tiling.c | 33 +- + drivers/gpu/drm/i915/i915_irq.c | 659 ++++++--- + drivers/gpu/drm/i915/i915_reg.h | 293 +++- + drivers/gpu/drm/i915/i915_suspend.c | 15 +- + drivers/gpu/drm/i915/i915_sysfs.c | 27 +- + drivers/gpu/drm/i915/intel_bios.c | 9 +- + drivers/gpu/drm/i915/intel_bios.h | 4 +- + drivers/gpu/drm/i915/intel_crt.c | 22 +- + drivers/gpu/drm/i915/intel_ddi.c | 70 +- + drivers/gpu/drm/i915/intel_display.c | 1543 +++++++++++--------- + drivers/gpu/drm/i915/intel_dp.c | 526 ++++--- + drivers/gpu/drm/i915/intel_drv.h | 155 +- + drivers/gpu/drm/i915/intel_dvo.c | 13 +- + drivers/gpu/drm/i915/intel_fb.c | 8 +- + drivers/gpu/drm/i915/intel_hdmi.c | 166 ++- + drivers/gpu/drm/i915/intel_i2c.c | 4 +- + drivers/gpu/drm/i915/intel_lvds.c | 49 +- + drivers/gpu/drm/i915/intel_panel.c | 49 +- + drivers/gpu/drm/i915/intel_pm.c | 245 +++- + drivers/gpu/drm/i915/intel_sdvo.c | 131 +- + drivers/gpu/drm/i915/intel_sprite.c | 243 ++- + drivers/gpu/drm/i915/intel_tv.c | 16 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 6 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 12 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 31 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 7 +- + drivers/gpu/drm/nouveau/Makefile | 26 +- + drivers/gpu/drm/nouveau/core/core/client.c | 7 +- + drivers/gpu/drm/nouveau/core/core/engine.c | 4 +- + drivers/gpu/drm/nouveau/core/core/event.c | 12 +- + drivers/gpu/drm/nouveau/core/core/object.c | 19 +- + drivers/gpu/drm/nouveau/core/core/parent.c | 8 +- + .../nouveau/core/{subdev => engine}/device/base.c | 186 +-- + .../nouveau/core/{subdev => engine}/device/nv04.c | 2 +- + .../nouveau/core/{subdev => engine}/device/nv10.c | 2 +- + .../nouveau/core/{subdev => engine}/device/nv20.c | 2 +- + .../nouveau/core/{subdev => engine}/device/nv30.c | 2 +- + .../nouveau/core/{subdev => engine}/device/nv40.c | 2 +- + .../nouveau/core/{subdev => engine}/device/nv50.c | 20 +- + .../nouveau/core/{subdev => engine}/device/nvc0.c | 30 +- + .../nouveau/core/{subdev => engine}/device/nve0.c | 36 +- + drivers/gpu/drm/nouveau/core/engine/disp/dport.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 5 +- + drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 3 +- + drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c | 89 ++ + drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c | 3 + + drivers/gpu/drm/nouveau/core/engine/fifo/base.c | 7 + + drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c | 18 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c | 22 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c | 9 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 7 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvc0.c | 51 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnve0.c | 13 +- + .../drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc | 5 + + .../drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc | 3 + + drivers/gpu/drm/nouveau/core/engine/graph/nv20.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv25.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv2a.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv30.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv34.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv35.c | 2 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv40.c | 10 + + drivers/gpu/drm/nouveau/core/engine/graph/nv50.c | 10 + + drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | 31 +- + drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h | 3 + + drivers/gpu/drm/nouveau/core/engine/graph/nve0.c | 230 ++- + .../gpu/drm/nouveau/core/engine/software/nvc0.c | 29 + + drivers/gpu/drm/nouveau/core/include/core/class.h | 12 + + drivers/gpu/drm/nouveau/core/include/core/device.h | 6 +- + drivers/gpu/drm/nouveau/core/include/core/parent.h | 4 +- + .../core/include/{subdev => engine}/device.h | 1 - + drivers/gpu/drm/nouveau/core/include/engine/disp.h | 1 + + drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 3 +- + .../gpu/drm/nouveau/core/include/engine/graph.h | 4 + + drivers/gpu/drm/nouveau/core/include/subdev/ltcg.h | 7 + + drivers/gpu/drm/nouveau/core/include/subdev/mc.h | 30 +- + .../gpu/drm/nouveau/core/include/subdev/therm.h | 1 + + drivers/gpu/drm/nouveau/core/os.h | 1 + + drivers/gpu/drm/nouveau/core/subdev/bar/nv50.c | 22 +- + drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c | 14 +- + drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 56 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c | 72 +- + drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | 6 +- + drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c | 20 +- + drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h | 1 - + drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c | 12 +- + drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c | 129 +- + drivers/gpu/drm/nouveau/core/subdev/mc/base.c | 60 +- + drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c | 1 - + drivers/gpu/drm/nouveau/core/subdev/mc/nv44.c | 1 - + drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c | 1 - + drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c | 1 - + drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c | 1 - + drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c | 175 +-- + drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c | 221 +++ + drivers/gpu/drm/nouveau/core/subdev/therm/nva3.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/therm/priv.h | 3 +- + drivers/gpu/drm/nouveau/core/subdev/therm/temp.c | 14 +- + drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c | 13 +- + drivers/gpu/drm/nouveau/core/subdev/vm/nv04.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/vm/nvc0.c | 58 +- + drivers/gpu/drm/nouveau/dispnv04/Makefile | 10 + + .../drm/nouveau/{nouveau_calc.c => dispnv04/arb.c} | 2 +- + .../drm/nouveau/{nv04_crtc.c => dispnv04/crtc.c} | 5 +- + .../nouveau/{nv04_cursor.c => dispnv04/cursor.c} | 3 +- + .../gpu/drm/nouveau/{nv04_dac.c => dispnv04/dac.c} | 2 +- + .../gpu/drm/nouveau/{nv04_dfp.c => dispnv04/dfp.c} | 2 +- + .../nouveau/{nv04_display.c => dispnv04/disp.c} | 2 +- + .../nouveau/{nv04_display.h => dispnv04/disp.h} | 0 + .../drm/nouveau/{nouveau_hw.c => dispnv04/hw.c} | 2 +- + .../drm/nouveau/{nouveau_hw.h => dispnv04/hw.h} | 3 +- + drivers/gpu/drm/nouveau/{ => dispnv04}/nvreg.h | 0 + .../{nv17_tv_modes.c => dispnv04/tvmodesnv17.c} | 4 +- + .../drm/nouveau/{nv04_tv.c => dispnv04/tvnv04.c} | 2 +- + .../drm/nouveau/{nv17_tv.c => dispnv04/tvnv17.c} | 4 +- + .../drm/nouveau/{nv17_tv.h => dispnv04/tvnv17.h} | 0 + drivers/gpu/drm/nouveau/nouveau_abi16.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 3 + + drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.h | 2 - + drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 26 +- + drivers/gpu/drm/nouveau/nouveau_drm.h | 13 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_irq.c | 76 - + drivers/gpu/drm/nouveau/nouveau_irq.h | 11 - + drivers/gpu/drm/nouveau/nouveau_ttm.c | 25 +- + drivers/gpu/drm/nouveau/nv04_pm.c | 2 +- + drivers/gpu/drm/nouveau/nv40_pm.c | 2 +- + drivers/gpu/drm/nouveau/nv50_display.c | 1 + + drivers/gpu/drm/nouveau/nv50_pm.c | 2 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 27 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 21 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 165 ++- + drivers/gpu/drm/omapdrm/omap_drv.h | 38 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 24 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 17 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 6 + + drivers/gpu/drm/qxl/Kconfig | 10 + + drivers/gpu/drm/qxl/Makefile | 9 + + drivers/gpu/drm/qxl/qxl_cmd.c | 690 +++++++++ + drivers/gpu/drm/qxl/qxl_debugfs.c | 141 ++ + drivers/gpu/drm/qxl/qxl_dev.h | 879 +++++++++++ + drivers/gpu/drm/qxl/qxl_display.c | 982 +++++++++++++ + drivers/gpu/drm/qxl/qxl_draw.c | 390 +++++ + drivers/gpu/drm/qxl/qxl_drv.c | 145 ++ + drivers/gpu/drm/qxl/qxl_drv.h | 566 +++++++ + drivers/gpu/drm/qxl/qxl_dumb.c | 93 ++ + drivers/gpu/drm/qxl/qxl_fb.c | 567 +++++++ + drivers/gpu/drm/qxl/qxl_fence.c | 97 ++ + drivers/gpu/drm/qxl/qxl_gem.c | 149 ++ + drivers/gpu/drm/qxl/qxl_image.c | 176 +++ + drivers/gpu/drm/qxl/qxl_ioctl.c | 411 ++++++ + drivers/gpu/drm/qxl/qxl_irq.c | 97 ++ + drivers/gpu/drm/qxl/qxl_kms.c | 302 ++++ + drivers/gpu/drm/qxl/qxl_object.c | 365 +++++ + drivers/gpu/drm/qxl/qxl_object.h | 112 ++ + drivers/gpu/drm/qxl/qxl_release.c | 307 ++++ + drivers/gpu/drm/qxl/qxl_ttm.c | 581 ++++++++ + drivers/gpu/drm/radeon/Makefile | 2 +- + drivers/gpu/drm/radeon/atombios.h | 2 + + drivers/gpu/drm/radeon/atombios_crtc.c | 3 + + drivers/gpu/drm/radeon/atombios_encoders.c | 17 +- + drivers/gpu/drm/radeon/evergreen.c | 1268 +++++++++++++++- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 169 ++- + drivers/gpu/drm/radeon/evergreen_reg.h | 2 + + drivers/gpu/drm/radeon/evergreend.h | 48 + + drivers/gpu/drm/radeon/ni.c | 408 +++++- + drivers/gpu/drm/radeon/nid.h | 21 + + drivers/gpu/drm/radeon/r100.c | 77 +- + drivers/gpu/drm/radeon/r500_reg.h | 2 + + drivers/gpu/drm/radeon/r600.c | 404 ++++- + drivers/gpu/drm/radeon/r600_audio.c | 64 +- + drivers/gpu/drm/radeon/r600_hdmi.c | 150 +- + drivers/gpu/drm/radeon/r600d.h | 68 +- + drivers/gpu/drm/radeon/radeon.h | 78 +- + drivers/gpu/drm/radeon/radeon_asic.c | 100 +- + drivers/gpu/drm/radeon/radeon_asic.h | 28 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 105 ++ + drivers/gpu/drm/radeon/radeon_cs.c | 83 +- + drivers/gpu/drm/radeon/radeon_device.c | 51 +- + drivers/gpu/drm/radeon/radeon_drv.c | 9 +- + drivers/gpu/drm/radeon/radeon_fence.c | 22 +- + drivers/gpu/drm/radeon/radeon_kms.c | 187 ++- + drivers/gpu/drm/radeon/radeon_mode.h | 23 + + drivers/gpu/drm/radeon/radeon_object.c | 16 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_pm.c | 6 +- + drivers/gpu/drm/radeon/radeon_ring.c | 27 +- + drivers/gpu/drm/radeon/radeon_test.c | 72 +- + drivers/gpu/drm/radeon/radeon_uvd.c | 694 +++++++++ + drivers/gpu/drm/radeon/rs600.c | 52 +- + drivers/gpu/drm/radeon/rs690.c | 23 + + drivers/gpu/drm/radeon/rs690d.h | 3 + + drivers/gpu/drm/radeon/rv515.c | 56 +- + drivers/gpu/drm/radeon/rv770.c | 985 ++++++++++++- + drivers/gpu/drm/radeon/rv770d.h | 43 + + drivers/gpu/drm/radeon/si.c | 1061 +++++++++++++- + drivers/gpu/drm/radeon/sid.h | 40 + + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- + drivers/gpu/drm/tegra/Makefile | 7 - + drivers/gpu/drm/tegra/drm.c | 217 --- + drivers/gpu/drm/tegra/fb.c | 52 - + drivers/gpu/drm/tegra/host1x.c | 327 ----- + drivers/gpu/drm/tilcdc/Makefile | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 9 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_slave.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 - + drivers/gpu/drm/ttm/ttm_bo_util.c | 13 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +- + drivers/gpu/drm/udl/udl_fb.c | 2 +- + drivers/gpu/drm/udl/udl_gem.c | 4 + + drivers/gpu/host1x/Kconfig | 24 + + drivers/gpu/host1x/Makefile | 20 + + drivers/gpu/host1x/cdma.c | 491 +++++++ + drivers/gpu/host1x/cdma.h | 100 ++ + drivers/gpu/host1x/channel.c | 126 ++ + drivers/gpu/host1x/channel.h | 52 + + drivers/gpu/host1x/debug.c | 210 +++ + drivers/gpu/host1x/debug.h | 51 + + drivers/gpu/host1x/dev.c | 246 ++++ + drivers/gpu/host1x/dev.h | 308 ++++ + drivers/gpu/{drm/tegra => host1x/drm}/Kconfig | 20 +- + drivers/gpu/{drm/tegra => host1x/drm}/dc.c | 31 +- + drivers/gpu/{drm/tegra => host1x/drm}/dc.h | 0 + drivers/gpu/host1x/drm/drm.c | 640 ++++++++ + drivers/gpu/{drm/tegra => host1x/drm}/drm.h | 68 +- + drivers/gpu/host1x/drm/fb.c | 374 +++++ + drivers/gpu/host1x/drm/gem.c | 270 ++++ + drivers/gpu/host1x/drm/gem.h | 59 + + drivers/gpu/host1x/drm/gr2d.c | 339 +++++ + drivers/gpu/{drm/tegra => host1x/drm}/hdmi.c | 5 +- + drivers/gpu/{drm/tegra => host1x/drm}/hdmi.h | 0 + drivers/gpu/{drm/tegra => host1x/drm}/output.c | 0 + drivers/gpu/{drm/tegra => host1x/drm}/rgb.c | 0 + drivers/gpu/host1x/host1x.h | 30 + + drivers/gpu/host1x/host1x_bo.h | 87 ++ + drivers/gpu/host1x/host1x_client.h | 35 + + drivers/gpu/host1x/hw/Makefile | 6 + + drivers/gpu/host1x/hw/cdma_hw.c | 326 +++++ + drivers/gpu/host1x/hw/channel_hw.c | 168 +++ + drivers/gpu/host1x/hw/debug_hw.c | 322 ++++ + drivers/gpu/host1x/hw/host1x01.c | 42 + + drivers/gpu/host1x/hw/host1x01.h | 25 + + drivers/gpu/host1x/hw/host1x01_hardware.h | 143 ++ + drivers/gpu/host1x/hw/hw_host1x01_channel.h | 120 ++ + drivers/gpu/host1x/hw/hw_host1x01_sync.h | 243 +++ + drivers/gpu/host1x/hw/hw_host1x01_uclass.h | 174 +++ + drivers/gpu/host1x/hw/intr_hw.c | 143 ++ + drivers/gpu/host1x/hw/syncpt_hw.c | 114 ++ + drivers/gpu/host1x/intr.c | 354 +++++ + drivers/gpu/host1x/intr.h | 102 ++ + drivers/gpu/host1x/job.c | 603 ++++++++ + drivers/gpu/host1x/job.h | 162 ++ + drivers/gpu/host1x/syncpt.c | 387 +++++ + drivers/gpu/host1x/syncpt.h | 165 +++ + drivers/video/Kconfig | 2 + + drivers/video/console/fbcon.c | 2 + + drivers/video/fbmem.c | 7 + + drivers/video/hdmi.c | 21 +- + drivers/video/omap2/displays/panel-acx565akm.c | 59 +- + drivers/video/omap2/displays/panel-generic-dpi.c | 39 +- + .../omap2/displays/panel-lgphilips-lb035q02.c | 58 +- + drivers/video/omap2/displays/panel-n8x0.c | 95 +- + .../omap2/displays/panel-nec-nl8048hl11-01b.c | 135 +- + drivers/video/omap2/displays/panel-picodlp.c | 49 +- + .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 126 +- + drivers/video/omap2/displays/panel-taal.c | 300 +--- + drivers/video/omap2/displays/panel-tfp410.c | 2 +- + .../video/omap2/displays/panel-tpo-td043mtea1.c | 45 +- + drivers/video/omap2/dss/apply.c | 15 +- + drivers/video/omap2/dss/core.c | 5 +- + drivers/video/omap2/dss/dispc.c | 176 ++- + drivers/video/omap2/dss/dispc.h | 1 + + drivers/video/omap2/dss/dpi.c | 316 +++- + drivers/video/omap2/dss/dsi.c | 1221 ++++++++++------ + drivers/video/omap2/dss/dss.c | 181 +-- + drivers/video/omap2/dss/dss.h | 36 +- + drivers/video/omap2/dss/dss_features.c | 8 +- + drivers/video/omap2/dss/hdmi.c | 35 +- + drivers/video/omap2/dss/output.c | 1 + + drivers/video/omap2/dss/rfbi.c | 2 + + drivers/video/omap2/dss/sdi.c | 70 +- + drivers/video/omap2/dss/venc.c | 23 +- + drivers/video/omap2/omapfb/omapfb-main.c | 2 +- + include/drm/drmP.h | 5 +- + include/drm/drm_crtc.h | 23 +- + include/drm/drm_edid.h | 9 + + include/drm/drm_fb_helper.h | 10 +- + include/drm/ttm/ttm_bo_driver.h | 4 + + include/linux/fb.h | 2 + + include/linux/pm.h | 13 + + include/linux/scatterlist.h | 28 +- + include/trace/events/host1x.h | 253 ++++ + include/uapi/drm/Kbuild | 2 + + include/uapi/drm/drm.h | 6 +- + include/uapi/drm/drm_mode.h | 6 +- + include/uapi/drm/qxl_drm.h | 152 ++ + include/uapi/drm/radeon_drm.h | 26 + + include/uapi/drm/tegra_drm.h | 136 ++ + include/video/omap-panel-data.h | 150 ++ + include/video/omap-panel-generic-dpi.h | 37 - + include/video/omap-panel-n8x0.h | 15 - + include/video/omap-panel-nokia-dsi.h | 32 - + include/video/omap-panel-picodlp.h | 23 - + include/video/omap-panel-tfp410.h | 35 - + include/video/omapdss.h | 86 +- + kernel/power/console.c | 116 ++ + lib/scatterlist.c | 4 +- + 392 files changed, 29001 insertions(+), 7170 deletions(-) + create mode 100644 Documentation/EDID/1600x1200.S + delete mode 100644 Documentation/devicetree/bindings/drm/exynos/g2d.txt + rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/base.c (89%) + rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv04.c (99%) + rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv10.c (99%) + rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv20.c (99%) + rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv30.c (99%) + rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv40.c (99%) + rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nv50.c (97%) + rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nvc0.c (90%) + rename drivers/gpu/drm/nouveau/core/{subdev => engine}/device/nve0.c (79%) + create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c + rename drivers/gpu/drm/nouveau/core/include/{subdev => engine}/device.h (93%) + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv04/Makefile + rename drivers/gpu/drm/nouveau/{nouveau_calc.c => dispnv04/arb.c} (99%) + rename drivers/gpu/drm/nouveau/{nv04_crtc.c => dispnv04/crtc.c} (99%) + rename drivers/gpu/drm/nouveau/{nv04_cursor.c => dispnv04/cursor.c} (98%) + rename drivers/gpu/drm/nouveau/{nv04_dac.c => dispnv04/dac.c} (99%) + rename drivers/gpu/drm/nouveau/{nv04_dfp.c => dispnv04/dfp.c} (99%) + rename drivers/gpu/drm/nouveau/{nv04_display.c => dispnv04/disp.c} (99%) + rename drivers/gpu/drm/nouveau/{nv04_display.h => dispnv04/disp.h} (100%) + rename drivers/gpu/drm/nouveau/{nouveau_hw.c => dispnv04/hw.c} (99%) + rename drivers/gpu/drm/nouveau/{nouveau_hw.h => dispnv04/hw.h} (99%) + rename drivers/gpu/drm/nouveau/{ => dispnv04}/nvreg.h (100%) + rename drivers/gpu/drm/nouveau/{nv17_tv_modes.c => dispnv04/tvmodesnv17.c} (99%) + rename drivers/gpu/drm/nouveau/{nv04_tv.c => dispnv04/tvnv04.c} (99%) + rename drivers/gpu/drm/nouveau/{nv17_tv.c => dispnv04/tvnv17.c} (99%) + rename drivers/gpu/drm/nouveau/{nv17_tv.h => dispnv04/tvnv17.h} (100%) + delete mode 100644 drivers/gpu/drm/nouveau/nouveau_irq.c + delete mode 100644 drivers/gpu/drm/nouveau/nouveau_irq.h + create mode 100644 drivers/gpu/drm/qxl/Kconfig + create mode 100644 drivers/gpu/drm/qxl/Makefile + create mode 100644 drivers/gpu/drm/qxl/qxl_cmd.c + create mode 100644 drivers/gpu/drm/qxl/qxl_debugfs.c + create mode 100644 drivers/gpu/drm/qxl/qxl_dev.h + create mode 100644 drivers/gpu/drm/qxl/qxl_display.c + create mode 100644 drivers/gpu/drm/qxl/qxl_draw.c + create mode 100644 drivers/gpu/drm/qxl/qxl_drv.c + create mode 100644 drivers/gpu/drm/qxl/qxl_drv.h + create mode 100644 drivers/gpu/drm/qxl/qxl_dumb.c + create mode 100644 drivers/gpu/drm/qxl/qxl_fb.c + create mode 100644 drivers/gpu/drm/qxl/qxl_fence.c + create mode 100644 drivers/gpu/drm/qxl/qxl_gem.c + create mode 100644 drivers/gpu/drm/qxl/qxl_image.c + create mode 100644 drivers/gpu/drm/qxl/qxl_ioctl.c + create mode 100644 drivers/gpu/drm/qxl/qxl_irq.c + create mode 100644 drivers/gpu/drm/qxl/qxl_kms.c + create mode 100644 drivers/gpu/drm/qxl/qxl_object.c + create mode 100644 drivers/gpu/drm/qxl/qxl_object.h + create mode 100644 drivers/gpu/drm/qxl/qxl_release.c + create mode 100644 drivers/gpu/drm/qxl/qxl_ttm.c + create mode 100644 drivers/gpu/drm/radeon/radeon_uvd.c + delete mode 100644 drivers/gpu/drm/tegra/Makefile + delete mode 100644 drivers/gpu/drm/tegra/drm.c + delete mode 100644 drivers/gpu/drm/tegra/fb.c + delete mode 100644 drivers/gpu/drm/tegra/host1x.c + create mode 100644 drivers/gpu/host1x/Kconfig + create mode 100644 drivers/gpu/host1x/Makefile + create mode 100644 drivers/gpu/host1x/cdma.c + create mode 100644 drivers/gpu/host1x/cdma.h + create mode 100644 drivers/gpu/host1x/channel.c + create mode 100644 drivers/gpu/host1x/channel.h + create mode 100644 drivers/gpu/host1x/debug.c + create mode 100644 drivers/gpu/host1x/debug.h + create mode 100644 drivers/gpu/host1x/dev.c + create mode 100644 drivers/gpu/host1x/dev.h + rename drivers/gpu/{drm/tegra => host1x/drm}/Kconfig (53%) + rename drivers/gpu/{drm/tegra => host1x/drm}/dc.c (97%) + rename drivers/gpu/{drm/tegra => host1x/drm}/dc.h (100%) + create mode 100644 drivers/gpu/host1x/drm/drm.c + rename drivers/gpu/{drm/tegra => host1x/drm}/drm.h (77%) + create mode 100644 drivers/gpu/host1x/drm/fb.c + create mode 100644 drivers/gpu/host1x/drm/gem.c + create mode 100644 drivers/gpu/host1x/drm/gem.h + create mode 100644 drivers/gpu/host1x/drm/gr2d.c + rename drivers/gpu/{drm/tegra => host1x/drm}/hdmi.c (99%) + rename drivers/gpu/{drm/tegra => host1x/drm}/hdmi.h (100%) + rename drivers/gpu/{drm/tegra => host1x/drm}/output.c (100%) + rename drivers/gpu/{drm/tegra => host1x/drm}/rgb.c (100%) + create mode 100644 drivers/gpu/host1x/host1x.h + create mode 100644 drivers/gpu/host1x/host1x_bo.h + create mode 100644 drivers/gpu/host1x/host1x_client.h + create mode 100644 drivers/gpu/host1x/hw/Makefile + create mode 100644 drivers/gpu/host1x/hw/cdma_hw.c + create mode 100644 drivers/gpu/host1x/hw/channel_hw.c + create mode 100644 drivers/gpu/host1x/hw/debug_hw.c + create mode 100644 drivers/gpu/host1x/hw/host1x01.c + create mode 100644 drivers/gpu/host1x/hw/host1x01.h + create mode 100644 drivers/gpu/host1x/hw/host1x01_hardware.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x01_channel.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x01_sync.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x01_uclass.h + create mode 100644 drivers/gpu/host1x/hw/intr_hw.c + create mode 100644 drivers/gpu/host1x/hw/syncpt_hw.c + create mode 100644 drivers/gpu/host1x/intr.c + create mode 100644 drivers/gpu/host1x/intr.h + create mode 100644 drivers/gpu/host1x/job.c + create mode 100644 drivers/gpu/host1x/job.h + create mode 100644 drivers/gpu/host1x/syncpt.c + create mode 100644 drivers/gpu/host1x/syncpt.h + create mode 100644 include/trace/events/host1x.h + create mode 100644 include/uapi/drm/qxl_drm.h + create mode 100644 include/uapi/drm/tegra_drm.h + create mode 100644 include/video/omap-panel-data.h + delete mode 100644 include/video/omap-panel-generic-dpi.h + delete mode 100644 include/video/omap-panel-n8x0.h + delete mode 100644 include/video/omap-panel-nokia-dsi.h + delete mode 100644 include/video/omap-panel-picodlp.h + delete mode 100644 include/video/omap-panel-tfp410.h +Merging drm-intel/drm-intel-next-queued (17aa6be drm/i915: simplify DP/DDI port width macros) +$ git merge drm-intel/drm-intel-next-queued +Resolved 'drivers/gpu/drm/i915/i915_reg.h' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_opregion.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 31fc888] Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 2 + + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/drm_rect.c | 295 ++++++++ + drivers/gpu/drm/i915/i915_debugfs.c | 70 +- + drivers/gpu/drm/i915/i915_dma.c | 19 +- + drivers/gpu/drm/i915/i915_drv.c | 8 +- + drivers/gpu/drm/i915/i915_drv.h | 129 ++-- + drivers/gpu/drm/i915/i915_gem_context.c | 28 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 87 ++- + drivers/gpu/drm/i915/i915_gem_stolen.c | 1 + + drivers/gpu/drm/i915/i915_irq.c | 437 ++++++++++-- + drivers/gpu/drm/i915/i915_reg.h | 189 ++++- + drivers/gpu/drm/i915/i915_suspend.c | 10 + + drivers/gpu/drm/i915/i915_sysfs.c | 71 +- + drivers/gpu/drm/i915/intel_crt.c | 4 + + drivers/gpu/drm/i915/intel_ddi.c | 55 +- + drivers/gpu/drm/i915/intel_display.c | 1171 +++++++++++++++++++------------ + drivers/gpu/drm/i915/intel_dp.c | 278 +++++++- + drivers/gpu/drm/i915/intel_drv.h | 89 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 139 +++- + drivers/gpu/drm/i915/intel_lvds.c | 231 +----- + drivers/gpu/drm/i915/intel_opregion.c | 102 +-- + drivers/gpu/drm/i915/intel_panel.c | 296 +++++++- + drivers/gpu/drm/i915/intel_pm.c | 333 ++++++++- + drivers/gpu/drm/i915/intel_sprite.c | 213 ++++-- + include/drm/drm_rect.h | 160 +++++ + 26 files changed, 3252 insertions(+), 1168 deletions(-) + create mode 100644 drivers/gpu/drm/drm_rect.c + create mode 100644 include/drm/drm_rect.h +Merging sound/for-next (4ca231b ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_dispatch) +$ git merge sound/for-next +Resolved 'arch/arm/mach-s3c24xx/dma-s3c2410.c' using previous resolution. +Resolved 'arch/arm/mach-s3c24xx/dma-s3c2412.c' using previous resolution. +Resolved 'arch/arm/mach-s3c24xx/dma-s3c2440.c' using previous resolution. +Resolved 'arch/arm/mach-s3c24xx/dma-s3c2443.c' using previous resolution. +Auto-merging sound/soc/ux500/ux500_msp_i2s.h +Auto-merging sound/soc/ux500/ux500_msp_dai.c +Auto-merging sound/soc/ux500/Kconfig +Removing sound/soc/omap/omap-pcm.h +Auto-merging sound/soc/mxs/mxs-saif.c +Removing sound/soc/cirrus/ep93xx-pcm.h +Auto-merging sound/core/info.c +Removing include/sound/tegra_wm8903.h +Auto-merging include/sound/pcm.h +Auto-merging include/linux/mfd/arizona/registers.h +Auto-merging drivers/mfd/wm5102-tables.c +Auto-merging arch/arm/plat-samsung/devs.c +Auto-merging arch/arm/mach-s3c24xx/dma-s3c2443.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2443.c +Auto-merging arch/arm/mach-s3c24xx/dma-s3c2440.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2440.c +Auto-merging arch/arm/mach-s3c24xx/dma-s3c2412.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2412.c +Auto-merging arch/arm/mach-s3c24xx/dma-s3c2410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2410.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1b381e4] Merge remote-tracking branch 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/writing-an-alsa-driver.tmpl | 12 +- + Documentation/devicetree/bindings/sound/ak5386.txt | 19 + + .../bindings/sound/nvidia,tegra30-ahub.txt | 26 +- + .../devicetree/bindings/sound/ti,tas5086.txt | 32 + + Documentation/sound/alsa/HD-Audio.txt | 10 +- + arch/arm/mach-s3c24xx/dma-s3c2410.c | 2 - + arch/arm/mach-s3c24xx/dma-s3c2412.c | 2 - + arch/arm/mach-s3c24xx/dma-s3c2440.c | 2 - + arch/arm/mach-s3c24xx/dma-s3c2443.c | 2 - + arch/arm/plat-samsung/devs.c | 6 + + drivers/mfd/wm5102-tables.c | 10 + + include/linux/mfd/arizona/registers.h | 42 ++ + include/linux/mfd/wm8994/pdata.h | 8 + + include/linux/usb/audio-v2.h | 2 + + include/sound/compress_driver.h | 4 +- + include/sound/control.h | 5 +- + include/sound/core.h | 26 +- + include/sound/dmaengine_pcm.h | 97 ++- + include/sound/emu10k1.h | 1 + + include/sound/pcm.h | 31 +- + include/sound/soc-dai.h | 8 - + include/sound/soc-dapm.h | 1 - + include/sound/soc.h | 33 +- + include/sound/tas5086.h | 7 + + include/sound/tegra_wm8903.h | 26 - + include/uapi/sound/asound.h | 4 +- + sound/aoa/soundbus/i2sbus/pcm.c | 2 +- + sound/atmel/ac97c.c | 4 +- + sound/core/compress_offload.c | 128 ++-- + sound/core/control.c | 41 +- + sound/core/device.c | 8 +- + sound/core/hwdep.c | 2 +- + sound/core/info.c | 41 +- + sound/core/init.c | 16 +- + sound/core/isadma.c | 2 +- + sound/core/jack.c | 6 +- + sound/core/memalloc.c | 20 +- + sound/core/memory.c | 4 +- + sound/core/pcm.c | 8 +- + sound/core/pcm_lib.c | 54 +- + sound/core/pcm_memory.c | 19 +- + sound/core/pcm_misc.c | 36 +- + sound/core/pcm_native.c | 13 + + sound/core/rawmidi.c | 14 +- + sound/core/sound.c | 7 +- + sound/core/vmaster.c | 7 +- + sound/drivers/Kconfig | 2 +- + sound/drivers/aloop.c | 2 +- + sound/drivers/mpu401/mpu401_uart.c | 6 +- + sound/oss/dmabuf.c | 3 +- + sound/oss/sb_common.c | 3 +- + sound/oss/uart401.c | 11 +- + sound/pci/ac97/ac97_codec.c | 16 +- + sound/pci/ac97/ac97_pcm.c | 10 +- + sound/pci/ali5451/ali5451.c | 8 +- + sound/pci/asihpi/asihpi.c | 6 +- + sound/pci/emu10k1/emu10k1_main.c | 39 +- + sound/pci/hda/hda_auto_parser.c | 68 +- + sound/pci/hda/hda_auto_parser.h | 29 +- + sound/pci/hda/hda_beep.c | 39 +- + sound/pci/hda/hda_beep.h | 1 + + sound/pci/hda/hda_codec.c | 28 +- + sound/pci/hda/hda_codec.h | 3 + + sound/pci/hda/hda_generic.c | 433 +++++++++---- + sound/pci/hda/hda_generic.h | 30 +- + sound/pci/hda/hda_intel.c | 39 +- + sound/pci/hda/hda_jack.c | 43 +- + sound/pci/hda/hda_local.h | 4 + + sound/pci/hda/patch_analog.c | 33 +- + sound/pci/hda/patch_ca0132.c | 82 ++- + sound/pci/hda/patch_cirrus.c | 19 +- + sound/pci/hda/patch_conexant.c | 21 +- + sound/pci/hda/patch_hdmi.c | 236 ++++--- + sound/pci/hda/patch_realtek.c | 715 ++++++++++++++++++--- + sound/pci/hda/patch_sigmatel.c | 39 +- + sound/pci/hda/patch_via.c | 20 + + sound/pci/rme9652/hdspm.c | 382 +++++++---- + sound/soc/Kconfig | 4 + + sound/soc/Makefile | 4 + + sound/soc/atmel/atmel-pcm-dma.c | 29 +- + sound/soc/atmel/atmel_ssc_dai.c | 54 +- + sound/soc/au1x/ac97c.c | 9 +- + sound/soc/au1x/i2sc.c | 9 +- + sound/soc/au1x/psc-ac97.c | 9 +- + sound/soc/au1x/psc-i2s.c | 9 +- + sound/soc/blackfin/bf5xx-ac97.c | 9 +- + sound/soc/blackfin/bf5xx-i2s.c | 9 +- + sound/soc/blackfin/bf5xx-tdm.c | 9 +- + sound/soc/blackfin/bf6xx-i2s.c | 9 +- + sound/soc/cirrus/edb93xx.c | 1 - + sound/soc/cirrus/ep93xx-ac97.c | 18 +- + sound/soc/cirrus/ep93xx-i2s.c | 25 +- + sound/soc/cirrus/ep93xx-pcm.c | 38 +- + sound/soc/cirrus/ep93xx-pcm.h | 20 - + sound/soc/cirrus/simone.c | 2 - + sound/soc/cirrus/snappercl15.c | 1 - + sound/soc/codecs/Kconfig | 10 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/adau1373.c | 5 +- + sound/soc/codecs/ak4104.c | 55 +- + sound/soc/codecs/ak5386.c | 152 +++++ + sound/soc/codecs/arizona.c | 497 ++++++++++++-- + sound/soc/codecs/arizona.h | 31 +- + sound/soc/codecs/cs4271.c | 166 +++-- + sound/soc/codecs/cs42l73.c | 6 +- + sound/soc/codecs/max98088.c | 32 +- + sound/soc/codecs/max98090.c | 45 +- + sound/soc/codecs/si476x.c | 47 +- + sound/soc/codecs/tas5086.c | 591 +++++++++++++++++ + sound/soc/codecs/wm0010.c | 6 +- + sound/soc/codecs/wm2000.c | 4 +- + sound/soc/codecs/wm2000.h | 2 + + sound/soc/codecs/wm2200.c | 2 +- + sound/soc/codecs/wm5102.c | 121 ++-- + sound/soc/codecs/wm5102.h | 6 +- + sound/soc/codecs/wm5110.c | 46 +- + sound/soc/codecs/wm5110.h | 6 +- + sound/soc/codecs/wm8903.c | 4 + + sound/soc/codecs/wm8960.c | 10 + + sound/soc/codecs/wm8994.c | 68 +- + sound/soc/codecs/wm8994.h | 3 +- + sound/soc/codecs/wm_adsp.c | 124 +++- + sound/soc/codecs/wm_adsp.h | 5 +- + sound/soc/codecs/wm_hubs.c | 9 +- + sound/soc/davinci/davinci-i2s.c | 15 +- + sound/soc/davinci/davinci-mcasp.c | 110 +++- + sound/soc/davinci/davinci-mcasp.h | 2 +- + sound/soc/davinci/davinci-pcm.c | 9 +- + sound/soc/davinci/davinci-vcif.c | 11 +- + sound/soc/dwc/designware_i2s.c | 9 +- + sound/soc/fsl/Kconfig | 2 +- + sound/soc/fsl/fsl_ssi.c | 64 +- + sound/soc/fsl/fsl_ssi.h | 8 + + sound/soc/fsl/imx-audmux.c | 3 +- + sound/soc/fsl/imx-pcm-dma.c | 120 +--- + sound/soc/fsl/imx-pcm-fiq.c | 6 +- + sound/soc/fsl/imx-pcm.c | 6 +- + sound/soc/fsl/imx-pcm.h | 24 +- + sound/soc/fsl/imx-sgtl5000.c | 2 +- + sound/soc/fsl/imx-ssi.c | 62 +- + sound/soc/fsl/imx-ssi.h | 7 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 8 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 9 +- + sound/soc/jz4740/jz4740-i2s.c | 9 +- + sound/soc/kirkwood/kirkwood-i2s.c | 11 +- + sound/soc/mid-x86/sst_platform.c | 20 +- + sound/soc/mid-x86/sst_platform.h | 2 + + sound/soc/mxs/Kconfig | 2 +- + sound/soc/mxs/mxs-pcm.c | 176 +---- + sound/soc/mxs/mxs-pcm.h | 4 +- + sound/soc/mxs/mxs-saif.c | 20 +- + sound/soc/nuc900/nuc900-ac97.c | 9 +- + sound/soc/omap/am3517evm.c | 1 - + sound/soc/omap/ams-delta.c | 1 - + sound/soc/omap/mcbsp.c | 14 +- + sound/soc/omap/mcbsp.h | 7 +- + sound/soc/omap/n810.c | 1 - + sound/soc/omap/omap-abe-twl6040.c | 1 - + sound/soc/omap/omap-dmic.c | 47 +- + sound/soc/omap/omap-hdmi.c | 33 +- + sound/soc/omap/omap-mcbsp.c | 27 +- + sound/soc/omap/omap-mcpdm.c | 118 ++-- + sound/soc/omap/omap-pcm.c | 86 +-- + sound/soc/omap/omap-pcm.h | 40 -- + sound/soc/omap/omap-twl4030.c | 1 - + sound/soc/omap/omap3pandora.c | 9 +- + sound/soc/omap/osk5912.c | 1 - + sound/soc/omap/rx51.c | 1 - + sound/soc/pxa/mmp-pcm.c | 34 +- + sound/soc/pxa/mmp-sspa.c | 9 +- + sound/soc/pxa/pxa-ssp.c | 9 +- + sound/soc/pxa/pxa2xx-ac97.c | 11 +- + sound/soc/pxa/pxa2xx-i2s.c | 9 +- + sound/soc/s6000/s6000-i2s.c | 9 +- + sound/soc/samsung/Kconfig | 5 +- + sound/soc/samsung/ac97.c | 14 +- + sound/soc/samsung/goni_wm8994.c | 11 +- + sound/soc/samsung/h1940_uda1380.c | 2 +- + sound/soc/samsung/i2s.c | 16 +- + sound/soc/samsung/idma.c | 11 +- + sound/soc/samsung/neo1973_wm8753.c | 3 +- + sound/soc/samsung/pcm.c | 11 +- + .../include/plat => sound/soc/samsung}/regs-ac97.h | 0 + .../include/plat => sound/soc/samsung}/regs-iis.h | 0 + sound/soc/samsung/rx1950_uda1380.c | 2 +- + sound/soc/samsung/s3c-i2s-v2.c | 9 +- + sound/soc/samsung/s3c-i2s-v2.h | 7 +- + sound/soc/samsung/s3c2412-i2s.c | 12 +- + sound/soc/samsung/s3c24xx-i2s.c | 13 +- + sound/soc/samsung/s3c24xx_uda134x.c | 2 +- + sound/soc/samsung/spdif.c | 11 +- + sound/soc/sh/fsi.c | 14 +- + sound/soc/sh/hac.c | 10 +- + sound/soc/sh/migor.c | 2 +- + sound/soc/sh/siu_dai.c | 11 +- + sound/soc/sh/ssi.c | 10 +- + sound/soc/soc-compress.c | 38 +- + sound/soc/soc-core.c | 213 ++++-- + sound/soc/soc-dapm.c | 320 ++++----- + sound/soc/soc-dmaengine-pcm.c | 150 +++-- + sound/soc/soc-generic-dmaengine-pcm.c | 300 +++++++++ + sound/soc/soc-io.c | 5 +- + sound/soc/soc-utils.c | 25 + + sound/soc/spear/spdif_in.c | 9 +- + sound/soc/spear/spdif_out.c | 9 +- + sound/soc/spear/spear_pcm.c | 23 +- + sound/soc/tegra/Kconfig | 2 +- + sound/soc/tegra/tegra20_ac97.c | 28 +- + sound/soc/tegra/tegra20_ac97.h | 4 +- + sound/soc/tegra/tegra20_i2s.c | 28 +- + sound/soc/tegra/tegra20_i2s.h | 4 +- + sound/soc/tegra/tegra20_spdif.c | 22 +- + sound/soc/tegra/tegra20_spdif.h | 4 +- + sound/soc/tegra/tegra30_ahub.c | 72 ++- + sound/soc/tegra/tegra30_ahub.h | 24 +- + sound/soc/tegra/tegra30_i2s.c | 28 +- + sound/soc/tegra/tegra30_i2s.h | 4 +- + sound/soc/tegra/tegra_alc5632.c | 15 +- + sound/soc/tegra/tegra_asoc_utils.c | 34 +- + sound/soc/tegra/tegra_asoc_utils.h | 1 + + sound/soc/tegra/tegra_pcm.c | 187 +----- + sound/soc/tegra/tegra_pcm.h | 7 - + sound/soc/tegra/tegra_wm8753.c | 15 +- + sound/soc/tegra/tegra_wm8903.c | 179 ++---- + sound/soc/tegra/tegra_wm9712.c | 7 +- + sound/soc/tegra/trimslice.c | 56 +- + sound/soc/txx9/txx9aclc-ac97.c | 9 +- + sound/soc/ux500/Kconfig | 2 +- + sound/soc/ux500/ux500_msp_dai.c | 13 +- + sound/soc/ux500/ux500_msp_dai.h | 5 - + sound/soc/ux500/ux500_msp_i2s.h | 1 + + sound/soc/ux500/ux500_pcm.c | 229 +------ + sound/soc/ux500/ux500_pcm.h | 14 - + sound/sound_core.c | 22 +- + sound/spi/at73c213.c | 22 +- + sound/usb/6fire/pcm.c | 1 - + sound/usb/caiaq/audio.c | 462 ++++++------- + sound/usb/caiaq/audio.h | 4 +- + sound/usb/caiaq/control.c | 67 +- + sound/usb/caiaq/control.h | 2 +- + sound/usb/caiaq/device.c | 248 +++---- + sound/usb/caiaq/device.h | 18 +- + sound/usb/caiaq/input.c | 336 +++++----- + sound/usb/caiaq/input.h | 6 +- + sound/usb/caiaq/midi.c | 63 +- + sound/usb/caiaq/midi.h | 5 +- + sound/usb/card.c | 15 +- + sound/usb/card.h | 9 + + sound/usb/clock.c | 189 ++++-- + sound/usb/clock.h | 3 +- + sound/usb/endpoint.c | 32 +- + sound/usb/endpoint.h | 2 +- + sound/usb/format.c | 30 +- + sound/usb/format.h | 2 +- + sound/usb/helper.c | 10 +- + sound/usb/midi.c | 25 +- + sound/usb/misc/ua101.c | 3 +- + sound/usb/pcm.c | 158 +++-- + sound/usb/proc.c | 9 +- + sound/usb/quirks-table.h | 121 +++- + sound/usb/quirks.c | 60 +- + sound/usb/quirks.h | 5 + + sound/usb/stream.c | 23 +- + sound/usb/usbaudio.h | 1 + + sound/usb/usx2y/usb_stream.c | 1 - + sound/usb/usx2y/usbusx2yaudio.c | 1 - + sound/usb/usx2y/usx2yhwdeppcm.c | 1 - + 267 files changed, 7241 insertions(+), 3721 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ak5386.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,tas5086.txt + create mode 100644 include/sound/tas5086.h + delete mode 100644 include/sound/tegra_wm8903.h + delete mode 100644 sound/soc/cirrus/ep93xx-pcm.h + create mode 100644 sound/soc/codecs/ak5386.c + create mode 100644 sound/soc/codecs/tas5086.c + delete mode 100644 sound/soc/omap/omap-pcm.h + rename {arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-ac97.h (100%) + rename {arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-iis.h (100%) + create mode 100644 sound/soc/soc-generic-dmaengine-pcm.c +Merging sound-asoc/for-next (ee668c0 Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/soc-dapm.c +Auto-merging sound/soc/davinci/davinci-mcasp.c +Auto-merging sound/soc/codecs/wm8994.c +Merge made by the 'recursive' strategy. + sound/soc/codecs/wm8994.c | 1 + + sound/soc/davinci/davinci-mcasp.c | 5 ++++- + sound/soc/soc-dapm.c | 4 ++-- + 3 files changed, 7 insertions(+), 3 deletions(-) +Merging modules/modules-next (a53a11f3 modpost: fix unwanted VMLINUX_SYMBOL_STR expansion) +$ git merge modules/modules-next +Resolved 'include/asm-generic/unistd.h' using previous resolution. +Auto-merging scripts/Makefile.lib +Auto-merging kernel/Makefile +Auto-merging include/linux/kernel.h +Auto-merging include/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/asm-generic/unistd.h +Auto-merging arch/metag/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 775e1ef] Merge remote-tracking branch 'modules/modules-next' +$ git diff -M --stat --summary HEAD^.. + Makefile | 2 +- + arch/Kconfig | 6 ++ + arch/blackfin/Kconfig | 5 +- + arch/h8300/Kconfig | 5 +- + arch/metag/Kconfig | 5 +- + crypto/asymmetric_keys/x509_cert_parser.c | 55 +++++++++++++++--- + drivers/mtd/chips/gen_probe.c | 8 ++- + include/asm-generic/unistd.h | 1 + + include/asm-generic/vmlinux.lds.h | 8 +-- + include/linux/export.h | 20 +++++-- + include/linux/kernel.h | 7 --- + include/linux/module.h | 4 +- + kernel/Makefile | 2 +- + kernel/kallsyms.c | 26 ++++++--- + kernel/modsign_certificate.S | 13 +---- + kernel/module.c | 18 ++++-- + scripts/Makefile.build | 3 +- + scripts/Makefile.lib | 7 --- + scripts/Makefile.modpost | 8 ++- + scripts/genksyms/genksyms.c | 18 +++--- + scripts/link-vmlinux.sh | 5 +- + scripts/mod/modpost.c | 94 ++++++++++++++++++++----------- + 22 files changed, 192 insertions(+), 128 deletions(-) +$ git am -3 ../patches/0001-cond_syscall-and-SYSCALL_ALIAS-merge-fixup.patch +Applying: cond_syscall and SYSCALL_ALIAS merge fixup +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/linkage.h +$ git add -A . +$ git commit -v -a --amend +[master 637c87d] Merge remote-tracking branch 'modules/modules-next' +Merging virtio/virtio-next (01d779a caif_virtio: Remove bouncing email addresses) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (0c6a616 Input: trackpoint - Optimize trackpoint init to use power-on reset) +$ git merge input/next +Already up-to-date. +Merging input-mt/for-next (194664e Input: MT - handle semi-mt devices in core) +$ git merge input-mt/for-next +Merge made by the 'recursive' strategy. +Merging cgroup/for-next (2a0010a cpuset: fix compile warning when CONFIG_SMP=n) +$ git merge cgroup/for-next +Already up-to-date. +Merging block/for-next (410fa26 Merge branch 'for-3.10/drivers' into for-next) +$ git merge block/for-next +Resolved 'drivers/block/drbd/drbd_proc.c' using previous resolution. +Resolved 'include/linux/blk_types.h' using previous resolution. +Auto-merging mm/page_io.c +Auto-merging mm/bounce.c +Auto-merging kernel/trace/blktrace.c +Auto-merging kernel/relay.c +Auto-merging kernel/lockdep.c +Auto-merging kernel/fork.c +Auto-merging include/trace/events/block.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/idr.h +Auto-merging include/linux/blk_types.h +CONFLICT (content): Merge conflict in include/linux/blk_types.h +Auto-merging fs/jfs/jfs_logmgr.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/direct-io.c +Auto-merging fs/buffer.c +Auto-merging fs/block_dev.c +Auto-merging fs/bio.c +Auto-merging drivers/scsi/libsas/sas_expander.c +Auto-merging drivers/message/fusion/mptsas.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/md.c +Auto-merging drivers/block/rbd.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/drbd/drbd_proc.c +CONFLICT (content): Merge conflict in drivers/block/drbd/drbd_proc.c +Auto-merging drivers/block/cciss.c +Auto-merging drivers/block/aoe/aoecmd.c +Auto-merging block/blk-core.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master de1e468] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-bcache | 156 ++ + Documentation/bcache.txt | 431 +++++ + Documentation/block/cfq-iosched.txt | 47 +- + MAINTAINERS | 7 + + block/blk-cgroup.c | 4 +- + block/blk-core.c | 265 ++- + block/cfq-iosched.c | 7 +- + block/deadline-iosched.c | 2 +- + block/elevator.c | 26 + + block/partitions/efi.c | 4 +- + drivers/block/aoe/aoecmd.c | 6 +- + drivers/block/brd.c | 3 +- + drivers/block/cciss.c | 22 +- + drivers/block/drbd/drbd_actlog.c | 246 ++- + drivers/block/drbd/drbd_bitmap.c | 13 +- + drivers/block/drbd/drbd_int.h | 179 +- + drivers/block/drbd/drbd_main.c | 251 ++- + drivers/block/drbd/drbd_nl.c | 200 +- + drivers/block/drbd/drbd_proc.c | 10 +- + drivers/block/drbd/drbd_receiver.c | 16 +- + drivers/block/drbd/drbd_req.c | 192 +- + drivers/block/drbd/drbd_req.h | 8 + + drivers/block/drbd/drbd_state.c | 28 +- + drivers/block/drbd/drbd_strings.c | 1 + + drivers/block/drbd/drbd_worker.c | 24 +- + drivers/block/floppy.c | 1 - + drivers/block/mg_disk.c | 2 + + drivers/block/mtip32xx/mtip32xx.c | 79 +- + drivers/block/mtip32xx/mtip32xx.h | 11 + + drivers/block/pktcdvd.c | 102 +- + drivers/block/rbd.c | 2 +- + drivers/md/Kconfig | 2 + + drivers/md/Makefile | 1 + + drivers/md/bcache/Kconfig | 42 + + drivers/md/bcache/Makefile | 7 + + drivers/md/bcache/alloc.c | 599 ++++++ + drivers/md/bcache/bcache.h | 1259 +++++++++++++ + drivers/md/bcache/bset.c | 1192 ++++++++++++ + drivers/md/bcache/bset.h | 379 ++++ + drivers/md/bcache/btree.c | 2503 ++++++++++++++++++++++++++ + drivers/md/bcache/btree.h | 405 +++++ + drivers/md/bcache/closure.c | 345 ++++ + drivers/md/bcache/closure.h | 672 +++++++ + drivers/md/bcache/debug.c | 565 ++++++ + drivers/md/bcache/debug.h | 54 + + drivers/md/bcache/io.c | 397 ++++ + drivers/md/bcache/journal.c | 787 ++++++++ + drivers/md/bcache/journal.h | 215 +++ + drivers/md/bcache/movinggc.c | 254 +++ + drivers/md/bcache/request.c | 1411 +++++++++++++++ + drivers/md/bcache/request.h | 62 + + drivers/md/bcache/stats.c | 246 +++ + drivers/md/bcache/stats.h | 58 + + drivers/md/bcache/super.c | 1987 ++++++++++++++++++++ + drivers/md/bcache/sysfs.c | 817 +++++++++ + drivers/md/bcache/sysfs.h | 110 ++ + drivers/md/bcache/trace.c | 26 + + drivers/md/bcache/util.c | 377 ++++ + drivers/md/bcache/util.h | 589 ++++++ + drivers/md/bcache/writeback.c | 414 +++++ + drivers/md/dm-crypt.c | 3 +- + drivers/md/dm-raid1.c | 2 +- + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm-verity.c | 4 +- + drivers/md/faulty.c | 6 +- + drivers/md/linear.c | 3 +- + drivers/md/md.c | 17 +- + drivers/md/raid0.c | 9 +- + drivers/md/raid1.c | 133 +- + drivers/md/raid10.c | 78 +- + drivers/md/raid5.c | 49 +- + drivers/message/fusion/mptsas.c | 6 +- + drivers/s390/block/dcssblk.c | 3 +- + drivers/scsi/libsas/sas_expander.c | 6 +- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 10 +- + fs/bio-integrity.c | 144 +- + fs/bio.c | 366 +++- + fs/block_dev.c | 2 +- + fs/btrfs/extent_io.c | 3 +- + fs/btrfs/volumes.c | 2 +- + fs/buffer.c | 1 - + fs/direct-io.c | 8 +- + fs/exofs/ore.c | 2 +- + fs/exofs/ore_raid.c | 2 +- + fs/fs-writeback.c | 102 +- + fs/gfs2/lops.c | 2 +- + fs/jfs/jfs_logmgr.c | 2 - + fs/logfs/dev_bdev.c | 5 - + include/linux/backing-dev.h | 16 +- + include/linux/bio.h | 115 +- + include/linux/blk_types.h | 5 + + include/linux/blkdev.h | 29 +- + include/linux/cgroup_subsys.h | 6 + + include/linux/drbd.h | 5 +- + include/linux/drbd_limits.h | 11 +- + include/linux/idr.h | 10 +- + include/linux/lru_cache.h | 1 + + include/linux/rwsem.h | 10 + + include/linux/sched.h | 4 + + include/trace/events/bcache.h | 271 +++ + include/trace/events/block.h | 12 +- + include/trace/events/writeback.h | 5 - + kernel/fork.c | 4 + + kernel/lockdep.c | 1 + + kernel/relay.c | 2 +- + kernel/rwsem.c | 16 + + kernel/trace/blktrace.c | 1 + + lib/lru_cache.c | 56 +- + mm/backing-dev.c | 259 +-- + mm/bounce.c | 75 +- + mm/page_io.c | 1 - + 111 files changed, 18680 insertions(+), 1327 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-block-bcache + create mode 100644 Documentation/bcache.txt + create mode 100644 drivers/md/bcache/Kconfig + create mode 100644 drivers/md/bcache/Makefile + create mode 100644 drivers/md/bcache/alloc.c + create mode 100644 drivers/md/bcache/bcache.h + create mode 100644 drivers/md/bcache/bset.c + create mode 100644 drivers/md/bcache/bset.h + create mode 100644 drivers/md/bcache/btree.c + create mode 100644 drivers/md/bcache/btree.h + create mode 100644 drivers/md/bcache/closure.c + create mode 100644 drivers/md/bcache/closure.h + create mode 100644 drivers/md/bcache/debug.c + create mode 100644 drivers/md/bcache/debug.h + create mode 100644 drivers/md/bcache/io.c + create mode 100644 drivers/md/bcache/journal.c + create mode 100644 drivers/md/bcache/journal.h + create mode 100644 drivers/md/bcache/movinggc.c + create mode 100644 drivers/md/bcache/request.c + create mode 100644 drivers/md/bcache/request.h + create mode 100644 drivers/md/bcache/stats.c + create mode 100644 drivers/md/bcache/stats.h + create mode 100644 drivers/md/bcache/super.c + create mode 100644 drivers/md/bcache/sysfs.c + create mode 100644 drivers/md/bcache/sysfs.h + create mode 100644 drivers/md/bcache/trace.c + create mode 100644 drivers/md/bcache/util.c + create mode 100644 drivers/md/bcache/util.h + create mode 100644 drivers/md/bcache/writeback.c + create mode 100644 include/trace/events/bcache.h +Merging device-mapper/master (adf9566 Fix some typos in dm-space-map-metadata.c error messages.) +$ git merge device-mapper/master +Merge made by the 'recursive' strategy. + drivers/md/dm-bufio.c | 24 +++++++++++++++++++++- + drivers/md/dm-cache-policy.h | 4 ++-- + drivers/md/dm-cache-target.c | 1 + + drivers/md/dm-snap.c | 1 + + drivers/md/dm-table.c | 2 +- + drivers/md/persistent-data/dm-space-map-metadata.c | 8 ++++---- + include/linux/device-mapper.h | 15 ++++++++++++++ + 7 files changed, 47 insertions(+), 8 deletions(-) +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (e4404fa mmc: sdhci-tegra: fix MODULE_DEVICE_TABLE) +$ git merge mmc/mmc-next +Auto-merging drivers/mmc/host/sdhci-s3c.c +Auto-merging drivers/mmc/host/sdhci-cns3xxx.c +Auto-merging drivers/mmc/host/davinci_mmc.c +Auto-merging drivers/mmc/core/core.c +Auto-merging arch/powerpc/boot/dts/mpc5121.dtsi +Auto-merging arch/avr32/configs/favr-32_defconfig +Auto-merging arch/arm/configs/at91sam9g45_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/fsl-imx-mmc.txt | 24 ++ + .../devicetree/bindings/mmc/samsung-sdhci.txt | 35 +-- + .../devicetree/bindings/mmc/sdhci-sirf.txt | 18 ++ + Documentation/mmc/mmc-dev-attrs.txt | 1 + + MAINTAINERS | 1 + + arch/arm/configs/at91sam9g45_defconfig | 1 - + arch/avr32/configs/favr-32_defconfig | 1 - + arch/avr32/configs/merisc_defconfig | 1 - + arch/powerpc/boot/dts/mpc5121.dtsi | 2 + + drivers/mmc/card/block.c | 10 +- + drivers/mmc/card/queue.c | 3 - + drivers/mmc/card/queue.h | 2 + + drivers/mmc/core/core.c | 18 +- + drivers/mmc/core/mmc.c | 5 +- + drivers/mmc/core/sdio.c | 4 +- + drivers/mmc/core/sdio_bus.c | 23 +- + drivers/mmc/host/Kconfig | 31 +-- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/android-goldfish.c | 2 +- + drivers/mmc/host/atmel-mci.c | 16 +- + drivers/mmc/host/davinci_mmc.c | 23 +- + drivers/mmc/host/dw_mmc-exynos.c | 54 +--- + drivers/mmc/host/dw_mmc.c | 153 ++++++----- + drivers/mmc/host/dw_mmc.h | 3 - + drivers/mmc/host/mvsdio.c | 54 ++-- + drivers/mmc/host/mxcmmc.c | 296 +++++++++++++++------ + drivers/mmc/host/mxs-mmc.c | 15 +- + drivers/mmc/host/omap_hsmmc.c | 14 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 10 + + drivers/mmc/host/sdhci-acpi.c | 2 + + drivers/mmc/host/sdhci-bcm2835.c | 4 +- + drivers/mmc/host/sdhci-cns3xxx.c | 4 +- + drivers/mmc/host/sdhci-dove.c | 4 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 4 +- + drivers/mmc/host/sdhci-of-esdhc.c | 4 +- + drivers/mmc/host/sdhci-of-hlwd.c | 4 +- + drivers/mmc/host/sdhci-pci.c | 4 +- + drivers/mmc/host/sdhci-pltfm.c | 7 +- + drivers/mmc/host/sdhci-pltfm.h | 6 +- + drivers/mmc/host/sdhci-pxav2.c | 2 +- + drivers/mmc/host/sdhci-pxav3.c | 49 ++-- + drivers/mmc/host/sdhci-s3c.c | 88 +----- + drivers/mmc/host/sdhci-sirf.c | 193 ++++++++++++++ + drivers/mmc/host/sdhci-spear.c | 4 +- + drivers/mmc/host/sdhci-tegra.c | 124 ++------- + drivers/mmc/host/sdhci.c | 39 ++- + drivers/mmc/host/wmt-sdmmc.c | 4 +- + include/linux/mmc/card.h | 1 + + include/linux/mmc/host.h | 3 + + 49 files changed, 824 insertions(+), 547 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/fsl-imx-mmc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-sirf.txt + create mode 100644 drivers/mmc/host/sdhci-sirf.c +Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (14e50c6 mm: slab: Verify the nodeid passed to ____cache_alloc_node) +$ git merge slab/for-next +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Removing include/linux/kmalloc_sizes.h +Merge made by the 'recursive' strategy. + fs/proc/stat.c | 2 +- + include/linux/kmalloc_sizes.h | 45 --- + include/linux/slab.h | 231 ++++++++---- + include/linux/slab_def.h | 48 +-- + include/linux/slub_def.h | 136 +------- + mm/slab.c | 790 ++++++++++++++++++------------------------ + mm/slab.h | 43 ++- + mm/slab_common.c | 165 ++++++++- + mm/slub.c | 221 +++--------- + 9 files changed, 766 insertions(+), 915 deletions(-) + delete mode 100644 include/linux/kmalloc_sizes.h +Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (1fef8be raid5: make release_stripe lockless) +$ git merge md/for-next +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/md.c | 8 +- + drivers/md/md.h | 8 + + drivers/md/raid5.c | 458 ++++++++++++++++++++++++++++++++++++++++++++++++++--- + drivers/md/raid5.h | 22 +++ + 4 files changed, 469 insertions(+), 27 deletions(-) +Merging mfd/master (99f4c6b mfd: si476x: Don't use 0bNNN) +$ git merge mfd/master +Resolved 'drivers/mfd/Kconfig' using previous resolution. +Auto-merging include/linux/of.h +Auto-merging include/linux/mfd/tps65090.h +Auto-merging include/linux/mfd/palmas.h +Auto-merging include/linux/mfd/arizona/pdata.h +Auto-merging drivers/power/rx51_battery.c +Auto-merging drivers/mfd/wm5102-tables.c +Auto-merging drivers/mfd/ab8500-gpadc.c +Auto-merging drivers/mfd/Kconfig +CONFLICT (content): Merge conflict in drivers/mfd/Kconfig +Auto-merging arch/arm/mach-s3c64xx/mach-crag6410-module.c +Auto-merging arch/arm/mach-imx/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5214b6e] Merge remote-tracking branch 'mfd/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/input/cros-ec-keyb.txt | 72 + + Documentation/devicetree/bindings/mfd/as3711.txt | 73 + + Documentation/devicetree/bindings/mfd/cros-ec.txt | 56 + + .../devicetree/bindings/mfd/omap-usb-host.txt | 80 + + .../devicetree/bindings/mfd/omap-usb-tll.txt | 17 + + Documentation/devicetree/bindings/sound/wm8994.txt | 58 +- + arch/arm/mach-imx/Kconfig | 2 - + arch/arm/mach-s3c64xx/Kconfig | 3 - + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 4 +- + drivers/gpio/gpio-ucb1400.c | 19 +- + drivers/input/keyboard/Kconfig | 12 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/cros_ec_keyb.c | 334 ++++ + drivers/input/keyboard/lpc32xx-keys.c | 11 +- + drivers/input/keyboard/omap4-keypad.c | 16 +- + drivers/input/keyboard/tca8418_keypad.c | 7 +- + drivers/input/matrix-keymap.c | 20 + + drivers/mfd/88pm860x-core.c | 12 +- + drivers/mfd/Kconfig | 1620 ++++++++++---------- + drivers/mfd/Makefile | 9 +- + drivers/mfd/aat2870-core.c | 20 +- + drivers/mfd/ab3100-otp.c | 14 +- + drivers/mfd/ab8500-core.c | 28 +- + drivers/mfd/ab8500-gpadc.c | 2 +- + drivers/mfd/ab8500-sysctrl.c | 2 +- + drivers/mfd/adp5520.c | 20 +- + drivers/mfd/arizona-core.c | 267 +++- + drivers/mfd/arizona-irq.c | 106 +- + drivers/mfd/arizona-spi.c | 2 +- + drivers/mfd/as3711.c | 27 +- + drivers/mfd/cros_ec.c | 196 +++ + drivers/mfd/cros_ec_i2c.c | 201 +++ + drivers/mfd/cros_ec_spi.c | 375 +++++ + drivers/mfd/da903x.c | 19 +- + drivers/mfd/da9052-spi.c | 4 +- + drivers/mfd/da9055-core.c | 2 +- + drivers/mfd/davinci_voicecodec.c | 12 +- + drivers/mfd/db8500-prcmu.c | 72 +- + drivers/mfd/ezx-pcap.c | 21 +- + drivers/mfd/htc-pasic3.c | 13 +- + drivers/mfd/intel_msic.c | 10 +- + drivers/mfd/lm3533-core.c | 8 +- + drivers/mfd/max77686.c | 2 +- + drivers/mfd/mc13xxx-spi.c | 6 +- + drivers/mfd/omap-usb-host.c | 209 ++- + drivers/mfd/omap-usb-tll.c | 219 +-- + drivers/mfd/omap-usb.h | 5 +- + drivers/mfd/palmas.c | 7 +- + drivers/mfd/retu-mfd.c | 85 +- + drivers/mfd/rts5249.c | 241 +++ + drivers/mfd/rtsx_pcr.c | 11 +- + drivers/mfd/rtsx_pcr.h | 1 + + drivers/mfd/si476x-cmd.c | 1553 +++++++++++++++++++ + drivers/mfd/si476x-i2c.c | 886 +++++++++++ + drivers/mfd/si476x-prop.c | 241 +++ + drivers/mfd/sta2x11-mfd.c | 11 - + drivers/mfd/stmpe-i2c.c | 1 + + drivers/mfd/stmpe-spi.c | 2 +- + drivers/mfd/stmpe.c | 105 +- + drivers/mfd/stmpe.h | 49 + + drivers/mfd/syscon.c | 80 +- + drivers/mfd/tc3589x.c | 21 +- + drivers/mfd/tps65090.c | 11 + + drivers/mfd/twl4030-madc.c | 14 +- + drivers/mfd/twl6040.c | 31 +- + drivers/mfd/ucb1400_core.c | 5 + + drivers/mfd/vexpress-config.c | 35 +- + drivers/mfd/vexpress-sysreg.c | 4 +- + drivers/mfd/wm5102-tables.c | 56 +- + drivers/mfd/wm831x-spi.c | 6 +- + drivers/mfd/wm8994-core.c | 88 +- + drivers/power/rx51_battery.c | 1 + + include/linux/i2c/twl4030-madc.h | 2 + + include/linux/input/matrix_keypad.h | 19 + + include/linux/mfd/arizona/pdata.h | 7 +- + include/linux/mfd/cros_ec.h | 170 ++ + include/linux/mfd/cros_ec_commands.h | 1369 +++++++++++++++++ + include/linux/mfd/palmas.h | 12 +- + include/linux/mfd/retu.h | 8 +- + include/linux/mfd/rtsx_pci.h | 36 + + include/linux/mfd/si476x-core.h | 533 +++++++ + include/linux/mfd/si476x-platform.h | 267 ++++ + include/linux/mfd/si476x-reports.h | 163 ++ + include/linux/mfd/stmpe.h | 3 + + include/linux/mfd/syscon.h | 3 + + include/linux/mfd/tps65090.h | 1 + + include/linux/of.h | 5 + + include/linux/ucb1400.h | 18 +- + 88 files changed, 9044 insertions(+), 1405 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/cros-ec-keyb.txt + create mode 100644 Documentation/devicetree/bindings/mfd/as3711.txt + create mode 100644 Documentation/devicetree/bindings/mfd/cros-ec.txt + create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-host.txt + create mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-tll.txt + create mode 100644 drivers/input/keyboard/cros_ec_keyb.c + create mode 100644 drivers/mfd/cros_ec.c + create mode 100644 drivers/mfd/cros_ec_i2c.c + create mode 100644 drivers/mfd/cros_ec_spi.c + create mode 100644 drivers/mfd/rts5249.c + create mode 100644 drivers/mfd/si476x-cmd.c + create mode 100644 drivers/mfd/si476x-i2c.c + create mode 100644 drivers/mfd/si476x-prop.c + create mode 100644 include/linux/mfd/cros_ec.h + create mode 100644 include/linux/mfd/cros_ec_commands.h + create mode 100644 include/linux/mfd/si476x-core.h + create mode 100644 include/linux/mfd/si476x-platform.h + create mode 100644 include/linux/mfd/si476x-reports.h +Merging battery/master (6b17080 pm2301-charger: Fix suspend/resume) +$ git merge battery/master +Already up-to-date. +Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1) +$ git merge fbdev/fbdev-next +Already up-to-date. +Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning) +$ git merge omap_dss2/for-next +Merge made by the 'recursive' strategy. + drivers/video/ps3fb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging regulator/for-next (6c922f8 Merge remote-tracking branch 'regulator/fix/doc' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging security/next (b7ae9f0 Merge branch 'tpmdd-04-17-13' of git://github.com/shpedoikal/linux into my-next) +$ git merge security/next +Already up-to-date. +Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) +$ git merge selinux/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/master (69c6612 watchdog: Fix race condition in registration code) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/ath79_wdt.c | 8 +++----- + drivers/watchdog/davinci_wdt.c | 9 ++++----- + drivers/watchdog/s3c2410_wdt.c | 7 +++---- + drivers/watchdog/shwdt.c | 7 ++++--- + drivers/watchdog/watchdog_dev.c | 3 ++- + 5 files changed, 16 insertions(+), 18 deletions(-) +Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (0c4513b Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/dmar.c +Auto-merging drivers/iommu/amd_iommu_types.h +Auto-merging drivers/iommu/amd_iommu_init.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 14 ++++ + arch/x86/include/asm/irq_remapping.h | 9 ++ + arch/x86/kernel/early-quirks.c | 20 +++++ + drivers/iommu/amd_iommu.c | 145 +++++++++++++++------------------ + drivers/iommu/amd_iommu_init.c | 154 +++++++++++++++++++++++++++++++---- + drivers/iommu/amd_iommu_types.h | 2 + + drivers/iommu/dmar.c | 23 ++++-- + drivers/iommu/exynos-iommu.c | 2 +- + drivers/iommu/intel-iommu.c | 24 ++++-- + drivers/iommu/intel_irq_remapping.c | 10 +++ + drivers/iommu/iommu.c | 37 ++++++++- + drivers/iommu/irq_remapping.c | 6 ++ + drivers/iommu/irq_remapping.h | 2 + + drivers/iommu/msm_iommu.c | 2 +- + drivers/iommu/omap-iommu.c | 2 +- + drivers/iommu/pci.h | 29 +++++++ + drivers/iommu/shmobile-iommu.c | 2 +- + drivers/iommu/tegra-gart.c | 5 +- + drivers/iommu/tegra-smmu.c | 5 +- + include/linux/iommu.h | 18 ++-- + 20 files changed, 380 insertions(+), 131 deletions(-) + create mode 100644 drivers/iommu/pci.h +Merging vfio/next (664e938 vfio: Set container device mode) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (071361d mm: Convert print_symbol to %pSR) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge audit/for-next +Already up-to-date. +Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased) +$ git merge edac-amd/for-next +Already up-to-date. +Merging devicetree/devicetree/next (d347bc5 Merge branch 'robherring/for-next' from git://sources.calxeda.com/kernel/linux.git) +$ git merge devicetree/devicetree/next +Auto-merging drivers/of/base.c +Merge made by the 'recursive' strategy. + .../bindings/{drm/exynos/hdmi.txt => video/exynos_hdmi.txt} | 0 + .../bindings/{drm/exynos/hdmiddc.txt => video/exynos_hdmiddc.txt} | 0 + .../bindings/{drm/exynos/hdmiphy.txt => video/exynos_hdmiphy.txt} | 0 + .../bindings/{drm/exynos/mixer.txt => video/exynos_mixer.txt} | 0 + drivers/of/base.c | 4 ++-- + include/linux/of_platform.h | 5 +++-- + 6 files changed, 5 insertions(+), 4 deletions(-) + rename Documentation/devicetree/bindings/{drm/exynos/hdmi.txt => video/exynos_hdmi.txt} (100%) + rename Documentation/devicetree/bindings/{drm/exynos/hdmiddc.txt => video/exynos_hdmiddc.txt} (100%) + rename Documentation/devicetree/bindings/{drm/exynos/hdmiphy.txt => video/exynos_hdmiphy.txt} (100%) + rename Documentation/devicetree/bindings/{drm/exynos/mixer.txt => video/exynos_mixer.txt} (100%) +Merging dt-rh/for-next (a2b9ea7 Documentation/devicetree: make semantic of initrd-end more explicit) +$ git merge dt-rh/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/usage-model.txt | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration) +$ git merge spi/spi/next +Already up-to-date. +Merging spi-mb/for-next (f557c98 spi/spi-atmel: BUG: fix doesn' support 16 bits transfers using PIO) +$ git merge spi-mb/for-next +Auto-merging drivers/spi/spi-atmel.c +Merge made by the 'recursive' strategy. + drivers/spi/spi-atmel.c | 47 ++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 38 insertions(+), 9 deletions(-) +Merging tip/auto-latest (979830a Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging kernel/timer.c +Auto-merging kernel/softirq.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/rcutree.c +Auto-merging kernel/printk.c +Auto-merging kernel/events/core.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/trace/events/timer.h +Auto-merging include/linux/sched.h +Auto-merging drivers/firmware/efi/efivars.c +CONFLICT (content): Merge conflict in drivers/firmware/efi/efivars.c +Auto-merging drivers/firmware/efi/efi-pstore.c +CONFLICT (content): Merge conflict in drivers/firmware/efi/efi-pstore.c +Auto-merging arch/x86/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/cpu-freq/governors.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/firmware/efi/efi-pstore.c'. +Recorded resolution for 'drivers/firmware/efi/efivars.c'. +[master 1e2612e] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/stallwarn.txt | 2 +- + Documentation/cpu-freq/governors.txt | 4 +- + Documentation/kernel-parameters.txt | 8 + + Documentation/kernel-per-CPU-kthreads.txt | 202 ++++++++++++++++++ + Documentation/timers/NO_HZ.txt | 273 ++++++++++++++++++++++++ + arch/um/include/shared/common-offsets.h | 4 +- + arch/um/os-Linux/time.c | 2 +- + arch/x86/Kconfig | 39 ++++ + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 19 +- + arch/x86/kernel/irq.c | 4 - + include/asm-generic/cputime_nsecs.h | 28 ++- + include/linux/perf_event.h | 6 + + include/linux/posix-timers.h | 2 + + include/linux/rcupdate.h | 7 + + include/linux/sched.h | 18 +- + include/linux/tick.h | 25 ++- + include/trace/events/timer.h | 21 ++ + init/Kconfig | 8 +- + init/main.c | 1 + + kernel/events/core.c | 17 +- + kernel/hrtimer.c | 4 +- + kernel/posix-cpu-timers.c | 76 +++++-- + kernel/printk.c | 2 +- + kernel/rcutree.c | 16 +- + kernel/rcutree.h | 2 +- + kernel/rcutree_plugin.h | 33 ++- + kernel/sched/core.c | 62 +++++- + kernel/sched/fair.c | 10 +- + kernel/sched/sched.h | 15 +- + kernel/softirq.c | 19 +- + kernel/time/Kconfig | 81 +++++++- + kernel/time/tick-broadcast.c | 3 +- + kernel/time/tick-common.c | 5 +- + kernel/time/tick-sched.c | 289 ++++++++++++++++++++++++-- + kernel/timer.c | 16 +- + 35 files changed, 1192 insertions(+), 131 deletions(-) + create mode 100644 Documentation/kernel-per-CPU-kthreads.txt + create mode 100644 Documentation/timers/NO_HZ.txt +Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being added) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (a9be854 Merge commit '6d87669357936bffa1e8fea7a4e7743e76905736' into next.2013.10.22a) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. +Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) +$ git merge cputime/cputime +Already up-to-date. +Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (4cee4b7 kvm: KVM_CAP_IOMMU only available with device assignment) +$ git merge kvm/linux-next +Recorded preimage for 'arch/s390/mm/pgtable.c' +Resolved 'drivers/s390/kvm/virtio_ccw.c' using previous resolution. +Auto-merging virt/kvm/kvm_main.c +Auto-merging include/linux/kvm_host.h +Auto-merging drivers/s390/kvm/virtio_ccw.c +CONFLICT (content): Merge conflict in drivers/s390/kvm/virtio_ccw.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kvm/lapic.c +Auto-merging arch/x86/kernel/irq.c +Auto-merging arch/x86/include/uapi/asm/msr-index.h +Auto-merging arch/s390/mm/pgtable.c +CONFLICT (content): Merge conflict in arch/s390/mm/pgtable.c +Auto-merging arch/powerpc/sysdev/xics/icp-native.c +Auto-merging arch/powerpc/kvm/e500mc.c +Auto-merging arch/powerpc/kvm/e500.h +Auto-merging arch/powerpc/kvm/book3s_pr.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/reg.h +Auto-merging arch/arm/kvm/arm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/s390/mm/pgtable.c'. +[master 1120a43] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 126 ++ + Documentation/virtual/kvm/devices/README | 1 + + Documentation/virtual/kvm/devices/mpic.txt | 56 + + arch/arm/kvm/arm.c | 18 +- + arch/ia64/include/asm/kvm_host.h | 1 + + arch/ia64/include/uapi/asm/kvm.h | 1 - + arch/ia64/kvm/Kconfig | 14 +- + arch/ia64/kvm/Makefile | 6 +- + arch/ia64/kvm/kvm-ia64.c | 35 +- + arch/ia64/kvm/lapic.h | 6 - + arch/powerpc/include/asm/hvcall.h | 3 + + arch/powerpc/include/asm/kvm_book3s.h | 7 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 13 + + arch/powerpc/include/asm/kvm_book3s_asm.h | 8 +- + arch/powerpc/include/asm/kvm_booke.h | 2 + + arch/powerpc/include/asm/kvm_host.h | 41 +- + arch/powerpc/include/asm/kvm_ppc.h | 112 +- + arch/powerpc/include/asm/reg.h | 1 + + arch/powerpc/include/uapi/asm/kvm.h | 82 ++ + arch/powerpc/kernel/asm-offsets.c | 4 + + arch/powerpc/kvm/44x.c | 12 + + arch/powerpc/kvm/Kconfig | 26 +- + arch/powerpc/kvm/Makefile | 12 +- + arch/powerpc/kvm/book3s.c | 36 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 120 +- + arch/powerpc/kvm/book3s_emulate.c | 4 +- + arch/powerpc/kvm/book3s_hv.c | 92 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 11 - + arch/powerpc/kvm/book3s_hv_rm_xics.c | 406 ++++++ + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 228 +++- + arch/powerpc/kvm/book3s_pr.c | 7 +- + arch/powerpc/kvm/book3s_pr_papr.c | 21 + + arch/powerpc/kvm/book3s_rtas.c | 274 +++++ + arch/powerpc/kvm/book3s_xics.c | 1130 +++++++++++++++++ + arch/powerpc/kvm/book3s_xics.h | 129 ++ + arch/powerpc/kvm/booke.c | 158 ++- + arch/powerpc/kvm/booke_interrupts.S | 42 +- + arch/powerpc/kvm/e500.c | 14 + + arch/powerpc/kvm/e500.h | 22 + + arch/powerpc/kvm/e500_emulate.c | 19 + + arch/powerpc/kvm/e500_mmu.c | 192 ++- + arch/powerpc/kvm/e500mc.c | 16 + + arch/powerpc/kvm/emulate.c | 2 + + arch/powerpc/kvm/irq.h | 17 + + arch/powerpc/kvm/mpic.c | 1843 ++++++++++++++++++++++++++++ + arch/powerpc/kvm/powerpc.c | 88 +- + arch/powerpc/sysdev/xics/icp-native.c | 8 + + arch/s390/include/uapi/asm/Kbuild | 1 + + arch/s390/include/uapi/asm/virtio-ccw.h | 21 + + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/Makefile | 2 +- + arch/s390/kvm/diag.c | 26 + + arch/s390/kvm/gaccess.h | 429 ++----- + arch/s390/kvm/intercept.c | 18 +- + arch/s390/kvm/interrupt.c | 245 ++-- + arch/s390/kvm/kvm-s390.c | 43 +- + arch/s390/kvm/kvm-s390.h | 12 +- + arch/s390/kvm/priv.c | 270 ++-- + arch/x86/include/asm/entry_arch.h | 4 + + arch/x86/include/asm/hardirq.h | 3 + + arch/x86/include/asm/hw_irq.h | 1 + + arch/x86/include/asm/irq_vectors.h | 5 + + arch/x86/include/asm/kvm_host.h | 24 +- + arch/x86/include/asm/vmx.h | 18 + + arch/x86/include/uapi/asm/kvm.h | 1 - + arch/x86/include/uapi/asm/msr-index.h | 2 + + arch/x86/include/uapi/asm/vmx.h | 5 +- + arch/x86/kernel/entry_64.S | 5 + + arch/x86/kernel/irq.c | 22 + + arch/x86/kernel/irqinit.c | 4 + + arch/x86/kernel/kvmclock.c | 9 +- + arch/x86/kvm/Kconfig | 14 +- + arch/x86/kvm/Makefile | 5 +- + arch/x86/kvm/emulate.c | 31 +- + arch/x86/kvm/i8254.c | 4 +- + arch/x86/kvm/lapic.c | 189 +-- + arch/x86/kvm/lapic.h | 22 +- + arch/x86/kvm/mmu.c | 108 +- + arch/x86/kvm/mmu.h | 11 +- + arch/x86/kvm/paging_tmpl.h | 2 +- + arch/x86/kvm/pmu.c | 14 +- + arch/x86/kvm/svm.c | 35 +- + arch/x86/kvm/vmx.c | 1061 ++++++++++++---- + arch/x86/kvm/x86.c | 240 ++-- + drivers/s390/kvm/virtio_ccw.c | 20 +- + include/linux/kvm_host.h | 165 ++- + include/trace/events/kvm.h | 12 +- + include/uapi/linux/kvm.h | 43 +- + virt/kvm/Kconfig | 3 + + virt/kvm/assigned-dev.c | 43 +- + virt/kvm/eventfd.c | 53 +- + virt/kvm/ioapic.c | 163 ++- + virt/kvm/ioapic.h | 27 +- + virt/kvm/irq_comm.c | 215 +--- + virt/kvm/irqchip.c | 237 ++++ + virt/kvm/kvm_main.c | 250 +++- + 96 files changed, 7681 insertions(+), 1923 deletions(-) + create mode 100644 Documentation/virtual/kvm/devices/README + create mode 100644 Documentation/virtual/kvm/devices/mpic.txt + create mode 100644 arch/powerpc/kvm/book3s_hv_rm_xics.c + create mode 100644 arch/powerpc/kvm/book3s_rtas.c + create mode 100644 arch/powerpc/kvm/book3s_xics.c + create mode 100644 arch/powerpc/kvm/book3s_xics.h + create mode 100644 arch/powerpc/kvm/irq.h + create mode 100644 arch/powerpc/kvm/mpic.c + create mode 100644 arch/s390/include/uapi/asm/virtio-ccw.h + create mode 100644 virt/kvm/irqchip.c +Merging kvm-arm/kvm-arm-next (b8022d7 arm: kvm: arch_timer: use symbolic constants) +$ git merge kvm-arm/kvm-arm-next +Auto-merging arch/arm/kvm/arm.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_host.h | 3 ++ + arch/arm/kvm/Makefile | 2 +- + arch/arm/kvm/arch_timer.c | 7 +++-- + arch/arm/kvm/arm.c | 4 +++ + arch/arm/kvm/perf.c | 68 +++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 80 insertions(+), 4 deletions(-) + create mode 100644 arch/arm/kvm/perf.c +Merging kvm-ppc/kvm-ppc-next (5975a2e KVM: PPC: Book3S: Add API for in-kernel XICS emulation) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging virt/kvm/kvm_main.c +Auto-merging include/linux/kvm_host.h +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 8 ++ + Documentation/virtual/kvm/devices/mpic.txt | 3 - + Documentation/virtual/kvm/devices/xics.txt | 66 ++++++++++ + arch/powerpc/include/asm/kvm_ppc.h | 2 + + arch/powerpc/include/uapi/asm/kvm.h | 12 ++ + arch/powerpc/kvm/book3s_xics.c | 190 +++++++++++++++++++++++++---- + arch/powerpc/kvm/book3s_xics.h | 1 + + arch/powerpc/kvm/irq.h | 3 + + arch/powerpc/kvm/mpic.c | 56 +++++---- + arch/powerpc/kvm/powerpc.c | 45 ++++++- + include/linux/kvm_host.h | 1 + + include/uapi/linux/kvm.h | 2 + + virt/kvm/kvm_main.c | 5 + + 13 files changed, 339 insertions(+), 55 deletions(-) + create mode 100644 Documentation/virtual/kvm/devices/xics.txt +Merging oprofile/for-next (23995bb oprofile, s390: Add support for IBM zEnterprise EC12) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes) +$ git merge xen/upstream/xen +Already up-to-date. +Merging xen-two/linux-next (6461b07 Merge branch 'stable/for-linus-3.10' into linux-next) +$ git merge xen-two/linux-next +Auto-merging arch/x86/xen/smp.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/include/asm/xen/interface.h | 11 ++- + arch/x86/include/asm/xen/page.h | 3 + + arch/x86/xen/Kconfig | 8 ++ + arch/x86/xen/enlighten.c | 76 ++++++++++++----- + arch/x86/xen/irq.c | 5 +- + arch/x86/xen/mmu.c | 158 ++++++++++++++++++++++++++++++++--- + arch/x86/xen/mmu.h | 2 + + arch/x86/xen/p2m.c | 2 +- + arch/x86/xen/setup.c | 59 ++++++++++--- + arch/x86/xen/smp.c | 39 ++++++--- + arch/x86/xen/xen-head.S | 10 ++- + drivers/xen/balloon.c | 14 ++-- + drivers/xen/cpu_hotplug.c | 4 +- + drivers/xen/events.c | 9 +- + drivers/xen/gntdev.c | 3 +- + drivers/xen/grant-table.c | 64 +++++++++++++- + drivers/xen/privcmd.c | 2 +- + drivers/xen/xenbus/xenbus_client.c | 3 +- + 18 files changed, 401 insertions(+), 71 deletions(-) +Merging xen-arm/linux-next (9bc25a1 xen/arm: remove duplicated include from enlighten.c) +$ git merge xen-arm/linux-next +Auto-merging arch/arm/mach-vexpress/v2m.c +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 + + arch/arm/boot/dts/Makefile | 4 +- + arch/arm/boot/dts/xenvm-4.2.dts | 13 +++++++ + arch/arm/include/asm/xen/hypercall.h | 1 + + arch/arm/mach-vexpress/v2m.c | 1 - + arch/arm/mach-virt/virt.c | 1 + + arch/arm/xen/enlighten.c | 74 ++++++++++++++++++++++++++++++++---- + arch/arm/xen/hypercall.S | 1 + + 8 files changed, 86 insertions(+), 10 deletions(-) +Merging percpu/for-next (a1b2a55 percpu: add documentation on this_cpu operations) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (46aed11 Merge branch 'for-3.10' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/linux-next (e6e5224 ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it) +$ git merge drivers-x86/linux-next +Resolved 'drivers/platform/x86/chromeos_laptop.c' using previous resolution. +Auto-merging drivers/platform/x86/hp-wmi.c +Auto-merging drivers/platform/x86/chromeos_laptop.c +CONFLICT (content): Merge conflict in drivers/platform/x86/chromeos_laptop.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c8e6bdd] Merge remote-tracking branch 'drivers-x86/linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/platform/x86/hp-wmi.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (38a8179 Merge remote-tracking branch 'regmap/topic/range' into regmap-next) +$ git merge regmap/for-next +Already up-to-date. +Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (df92d5f leds: leds-asic3: switch to using SIMPLE_DEV_PM_OPS) +$ git merge leds/for-next +Auto-merging include/linux/mmc/host.h +Auto-merging drivers/leds/trigger/ledtrig-transient.c +Auto-merging drivers/leds/trigger/ledtrig-timer.c +Auto-merging drivers/leds/trigger/ledtrig-oneshot.c +Auto-merging drivers/leds/trigger/ledtrig-heartbeat.c +Auto-merging drivers/leds/trigger/ledtrig-gpio.c +Auto-merging drivers/leds/trigger/ledtrig-default-on.c +Auto-merging drivers/leds/trigger/ledtrig-cpu.c +Auto-merging drivers/leds/trigger/ledtrig-backlight.c +Merge made by the 'recursive' strategy. + Documentation/leds/00-INDEX | 2 + + Documentation/leds/leds-lp5521.txt | 19 - + Documentation/leds/leds-lp5562.txt | 120 +++++ + Documentation/leds/leds-lp55xx.txt | 46 +- + drivers/leds/Kconfig | 115 +---- + drivers/leds/Makefile | 11 +- + drivers/leds/leds-asic3.c | 7 +- + drivers/leds/leds-atmel-pwm.c | 4 +- + drivers/leds/leds-bd2802.c | 14 +- + drivers/leds/leds-lm355x.c | 2 + + drivers/leds/leds-lm3642.c | 2 + + drivers/leds/leds-lp5521.c | 22 +- + drivers/leds/leds-lp5562.c | 599 ++++++++++++++++++++++++ + drivers/leds/leds-lp55xx-common.c | 42 +- + drivers/leds/leds-lp55xx-common.h | 4 + + drivers/leds/leds-lt3593.c | 5 +- + drivers/leds/leds-ns2.c | 44 +- + drivers/leds/leds-pwm.c | 50 +- + drivers/leds/leds-renesas-tpu.c | 3 +- + drivers/leds/leds-tca6507.c | 4 +- + drivers/leds/leds-wm8350.c | 5 +- + drivers/leds/trigger/Kconfig | 111 +++++ + drivers/leds/trigger/Makefile | 10 + + drivers/leds/{ => trigger}/ledtrig-backlight.c | 2 +- + drivers/leds/trigger/ledtrig-camera.c | 57 +++ + drivers/leds/{ => trigger}/ledtrig-cpu.c | 2 +- + drivers/leds/{ => trigger}/ledtrig-default-on.c | 2 +- + drivers/leds/{ => trigger}/ledtrig-gpio.c | 2 +- + drivers/leds/{ => trigger}/ledtrig-heartbeat.c | 2 +- + drivers/leds/{ => trigger}/ledtrig-ide-disk.c | 0 + drivers/leds/{ => trigger}/ledtrig-oneshot.c | 2 +- + drivers/leds/{ => trigger}/ledtrig-timer.c | 1 - + drivers/leds/{ => trigger}/ledtrig-transient.c | 2 +- + include/linux/leds.h | 33 +- + include/linux/mmc/host.h | 2 - + include/linux/platform_data/leds-lp55xx.h | 21 +- + 36 files changed, 1149 insertions(+), 220 deletions(-) + create mode 100644 Documentation/leds/leds-lp5562.txt + create mode 100644 drivers/leds/leds-lp5562.c + create mode 100644 drivers/leds/trigger/Kconfig + create mode 100644 drivers/leds/trigger/Makefile + rename drivers/leds/{ => trigger}/ledtrig-backlight.c (99%) + create mode 100644 drivers/leds/trigger/ledtrig-camera.c + rename drivers/leds/{ => trigger}/ledtrig-cpu.c (99%) + rename drivers/leds/{ => trigger}/ledtrig-default-on.c (98%) + rename drivers/leds/{ => trigger}/ledtrig-gpio.c (99%) + rename drivers/leds/{ => trigger}/ledtrig-heartbeat.c (99%) + rename drivers/leds/{ => trigger}/ledtrig-ide-disk.c (100%) + rename drivers/leds/{ => trigger}/ledtrig-oneshot.c (99%) + rename drivers/leds/{ => trigger}/ledtrig-timer.c (99%) + rename drivers/leds/{ => trigger}/ledtrig-transient.c (99%) +Merging driver-core/driver-core-next (0d1d392 Merge 3.9-rc7 into driver-core-next) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (45efcb2 tty/serial/sirf: fix MODULE_DEVICE_TABLE) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (4626b8d USB: ehci-msm: USB_MSM_OTG needs USB_PHY) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (added5f ARM: mxs_defconfig: add CONFIG_USB_PHY) +$ git merge usb-gadget/next +Already up-to-date. +Merging staging/staging-next (a0eeed4 staging: comedi: ni_labpc: fix legacy driver build) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (0e27263 Tools: hv: Fix a checkpatch warning) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation) +$ git merge bcon/master +Resolved 'drivers/block/Kconfig' using previous resolution. +Auto-merging kernel/printk.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 d73fdc6] 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 tmem/linux-next +Already up-to-date. +Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio()) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) +$ git merge arm-dt/devicetree/arm-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (d463f82 pinctrl: fix mutex deadlock in get_pinctrl_dev_from_of_node()) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (8afa6e0 vhost_scsi: module rename) +$ git merge vhost/linux-next +Recorded preimage for 'drivers/vhost/Kconfig' +Recorded preimage for 'drivers/vhost/Makefile' +Auto-merging drivers/vhost/Makefile +CONFLICT (content): Merge conflict in drivers/vhost/Makefile +Auto-merging drivers/vhost/Kconfig +CONFLICT (content): Merge conflict in drivers/vhost/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/vhost/Kconfig'. +Recorded resolution for 'drivers/vhost/Makefile'. +[master 5d42311] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) +$ git merge memblock/memblock-kill-early_node_map +Already up-to-date. +Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO) +$ git merge remoteproc/for-next +Resolved 'drivers/remoteproc/Kconfig' using previous resolution. +Auto-merging drivers/remoteproc/ste_modem_rproc.c +Auto-merging drivers/remoteproc/remoteproc_core.c +Auto-merging drivers/remoteproc/Kconfig +CONFLICT (content): Merge conflict in drivers/remoteproc/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 05d28d1] Merge remote-tracking branch 'remoteproc/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/remoteproc/Kconfig | 27 ++- + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/da8xx_remoteproc.c | 324 +++++++++++++++++++++++++++++ + drivers/remoteproc/remoteproc_core.c | 211 ++++++++++++------- + drivers/remoteproc/remoteproc_elf_loader.c | 100 ++++++--- + drivers/remoteproc/remoteproc_internal.h | 15 +- + drivers/remoteproc/remoteproc_virtio.c | 79 +++++-- + drivers/remoteproc/ste_modem_rproc.c | 45 ++-- + include/linux/remoteproc.h | 13 +- + 9 files changed, 677 insertions(+), 138 deletions(-) + create mode 100644 drivers/remoteproc/da8xx_remoteproc.c +Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Auto-merging drivers/rpmsg/virtio_rpmsg_bus.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +++++++ + drivers/rpmsg/Kconfig | 1 + + drivers/rpmsg/virtio_rpmsg_bus.c | 49 ++++++++++++++++++++++++++++------------ + 3 files changed, 44 insertions(+), 14 deletions(-) +Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq) +$ git merge irqdomain/irqdomain/next +Merge made by the 'recursive' strategy. + kernel/irq/irqdomain.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging gpio/gpio/next (753c598 gpio/em: Add Device Tree support) +$ git merge gpio/gpio/next +Auto-merging drivers/gpio/gpio-tegra.c +Auto-merging drivers/gpio/gpio-omap.c +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-em.c | 45 ++++++++++++++++++++++++++-- + drivers/gpio/gpio-omap.c | 75 +++++++++++++++++++++-------------------------- + drivers/gpio/gpio-tegra.c | 11 ++++--- + 3 files changed, 81 insertions(+), 50 deletions(-) +Merging gpio-lw/for-next (ab6ec0f gpio/omap: ensure gpio context is initialised) +$ git merge gpio-lw/for-next +Auto-merging drivers/gpio/gpiolib-of.c +Auto-merging drivers/gpio/gpio-pxa.c +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/gpio/gpio-omap.c +Auto-merging drivers/gpio/gpio-mvebu.c +Auto-merging drivers/gpio/gpio-ich.c +Auto-merging Documentation/acpi/enumeration.txt +Merge made by the 'recursive' strategy. + Documentation/acpi/enumeration.txt | 32 +- + .../devicetree/bindings/gpio/gpio-grgpio.txt | 26 ++ + .../devicetree/bindings/gpio/gpio-mcp23s08.txt | 47 ++ + .../devicetree/bindings/gpio/gpio-omap.txt | 7 +- + drivers/gpio/Kconfig | 13 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-74x164.c | 8 +- + drivers/gpio/gpio-adp5520.c | 4 +- + drivers/gpio/gpio-em.c | 53 +-- + drivers/gpio/gpio-generic.c | 62 ++- + drivers/gpio/gpio-grgpio.c | 505 +++++++++++++++++++++ + drivers/gpio/gpio-ich.c | 17 +- + drivers/gpio/gpio-lpc32xx.c | 2 +- + drivers/gpio/gpio-lynxpoint.c | 1 + + drivers/gpio/gpio-max7300.c | 4 +- + drivers/gpio/gpio-max7301.c | 7 +- + drivers/gpio/gpio-max732x.c | 5 +- + drivers/gpio/gpio-mc33880.c | 19 +- + drivers/gpio/gpio-mcp23s08.c | 137 ++++-- + drivers/gpio/gpio-mvebu.c | 85 +++- + drivers/gpio/gpio-omap.c | 99 +++- + drivers/gpio/gpio-pca953x.c | 3 +- + drivers/gpio/gpio-pcf857x.c | 8 +- + drivers/gpio/gpio-pxa.c | 4 +- + drivers/gpio/gpio-samsung.c | 1 + + drivers/gpio/gpio-sch.c | 111 +++-- + drivers/gpio/gpio-stp-xway.c | 2 +- + drivers/gpio/gpio-tc3589x.c | 8 +- + drivers/gpio/gpio-timberdale.c | 3 +- + drivers/gpio/gpio-tps65910.c | 2 +- + drivers/gpio/gpio-viperboard.c | 4 - + drivers/gpio/gpio-vt8500.c | 8 +- + drivers/gpio/gpiolib-acpi.c | 217 ++++++++- + drivers/gpio/gpiolib-of.c | 2 +- + include/linux/acpi_gpio.h | 19 + + include/linux/basic_mmio_gpio.h | 1 + + 36 files changed, 1268 insertions(+), 259 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-grgpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt + create mode 100644 drivers/gpio/gpio-grgpio.c +Merging gen-gpio/for_next (f4c5405 gpio: update gpio Chinese documentation) +$ git merge gen-gpio/for_next +Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution. +Auto-merging drivers/video/backlight/Kconfig +Auto-merging drivers/video/Kconfig +CONFLICT (modify/delete): drivers/usb/otg/Kconfig deleted in HEAD and modified in gen-gpio/for_next. Version gen-gpio/for_next of drivers/usb/otg/Kconfig left in tree. +Auto-merging drivers/staging/iio/adc/Kconfig +Auto-merging drivers/staging/android/Kconfig +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/i2c/muxes/Kconfig +Auto-merging drivers/gpio/gpio-lpc32xx.c +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sh/kernel/cpu/sh2a/Makefile +CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile +Auto-merging arch/sh/Kconfig +Auto-merging arch/powerpc/platforms/Kconfig +Auto-merging arch/powerpc/platforms/85xx/Kconfig +Auto-merging arch/powerpc/platforms/44x/Kconfig +Auto-merging arch/powerpc/platforms/40x/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/openrisc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/microblaze/Kconfig +Auto-merging arch/metag/Kconfig +Auto-merging arch/m68k/Kconfig.cpu +Auto-merging arch/ia64/Kconfig +Auto-merging arch/hexagon/Kconfig +Auto-merging arch/blackfin/Kconfig +Auto-merging arch/avr32/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/plat-orion/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging arch/alpha/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/usb/otg/Kconfig +drivers/usb/otg/Kconfig: needs merge +rm 'drivers/usb/otg/Kconfig' +$ git commit -v -a +[master 96b4311] Merge remote-tracking branch 'gen-gpio/for_next' +$ git diff -M --stat --summary HEAD^.. + Documentation/gpio.txt | 10 +++++----- + Documentation/zh_CN/gpio.txt | 8 ++++---- + arch/alpha/Kconfig | 3 --- + arch/arm/Kconfig | 3 --- + arch/arm/plat-orion/Makefile | 2 +- + arch/arm/plat-orion/gpio.c | 2 +- + arch/arm64/Kconfig | 3 --- + arch/avr32/Kconfig | 3 --- + arch/blackfin/Kconfig | 5 +---- + arch/hexagon/Kconfig | 3 --- + arch/ia64/Kconfig | 3 --- + arch/m68k/Kconfig | 3 --- + arch/m68k/Kconfig.cpu | 3 +-- + arch/metag/Kconfig | 3 --- + arch/microblaze/Kconfig | 3 --- + arch/mips/Kconfig | 10 +--------- + arch/mips/loongson/common/Makefile | 2 +- + arch/mips/txx9/generic/setup.c | 2 +- + arch/openrisc/Kconfig | 3 --- + arch/powerpc/Kconfig | 5 ----- + arch/powerpc/platforms/40x/Kconfig | 1 - + arch/powerpc/platforms/44x/Kconfig | 1 - + arch/powerpc/platforms/85xx/Kconfig | 1 - + arch/powerpc/platforms/86xx/Kconfig | 3 --- + arch/powerpc/platforms/8xx/Kconfig | 1 - + arch/powerpc/platforms/Kconfig | 4 ---- + arch/sh/Kconfig | 3 --- + arch/sh/boards/mach-sdk7786/Makefile | 2 +- + arch/sh/boards/mach-x3proto/Makefile | 2 +- + arch/sh/kernel/cpu/sh2a/Makefile | 2 +- + arch/sh/kernel/cpu/sh3/Makefile | 2 +- + arch/sh/kernel/cpu/sh4a/Makefile | 2 +- + arch/sparc/Kconfig | 5 ----- + arch/unicore32/Kconfig | 6 +----- + arch/x86/Kconfig | 3 --- + arch/xtensa/Kconfig | 3 --- + arch/xtensa/configs/iss_defconfig | 1 - + arch/xtensa/configs/s6105_defconfig | 1 - + drivers/extcon/Kconfig | 2 +- + drivers/gpio/Kconfig | 1 - + drivers/gpio/gpio-lpc32xx.c | 2 +- + drivers/i2c/busses/Kconfig | 4 ++-- + drivers/i2c/muxes/Kconfig | 2 +- + drivers/input/keyboard/Kconfig | 6 +++--- + drivers/input/misc/Kconfig | 8 ++++---- + drivers/input/mouse/Kconfig | 2 +- + drivers/leds/Kconfig | 6 +++--- + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/net/phy/Kconfig | 2 +- + drivers/pinctrl/sh-pfc/Kconfig | 26 +++++++++++++------------- + drivers/regulator/Kconfig | 2 +- + drivers/spi/Kconfig | 8 ++++---- + drivers/staging/android/Kconfig | 2 +- + drivers/staging/iio/accel/Kconfig | 2 +- + drivers/staging/iio/adc/Kconfig | 2 +- + drivers/staging/iio/addac/Kconfig | 2 +- + drivers/staging/iio/resolver/Kconfig | 4 ++-- + drivers/staging/iio/trigger/Kconfig | 2 +- + drivers/video/Kconfig | 2 +- + drivers/video/backlight/Kconfig | 4 ++-- + drivers/w1/masters/Kconfig | 2 +- + include/linux/gpio.h | 6 +++--- + 63 files changed, 73 insertions(+), 152 deletions(-) +$ git am -3 ../patches/0001-gen-gpio-GPIOLIB-merge-fix-up.patch +Applying: gen-gpio: GPIOLIB merge fix up +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/phy/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 3327840] Merge remote-tracking branch 'gen-gpio/for_next' +$ git am -3 ../patches/0001-merge-fix-for-Convert-selectors-of-GENERIC_GPIO-to-G.patch +Applying: merge fix for Convert selectors of GENERIC_GPIO to GPIOLIB +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/platforms/85xx/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 362258a] Merge remote-tracking branch 'gen-gpio/for_next' +$ git am -3 ../patches/0001-merge-fix-2-for-Convert-selectors-of-GENERIC_GPIO-to.patch +Applying: merge fix 2 for Convert selectors of GENERIC_GPIO to GPIOLIB +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/i2c/muxes/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 120c89a] Merge remote-tracking branch 'gen-gpio/for_next' +Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of sizeof in mailbox_msg_send()) +$ git merge mailbox/dbx500-prcmu-mailbox +Auto-merging drivers/remoteproc/Kconfig +Auto-merging drivers/mailbox/mailbox-omap2.c +Auto-merging drivers/mailbox/mailbox-omap1.c +Removing arch/arm/plat-omap/mailbox.c +Removing arch/arm/plat-omap/include/plat/mailbox.h +Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_2430_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_2420_data.c +Auto-merging arch/arm/mach-omap2/devices.c +Auto-merging arch/arm/configs/omap1_defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mailbox/dbx500-mailbox.txt | 27 + + arch/arm/configs/omap1_defconfig | 3 +- + arch/arm/mach-omap1/Makefile | 4 - + arch/arm/mach-omap2/Makefile | 3 - + arch/arm/mach-omap2/devices.c | 13 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 12 + + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 11 + + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 11 + + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 + + arch/arm/plat-omap/Kconfig | 16 - + arch/arm/plat-omap/Makefile | 3 - + arch/arm/plat-omap/include/plat/mailbox.h | 105 ---- + arch/arm/plat-omap/mailbox.c | 435 -------------- + drivers/cpufreq/highbank-cpufreq.c | 2 +- + drivers/mailbox/Kconfig | 41 ++ + drivers/mailbox/Makefile | 5 + + drivers/mailbox/mailbox-dbx500.c | 648 +++++++++++++++++++++ + .../mailbox.c => drivers/mailbox/mailbox-omap1.c | 90 ++- + .../mailbox.c => drivers/mailbox/mailbox-omap2.c | 330 +++++------ + drivers/mailbox/mailbox.c | 552 ++++++++++++++++++ + drivers/mailbox/mailbox_internal.h | 70 +++ + drivers/mailbox/pl320-ipc.c | 2 +- + drivers/remoteproc/Kconfig | 3 +- + drivers/remoteproc/omap_remoteproc.c | 36 +- + drivers/staging/tidspbridge/Kconfig | 3 +- + drivers/staging/tidspbridge/core/_tiomap.h | 2 +- + drivers/staging/tidspbridge/core/chnl_sm.c | 8 +- + drivers/staging/tidspbridge/core/io_sm.c | 5 +- + drivers/staging/tidspbridge/core/tiomap3430.c | 6 +- + drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 6 +- + drivers/staging/tidspbridge/core/tiomap_io.c | 9 +- + .../tidspbridge/include/dspbridge/host_os.h | 2 +- + include/linux/mailbox.h | 52 +- + include/linux/pl320-ipc.h | 17 + + include/linux/platform_data/mailbox-dbx500.h | 12 + + include/linux/platform_data/mailbox-omap.h | 53 ++ + 36 files changed, 1766 insertions(+), 844 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/dbx500-mailbox.txt + delete mode 100644 arch/arm/plat-omap/include/plat/mailbox.h + delete mode 100644 arch/arm/plat-omap/mailbox.c + create mode 100644 drivers/mailbox/mailbox-dbx500.c + rename arch/arm/mach-omap1/mailbox.c => drivers/mailbox/mailbox-omap1.c (64%) + rename arch/arm/mach-omap2/mailbox.c => drivers/mailbox/mailbox-omap2.c (50%) + create mode 100644 drivers/mailbox/mailbox.c + create mode 100644 drivers/mailbox/mailbox_internal.h + create mode 100644 include/linux/pl320-ipc.h + create mode 100644 include/linux/platform_data/mailbox-dbx500.h + create mode 100644 include/linux/platform_data/mailbox-omap.h +Merging arm-soc/for-next (c2d498d Merge branch 'late/cleanup' into for-next) +$ git merge arm-soc/for-next +Auto-merging include/linux/of.h +Removing include/linux/mxsfb.h +Auto-merging drivers/video/atmel_lcdfb.c +Auto-merging drivers/video/Kconfig +Auto-merging drivers/tty/serial/mxs-auart.c +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/staging/imx-drm/ipu-v3/ipu-common.c +Auto-merging drivers/spi/spi-mxs.c +Auto-merging drivers/spi/spi-davinci.c +Auto-merging drivers/pinctrl/sh-pfc/Kconfig +Auto-merging drivers/pinctrl/pinctrl-samsung.h +CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-samsung.h +Auto-merging drivers/pinctrl/pinctrl-samsung.c +CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-samsung.c +Auto-merging drivers/pinctrl/pinctrl-exynos.c +Auto-merging drivers/pinctrl/Makefile +Auto-merging drivers/pinctrl/Kconfig +Auto-merging drivers/of/base.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/freescale/fec.h +Auto-merging drivers/mmc/host/mxs-mmc.c +Auto-merging drivers/irqchip/irq-vt8500.c +Auto-merging drivers/irqchip/irq-s3c24xx.c +Auto-merging drivers/irqchip/irq-armada-370-xp.c +Auto-merging drivers/i2c/busses/i2c-mxs.c +CONFLICT (modify/delete): drivers/gpio/gpio-vt8500.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/gpio/gpio-vt8500.c left in tree. +Auto-merging drivers/gpio/gpio-samsung.c +Auto-merging drivers/gpio/gpio-pxa.c +Auto-merging drivers/gpio/gpio-pl061.c +CONFLICT (content): Merge conflict in drivers/gpio/gpio-pl061.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/clocksource/exynos_mct.c +Auto-merging drivers/clocksource/Makefile +CONFLICT (content): Merge conflict in drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clk/Makefile +Auto-merging drivers/Makefile +Auto-merging drivers/Kconfig +Removing arch/arm/plat-samsung/time.c +Auto-merging arch/arm/plat-samsung/samsung-time.c +Removing arch/arm/plat-samsung/include/plat/s5p-time.h +Auto-merging arch/arm/plat-samsung/devs.c +Auto-merging arch/arm/plat-orion/gpio.c +Removing arch/arm/plat-orion/addr-map.c +Auto-merging arch/arm/plat-orion/Makefile +CONFLICT (content): Merge conflict in arch/arm/plat-orion/Makefile +Auto-merging arch/arm/plat-omap/dmtimer.c +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-virt/virt.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-tegra/tegra.c +Auto-merging arch/arm/mach-tegra/Kconfig +Removing arch/arm/mach-spear/spear13xx-dma.h +Auto-merging arch/arm/mach-shmobile/include/mach/common.h +Auto-merging arch/arm/mach-shmobile/board-mackerel.c +Auto-merging arch/arm/mach-shmobile/board-kzm9g.c +Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadillo800eva.c +Auto-merging arch/arm/mach-s3c64xx/Kconfig +Auto-merging arch/arm/mach-s3c24xx/mach-rx1950.c +Removing arch/arm/mach-s3c24xx/irq-s3c244x.c +Removing arch/arm/mach-s3c24xx/irq-s3c2440.c +Removing arch/arm/mach-s3c24xx/irq-s3c2412.c +Removing arch/arm/mach-s3c24xx/include/mach/entry-macro.S +Removing arch/arm/mach-pxa/include/mach/debug-macro.S +Auto-merging arch/arm/mach-pxa/Kconfig +Auto-merging arch/arm/mach-orion5x/common.c +Auto-merging arch/arm/mach-orion5x/board-dt.c +Removing arch/arm/mach-orion5x/addr-map.c +Auto-merging arch/arm/mach-omap2/timer.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/timer.c +Auto-merging arch/arm/mach-omap2/omap_hwmod.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod.c +Auto-merging arch/arm/mach-omap2/gpmc.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/gpmc.c +Auto-merging arch/arm/mach-omap2/gpmc-onenand.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/gpmc-onenand.c +Auto-merging arch/arm/mach-omap2/common.h +Auto-merging arch/arm/mach-omap2/board-omap3beagle.c +Removing arch/arm/mach-mvebu/addr-map.c +Removing arch/arm/mach-mv78xx0/addr-map.c +Auto-merging arch/arm/mach-mmp/ttc_dkb.cRecorded preimage for 'arch/arm/mach-omap2/gpmc-onenand.c' +Recorded preimage for 'arch/arm/mach-omap2/gpmc.c' +Recorded preimage for 'arch/arm/mach-omap2/timer.c' +Recorded preimage for 'arch/arm/plat-orion/Makefile' +Recorded preimage for 'drivers/gpio/gpio-pl061.c' +Resolved 'arch/arm/mach-omap2/omap_hwmod.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/board-armadillo800eva.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/pinctrl/pinctrl-samsung.c' using previous resolution. +Resolved 'drivers/pinctrl/pinctrl-samsung.h' using previous resolution. + +Removing arch/arm/mach-mmp/include/mach/debug-macro.S +Auto-merging arch/arm/mach-mmp/aspenite.c +Removing arch/arm/mach-kirkwood/addr-map.c +Auto-merging arch/arm/mach-imx/Makefile +Auto-merging arch/arm/mach-imx/Kconfig +Auto-merging arch/arm/mach-exynos/mach-universal_c210.c +Auto-merging arch/arm/mach-exynos/mach-nuri.c +Removing arch/arm/mach-exynos/include/mach/regs-mct.h +Removing arch/arm/mach-exynos/clock-exynos5.c +Removing arch/arm/mach-exynos/clock-exynos4212.c +Removing arch/arm/mach-exynos/clock-exynos4210.c +Removing arch/arm/mach-exynos/clock-exynos4.h +Removing arch/arm/mach-exynos/clock-exynos4.c +Auto-merging arch/arm/mach-exynos/Kconfig +Removing arch/arm/mach-dove/addr-map.c +Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c +Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c +Auto-merging arch/arm/mach-bcm/board_bcm.c +Auto-merging arch/arm/mach-at91/cpuidle.c +Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c +Auto-merging arch/arm/mach-at91/at91sam9g45.c +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/sched_clock.c +Auto-merging arch/arm/configs/kirkwood_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/common/Makefile +Auto-merging arch/arm/boot/dts/wm8850.dtsi +Auto-merging arch/arm/boot/dts/wm8650.dtsi +Auto-merging arch/arm/boot/dts/wm8505.dtsi +Auto-merging arch/arm/boot/dts/vt8500.dtsi +Removing arch/arm/boot/dts/sh73a0-reference.dtsi +Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi +Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi +Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi +Auto-merging arch/arm/boot/dts/am33xx.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Auto-merging Documentation/devicetree/bindings/usb/omap-usb.txt +Auto-merging Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt +Removing Documentation/devicetree/bindings/gpio/gpio-vt8500.txt +Auto-merging Documentation/devicetree/bindings/gpio/gpio-omap.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/gpio/gpio-vt8500.c +drivers/gpio/gpio-vt8500.c: needs merge +rm 'drivers/gpio/gpio-vt8500.c' +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-omap2/gpmc-onenand.c'. +Recorded resolution for 'arch/arm/mach-omap2/gpmc.c'. +Recorded resolution for 'arch/arm/mach-omap2/timer.c'. +Recorded resolution for 'arch/arm/plat-orion/Makefile'. +Recorded resolution for 'drivers/gpio/gpio-pl061.c'. +[master 66ffc5e] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/firmware.txt | 88 + + .../devicetree/bindings/arm/omap/l3-noc.txt | 1 + + .../devicetree/bindings/arm/omap/timer.txt | 17 +- + .../devicetree/bindings/arm/primecell.txt | 19 +- + .../devicetree/bindings/arm/samsung-boards.txt | 10 + + .../devicetree/bindings/arm/samsung/sysreg.txt | 7 + + .../devicetree/bindings/ata/pata-arasan.txt | 22 + + Documentation/devicetree/bindings/bus/ti-gpmc.txt | 103 +- + .../devicetree/bindings/clock/exynos4-clock.txt | 288 +++ + .../devicetree/bindings/clock/exynos5250-clock.txt | 177 ++ + .../devicetree/bindings/clock/exynos5440-clock.txt | 61 + + .../devicetree/bindings/clock/imx5-clock.txt | 14 +- + .../devicetree/bindings/clock/imx6q-clock.txt | 3 + + .../bindings/clock/nvidia,tegra114-car.txt | 303 +++ + .../bindings/clock/nvidia,tegra20-car.txt | 4 +- + .../devicetree/bindings/dma/fsl-mxs-dma.txt | 49 +- + Documentation/devicetree/bindings/fb/mxsfb.txt | 36 +- + .../devicetree/bindings/gpio/gpio-omap.txt | 8 +- + .../devicetree/bindings/gpio/gpio-vt8500.txt | 24 - + .../devicetree/bindings/gpio/mrvl-gpio.txt | 7 +- + .../devicetree/bindings/gpu/samsung-g2d.txt | 20 + + Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 12 +- + .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 60 + + .../interrupt-controller/samsung,s3c24xx-irq.txt | 53 + + .../devicetree/bindings/media/s5p-mfc.txt | 21 + + Documentation/devicetree/bindings/misc/smc.txt | 14 + + Documentation/devicetree/bindings/mmc/mxs-mmc.txt | 12 +- + Documentation/devicetree/bindings/mtd/gpmc-nor.txt | 98 + + .../devicetree/bindings/mtd/gpmc-onenand.txt | 3 + + .../devicetree/bindings/mtd/gpmi-nand.txt | 17 +- + Documentation/devicetree/bindings/net/gpmc-eth.txt | 97 + + .../bindings/pinctrl/fsl,mxs-pinctrl.txt | 4 + + .../devicetree/bindings/pinctrl/pinctrl-vt8500.txt | 57 + + .../devicetree/bindings/pwm/pwm-samsung.txt | 43 + + .../devicetree/bindings/reset/fsl,imx-src.txt | 49 + + Documentation/devicetree/bindings/reset/reset.txt | 75 + + Documentation/devicetree/bindings/serial/pl011.txt | 17 + + .../bindings/sound/nvidia,tegra-audio-alc5632.txt | 8 + + .../sound/nvidia,tegra-audio-trimslice.txt | 7 + + .../bindings/sound/nvidia,tegra-audio-wm8753.txt | 8 + + .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 8 + + .../bindings/sound/nvidia,tegra-audio-wm9712.txt | 8 + + Documentation/devicetree/bindings/spi/mxs-spi.txt | 12 +- + .../devicetree/bindings/spi/spi-davinci.txt | 51 + + .../devicetree/bindings/spi/spi_pl022.txt | 36 + + .../bindings/staging/imx-drm/fsl-imx-drm.txt | 3 + + .../devicetree/bindings/timer/arm,sp804.txt | 29 + + .../bindings/timer/samsung,exynos4210-mct.txt | 68 + + .../bindings/tty/serial/fsl-mxs-auart.txt | 16 +- + .../devicetree/bindings/usb/exynos-usb.txt | 50 + + Documentation/devicetree/bindings/usb/omap-usb.txt | 1 + + .../devicetree/bindings/video/samsung-fimd.txt | 65 + + arch/arm/Kconfig | 24 +- + arch/arm/Kconfig.debug | 13 +- + arch/arm/arm-soc-for-next-contents.txt | 399 +++ + arch/arm/boot/dts/Makefile | 20 +- + arch/arm/boot/dts/am335x-bone.dts | 10 +- + arch/arm/boot/dts/am335x-evm.dts | 18 +- + arch/arm/boot/dts/am335x-evmsk.dts | 18 +- + arch/arm/boot/dts/am33xx.dtsi | 40 +- + arch/arm/boot/dts/am3517-evm.dts | 2 +- + arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 +- + arch/arm/boot/dts/armada-370-db.dts | 134 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 176 +- + arch/arm/boot/dts/armada-370-rd.dts | 96 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 341 ++- + arch/arm/boot/dts/armada-370.dtsi | 330 +-- + arch/arm/boot/dts/armada-xp-db.dts | 202 +- + arch/arm/boot/dts/armada-xp-gp.dts | 222 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 284 +-- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 342 +-- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 484 ++-- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 262 +- + arch/arm/boot/dts/armada-xp.dtsi | 202 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 5 + + arch/arm/boot/dts/at91sam9n12.dtsi | 9 + + arch/arm/boot/dts/at91sam9x5.dtsi | 15 + + arch/arm/boot/dts/bcm11351.dtsi | 5 + + arch/arm/boot/dts/cros5250-common.dtsi | 192 +- + arch/arm/boot/dts/da850-evm.dts | 40 + + arch/arm/boot/dts/da850.dtsi | 94 + + arch/arm/boot/dts/exynos4.dtsi | 98 + + arch/arm/boot/dts/exynos4210-origen.dts | 22 + + arch/arm/boot/dts/exynos4210-smdkv310.dts | 75 +- + arch/arm/boot/dts/exynos4210-trats.dts | 12 + + arch/arm/boot/dts/exynos4210-universal_c210.dts | 352 +++ + arch/arm/boot/dts/exynos4210.dtsi | 44 + + arch/arm/boot/dts/exynos4212.dtsi | 31 + + arch/arm/boot/dts/exynos4412-odroidx.dts | 111 + + arch/arm/boot/dts/exynos4412-origen.dts | 453 ++++ + arch/arm/boot/dts/exynos4412-smdk4412.dts | 33 + + arch/arm/boot/dts/exynos4412.dtsi | 43 + + arch/arm/boot/dts/exynos4x12.dtsi | 13 + + arch/arm/boot/dts/exynos5250-arndale.dts | 452 ++++ + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 783 ++++++ + arch/arm/boot/dts/exynos5250-smdk5250.dts | 69 +- + arch/arm/boot/dts/exynos5250-snow.dts | 160 +- + arch/arm/boot/dts/exynos5250.dtsi | 495 ++-- + arch/arm/boot/dts/exynos5440-sd5v1.dts | 39 + + arch/arm/boot/dts/exynos5440-ssdk5440.dts | 25 +- + arch/arm/boot/dts/exynos5440.dtsi | 116 +- + arch/arm/boot/dts/imx23-evk.dts | 36 +- + arch/arm/boot/dts/imx23-olinuxino.dts | 1 + + arch/arm/boot/dts/imx23.dtsi | 42 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 25 + + arch/arm/boot/dts/imx28-apx4devkit.dts | 25 + + arch/arm/boot/dts/imx28-cfa10049.dts | 50 +- + arch/arm/boot/dts/imx28-evk.dts | 36 +- + arch/arm/boot/dts/imx28-m28evk.dts | 27 + + arch/arm/boot/dts/imx28.dtsi | 62 +- + arch/arm/boot/dts/imx6qdl.dtsi | 8 +- + arch/arm/boot/dts/integratorcp.dts | 6 +- + arch/arm/boot/dts/kirkwood-cloudbox.dts | 89 + + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 180 ++ + arch/arm/boot/dts/kirkwood-ns2mini.dts | 1 + + arch/arm/boot/dts/mmp2.dtsi | 2 +- + arch/arm/boot/dts/omap2.dtsi | 39 +- + arch/arm/boot/dts/omap2420-h4.dts | 46 + + arch/arm/boot/dts/omap2420.dtsi | 67 +- + arch/arm/boot/dts/omap2430.dtsi | 87 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 26 +- + arch/arm/boot/dts/omap3-beagle.dts | 79 +- + arch/arm/boot/dts/omap3-devkit8000.dts | 169 ++ + arch/arm/boot/dts/omap3-evm.dts | 14 +- + arch/arm/boot/dts/omap3-igep.dtsi | 122 + + arch/arm/boot/dts/omap3-igep0020.dts | 56 + + arch/arm/boot/dts/omap3-igep0030.dts | 44 + + arch/arm/boot/dts/omap3-overo.dtsi | 31 +- + arch/arm/boot/dts/omap3.dtsi | 173 +- + arch/arm/boot/dts/omap3430-sdp.dts | 190 ++ + arch/arm/boot/dts/omap34xx.dtsi | 28 + + arch/arm/boot/dts/omap36xx.dtsi | 13 + + arch/arm/boot/dts/omap4-panda-a4.dts | 5 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 251 ++ + arch/arm/boot/dts/omap4-panda-es.dts | 5 +- + arch/arm/boot/dts/omap4-panda.dts | 201 +- + arch/arm/boot/dts/omap4-sdp.dts | 74 +- + arch/arm/boot/dts/omap4-var-som.dts | 2 +- + arch/arm/boot/dts/omap4.dtsi | 165 +- + arch/arm/boot/dts/omap443x.dtsi | 27 + + arch/arm/boot/dts/omap4460.dtsi | 32 + + arch/arm/boot/dts/omap5-evm.dts | 110 +- + arch/arm/boot/dts/omap5.dtsi | 245 +- + arch/arm/boot/dts/pxa168.dtsi | 2 +- + arch/arm/boot/dts/pxa910.dtsi | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 52 + + arch/arm/boot/dts/r8a73a4.dtsi | 94 + + arch/arm/boot/dts/r8a7778-bockw.dts | 32 + + arch/arm/boot/dts/r8a7778.dtsi | 35 + + arch/arm/boot/dts/r8a7779-marzen-reference.dts | 47 + + arch/arm/boot/dts/r8a7790-lager.dts | 31 + + arch/arm/boot/dts/r8a7790.dtsi | 63 + + arch/arm/boot/dts/sama5d3.dtsi | 19 +- + arch/arm/boot/dts/sama5d34ek.dts | 2 +- + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 79 + + arch/arm/boot/dts/sh73a0-reference.dtsi | 24 - + arch/arm/boot/dts/sh73a0.dtsi | 125 + + arch/arm/boot/dts/spear1340.dtsi | 3 + + arch/arm/boot/dts/spear13xx.dtsi | 25 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 892 ++++++- + arch/arm/boot/dts/tegra114-pluto.dts | 1 - + arch/arm/boot/dts/tegra114.dtsi | 248 +- + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 12 + + arch/arm/boot/dts/tegra20-harmony.dts | 20 + + arch/arm/boot/dts/tegra20-medcom-wide.dts | 7 + + arch/arm/boot/dts/tegra20-paz00.dts | 10 + + arch/arm/boot/dts/tegra20-plutux.dts | 3 + + arch/arm/boot/dts/tegra20-seaboard.dts | 11 + + arch/arm/boot/dts/tegra20-tamonten.dtsi | 6 + + arch/arm/boot/dts/tegra20-tec.dts | 3 + + arch/arm/boot/dts/tegra20-trimslice.dts | 23 + + arch/arm/boot/dts/tegra20-ventana.dts | 22 + + arch/arm/boot/dts/tegra20-whistler.dts | 13 + + arch/arm/boot/dts/tegra20.dtsi | 53 +- + arch/arm/boot/dts/tegra30-beaver.dts | 8 + + arch/arm/boot/dts/tegra30-cardhu-a02.dts | 1 + + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 1 + + arch/arm/boot/dts/tegra30-cardhu.dtsi | 11 + + arch/arm/boot/dts/tegra30.dtsi | 1 + + arch/arm/boot/dts/twl4030.dtsi | 18 +- + arch/arm/boot/dts/twl6030.dtsi | 12 + + arch/arm/boot/dts/versatile-ab.dts | 12 + + arch/arm/boot/dts/vexpress-v2p-ca9.dts | 1 + + arch/arm/boot/dts/vt8500.dtsi | 10 +- + arch/arm/boot/dts/wm8505.dtsi | 10 +- + arch/arm/boot/dts/wm8650.dtsi | 10 +- + arch/arm/boot/dts/wm8850.dtsi | 10 +- + arch/arm/common/Makefile | 2 + + arch/arm/common/firmware.c | 18 + + arch/arm/common/timer-sp.c | 140 +- + arch/arm/configs/bockw_defconfig | 94 + + arch/arm/configs/da8xx_omapl_defconfig | 1 + + arch/arm/configs/davinci_all_defconfig | 1 + + arch/arm/configs/imx_v4_v5_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/configs/kirkwood_defconfig | 53 +- + arch/arm/configs/msm_defconfig | 155 +- + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/include/asm/arch_timer.h | 13 +- + arch/arm/include/asm/firmware.h | 66 + + arch/arm/include/asm/hardware/timer-sp.h | 16 +- + arch/arm/include/asm/sched_clock.h | 2 + + arch/arm/include/debug/mvebu.S | 2 +- + arch/arm/include/debug/pxa.S | 33 + + arch/arm/kernel/arch_timer.c | 29 +- + arch/arm/kernel/devtree.c | 7 + + arch/arm/kernel/sched_clock.c | 15 +- + arch/arm/kernel/setup.c | 13 +- + arch/arm/kernel/time.c | 7 +- + arch/arm/mach-at91/at91sam9261.c | 2 + + arch/arm/mach-at91/at91sam9261_devices.c | 6 +- + arch/arm/mach-at91/at91sam9263.c | 1 + + arch/arm/mach-at91/at91sam9263_devices.c | 2 +- + arch/arm/mach-at91/at91sam9g45.c | 2 + + arch/arm/mach-at91/at91sam9g45_devices.c | 6 +- + arch/arm/mach-at91/at91sam9rl.c | 1 + + arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- + arch/arm/mach-at91/cpuidle.c | 2 + + arch/arm/mach-at91/include/mach/cpu.h | 9 +- + arch/arm/mach-at91/pm.c | 2 + + arch/arm/mach-at91/pm.h | 30 +- + arch/arm/mach-at91/setup.c | 22 +- + arch/arm/mach-bcm/Makefile | 4 +- + arch/arm/mach-bcm/bcm_kona_smc.c | 118 + + arch/arm/mach-bcm/bcm_kona_smc.h | 80 + + arch/arm/mach-bcm/bcm_kona_smc_asm.S | 41 + + arch/arm/mach-bcm/board_bcm.c | 23 + + arch/arm/mach-davinci/board-da830-evm.c | 6 +- + arch/arm/mach-davinci/board-da850-evm.c | 17 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 25 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 7 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 15 +- + arch/arm/mach-davinci/board-omapl138-hawk.c | 6 + + arch/arm/mach-davinci/da8xx-dt.c | 6 + + arch/arm/mach-davinci/devices.c | 2 +- + arch/arm/mach-davinci/usb.c | 2 +- + arch/arm/mach-dove/Makefile | 2 +- + arch/arm/mach-dove/addr-map.c | 125 - + arch/arm/mach-dove/board-dt.c | 2 +- + arch/arm/mach-dove/common.c | 39 +- + arch/arm/mach-dove/common.h | 2 +- + arch/arm/mach-dove/include/mach/dove.h | 5 + + arch/arm/mach-exynos/Kconfig | 12 +- + arch/arm/mach-exynos/Makefile | 12 +- + arch/arm/mach-exynos/clock-exynos4.c | 1601 ------------ + arch/arm/mach-exynos/clock-exynos4.h | 35 - + arch/arm/mach-exynos/clock-exynos4210.c | 187 -- + arch/arm/mach-exynos/clock-exynos4212.c | 201 -- + arch/arm/mach-exynos/clock-exynos5.c | 1645 ------------ + arch/arm/mach-exynos/common.c | 205 +- + arch/arm/mach-exynos/common.h | 15 +- + arch/arm/mach-exynos/exynos-smc.S | 22 + + arch/arm/mach-exynos/firmware.c | 70 + + arch/arm/mach-exynos/include/mach/irqs.h | 19 +- + arch/arm/mach-exynos/include/mach/map.h | 5 +- + arch/arm/mach-exynos/include/mach/regs-mct.h | 53 - + arch/arm/mach-exynos/mach-armlex4210.c | 3 +- + arch/arm/mach-exynos/mach-exynos4-dt.c | 123 +- + arch/arm/mach-exynos/mach-exynos5-dt.c | 141 +- + arch/arm/mach-exynos/mach-nuri.c | 5 +- + arch/arm/mach-exynos/mach-origen.c | 5 +- + arch/arm/mach-exynos/mach-smdk4x12.c | 5 +- + arch/arm/mach-exynos/mach-smdkv310.c | 7 +- + arch/arm/mach-exynos/mach-universal_c210.c | 9 +- + arch/arm/mach-exynos/platsmp.c | 32 +- + arch/arm/mach-exynos/smc.h | 31 + + arch/arm/mach-highbank/highbank.c | 24 +- + arch/arm/mach-imx/Kconfig | 10 +- + arch/arm/mach-imx/Makefile | 1 + + arch/arm/mach-imx/anatop.c | 103 + + arch/arm/mach-imx/clk-imx51-imx53.c | 75 +- + arch/arm/mach-imx/clk-imx6q.c | 126 +- + arch/arm/mach-imx/clk.h | 17 + + arch/arm/mach-imx/common.h | 10 +- + arch/arm/mach-imx/gpc.c | 23 +- + arch/arm/mach-imx/headsmp.S | 2 +- + arch/arm/mach-imx/mach-imx6q.c | 74 +- + arch/arm/mach-imx/mm-imx1.c | 2 + + arch/arm/mach-imx/mxc.h | 11 + + arch/arm/mach-imx/platsmp.c | 4 +- + arch/arm/mach-imx/pm-imx6q.c | 4 +- + arch/arm/mach-imx/src.c | 66 + + arch/arm/mach-integrator/integrator_cp.c | 34 - + arch/arm/mach-kirkwood/Kconfig | 334 +-- + arch/arm/mach-kirkwood/Makefile | 44 +- + arch/arm/mach-kirkwood/addr-map.c | 91 - + arch/arm/mach-kirkwood/board-dt.c | 20 +- + arch/arm/mach-kirkwood/board-ns2.c | 3 +- + arch/arm/mach-kirkwood/board-readynas.c | 28 + + arch/arm/mach-kirkwood/common.c | 38 +- + arch/arm/mach-kirkwood/common.h | 14 +- + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 7 +- + arch/arm/mach-kirkwood/pcie.c | 1 - + arch/arm/mach-mmp/aspenite.c | 7 + + arch/arm/mach-mmp/avengers_lite.c | 7 + + arch/arm/mach-mmp/brownstone.c | 7 + + arch/arm/mach-mmp/clock-mmp2.c | 2 +- + arch/arm/mach-mmp/clock-pxa168.c | 2 +- + arch/arm/mach-mmp/clock-pxa910.c | 2 +- + arch/arm/mach-mmp/flint.c | 7 + + arch/arm/mach-mmp/gplugd.c | 7 + + arch/arm/mach-mmp/include/mach/debug-macro.S | 30 - + arch/arm/mach-mmp/jasper.c | 8 + + arch/arm/mach-mmp/mmp-dt.c | 4 +- + arch/arm/mach-mmp/mmp2-dt.c | 2 +- + arch/arm/mach-mmp/mmp2.c | 2 +- + arch/arm/mach-mmp/pxa168.c | 2 +- + arch/arm/mach-mmp/pxa910.c | 2 +- + arch/arm/mach-mmp/tavorevb.c | 7 + + arch/arm/mach-mmp/teton_bga.c | 7 + + arch/arm/mach-mmp/ttc_dkb.c | 7 + + arch/arm/mach-mv78xx0/Makefile | 2 +- + arch/arm/mach-mv78xx0/addr-map.c | 93 - + arch/arm/mach-mv78xx0/common.c | 10 +- + arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 9 +- + arch/arm/mach-mv78xx0/pcie.c | 21 +- + arch/arm/mach-mvebu/Kconfig | 2 + + arch/arm/mach-mvebu/Makefile | 2 +- + arch/arm/mach-mvebu/addr-map.c | 137 - + arch/arm/mach-mvebu/armada-370-xp.c | 27 +- + arch/arm/mach-mvebu/armada-370-xp.h | 8 +- + arch/arm/mach-mvebu/platsmp.c | 2 + + arch/arm/mach-mxs/mach-mxs.c | 170 -- + arch/arm/mach-omap1/include/mach/usb.h | 2 +- + arch/arm/mach-omap1/usb.c | 6 +- + arch/arm/mach-omap2/Kconfig | 4 +- + arch/arm/mach-omap2/Makefile | 11 +- + arch/arm/mach-omap2/board-2430sdp.c | 43 +- + arch/arm/mach-omap2/board-3430sdp.c | 74 +- + arch/arm/mach-omap2/board-3630sdp.c | 21 +- + arch/arm/mach-omap2/board-4430sdp.c | 6 + + arch/arm/mach-omap2/board-am3517crane.c | 24 +- + arch/arm/mach-omap2/board-am3517evm.c | 91 +- + arch/arm/mach-omap2/board-cm-t35.c | 80 +- + arch/arm/mach-omap2/board-cm-t3517.c | 22 +- + arch/arm/mach-omap2/board-devkit8000.c | 35 +- + arch/arm/mach-omap2/board-generic.c | 3 +- + arch/arm/mach-omap2/board-igep0020.c | 32 +- + arch/arm/mach-omap2/board-ldp.c | 61 +- + arch/arm/mach-omap2/board-omap3beagle.c | 32 +- + arch/arm/mach-omap2/board-omap3evm.c | 95 +- + arch/arm/mach-omap2/board-omap3pandora.c | 28 +- + arch/arm/mach-omap2/board-omap3stalker.c | 28 +- + arch/arm/mach-omap2/board-omap3touchbook.c | 17 +- + arch/arm/mach-omap2/board-omap4panda.c | 55 +- + arch/arm/mach-omap2/board-overo.c | 74 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 4 + + arch/arm/mach-omap2/board-rx51-video.c | 26 +- + arch/arm/mach-omap2/board-zoom-display.c | 94 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 53 +- + arch/arm/mach-omap2/board-zoom.c | 16 +- + arch/arm/mach-omap2/common.h | 3 +- + arch/arm/mach-omap2/dss-common.c | 54 +- + arch/arm/mach-omap2/gpmc-nand.c | 42 +- + arch/arm/mach-omap2/gpmc-onenand.c | 118 +- + arch/arm/mach-omap2/gpmc-smc91x.c | 30 +- + arch/arm/mach-omap2/gpmc.c | 544 ++-- + arch/arm/mach-omap2/gpmc.h | 43 +- + arch/arm/mach-omap2/omap_hwmod.c | 48 +- + arch/arm/mach-omap2/pmu.c | 14 +- + arch/arm/mach-omap2/timer.c | 138 +- + arch/arm/mach-omap2/usb-host.c | 160 +- + arch/arm/mach-omap2/usb-tusb6010.c | 62 +- + arch/arm/mach-omap2/usb.h | 9 + + arch/arm/mach-orion5x/Makefile | 2 +- + arch/arm/mach-orion5x/addr-map.c | 155 -- + arch/arm/mach-orion5x/board-dt.c | 2 +- + arch/arm/mach-orion5x/common.c | 49 +- + arch/arm/mach-orion5x/common.h | 13 +- + arch/arm/mach-orion5x/d2net-setup.c | 4 +- + arch/arm/mach-orion5x/db88f5281-setup.c | 13 +- + arch/arm/mach-orion5x/dns323-setup.c | 3 +- + arch/arm/mach-orion5x/edmini_v2-setup.c | 4 +- + arch/arm/mach-orion5x/include/mach/orion5x.h | 6 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 8 +- + arch/arm/mach-orion5x/ls-chl-setup.c | 4 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 4 +- + arch/arm/mach-orion5x/lsmini-setup.c | 4 +- + arch/arm/mach-orion5x/mss2-setup.c | 3 +- + arch/arm/mach-orion5x/mv2120-setup.c | 3 +- + arch/arm/mach-orion5x/net2big-setup.c | 4 +- + arch/arm/mach-orion5x/pci.c | 7 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 4 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 4 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 7 +- + arch/arm/mach-orion5x/terastation_pro2-setup.c | 4 +- + arch/arm/mach-orion5x/ts209-setup.c | 4 +- + arch/arm/mach-orion5x/ts409-setup.c | 4 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 4 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 4 +- + arch/arm/mach-prima2/Kconfig | 2 +- + arch/arm/mach-pxa/Kconfig | 2 + + arch/arm/mach-pxa/devices.c | 29 +- + arch/arm/mach-pxa/devices.h | 6 +- + arch/arm/mach-pxa/include/mach/debug-macro.S | 23 - + arch/arm/mach-pxa/pxa25x.c | 11 +- + arch/arm/mach-pxa/pxa27x.c | 7 +- + arch/arm/mach-pxa/pxa3xx.c | 23 +- + arch/arm/mach-pxa/pxa930.c | 17 +- + arch/arm/mach-s3c24xx/Kconfig | 7 + + arch/arm/mach-s3c24xx/Makefile | 8 +- + arch/arm/mach-s3c24xx/common.h | 4 + + arch/arm/mach-s3c24xx/include/mach/entry-macro.S | 70 - + arch/arm/mach-s3c24xx/include/mach/irqs.h | 58 +- + arch/arm/mach-s3c24xx/irq-s3c2412.c | 215 -- + arch/arm/mach-s3c24xx/irq-s3c2440.c | 128 - + arch/arm/mach-s3c24xx/irq-s3c244x.c | 142 -- + arch/arm/mach-s3c24xx/mach-amlm5900.c | 7 +- + arch/arm/mach-s3c24xx/mach-anubis.c | 6 +- + arch/arm/mach-s3c24xx/mach-at2440evb.c | 6 +- + arch/arm/mach-s3c24xx/mach-bast.c | 6 +- + arch/arm/mach-s3c24xx/mach-gta02.c | 6 +- + arch/arm/mach-s3c24xx/mach-h1940.c | 12 +- + arch/arm/mach-s3c24xx/mach-jive.c | 6 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 6 +- + arch/arm/mach-s3c24xx/mach-n30.c | 10 +- + arch/arm/mach-s3c24xx/mach-nexcoder.c | 6 +- + arch/arm/mach-s3c24xx/mach-osiris.c | 6 +- + arch/arm/mach-s3c24xx/mach-otom.c | 6 +- + arch/arm/mach-s3c24xx/mach-qt2410.c | 6 +- + arch/arm/mach-s3c24xx/mach-rx1950.c | 6 +- + arch/arm/mach-s3c24xx/mach-rx3715.c | 11 +- + arch/arm/mach-s3c24xx/mach-smdk2410.c | 6 +- + arch/arm/mach-s3c24xx/mach-smdk2413.c | 14 +- + arch/arm/mach-s3c24xx/mach-smdk2416.c | 4 +- + arch/arm/mach-s3c24xx/mach-smdk2440.c | 6 +- + arch/arm/mach-s3c24xx/mach-smdk2443.c | 4 +- + arch/arm/mach-s3c24xx/mach-tct_hammer.c | 6 +- + arch/arm/mach-s3c24xx/mach-vr1000.c | 6 +- + arch/arm/mach-s3c24xx/mach-vstms.c | 6 +- + arch/arm/mach-s3c24xx/pm-s3c2412.c | 8 + + arch/arm/mach-s3c64xx/Kconfig | 2 + + arch/arm/mach-s3c64xx/mach-anw6410.c | 4 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 4 +- + arch/arm/mach-s3c64xx/mach-hmt.c | 4 +- + arch/arm/mach-s3c64xx/mach-mini6410.c | 4 +- + arch/arm/mach-s3c64xx/mach-ncp.c | 4 +- + arch/arm/mach-s3c64xx/mach-real6410.c | 4 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 2 + + arch/arm/mach-s3c64xx/mach-smartq5.c | 3 +- + arch/arm/mach-s3c64xx/mach-smartq7.c | 3 +- + arch/arm/mach-s3c64xx/mach-smdk6400.c | 4 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 4 +- + arch/arm/mach-s5p64x0/Kconfig | 4 +- + arch/arm/mach-s5p64x0/mach-smdk6440.c | 6 +- + arch/arm/mach-s5p64x0/mach-smdk6450.c | 6 +- + arch/arm/mach-s5pc100/Kconfig | 1 + + arch/arm/mach-s5pc100/mach-smdkc100.c | 4 +- + arch/arm/mach-s5pv210/Kconfig | 2 +- + arch/arm/mach-s5pv210/mach-aquila.c | 6 +- + arch/arm/mach-s5pv210/mach-goni.c | 6 +- + arch/arm/mach-s5pv210/mach-smdkc110.c | 6 +- + arch/arm/mach-s5pv210/mach-smdkv210.c | 6 +- + arch/arm/mach-s5pv210/mach-torbreck.c | 6 +- + arch/arm/mach-shmobile/Kconfig | 77 +- + arch/arm/mach-shmobile/Makefile | 8 + + arch/arm/mach-shmobile/board-ag5evm.c | 172 +- + arch/arm/mach-shmobile/board-ap4evb.c | 91 +- + arch/arm/mach-shmobile/board-ape6evm.c | 94 + + arch/arm/mach-shmobile/board-armadillo800eva.c | 333 ++- + arch/arm/mach-shmobile/board-bockw.c | 81 + + arch/arm/mach-shmobile/board-bonito.c | 52 +- + arch/arm/mach-shmobile/board-kota2.c | 208 +- + arch/arm/mach-shmobile/board-kzm9d.c | 1 - + arch/arm/mach-shmobile/board-kzm9g-reference.c | 107 + + arch/arm/mach-shmobile/board-kzm9g.c | 244 +- + arch/arm/mach-shmobile/board-lager.c | 46 + + arch/arm/mach-shmobile/board-mackerel.c | 187 +- + arch/arm/mach-shmobile/board-marzen-reference.c | 75 + + arch/arm/mach-shmobile/board-marzen.c | 119 +- + arch/arm/mach-shmobile/clock-r8a73a4.c | 115 + + arch/arm/mach-shmobile/clock-r8a7740.c | 114 +- + arch/arm/mach-shmobile/clock-r8a7778.c | 107 + + arch/arm/mach-shmobile/clock-r8a7779.c | 219 +- + arch/arm/mach-shmobile/clock-r8a7790.c | 93 + + arch/arm/mach-shmobile/clock-sh7372.c | 50 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 115 +- + arch/arm/mach-shmobile/clock.c | 13 + + arch/arm/mach-shmobile/include/mach/clock.h | 39 + + arch/arm/mach-shmobile/include/mach/common.h | 53 - + arch/arm/mach-shmobile/include/mach/irqs.h | 4 + + arch/arm/mach-shmobile/include/mach/r8a73a4.h | 8 + + arch/arm/mach-shmobile/include/mach/r8a7740.h | 83 +- + arch/arm/mach-shmobile/include/mach/r8a7778.h | 32 + + arch/arm/mach-shmobile/include/mach/r8a7779.h | 336 +-- + arch/arm/mach-shmobile/include/mach/r8a7790.h | 9 + + arch/arm/mach-shmobile/include/mach/sh7372.h | 41 +- + arch/arm/mach-shmobile/include/mach/sh73a0.h | 378 +-- + arch/arm/mach-shmobile/intc-r8a7740.c | 641 +---- + arch/arm/mach-shmobile/intc-r8a7779.c | 53 +- + arch/arm/mach-shmobile/intc-sh73a0.c | 117 - + arch/arm/mach-shmobile/setup-emev2.c | 1 - + arch/arm/mach-shmobile/setup-r8a73a4.c | 202 ++ + arch/arm/mach-shmobile/setup-r8a7740.c | 193 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 244 ++ + arch/arm/mach-shmobile/setup-r8a7779.c | 81 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 150 ++ + arch/arm/mach-shmobile/setup-sh7372.c | 1 - + arch/arm/mach-shmobile/setup-sh73a0.c | 127 +- + arch/arm/mach-shmobile/timer.c | 7 +- + arch/arm/mach-spear/Makefile | 6 +- + arch/arm/mach-spear/generic.h | 5 - + arch/arm/mach-spear/include/mach/spear.h | 2 - + arch/arm/mach-spear/spear1310.c | 30 +- + arch/arm/mach-spear/spear1340.c | 32 +- + arch/arm/mach-spear/spear13xx-dma.h | 128 - + arch/arm/mach-spear/spear13xx.c | 60 +- + arch/arm/mach-tegra/Kconfig | 1 + + arch/arm/mach-tegra/tegra.c | 3 + + arch/arm/mach-ux500/Kconfig | 2 + + arch/arm/mach-ux500/board-mop500-pins.c | 34 +- + arch/arm/mach-versatile/core.c | 26 +- + arch/arm/mach-versatile/versatile_dt.c | 1 - + arch/arm/mach-vexpress/v2m.c | 25 +- + arch/arm/mach-virt/virt.c | 9 - + arch/arm/mach-vt8500/Kconfig | 1 + + arch/arm/mach-vt8500/Makefile | 2 +- + arch/arm/mach-vt8500/common.h | 6 - + arch/arm/mach-vt8500/vt8500.c | 14 +- + arch/arm/mach-zynq/platsmp.c | 16 - + arch/arm/plat-omap/dmtimer.c | 241 +- + arch/arm/plat-omap/include/plat/dmtimer.h | 1 + + arch/arm/plat-orion/Makefile | 6 - + arch/arm/plat-orion/addr-map.c | 178 -- + arch/arm/plat-orion/gpio.c | 59 + + arch/arm/plat-samsung/Kconfig | 10 +- + arch/arm/plat-samsung/Makefile | 3 +- + arch/arm/plat-samsung/devs.c | 2 +- + arch/arm/plat-samsung/include/plat/cpu.h | 15 +- + arch/arm/plat-samsung/include/plat/map-s5p.h | 1 + + arch/arm/plat-samsung/include/plat/s5p-time.h | 40 - + arch/arm/plat-samsung/include/plat/samsung-time.h | 53 + + .../plat-samsung/{s5p-time.c => samsung-time.c} | 138 +- + arch/arm/plat-samsung/time.c | 287 --- + arch/arm64/include/asm/arch_timer.h | 5 + + arch/arm64/kernel/time.c | 6 +- + arch/avr32/mach-at32ap/at32ap700x.c | 6 +- + arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c | 13 +- + arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 13 +- + arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 13 +- + arch/sh/kernel/cpu/sh3/pinmux-sh7720.c | 14 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c | 14 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c | 14 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 13 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 13 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c | 14 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 14 +- + arch/sh/kernel/cpu/sh4a/pinmux-shx3.c | 17 +- + drivers/Kconfig | 2 + + drivers/Makefile | 3 + + drivers/ata/pata_arasan_cf.c | 37 +- + drivers/bus/Kconfig | 7 + + drivers/bus/Makefile | 1 + + drivers/bus/mvebu-mbus.c | 870 +++++++ + drivers/clk/Makefile | 1 + + drivers/clk/mmp/clk-mmp2.c | 2 +- + drivers/clk/mmp/clk-pxa168.c | 2 +- + drivers/clk/mmp/clk-pxa910.c | 2 +- + drivers/clk/samsung/Makefile | 8 + + drivers/clk/samsung/clk-exynos4.c | 1082 ++++++++ + drivers/clk/samsung/clk-exynos5250.c | 522 ++++ + drivers/clk/samsung/clk-exynos5440.c | 138 + + drivers/clk/samsung/clk-pll.c | 419 +++ + drivers/clk/samsung/clk-pll.h | 41 + + drivers/clk/samsung/clk.c | 320 +++ + drivers/clk/samsung/clk.h | 287 +++ + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-periph-gate.c | 11 +- + drivers/clk/tegra/clk-periph.c | 14 +- + drivers/clk/tegra/clk-pll.c | 1194 ++++++++- + drivers/clk/tegra/clk-tegra114.c | 2085 +++++++++++++++ + drivers/clk/tegra/clk-tegra20.c | 184 +- + drivers/clk/tegra/clk-tegra30.c | 276 +- + drivers/clk/tegra/clk.c | 14 +- + drivers/clk/tegra/clk.h | 98 +- + drivers/clocksource/Kconfig | 15 + + drivers/clocksource/Makefile | 4 +- + drivers/clocksource/arm_arch_timer.c | 33 +- + drivers/clocksource/em_sti.c | 13 +- + .../mct.c => drivers/clocksource/exynos_mct.c | 221 +- + drivers/clocksource/samsung_pwm_timer.c | 494 ++++ + drivers/clocksource/sh_cmt.c | 189 +- + drivers/clocksource/sh_mtu2.c | 2 +- + drivers/clocksource/sh_tmu.c | 2 +- + drivers/dma/mxs-dma.c | 109 +- + drivers/gpio/Kconfig | 12 +- + drivers/gpio/Makefile | 2 +- + drivers/gpio/gpio-pxa.c | 151 +- + drivers/gpio/gpio-rcar.c | 396 +++ + drivers/gpio/gpio-samsung.c | 9 +- + drivers/gpio/gpio-vt8500.c | 353 --- + drivers/i2c/busses/i2c-mxs.c | 40 +- + drivers/irqchip/Kconfig | 8 + + drivers/irqchip/Makefile | 5 + + drivers/irqchip/exynos-combiner.c | 157 +- + .../irqchip}/irq-armada-370-xp.c | 106 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 547 ++++ + drivers/irqchip/irq-renesas-irqc.c | 307 +++ + .../irq.c => drivers/irqchip/irq-s3c24xx.c | 691 ++++- + .../irq.c => drivers/irqchip/irq-vt8500.c | 6 + + drivers/mmc/host/mxs-mmc.c | 48 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 51 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 3 +- + drivers/net/ethernet/freescale/fec.h | 1 + + drivers/net/ethernet/freescale/fec_main.c | 18 +- + drivers/of/base.c | 111 +- + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-bcm2835.c | 19 +- + drivers/pinctrl/pinctrl-exynos.c | 108 + + drivers/pinctrl/pinctrl-samsung.c | 2 + + drivers/pinctrl/pinctrl-samsung.h | 1 + + drivers/pinctrl/sh-pfc/Kconfig | 6 + + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 302 +-- + drivers/pinctrl/sh-pfc/core.h | 55 +- + drivers/pinctrl/sh-pfc/gpio.c | 372 ++- + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 2587 +++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 694 ++++- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 1695 ++++++++++--- + drivers/pinctrl/sh-pfc/pfc-sh7203.c | 488 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7264.c | 460 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7269.c | 624 ++--- + drivers/pinctrl/sh-pfc/pfc-sh7372.c | 323 ++- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 2664 ++++++++++++++------ + drivers/pinctrl/sh-pfc/pfc-sh7720.c | 333 +-- + drivers/pinctrl/sh-pfc/pfc-sh7722.c | 480 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7723.c | 642 ++--- + drivers/pinctrl/sh-pfc/pfc-sh7724.c | 638 ++--- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 55 +- + drivers/pinctrl/sh-pfc/pfc-sh7757.c | 620 ++--- + drivers/pinctrl/sh-pfc/pfc-sh7785.c | 354 +-- + drivers/pinctrl/sh-pfc/pfc-sh7786.c | 296 +-- + drivers/pinctrl/sh-pfc/pfc-shx3.c | 148 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 491 ++-- + drivers/pinctrl/sh-pfc/sh_pfc.h | 135 +- + drivers/pinctrl/vt8500/Kconfig | 52 + + drivers/pinctrl/vt8500/Makefile | 8 + + drivers/pinctrl/vt8500/pinctrl-vt8500.c | 501 ++++ + drivers/pinctrl/vt8500/pinctrl-wm8505.c | 532 ++++ + drivers/pinctrl/vt8500/pinctrl-wm8650.c | 370 +++ + drivers/pinctrl/vt8500/pinctrl-wm8750.c | 409 +++ + drivers/pinctrl/vt8500/pinctrl-wm8850.c | 388 +++ + drivers/pinctrl/vt8500/pinctrl-wmt.c | 632 +++++ + drivers/pinctrl/vt8500/pinctrl-wmt.h | 79 + + drivers/reset/Kconfig | 13 + + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 297 +++ + drivers/spi/spi-davinci.c | 4 +- + drivers/spi/spi-mxs.c | 60 +- + drivers/spi/spi-pl022.c | 43 +- + drivers/staging/imx-drm/ipu-v3/ipu-common.c | 12 +- + drivers/tty/serial/amba-pl011.c | 64 +- + drivers/tty/serial/mxs-auart.c | 52 +- + drivers/video/Kconfig | 2 + + drivers/video/atmel_lcdfb.c | 120 +- + drivers/video/mxsfb.c | 260 +- + include/clocksource/arm_arch_timer.h | 6 - + include/clocksource/samsung_pwm.h | 36 + + include/linux/clk/tegra.h | 1 + + include/linux/gpio-pxa.h | 1 + + include/linux/mbus.h | 27 +- + include/linux/mxsfb.h | 52 - + include/linux/of.h | 14 + + include/linux/pata_arasan_cf_data.h | 2 - + include/linux/platform_data/gpio-rcar.h | 26 + + .../linux/platform_data/irq-renesas-intc-irqpin.h | 29 + + include/linux/platform_data/irq-renesas-irqc.h | 27 + + include/linux/reset-controller.h | 51 + + include/linux/reset.h | 17 + + include/linux/spi/mxs-spi.h | 4 +- + include/video/atmel_lcdc.h | 4 +- + 672 files changed, 44005 insertions(+), 19389 deletions(-) + create mode 100644 Documentation/arm/firmware.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.txt + create mode 100644 Documentation/devicetree/bindings/clock/exynos4-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/exynos5250-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/exynos5440-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-vt8500.txt + create mode 100644 Documentation/devicetree/bindings/gpu/samsung-g2d.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/samsung,s3c24xx-irq.txt + create mode 100644 Documentation/devicetree/bindings/misc/smc.txt + create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nor.txt + create mode 100644 Documentation/devicetree/bindings/net/gpmc-eth.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-vt8500.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-samsung.txt + create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.txt + create mode 100644 Documentation/devicetree/bindings/reset/reset.txt + create mode 100644 Documentation/devicetree/bindings/serial/pl011.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-davinci.txt + create mode 100644 Documentation/devicetree/bindings/timer/arm,sp804.txt + create mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt + create mode 100644 Documentation/devicetree/bindings/usb/exynos-usb.txt + create mode 100644 Documentation/devicetree/bindings/video/samsung-fimd.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/exynos4210-universal_c210.dts + create mode 100644 arch/arm/boot/dts/exynos4412-odroidx.dts + create mode 100644 arch/arm/boot/dts/exynos4412-origen.dts + create mode 100644 arch/arm/boot/dts/exynos5250-arndale.dts + create mode 100644 arch/arm/boot/dts/exynos5250-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/exynos5440-sd5v1.dts + create mode 100644 arch/arm/boot/dts/kirkwood-cloudbox.dts + create mode 100644 arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts + create mode 100644 arch/arm/boot/dts/omap3-devkit8000.dts + create mode 100644 arch/arm/boot/dts/omap3-igep.dtsi + create mode 100644 arch/arm/boot/dts/omap3-igep0020.dts + create mode 100644 arch/arm/boot/dts/omap3-igep0030.dts + create mode 100644 arch/arm/boot/dts/omap3430-sdp.dts + create mode 100644 arch/arm/boot/dts/omap34xx.dtsi + create mode 100644 arch/arm/boot/dts/omap4-panda-common.dtsi + create mode 100644 arch/arm/boot/dts/omap443x.dtsi + create mode 100644 arch/arm/boot/dts/omap4460.dtsi + create mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm.dts + create mode 100644 arch/arm/boot/dts/r8a73a4.dtsi + create mode 100644 arch/arm/boot/dts/r8a7778-bockw.dts + create mode 100644 arch/arm/boot/dts/r8a7778.dtsi + create mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts + create mode 100644 arch/arm/boot/dts/r8a7790-lager.dts + create mode 100644 arch/arm/boot/dts/r8a7790.dtsi + create mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts + delete mode 100644 arch/arm/boot/dts/sh73a0-reference.dtsi + create mode 100644 arch/arm/common/firmware.c + create mode 100644 arch/arm/configs/bockw_defconfig + create mode 100644 arch/arm/include/asm/firmware.h + create mode 100644 arch/arm/include/debug/pxa.S + create mode 100644 arch/arm/mach-bcm/bcm_kona_smc.c + create mode 100644 arch/arm/mach-bcm/bcm_kona_smc.h + create mode 100644 arch/arm/mach-bcm/bcm_kona_smc_asm.S + delete mode 100644 arch/arm/mach-dove/addr-map.c + delete mode 100644 arch/arm/mach-exynos/clock-exynos4.c + delete mode 100644 arch/arm/mach-exynos/clock-exynos4.h + delete mode 100644 arch/arm/mach-exynos/clock-exynos4210.c + delete mode 100644 arch/arm/mach-exynos/clock-exynos4212.c + delete mode 100644 arch/arm/mach-exynos/clock-exynos5.c + create mode 100644 arch/arm/mach-exynos/exynos-smc.S + create mode 100644 arch/arm/mach-exynos/firmware.c + delete mode 100644 arch/arm/mach-exynos/include/mach/regs-mct.h + create mode 100644 arch/arm/mach-exynos/smc.h + create mode 100644 arch/arm/mach-imx/anatop.c + delete mode 100644 arch/arm/mach-kirkwood/addr-map.c + create mode 100644 arch/arm/mach-kirkwood/board-readynas.c + delete mode 100644 arch/arm/mach-mmp/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-mv78xx0/addr-map.c + delete mode 100644 arch/arm/mach-mvebu/addr-map.c + delete mode 100644 arch/arm/mach-orion5x/addr-map.c + delete mode 100644 arch/arm/mach-pxa/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-s3c24xx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2412.c + delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2440.c + delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c244x.c + create mode 100644 arch/arm/mach-shmobile/board-ape6evm.c + create mode 100644 arch/arm/mach-shmobile/board-bockw.c + create mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c + create mode 100644 arch/arm/mach-shmobile/board-lager.c + create mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c + create mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c + create mode 100644 arch/arm/mach-shmobile/clock-r8a7778.c + create mode 100644 arch/arm/mach-shmobile/clock-r8a7790.c + create mode 100644 arch/arm/mach-shmobile/include/mach/clock.h + create mode 100644 arch/arm/mach-shmobile/include/mach/r8a73a4.h + create mode 100644 arch/arm/mach-shmobile/include/mach/r8a7778.h + create mode 100644 arch/arm/mach-shmobile/include/mach/r8a7790.h + create mode 100644 arch/arm/mach-shmobile/setup-r8a73a4.c + create mode 100644 arch/arm/mach-shmobile/setup-r8a7778.c + create mode 100644 arch/arm/mach-shmobile/setup-r8a7790.c + delete mode 100644 arch/arm/mach-spear/spear13xx-dma.h + delete mode 100644 arch/arm/plat-orion/addr-map.c + delete mode 100644 arch/arm/plat-samsung/include/plat/s5p-time.h + create mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h + rename arch/arm/plat-samsung/{s5p-time.c => samsung-time.c} (68%) + delete mode 100644 arch/arm/plat-samsung/time.c + create mode 100644 drivers/bus/mvebu-mbus.c + create mode 100644 drivers/clk/samsung/Makefile + create mode 100644 drivers/clk/samsung/clk-exynos4.c + create mode 100644 drivers/clk/samsung/clk-exynos5250.c + create mode 100644 drivers/clk/samsung/clk-exynos5440.c + create mode 100644 drivers/clk/samsung/clk-pll.c + create mode 100644 drivers/clk/samsung/clk-pll.h + create mode 100644 drivers/clk/samsung/clk.c + create mode 100644 drivers/clk/samsung/clk.h + create mode 100644 drivers/clk/tegra/clk-tegra114.c + rename arch/arm/mach-exynos/mct.c => drivers/clocksource/exynos_mct.c (64%) + create mode 100644 drivers/clocksource/samsung_pwm_timer.c + create mode 100644 drivers/gpio/gpio-rcar.c + delete mode 100644 drivers/gpio/gpio-vt8500.c + rename {arch/arm/mach-mvebu => drivers/irqchip}/irq-armada-370-xp.c (91%) + create mode 100644 drivers/irqchip/irq-renesas-intc-irqpin.c + create mode 100644 drivers/irqchip/irq-renesas-irqc.c + rename arch/arm/mach-s3c24xx/irq.c => drivers/irqchip/irq-s3c24xx.c (53%) + rename arch/arm/mach-vt8500/irq.c => drivers/irqchip/irq-vt8500.c (97%) + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a73a4.c + create mode 100644 drivers/pinctrl/vt8500/Kconfig + create mode 100644 drivers/pinctrl/vt8500/Makefile + create mode 100644 drivers/pinctrl/vt8500/pinctrl-vt8500.c + create mode 100644 drivers/pinctrl/vt8500/pinctrl-wm8505.c + create mode 100644 drivers/pinctrl/vt8500/pinctrl-wm8650.c + create mode 100644 drivers/pinctrl/vt8500/pinctrl-wm8750.c + create mode 100644 drivers/pinctrl/vt8500/pinctrl-wm8850.c + create mode 100644 drivers/pinctrl/vt8500/pinctrl-wmt.c + create mode 100644 drivers/pinctrl/vt8500/pinctrl-wmt.h + create mode 100644 drivers/reset/Kconfig + create mode 100644 drivers/reset/Makefile + create mode 100644 drivers/reset/core.c + create mode 100644 include/clocksource/samsung_pwm.h + delete mode 100644 include/linux/mxsfb.h + create mode 100644 include/linux/platform_data/gpio-rcar.h + create mode 100644 include/linux/platform_data/irq-renesas-intc-irqpin.h + create mode 100644 include/linux/platform_data/irq-renesas-irqc.h + create mode 100644 include/linux/reset-controller.h + create mode 100644 include/linux/reset.h +Merging bcm2835/for-next (31880c3 Linux 3.9-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging cortex/for-next (4477ca4 ARM: ARMv7-M: Allow the building of new kernel port) +$ git merge cortex/for-next +Auto-merging arch/arm/mm/Makefile +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/kernel/entry-header.S +Auto-merging arch/arm/kernel/entry-common.S +Auto-merging arch/arm/include/asm/glue-cache.h +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 4 +- + arch/arm/Kconfig-nommu | 2 +- + arch/arm/Makefile | 1 + + arch/arm/include/asm/assembler.h | 17 +++- + arch/arm/include/asm/cputype.h | 12 ++- + 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/irqflags.h | 22 ++++-- + arch/arm/include/asm/ptrace.h | 4 + + arch/arm/include/asm/system_info.h | 1 + + arch/arm/include/asm/v7m.h | 44 +++++++++++ + arch/arm/include/uapi/asm/ptrace.h | 35 +++++++-- + arch/arm/kernel/Makefile | 8 +- + arch/arm/kernel/entry-common.S | 4 + + arch/arm/kernel/entry-header.S | 124 +++++++++++++++++++++++++++++ + arch/arm/kernel/entry-v7m.S | 143 +++++++++++++++++++++++++++++++++ + arch/arm/kernel/head-nommu.S | 10 ++- + arch/arm/kernel/setup.c | 17 +++- + arch/arm/kernel/traps.c | 8 ++ + arch/arm/mm/Kconfig | 21 ++++- + arch/arm/mm/Makefile | 2 + + arch/arm/mm/cache-nop.S | 50 ++++++++++++ + arch/arm/mm/nommu.c | 7 ++ + arch/arm/mm/proc-v7m.S | 157 +++++++++++++++++++++++++++++++++++++ + 25 files changed, 711 insertions(+), 26 deletions(-) + create mode 100644 arch/arm/include/asm/v7m.h + create mode 100644 arch/arm/kernel/entry-v7m.S + create mode 100644 arch/arm/mm/cache-nop.S + create mode 100644 arch/arm/mm/proc-v7m.S +Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (3795b56 Merge branches 'mxs/dt-3.11' and 'imx/dt-3.11' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx28.dtsi | 33 +++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/imx51.dtsi | 23 +++++++++++++++++++++++ + arch/arm/boot/dts/imx53-qsb.dts | 8 ++++++++ + arch/arm/boot/dts/imx53.dtsi | 31 +++++++++++++++++++++++++++++++ + 4 files changed, 95 insertions(+) +Merging ixp4xx/next (19f949f Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging msm/for-next (1df357a Merge branch 'msm-defconfig' into for-next) +$ git merge msm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging renesas/next (cda9c03 Merge branch 'heads/soc-sh73a0' into next) +$ git merge renesas/next +Resolved 'arch/arm/mach-shmobile/board-armadillo800eva.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/board-bockw.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/setup-r8a7740.c' using previous resolution. +Resolved 'drivers/pinctrl/sh-pfc/Kconfig' using previous resolution. +Auto-merging drivers/pinctrl/sh-pfc/Kconfig +CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/Kconfig +Auto-merging arch/arm/mach-shmobile/setup-sh73a0.c +Auto-merging arch/arm/mach-shmobile/setup-sh7372.c +Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c +Auto-merging arch/arm/mach-shmobile/board-mackerel.c +Auto-merging arch/arm/mach-shmobile/board-lager.c +Auto-merging arch/arm/mach-shmobile/board-kzm9g.c +Auto-merging arch/arm/mach-shmobile/board-kzm9d.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 +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadillo800eva.c +Auto-merging arch/arm/mach-shmobile/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 85c7f0c] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. + .../interrupt-controller/renesas,intc-irqpin.txt | 13 + + .../devicetree/bindings/timer/renesas,timer.txt | 45 + + arch/arm/boot/dts/Makefile | 1 + + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 45 + + arch/arm/boot/dts/r8a7740.dtsi | 117 + + arch/arm/boot/dts/r8a7779.dtsi | 17 + + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 86 + + arch/arm/boot/dts/sh73a0.dtsi | 11 + + arch/arm/configs/armadillo800eva_defconfig | 2 +- + arch/arm/configs/bockw_defconfig | 16 +- + arch/arm/configs/kzm9g_defconfig | 3 + + arch/arm/mach-shmobile/Kconfig | 17 + + arch/arm/mach-shmobile/Makefile | 3 +- + arch/arm/mach-shmobile/board-ap4evb.c | 132 +- + arch/arm/mach-shmobile/board-ape6evm.c | 15 + + .../board-armadillo800eva-reference.c | 213 ++ + arch/arm/mach-shmobile/board-armadillo800eva.c | 117 +- + arch/arm/mach-shmobile/board-bockw.c | 80 +- + arch/arm/mach-shmobile/board-bonito.c | 47 +- + arch/arm/mach-shmobile/board-kzm9d.c | 2 +- + arch/arm/mach-shmobile/board-kzm9g-reference.c | 1 - + arch/arm/mach-shmobile/board-kzm9g.c | 196 +- + arch/arm/mach-shmobile/board-lager.c | 15 + + arch/arm/mach-shmobile/board-mackerel.c | 171 +- + arch/arm/mach-shmobile/board-marzen.c | 12 +- + arch/arm/mach-shmobile/clock-r8a73a4.c | 375 ++- + arch/arm/mach-shmobile/clock-r8a7740.c | 8 +- + arch/arm/mach-shmobile/clock-r8a7778.c | 156 +- + arch/arm/mach-shmobile/clock-r8a7779.c | 4 +- + arch/arm/mach-shmobile/clock-r8a7790.c | 227 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 98 +- + arch/arm/mach-shmobile/cpuidle-r8a7740.c | 62 + + arch/arm/mach-shmobile/include/mach/clock.h | 8 +- + arch/arm/mach-shmobile/include/mach/irqs.h | 5 + + arch/arm/mach-shmobile/include/mach/r8a7740.h | 495 +-- + arch/arm/mach-shmobile/include/mach/r8a7778.h | 3 + + arch/arm/mach-shmobile/include/mach/sh7372.h | 391 --- + arch/arm/mach-shmobile/intc-r8a7740.c | 24 +- + arch/arm/mach-shmobile/pm-r8a7740.c | 165 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 77 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 99 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 19 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 35 +- + arch/arm/mach-shmobile/setup-sh7372.c | 24 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 62 +- + arch/arm/mach-shmobile/sleep-r8a7740.S | 57 + + drivers/clocksource/sh_cmt.c | 108 +- + drivers/clocksource/sh_tmu.c | 96 +- + drivers/gpio/gpio-rcar.c | 2 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 4 + + drivers/irqchip/irq-renesas-irqc.c | 8 + + 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-r8a7740.c | 1873 +++++++---- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 2516 ++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 443 ++- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 3502 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-sh7372.c | 1652 ++++++--- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 134 + + drivers/pinctrl/sh-pfc/sh_pfc.h | 4 +- + include/linux/platform_data/gpio-rcar.h | 2 + + 63 files changed, 11586 insertions(+), 2570 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,timer.txt + create mode 100644 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts + create mode 100644 arch/arm/mach-shmobile/board-armadillo800eva-reference.c + create mode 100644 arch/arm/mach-shmobile/cpuidle-r8a7740.c + create mode 100644 arch/arm/mach-shmobile/sleep-r8a7740.S + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7778.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7790.c +Merging samsung/for-next (e0f8f91 Merge branch 'next/late-exynos' into for-next) +$ git merge samsung/for-next +Resolved 'arch/arm/mach-exynos/cpuidle.c' using previous resolution. +Auto-merging arch/arm/mach-exynos/cpuidle.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpuidle.c +Auto-merging arch/arm/mach-exynos/Kconfig +Auto-merging arch/arm/boot/dts/exynos5250.dtsi +Auto-merging arch/arm/boot/dts/exynos4412-origen.dts +Auto-merging arch/arm/boot/dts/exynos4210.dtsi +Auto-merging arch/arm/boot/dts/exynos4.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ce741eb] Merge remote-tracking branch 'samsung/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/media/s5p-mfc.txt | 5 ++ + .../devicetree/bindings/usb/exynos-usb.txt | 34 +++++++++ + arch/arm/boot/dts/exynos4.dtsi | 2 + + arch/arm/boot/dts/exynos4210-origen.dts | 4 + + arch/arm/boot/dts/exynos4210.dtsi | 3 + + arch/arm/boot/dts/exynos4412-origen.dts | 62 +++++++++++++++ + arch/arm/boot/dts/exynos4412-smdk4412.dts | 87 ++++++++++++++++++++++ + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 56 -------------- + arch/arm/boot/dts/exynos5250.dtsi | 45 +++++++++++ + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-exynos/mach-exynos5-dt.c | 28 +++++++ + 11 files changed, 271 insertions(+), 56 deletions(-) +Merging tegra/for-next (c0c1cb1 Merge branch 'for-3.10/defconfig' into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging dma-mapping/dma-mapping-next (a937536 Linux 3.9-rc3) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (affb923 pwm: lpc32xx: Don't change PWM_ENABLE bit in lpc32xx_pwm_config) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-tiecap.txt | 12 ++++++++-- + .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 12 ++++++++-- + drivers/pwm/Kconfig | 8 +++---- + drivers/pwm/pwm-ab8500.c | 10 ++++---- + drivers/pwm/pwm-atmel-tcb.c | 1 + + drivers/pwm/pwm-imx.c | 6 +---- + drivers/pwm/pwm-lpc32xx.c | 27 ++++++++++++++++++---- + drivers/pwm/pwm-mxs.c | 4 +--- + drivers/pwm/pwm-puv3.c | 1 - + drivers/pwm/pwm-pxa.c | 23 ++++-------------- + drivers/pwm/pwm-samsung.c | 20 ++++++++-------- + drivers/pwm/pwm-spear.c | 11 ++++----- + drivers/pwm/pwm-tegra.c | 2 +- + drivers/pwm/pwm-tiecap.c | 6 +++-- + drivers/pwm/pwm-tiehrpwm.c | 6 +++-- + drivers/pwm/pwm-tipwmss.c | 2 ++ + drivers/pwm/pwm-tipwmss.h | 2 +- + drivers/pwm/pwm-twl-led.c | 4 +++- + drivers/pwm/pwm-twl.c | 6 +++-- + drivers/video/backlight/pwm_bl.c | 7 ++---- + 20 files changed, 91 insertions(+), 79 deletions(-) +Merging dma-buf/for-next (b89e356 dma-buf: Add debugfs support) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem) +$ git merge 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 ktest/for-next +Already up-to-date. +Merging signal/for-next (99e621f syscalls.h: slightly reduce the jungles of macros) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (1e43525 clk: add clk_ignore_unused option to keep boot clocks on) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) +Merging akpm-current/current (0fbd067 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge akpm-current/current +Already up-to-date. +$ 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: revert "ipc: don't allocate a copy larger than max" +Applying: drivers/char/random.c: fix priming of last_data +Applying: sound/soc/codecs/si476x.c: don't use 0bNNN +Applying: x86: make 'mem=' option to work for efi platform +Applying: kernel/auditfilter.c: tree and watch will memory leak when failure occurs +Applying: kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees() +Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress +Applying: drivers/video: implement a simple framebuffer driver +Applying: drivers-video-implement-a-simple-framebuffer-driver-fix +Applying: cyber2000fb: avoid palette corruption at higher clocks +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: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max +Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros +Applying: lglock: update lockdep annotations to report recursive local locks +Applying: block: restore /proc/partitions to not display non-partitionable removable devices +Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic +Applying: vm: adjust ifdef for TINY_RCU +Applying: mm/SPARC: use common help functions to free reserved pages +Applying: mm, vmalloc: export vmap_area_list, instead of vmlist +Applying: mm, vmalloc: remove list management of vmlist after initializing vmalloc +Applying: clear_refs: sanitize accepted commands declaration +Applying: clear_refs-sanitize-accepted-commands-declaration-fix +Applying: clear_refs: introduce private struct for mm_walk +Applying: pagemap: introduce pagemap_entry_t without pmshift bits +Applying: pagemap: introduce the /proc/PID/pagemap2 file +Applying: mm: soft-dirty bits for user memory changes tracking +Applying: mem-soft-dirty: Reshuffle CONFIG_ options to be more Arch-friendly +Applying: mm: remove free_area_cache +Applying: include/linux/mmzone.h: cleanups +Applying: include-linux-mmzoneh-cleanups-fix +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: memcg: debugging facility to access dangling memcgs +Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix +Applying: mm: add vm event counters for balloon pages compaction +Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq +Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg +Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask +Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting +Applying: drivers/rtc/rtc-v3020.c: use gpio_request_array() +Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue +Applying: drivers-rtc-rtc-pxac-fix-set-time-sync-time-issue-fix +Applying: drivers/rtc/rtc-pxa.c: use devm_* APIs +Applying: fat: additions to support fat_fallocate +Applying: fat-additions-to-support-fat_fallocate-fix +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: mwave: fix info leak in mwave_ioctl() +Applying: rapidio: make enumeration/discovery configurable +Applying: rapidio: add enumeration/discovery start from user space +Applying: rapidio: documentation update for enumeration changes +Applying: drivers/net: rename random32() to prandom_u32() +Applying: drivers-net-rename-random32-to-prandom_u32-fix +Applying: brcm80211: fix the misaligned indentation +Applying: remove unused random32() and srandom32() +Applying: random: fix accounting race condition with lockless irq entropy_count update +Applying: relay: fix timer madness +Applying: mm: remove old aio use_mm() comment +Applying: aio: remove dead code from aio.h +Applying: gadget: remove only user of aio retry +Applying: gadget-remove-only-user-of-aio-retry-checkpatch-fixes +Applying: aio: remove retry-based AIO +Applying: aio-remove-retry-based-aio-checkpatch-fixes +Applying: char: add aio_{read,write} to /dev/{null,zero} +Applying: aio: kill return value of aio_complete() +Applying: aio: add kiocb_cancel() +Applying: aio: move private stuff out of aio.h +Applying: aio: dprintk() -> pr_debug() +Applying: aio: do fget() after aio_get_req() +Applying: aio: make aio_put_req() lockless +Applying: aio-make-aio_put_req-lockless-checkpatch-fixes +Applying: aio: refcounting cleanup +Applying: aio-refcounting-cleanup-checkpatch-fixes +Applying: wait: add wait_event_hrtimeout() +Applying: aio: make aio_read_evt() more efficient, convert to hrtimers +Applying: aio-make-aio_read_evt-more-efficient-convert-to-hrtimers-checkpatch-fixes +Applying: aio: use flush_dcache_page() +Applying: aio: use cancellation list lazily +Applying: aio: change reqs_active to include unreaped completions +Applying: aio: kill batch allocation +Applying: aio: kill struct aio_ring_info +Applying: aio: give shared kioctx fields their own cachelines +Applying: aio: reqs_active -> reqs_available +Applying: aio: percpu reqs_available +Applying: generic dynamic per cpu refcounting +Applying: generic-dynamic-per-cpu-refcounting-checkpatch-fixes +Applying: generic-dynamic-per-cpu-refcounting-fix +Applying: aio: percpu ioctx refcount +Applying: aio: use xchg() instead of completion_lock +Applying: aio: don't include aio.h in sched.h +Applying: aio-dont-include-aioh-in-schedh-fix +Applying: aio: kill ki_key +Applying: aio: kill ki_retry +Applying: aio-kill-ki_retry-fix +Applying: aio-kill-ki_retry-checkpatch-fixes +Applying: block: prep work for batch completion +Applying: block-prep-work-for-batch-completion-checkpatch-fixes +Applying: block-prep-work-for-batch-completion-checkpatch merge fixes +Applying: block-prep-work-for-batch-completion-fix-2 +Applying: block-prep-work-for-batch-completion-fix-3 +Applying: block-prep-work-for-batch-completion-fix-3-fix +Applying: block-prep-work-for-batch-completion-fix-4 +Applying: block-prep-work-for-batch-completion-fix-99 +Applying: block, aio: batch completion for bios/kiocbs +Applying: block-aio-batch-completion-for-bios-kiocbs-checkpatch-fixes +Applying: block-aio-batch-completion-for-bios-kiocbs-fix +Applying: virtio-blk: convert to batch completion +Applying: mtip32xx: convert to batch completion +Applying: aio: fix kioctx not being freed after cancellation at exit time +Applying: decompressor: add LZ4 decompressor module +Applying: lib: add support for LZ4-compressed kernel +Applying: arm: add support for LZ4-compressed kernel +Applying: x86: add support for LZ4-compressed kernel +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: seccomp: add generic code for jitted seccomp filters. +Applying: ARM: net: bpf_jit: make code generation less dependent on struct sk_filter. +Applying: ARM: net: bpf_jit: add support for jitted seccomp filters. +Applying: bpf: add comments explaining the schedule_work() operation +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 00afda3...5e032f6 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (5e032f6 bpf: add comments explaining the schedule_work() operation) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/cgroups/memory.txt | 16 + + .../bindings/video/simple-framebuffer.txt | 25 + + Documentation/filesystems/proc.txt | 9 +- + Documentation/rapidio/rapidio.txt | 137 +- + Documentation/rapidio/sysfs.txt | 17 + + Documentation/sysctl/vm.txt | 33 +- + Documentation/vm/pagemap.txt | 5 + + Documentation/vm/soft-dirty.txt | 36 + + arch/Kconfig | 17 + + arch/arm/Kconfig | 2 + + arch/arm/boot/compressed/.gitignore | 1 + + arch/arm/boot/compressed/Makefile | 6 +- + arch/arm/boot/compressed/decompress.c | 4 + + arch/arm/boot/compressed/piggy.lz4.S | 6 + + arch/arm/mm/mmap.c | 2 - + arch/arm/net/bpf_jit_32.c | 91 +- + arch/arm64/mm/mmap.c | 2 - + arch/mips/mm/mmap.c | 2 - + arch/powerpc/mm/mmap_64.c | 2 - + arch/powerpc/net/bpf_jit_comp.c | 4 + + arch/s390/hypfs/inode.c | 1 + + arch/s390/mm/mmap.c | 4 - + arch/s390/net/bpf_jit_comp.c | 4 + + arch/sparc/kernel/leon_smp.c | 15 +- + arch/sparc/kernel/sys_sparc_64.c | 2 - + arch/sparc/mm/init_32.c | 37 +- + arch/sparc/mm/init_64.c | 28 +- + arch/sparc/net/bpf_jit_comp.c | 4 + + arch/tile/mm/mmap.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/pgtable.h | 24 +- + arch/x86/include/asm/pgtable_types.h | 12 + + arch/x86/kernel/e820.c | 72 +- + arch/x86/mm/mmap.c | 2 - + arch/x86/net/bpf_jit_comp.c | 4 + + arch/x86/platform/efi/efi.c | 15 +- + block/blk-core.c | 35 +- + block/blk-flush.c | 5 +- + block/blk-lib.c | 3 +- + block/blk.h | 3 +- + block/genhd.c | 2 +- + block/scsi_ioctl.c | 1 + + crypto/Kconfig | 16 + + crypto/Makefile | 2 + + crypto/lz4.c | 106 ++ + crypto/lz4hc.c | 106 ++ + drivers/block/blockconsole.c | 5 +- + drivers/block/drbd/drbd_bitmap.c | 3 +- + drivers/block/drbd/drbd_worker.c | 9 +- + drivers/block/drbd/drbd_wrappers.h | 9 +- + drivers/block/floppy.c | 3 +- + drivers/block/mtip32xx/mtip32xx.c | 86 +- + drivers/block/mtip32xx/mtip32xx.h | 8 +- + drivers/block/pktcdvd.c | 9 +- + drivers/block/swim3.c | 2 +- + drivers/block/virtio_blk.c | 31 +- + drivers/block/xen-blkback/blkback.c | 3 +- + drivers/char/mem.c | 36 + + drivers/char/mwave/tp3780i.c | 1 + + drivers/char/random.c | 54 +- + drivers/gpu/drm/drm_fb_helper.c | 8 + + drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 + + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/leds/leds-ot200.c | 14 +- + drivers/md/bcache/alloc.c | 3 +- + drivers/md/bcache/btree.c | 3 +- + drivers/md/bcache/debug.c | 3 +- + drivers/md/bcache/io.c | 6 +- + drivers/md/bcache/journal.c | 9 +- + drivers/md/bcache/movinggc.c | 3 +- + drivers/md/bcache/request.c | 9 +- + drivers/md/bcache/request.h | 3 +- + drivers/md/bcache/super.c | 11 +- + drivers/md/bcache/writeback.c | 8 +- + drivers/md/dm-bufio.c | 9 +- + drivers/md/dm-cache-target.c | 3 +- + drivers/md/dm-crypt.c | 3 +- + drivers/md/dm-io.c | 2 +- + drivers/md/dm-snap.c | 3 +- + drivers/md/dm-thin.c | 3 +- + drivers/md/dm-verity.c | 3 +- + drivers/md/dm.c | 8 +- + drivers/md/faulty.c | 3 +- + drivers/md/md.c | 9 +- + drivers/md/multipath.c | 3 +- + drivers/md/raid1.c | 12 +- + drivers/md/raid10.c | 18 +- + drivers/md/raid5.c | 15 +- + drivers/net/ethernet/broadcom/cnic.c | 4 +- + drivers/net/hamradio/baycom_epp.c | 2 +- + drivers/net/hamradio/hdlcdrv.c | 2 +- + drivers/net/hamradio/yam.c | 2 +- + drivers/net/team/team_mode_random.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +- + drivers/net/wireless/mwifiex/cfg80211.c | 4 +- + drivers/rapidio/Kconfig | 28 + + drivers/rapidio/Makefile | 3 +- + drivers/rapidio/rio-driver.c | 8 + + drivers/rapidio/rio-scan.c | 195 +-- + drivers/rapidio/rio-sysfs.c | 45 + + drivers/rapidio/rio.c | 234 ++- + drivers/rapidio/rio.h | 12 +- + drivers/rtc/rtc-pxa.c | 99 +- + drivers/rtc/rtc-v3020.c | 37 +- + drivers/scsi/sg.c | 1 + + drivers/staging/android/logger.c | 1 + + drivers/target/target_core_iblock.c | 6 +- + drivers/target/target_core_pscsi.c | 3 +- + drivers/usb/gadget/amd5536udc.c | 4 +- + drivers/usb/gadget/inode.c | 42 +- + drivers/video/Kconfig | 17 + + drivers/video/Makefile | 1 + + drivers/video/cyber2000fb.c | 3 + + drivers/video/simplefb.c | 234 +++ + fs/9p/vfs_addr.c | 1 + + fs/afs/write.c | 1 + + fs/aio.c | 1820 ++++++++------------ + fs/binfmt_aout.c | 2 - + fs/binfmt_elf.c | 23 +- + fs/bio-integrity.c | 3 +- + fs/bio.c | 64 +- + fs/block_dev.c | 1 + + fs/btrfs/check-integrity.c | 14 +- + fs/btrfs/compression.c | 6 +- + fs/btrfs/disk-io.c | 6 +- + fs/btrfs/extent_io.c | 12 +- + fs/btrfs/file.c | 1 + + fs/btrfs/inode.c | 14 +- + fs/btrfs/raid56.c | 9 +- + fs/btrfs/scrub.c | 18 +- + fs/btrfs/volumes.c | 5 +- + fs/buffer.c | 3 +- + fs/ceph/file.c | 1 + + fs/compat.c | 1 + + fs/direct-io.c | 22 +- + fs/drop_caches.c | 2 + + fs/ecryptfs/file.c | 1 + + fs/ext2/inode.c | 1 + + fs/ext3/inode.c | 1 + + fs/ext4/file.c | 1 + + fs/ext4/indirect.c | 1 + + fs/ext4/inode.c | 1 + + fs/ext4/page-io.c | 4 +- + fs/f2fs/data.c | 3 +- + fs/f2fs/segment.c | 3 +- + fs/fat/file.c | 108 +- + fs/fat/inode.c | 55 + + fs/fuse/cuse.c | 1 + + fs/fuse/dev.c | 1 + + fs/fuse/file.c | 1 + + fs/gfs2/aops.c | 1 + + fs/gfs2/file.c | 1 + + fs/gfs2/lops.c | 3 +- + fs/gfs2/ops_fstype.c | 3 +- + fs/hfs/inode.c | 1 + + fs/hfsplus/inode.c | 1 + + fs/hfsplus/wrapper.c | 3 +- + fs/jfs/inode.c | 1 + + fs/jfs/jfs_logmgr.c | 4 +- + fs/jfs/jfs_metapage.c | 6 +- + fs/logfs/dev_bdev.c | 8 +- + fs/mpage.c | 2 +- + fs/nfs/blocklayout/blocklayout.c | 17 +- + fs/nilfs2/inode.c | 2 +- + fs/nilfs2/segbuf.c | 3 +- + fs/ntfs/file.c | 1 + + fs/ntfs/inode.c | 1 + + fs/ocfs2/aops.h | 2 + + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/inode.h | 2 + + fs/pipe.c | 1 + + fs/proc/base.c | 2 + + fs/proc/internal.h | 1 + + fs/proc/task_mmu.c | 128 +- + fs/read_write.c | 35 +- + fs/reiserfs/inode.c | 1 + + fs/ubifs/file.c | 1 + + fs/udf/inode.c | 1 + + fs/xfs/xfs_aops.c | 4 +- + fs/xfs/xfs_buf.c | 3 +- + fs/xfs/xfs_file.c | 1 + + include/asm-generic/pgtable.h | 22 + + include/linux/aio.h | 199 +-- + include/linux/balloon_compaction.h | 7 + + include/linux/batch_complete.h | 23 + + include/linux/bio.h | 38 +- + include/linux/blk_types.h | 4 +- + include/linux/blkdev.h | 12 +- + include/linux/cgroup.h | 1 + + include/linux/decompress/unlz4.h | 10 + + include/linux/errno.h | 1 - + include/linux/fs.h | 2 +- + include/linux/hardirq.h | 5 + + include/linux/lockdep.h | 92 +- + include/linux/lz4.h | 87 + + include/linux/mm_types.h | 3 - + include/linux/mmzone.h | 20 +- + include/linux/pagemap.h | 2 +- + include/linux/percpu-refcount.h | 114 ++ + include/linux/pid_namespace.h | 1 + + include/linux/posix-timers.h | 16 +- + include/linux/random.h | 7 - + include/linux/rio.h | 17 + + include/linux/rio_drv.h | 1 + + include/linux/rtc-pxa.h | 18 + + include/linux/sched.h | 4 - + include/linux/seccomp.h | 18 + + include/linux/swap.h | 9 +- + include/linux/vm_event_item.h | 7 +- + include/linux/wait.h | 86 + + include/linux/writeback.h | 1 + + include/net/ip_vs.h | 8 +- + init/Kconfig | 34 +- + ipc/msg.c | 5 +- + ipc/sem.c | 250 ++- + kernel/audit_tree.c | 1 + + kernel/auditfilter.c | 4 + + kernel/fork.c | 5 +- + kernel/lglock.c | 12 +- + kernel/posix-cpu-timers.c | 395 ++--- + kernel/printk.c | 92 +- + kernel/ptrace.c | 1 + + kernel/relay.c | 14 +- + kernel/seccomp.c | 33 +- + kernel/smp.c | 11 +- + kernel/watchdog.c | 10 +- + lib/Kconfig | 13 + + lib/Makefile | 6 +- + lib/decompress.c | 5 + + lib/decompress_unlz4.c | 187 ++ + 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/percpu-refcount.c | 251 +++ + mm/Kconfig | 12 + + mm/balloon_compaction.c | 2 + + mm/bounce.c | 12 +- + mm/dmapool.c | 5 +- + mm/huge_memory.c | 2 +- + mm/memcontrol.c | 192 ++- + mm/migrate.c | 1 + + mm/mmap.c | 28 - + mm/mmu_context.c | 3 - + mm/mremap.c | 2 +- + mm/nommu.c | 4 - + mm/page_alloc.c | 5 +- + mm/page_io.c | 9 +- + mm/shmem.c | 1 + + mm/swap.c | 1 + + mm/util.c | 1 - + mm/vmstat.c | 9 +- + net/netfilter/ipvs/ip_vs_ctl.c | 4 +- + scripts/Makefile.lib | 5 + + security/keys/internal.h | 2 + + security/keys/keyctl.c | 1 + + sound/core/pcm_native.c | 2 +- + sound/soc/codecs/si476x.c | 6 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/timers/Makefile | 8 + + tools/testing/selftests/timers/posix_timers.c | 221 +++ + usr/Kconfig | 9 + + 268 files changed, 6506 insertions(+), 2495 deletions(-) + create mode 100644 Documentation/devicetree/bindings/video/simple-framebuffer.txt + create mode 100644 Documentation/vm/soft-dirty.txt + create mode 100644 arch/arm/boot/compressed/piggy.lz4.S + create mode 100644 crypto/lz4.c + create mode 100644 crypto/lz4hc.c + create mode 100644 drivers/video/simplefb.c + create mode 100644 include/linux/batch_complete.h + create mode 100644 include/linux/decompress/unlz4.h + create mode 100644 include/linux/lz4.h + create mode 100644 include/linux/percpu-refcount.h + create mode 100644 include/linux/rtc-pxa.h + 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 lib/percpu-refcount.c + create mode 100644 tools/testing/selftests/timers/Makefile + create mode 100644 tools/testing/selftests/timers/posix_timers.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..754f61a4755e --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 10b38669d64c757cfd927e3820292c580ed70aae +Unchanged quilt series jdelvare-hwmon +Importing device-mapper based on v3.9 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..7d438a0c51a2 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20130503 |