diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-08 13:55:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-08 13:55:06 +1000 |
| commit | 15110f9709d83fb802b0930b8b2f9854e1486794 (patch) | |
| tree | 08c05c4e0bacfea4618e9be84c7857d48a2d229e | |
| parent | 248aa85d2a5e2fa672dc7ac666188df3e7512c4e (diff) | |
Add linux-next specific files for 20130508next-20130508
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 | 3365 | ||||
| -rw-r--r-- | Next/quilt-import.log | 49 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3869 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c7214edcb056 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,226 @@ +Name SHA1 +---- ---- +origin de9c9f86be0dc3495de98dc65c80abe6e7c7d643 +fixes 0279b3c0ada1d78882f24acf94ac4595bd657a89 +kbuild-current a54292f58fc16e3d09aecea16de3e58a898dde97 +arc-current e9715b40d4ddaa01e19de5d7f05d3f58230715e5 +arm-current 1783d4574619aea9ff5d94e6506f288547fc6737 +m68k-current e00c73ee05dc38ecaccced55d4f5fc58b0b769f7 +powerpc-merge 5737789c8340620d7b542d1d4e9b197de8eb2801 +sparc de9c9f86be0dc3495de98dc65c80abe6e7c7d643 +net de9c9f86be0dc3495de98dc65c80abe6e7c7d643 +ipsec da241efcd9c3da2af6ba20055c7e158ec725005c +sound-current 4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e +pci-current e253aaf0af51c1e4dc7dd3b26ea8e666bf9a2d8d +wireless db178340433f90e09ada35c174dfb2c84c2c71f4 +driver-core.current c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +tty.current c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +usb.current c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +staging.current c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +char-misc.current c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +input-current f0aaceac279477f2a830e2897e6fc4c3500fc683 +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 51a26ae7a14b85c99c9be470c2d28eeeba0f26a3 +vfio-fixes 904c680c7bf016a8619a045850937427f8d7368c +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 07961ac7c0ee8b546658717034fe692fd12eefa9 +arm 0d240c95c4d78cdbbe981f993c41443bee539248 +arm-perf ab87304f8c7c625174aea467d67a89bde01ed5e7 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +xilinx 64e3fd3c96fe3416879c8ea985e606f80a28dea5 +arm64 b87447dcaa01b333aa0518116213d83781fe11e1 +blackfin f656c240ae07c48ddf8552e83b64692121044c42 +c6x f934af05cb1bf20558542185299394a69060b829 +cris 32ade6a282a36aae1803b190bae452f1e46f6b6c +hexagon de44443a45e36b7467af2518d3bf7ec6ec909549 +ia64 797f6a684f28dbb00f9e9719315574e344fcbf53 +m68k e00c73ee05dc38ecaccced55d4f5fc58b0b769f7 +m68knommu 2842e5b00e99b30404f9af1c1b367c8e467b5c6c +metag 164c013858a2e89b450cd8021a8be896f9e05697 +microblaze 01cc2cb1c9ee0eb0b813cc3a4404220d11160493 +mips 9339a580c366bd88feea8c14d2d6ca5023573733 +openrisc 6af609515d788bd4c94116344f00601b058f75a6 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +powerpc 5737789c8340620d7b542d1d4e9b197de8eb2801 +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx fdeaf0e20e9f3999c5cb129e821595fe927bf259 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 617e164c35c94c936e3632b387d6dbb3d80c2c02 +sh 37284bd93103ae36b5ea274a985d688fb16f7a38 +sparc-next f8ce1faf55955de62e0a12e330c6d9a526071f65 +tile 9fc1894c9883439245b225d16100d6a55b25373a +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa 4e34bf689fa23122f3d90bf0f92e6239e4b1d9e0 +btrfs 6aec51f7d1db54c0e4c36f051dc77b52edadda85 +ceph b5b09be30cf99f9c699e825629f02e3bce555d44 +cifs bb9055b2744ada735a2fe555c4196ad39a83ef2a +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs f6161aa153581da4a3867a2d1a7caf4be19b6ec9 +ext3 e162b2f835eeda0d255bd463753b5eb823735205 +ext4 e6155736ad76b2070652745f9e54cdea3f0d8567 +f2fs 42e49df33bacafc20434e39fc127c9722c9f8691 +fuse 60b9df7a54804a965850db00beec4d3a2c002536 +gfs2 222cb538f5f18741466dc27cc6cf4375bccf1f89 +jfs 73aaa22d5ffb2630456bac2f9a4ed9b81d0d7271 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs d497ab975141666e674e7bd8729e00095ec23c9d +nfsd 676e4ebd5f2c3b4fd1d2bff79b68385c23c5c105 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +ubifs c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +xfs 7dfbcbefad4b24d9822d04dbd7b5dd5c3fd45076 +vfs ac3e3c5b1164397656df81b9e9ab4991184d3236 +pci d4f09c5d7fbabd1389a5f03f5c9329d790f544e3 +hid 46b189707e62ec1a6c1fc5181b355360931679f3 +i2c c39e8e4354ce4daf23336de5daa28a3b01f00aa6 +jdelvare-hwmon 1aaf6d3d3d1e95f4be07e32dd84aa1c93855fbbd +hwmon-staging 6445e6600fa632448cac64e71119310378464ad9 +v4l-dvb 1d62caa36bbc0affb8137aa8ddb69f7ee944ca19 +kbuild abc88a2bfc55ad9a31926f153af9da00da2c10cb +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata 3d9b935020cc5e44f4bfb3b2ce62eb9aac777381 +infiniband f1258ea852252acb95ac2d0906d40805105d7b50 +pstore bd08ec33b5c23833581e5a36b2a69ccae6b39a28 +pm efe7428a513f6c2adcd8796f359a936ca6a200d6 +idle 5c99726b5faaf1ba4ca80c39d319f419c227f803 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +cpuidle 817c876374a090391e7f2873a8b6076537f42253 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal de6558dc964f6a3243218f17d8032ad810864e2b +ieee1394 6fe9efb9c9fbce690018c31e652924ae28019868 +ubi f6161aa153581da4a3867a2d1a7caf4be19b6ec9 +dlm 900083183959107159f962b83b3b439d53796499 +swiotlb af51a9f1848ff50079a10def56a2c064f326af22 +scsi df3034147c92a25a741005ee1aa3f7e61499e0ab +target-updates 04b59babc0ddd2adaebe6ee3064b4d1b4eeecb7f +target-merge b8d26b3be8b33682cf163274ed07479a70554633 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +slave-dma 9667bcf51b3ce0d95d847b978528834c96a86657 +dmaengine 41ef2d5678d83af030125550329b6ae8b74618fa +net-next de9c9f86be0dc3495de98dc65c80abe6e7c7d643 +ipsec-next 05600a799f6c67b139f2bc565e358b913b230cf5 +wireless-next a8a48e60a468084ef6ec23c78e8903c9e0ba7a4c +bluetooth 26b5afc1c3425dd9936e1a110ea4cf7e8b55c4cc +mtd cdb6404cc53a166a1e3b0179bd8d1f4070beff41 +l2-mtd 98927a242f6cb70e85a5330cee99572eaaf49291 +crypto 3862de1f6c442d53bd828d39f86d07d933a70605 +drm 307b9c022720f9de90d58e51743e01e9a42aec59 +drm-intel 1ffc5289bfcf7f4c4e4213240bb4be68c48ce603 +sound 2195b063f6609e4c6268f291683902f25eaf9aa6 +sound-asoc 2be8ff00acf751fa99bc08d7564f70c4b2288f2c +modules a53a11f35762ff1d5e268adedf2ab9ce313f871d +virtio 01d779a14ef800b74684d9692add4944df052461 +input 3e056a38894481e278b8d504cf7ffc8a64d5e9e0 +input-mt 194664eecd213375ef585b258379be26836edec0 +cgroup 2a0010af17b1739ef8ea8cf02647a127241ee674 +block 410fa266d656f40182ca0cdbc22df481116b6d55 +device-mapper 3e2495af94a99d9aeff112f58871e345eff6d69e +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc e4404fab2e0b70287a471a1e760c9338ce683fde +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 8a965b3baa89ffedc73c0fbc750006c631012ced +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 1fef8be59b01d0cb4e34563674607ade2c002e9a +mfd d7ab7302f970a254997687a1cdede421a5635c68 +battery 237a1b01fdb29df6a28d50d6dbe7a988c4fb3625 +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 3132f623386e9ac87077bd839e726f7b940fbc94 +dt-rh a2b9ea73967386ec5e524ab206bd549d5aafea17 +spi 00ab5392cbc3f87ddfeada311e22f55dfb0bc5c6 +spi-mb bdba7ade6c527ad7b2b30df5167fba39914d99c7 +tip 57e87c102535e46d3bef6b026cde825cb10be349 +ftrace 4c69e6ea415a35eb7f0fc8ee9390c8f7436492a2 +rcu a9be8541220913f9b0ccecdf60262941a32f3e08 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm db6ae6158186a17165ef990bda2895ae7594b039 +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 057c052dc9a652ce1f3f6842d307fee41eb5b89a +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc b9777859ec015a78dae1476e317d04f851bfdd0d +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +irqdomain 560aa5394d2db5437b2deb3bb897655f0fd99f61 +gpio 08ffb2229fafc2c3a696b325a74bf4198d6b91d7 +gpio-lw ab6ec0fb8901ce4359269ac56c691ffcb5071ccb +gen-gpio f4c54050640e7afa4749875cf9b900d42db361c0 +mailbox c497eba5247728c67ba0e0de0907723dd114134a +arm-soc ddc82340212bcb68bd2e94a80d48da32ad70a9c9 +bcm2835 31880c37c11e28cb81c70757e38392b42e695dc6 +cortex 4477ca45fb368880bf77b10ed3b24b03f0cc82da +ep93xx 7ec44295ef66efcac08433298661a18008883885 +imx-mxs 3795b569ba9ea8fbcd1a5d4bd1936aec3fdf91a7 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm 1df357aeed24c63dcbdd2eef01b359d89e83286d +renesas cda9c036109fd0ab01e915b0c7ae84d35b152a9a +samsung e0f8f91f8ba3cd538124b16fbca3fbcb4f6654dd +tegra c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +dma-mapping a937536b868b8369b98967929045f1df54234323 +pwm affb923df96d6c927f9a3dfb0e6f4be940b185cd +dma-buf b89e35636bc75b72d15a1af6d49798802aff77d5 +userns 78008c404acd8e731d1e06618cc5995961e847a6 +ktest df5f7c66013c46cec9aa8156af257bc5eb29b5c5 +signal 20b4fb485227404329e41ad15588afad3df23050 +clk 1e435256d625c203660f0105f1155cd2af283051 +random b980955236922ae6106774511c5c05003d3ad225 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm-current 0fbd06761f5c17cc9b20e02af60fd7ee9c895996 +akpm d72588eba1b10afa45d317d3debeee8aad399c18 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..bcc0b284f9d5 --- /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/tj/libata.git#for-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#for-linux-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://github.com/rydberg/linux.git#for-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper quilt http://people.redhat.com/agk/patches/linux/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git#master +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://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..184b8be453f8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3365 @@ +$ date +Wednesday 8 May 10:28:26 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 51a26ae Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net +Merging origin/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) +$ git merge origin/master +Updating 51a26ae..de9c9f8 +Fast-forward + Documentation/coccinelle.txt | 11 +- + .../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/sysreg.txt | 7 + + .../devicetree/bindings/ata/pata-arasan.txt | 22 + + .../devicetree/bindings/clock/imx5-clock.txt | 14 +- + .../devicetree/bindings/clock/imx6q-clock.txt | 3 + + .../devicetree/bindings/dma/fsl-mxs-dma.txt | 49 +- + Documentation/devicetree/bindings/fb/mxsfb.txt | 36 +- + .../devicetree/bindings/gpio/gpio-omap.txt | 8 +- + .../devicetree/bindings/gpu/samsung-g2d.txt | 20 + + Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 12 +- + .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 60 + + Documentation/devicetree/bindings/mmc/mxs-mmc.txt | 12 +- + .../devicetree/bindings/mtd/gpmi-nand.txt | 17 +- + .../bindings/pinctrl/fsl,mxs-pinctrl.txt | 4 + + .../devicetree/bindings/pwm/pwm-samsung.txt | 43 + + .../devicetree/bindings/reset/fsl,imx-src.txt | 49 + + 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/tty/serial/fsl-mxs-auart.txt | 16 +- + .../devicetree/bindings/usb/exynos-usb.txt | 10 + + Documentation/devicetree/bindings/usb/omap-usb.txt | 1 + + .../devicetree/bindings/video/samsung-fimd.txt | 65 + + Documentation/kbuild/kconfig.txt | 36 + + Documentation/kbuild/makefiles.txt | 7 +- + MAINTAINERS | 12 +- + Makefile | 2 + + arch/arm/Kconfig | 7 +- + arch/arm/Kconfig.debug | 4 +- + arch/arm/boot/dts/Makefile | 11 + + 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/cros5250-common.dtsi | 54 +- + arch/arm/boot/dts/da850-evm.dts | 40 + + arch/arm/boot/dts/da850.dtsi | 94 + + arch/arm/boot/dts/exynos4.dtsi | 40 + + arch/arm/boot/dts/exynos4210-origen.dts | 4 + + arch/arm/boot/dts/exynos4210-smdkv310.dts | 57 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 352 +++ + arch/arm/boot/dts/exynos4210.dtsi | 8 + + arch/arm/boot/dts/exynos4212.dtsi | 9 + + arch/arm/boot/dts/exynos4412-origen.dts | 21 + + arch/arm/boot/dts/exynos4412-smdk4412.dts | 8 + + arch/arm/boot/dts/exynos4412.dtsi | 17 + + arch/arm/boot/dts/exynos4x12.dtsi | 7 + + arch/arm/boot/dts/exynos5250-arndale.dts | 343 ++- + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 783 ++++++ + arch/arm/boot/dts/exynos5250-smdk5250.dts | 49 +- + arch/arm/boot/dts/exynos5250-snow.dts | 149 +- + arch/arm/boot/dts/exynos5250.dtsi | 348 +-- + arch/arm/boot/dts/exynos5440-sd5v1.dts | 39 + + arch/arm/boot/dts/exynos5440-ssdk5440.dts | 6 +- + arch/arm/boot/dts/exynos5440.dtsi | 55 +- + 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/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 | 8 +- + 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 | 142 +- + 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 | 135 +- + 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/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/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 | 13 + + arch/arm/boot/dts/sh73a0.dtsi | 81 + + arch/arm/boot/dts/spear1340.dtsi | 3 + + arch/arm/boot/dts/spear13xx.dtsi | 25 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 891 +++++++ + arch/arm/boot/dts/tegra114.dtsi | 240 +- + 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/zynq-7000.dtsi | 7 + + arch/arm/common/timer-sp.c | 140 +- + arch/arm/configs/bockw_defconfig | 94 + + arch/arm/configs/imx_v4_v5_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/include/asm/arch_timer.h | 13 +- + 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/kernel/arch_timer.c | 29 +- + arch/arm/kernel/sched_clock.c | 15 +- + arch/arm/kernel/time.c | 7 +- + 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-davinci/da8xx-dt.c | 6 + + 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/common.c | 88 +- + arch/arm/mach-exynos/common.h | 7 +- + arch/arm/mach-exynos/include/mach/map.h | 1 - + 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/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/Makefile | 2 +- + arch/arm/mach-kirkwood/addr-map.c | 91 - + arch/arm/mach-kirkwood/board-dt.c | 2 +- + arch/arm/mach-kirkwood/common.c | 38 +- + arch/arm/mach-kirkwood/common.h | 2 +- + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 7 +- + arch/arm/mach-kirkwood/pcie.c | 1 - + 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-omap2/board-2430sdp.c | 43 +- + arch/arm/mach-omap2/board-3430sdp.c | 53 +- + arch/arm/mach-omap2/board-4430sdp.c | 2 +- + arch/arm/mach-omap2/board-am3517evm.c | 74 +- + arch/arm/mach-omap2/board-cm-t35.c | 60 +- + arch/arm/mach-omap2/board-devkit8000.c | 27 +- + arch/arm/mach-omap2/board-generic.c | 1 + + arch/arm/mach-omap2/board-ldp.c | 61 +- + arch/arm/mach-omap2/board-omap3evm.c | 70 +- + arch/arm/mach-omap2/board-omap3pandora.c | 7 +- + arch/arm/mach-omap2/board-omap3stalker.c | 11 - + arch/arm/mach-omap2/board-omap4panda.c | 2 +- + arch/arm/mach-omap2/board-overo.c | 58 +- + arch/arm/mach-omap2/board-rx51-video.c | 26 +- + arch/arm/mach-omap2/board-zoom-display.c | 38 +- + arch/arm/mach-omap2/dss-common.c | 54 +- + arch/arm/mach-omap2/omap_hwmod.c | 48 +- + arch/arm/mach-omap2/pmu.c | 14 +- + arch/arm/mach-omap2/timer.c | 14 +- + 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-shmobile/Kconfig | 48 +- + arch/arm/mach-shmobile/Makefile | 6 + + arch/arm/mach-shmobile/board-ape6evm.c | 94 + + arch/arm/mach-shmobile/board-armadillo800eva.c | 35 +- + arch/arm/mach-shmobile/board-bockw.c | 81 + + arch/arm/mach-shmobile/board-kzm9d.c | 1 - + arch/arm/mach-shmobile/board-lager.c | 46 + + arch/arm/mach-shmobile/board-mackerel.c | 111 +- + arch/arm/mach-shmobile/board-marzen.c | 32 + + 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 | 54 - + arch/arm/mach-shmobile/include/mach/r8a73a4.h | 8 + + arch/arm/mach-shmobile/include/mach/r8a7740.h | 9 + + arch/arm/mach-shmobile/include/mach/r8a7778.h | 32 + + arch/arm/mach-shmobile/include/mach/r8a7779.h | 332 +-- + arch/arm/mach-shmobile/include/mach/r8a7790.h | 9 + + arch/arm/mach-shmobile/include/mach/sh7372.h | 12 + + arch/arm/mach-shmobile/include/mach/sh73a0.h | 15 + + arch/arm/mach-shmobile/intc-r8a7740.c | 641 +---- + 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 | 1 - + 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-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-zynq/Kconfig | 1 + + arch/arm/mach-zynq/Makefile | 6 +- + arch/arm/mach-zynq/common.c | 67 +- + 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 | 136 + + arch/arm/mach-zynq/slcr.c | 125 + + 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 | 4 +- + arch/arm64/include/asm/arch_timer.h | 5 + + arch/arm64/kernel/time.c | 6 +- + arch/powerpc/include/asm/cputable.h | 2 + + arch/powerpc/include/asm/hw_irq.h | 16 +- + arch/powerpc/include/asm/machdep.h | 3 + + arch/powerpc/include/asm/pci-bridge.h | 8 +- + arch/powerpc/include/asm/ppc-opcode.h | 4 + + arch/powerpc/include/uapi/asm/cputable.h | 9 + + arch/powerpc/kernel/cputable.c | 14 + + arch/powerpc/kernel/pci-common.c | 101 +- + arch/powerpc/kernel/pci_32.c | 2 +- + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/kernel/sysfs.c | 2 +- + arch/powerpc/kernel/traps.c | 10 +- + arch/powerpc/mm/hash_utils_64.c | 1 + + arch/powerpc/platforms/cell/iommu.c | 2 +- + arch/powerpc/platforms/cell/spu_base.c | 2 +- + arch/powerpc/platforms/embedded6xx/mpc10x.h | 11 - + arch/powerpc/platforms/powermac/pci.c | 2 +- + arch/powerpc/platforms/powernv/opal.c | 15 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 12 +- + arch/powerpc/platforms/powernv/smp.c | 4 +- + arch/powerpc/platforms/pseries/msi.c | 21 +- + arch/powerpc/platforms/pseries/pci.c | 53 + + arch/powerpc/platforms/pseries/pseries.h | 4 + + arch/powerpc/platforms/pseries/setup.c | 2 + + arch/powerpc/platforms/wsp/wsp_pci.c | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 11 +- + arch/powerpc/sysdev/mpic.c | 14 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 15 +- + arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 2 + + arch/x86/include/asm/rwsem.h | 28 +- + drivers/ata/pata_arasan_cf.c | 37 +- + drivers/bus/Kconfig | 7 + + drivers/bus/Makefile | 1 + + drivers/bus/mvebu-mbus.c | 870 +++++++ + drivers/clk/samsung/clk-exynos4.c | 93 +- + drivers/clk/samsung/clk-exynos5250.c | 1 - + drivers/clk/samsung/clk-exynos5440.c | 1 - + drivers/clk/samsung/clk.h | 2 - + drivers/clocksource/Kconfig | 10 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/arm_arch_timer.c | 33 +- + drivers/clocksource/exynos_mct.c | 22 +- + drivers/clocksource/samsung_pwm_timer.c | 494 ++++ + drivers/dma/mxs-dma.c | 109 +- + drivers/gpio/Kconfig | 6 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-rcar.c | 396 +++ + drivers/hwspinlock/Kconfig | 2 +- + drivers/i2c/busses/i2c-mxs.c | 40 +- + drivers/irqchip/Makefile | 1 + + drivers/irqchip/exynos-combiner.c | 125 +- + .../irqchip}/irq-armada-370-xp.c | 106 +- + 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/net/ethernet/intel/e1000e/e1000.h | 2 +- + drivers/pinctrl/sh-pfc/Kconfig | 5 + + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 41 +- + drivers/pinctrl/sh-pfc/core.h | 1 + + drivers/pinctrl/sh-pfc/gpio.c | 45 +- + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 2587 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 64 +- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 481 +--- + drivers/pinctrl/sh-pfc/pinctrl.c | 11 + + 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 +- + drivers/rpmsg/Kconfig | 1 + + drivers/rpmsg/virtio_rpmsg_bus.c | 49 +- + 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/vhost/net.c | 100 +- + drivers/vhost/scsi.c | 8 +- + drivers/vhost/vhost.c | 4 +- + drivers/vhost/vhost.h | 10 +- + drivers/video/Kconfig | 2 + + drivers/video/mxsfb.c | 260 +- + 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 +- + fs/proc/stat.c | 2 +- + include/clocksource/arm_arch_timer.h | 6 - + include/clocksource/samsung_pwm.h | 36 + + include/linux/kmalloc_sizes.h | 45 - + include/linux/mbus.h | 27 +- + include/linux/mxsfb.h | 52 - + include/linux/of.h | 5 + + include/linux/pata_arasan_cf_data.h | 2 - + include/linux/platform_data/gpio-rcar.h | 26 + + include/linux/remoteproc.h | 13 +- + include/linux/slab.h | 231 +- + include/linux/slab_def.h | 54 +- + include/linux/slub_def.h | 136 +- + include/linux/spi/mxs-spi.h | 4 +- + include/uapi/linux/fuse.h | 7 +- + kernel/irq/irqdomain.c | 20 +- + lib/rwsem-spinlock.c | 38 +- + lib/rwsem.c | 240 +- + mm/slab.c | 790 +++--- + mm/slab.h | 43 +- + mm/slab_common.c | 174 +- + mm/slub.c | 221 +- + 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/menu.c | 16 +- + scripts/kconfig/merge_config.sh | 10 +- + scripts/mod/Makefile | 2 + + scripts/package/Makefile | 39 +- + scripts/package/buildtar | 2 +- + scripts/tags.sh | 4 +- + 462 files changed, 20189 insertions(+), 8673 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/samsung/sysreg.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/pwm/pwm-samsung.txt + create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx-src.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/video/samsung-fimd.txt + create mode 100644 arch/arm/boot/dts/exynos4210-universal_c210.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/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/r8a7790-lager.dts + create mode 100644 arch/arm/boot/dts/r8a7790.dtsi + create mode 100644 arch/arm/configs/bockw_defconfig + delete mode 100644 arch/arm/mach-dove/addr-map.c + create mode 100644 arch/arm/mach-imx/anatop.c + delete mode 100644 arch/arm/mach-kirkwood/addr-map.c + 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 + 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-lager.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 + 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/plat-orion/addr-map.c + create mode 100644 drivers/bus/mvebu-mbus.c + create mode 100644 drivers/clocksource/samsung_pwm_timer.c + create mode 100644 drivers/gpio/gpio-rcar.c + rename {arch/arm/mach-mvebu => drivers/irqchip}/irq-armada-370-xp.c (91%) + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a73a4.c + create mode 100644 drivers/remoteproc/da8xx_remoteproc.c + create mode 100644 include/clocksource/samsung_pwm.h + delete mode 100644 include/linux/kmalloc_sizes.h + delete mode 100644 include/linux/mxsfb.h + create mode 100644 include/linux/platform_data/gpio-rcar.h + delete mode 100644 scripts/headers_install.pl + create mode 100644 scripts/headers_install.sh +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 (e9715b4 ARC: Remove non existent refs to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) +$ 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 | 31 ++- + 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(+), 337 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 +Already up-to-date. +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 (5737789 powerpc: Make hard_irq_disable() do the right thing vs. irq tracing) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) +$ git merge sparc/master +Already up-to-date. +Merging net/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) +$ git merge net/master +Already up-to-date. +$ 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 af3fe32] Merge remote-tracking branch 'arc-current/for-curr' +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 (4ca231b ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_dispatch) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (e253aaf PCI: Delay final fixups until resources are assigned) +$ git merge pci-current/for-linus +Auto-merging drivers/pci/probe.c +Merge made by the 'recursive' strategy. + arch/x86/pci/mrst.c | 10 ++++++---- + drivers/pci/bus.c | 1 + + drivers/pci/msi.c | 6 ++++-- + drivers/pci/probe.c | 1 - + 4 files changed, 11 insertions(+), 7 deletions(-) +Merging wireless/master (db17834 ath5k: do not reschedule tx_complete_work on stop) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath5k/base.c | 5 +++++ + drivers/net/wireless/ath/ath9k/main.c | 6 +++++- + 2 files changed, 10 insertions(+), 1 deletion(-) +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 (f0aacea Input: wacom - add a few new styli for Cintiq series) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/tablet/wacom_wac.c | 72 ++++++++++++++++++++++++++--------- + drivers/input/tablet/wacom_wac.h | 1 + + drivers/input/touchscreen/egalax_ts.c | 2 +- + 3 files changed, 55 insertions(+), 20 deletions(-) +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-davinci.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 (51a26ae Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ 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 +Merge made by the 'recursive' strategy. +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 +Recorded preimage for 'arch/arm/mach-spear/spear13xx.c' +Recorded preimage for 'arch/arm/mach-vexpress/v2m.c' +Recorded preimage for 'drivers/clocksource/Makefile' +Resolved 'arch/arm/mach-highbank/highbank.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mach-imx6q.c' using previous resolution. +Resolved 'arch/arm/mach-zynq/platsmp.c' using previous resolution. +Resolved 'drivers/clocksource/tegra20_timer.c' using previous resolution. +Auto-merging drivers/clocksource/tegra20_timer.c +CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c +Auto-merging drivers/clocksource/Makefile +CONFLICT (content): Merge conflict in drivers/clocksource/Makefile +Auto-merging arch/arm/mach-zynq/platsmp.c +CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c +Auto-merging arch/arm/mach-vexpress/v2m.c +CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c +Auto-merging arch/arm/mach-spear/spear13xx.c +CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c +Auto-merging arch/arm/mach-imx/mach-imx6q.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c +Auto-merging arch/arm/mach-highbank/highbank.c +CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-spear/spear13xx.c'. +Recorded resolution for 'arch/arm/mach-vexpress/v2m.c'. +Recorded resolution for 'drivers/clocksource/Makefile'. +[master 426f21c] Merge remote-tracking branch 'xilinx/arm-next' +$ git diff -M --stat --summary HEAD^.. +Merging arm64/upstream (b87447d arm64: dts: fix #address-cells for foundation-v8) +$ git merge arm64/upstream +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 4 ++++ + arch/arm64/boot/dts/foundation-v8.dts | 2 +- + arch/arm64/include/asm/system_misc.h | 2 +- + arch/arm64/kernel/early_printk.c | 5 +++-- + arch/arm64/kernel/process.c | 8 ++++---- + 5 files changed, 13 insertions(+), 8 deletions(-) +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 (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) +$ git merge hexagon/linux-next +Merge made by the 'recursive' strategy. + arch/hexagon/Kconfig | 2 -- + arch/hexagon/kernel/vm_entry.S | 12 ++++++------ + 2 files changed, 6 insertions(+), 8 deletions(-) +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 (9339a58 Merge branch 'mti-next' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging virt/kvm/kvm_main.c +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 | 17 + + .../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/ar7/memory.c | 1 - + 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 | 1 + + 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 | 116 +- + 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 | 7 +- + 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 | 22 +- + arch/mips/kernel/proc.c | 6 +- + arch/mips/kernel/process.c | 101 ++ + arch/mips/kernel/prom.c | 33 + + arch/mips/kernel/scall32-o32.S | 9 + + arch/mips/kernel/setup.c | 22 + + 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/smtc.c | 10 +- + 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 | 1826 ++++++++++++++++++++ + 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 | 928 ++++++++++ + 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 | 7 +- + 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 | 30 +- + arch/mips/mm/cache.c | 1 + + arch/mips/mm/dma-default.c | 25 +- + 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 | 131 +- + 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 | 55 +- + 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/powertv/init.c | 3 +- + arch/mips/powertv/init.h | 2 + + arch/mips/powertv/memory.c | 1 - + arch/mips/powertv/powertv_setup.c | 1 - + 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 +- + 201 files changed, 16129 insertions(+), 2313 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 (5737789 powerpc: Make hard_irq_disable() do the right thing vs. irq tracing) +$ 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 (617e164 s390: disable pfmf for clear page instruction) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 - + arch/s390/include/asm/page.h | 20 ++++++++------------ + arch/s390/kernel/dis.c | 2 ++ + 3 files changed, 10 insertions(+), 13 deletions(-) +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 (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (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 +Already up-to-date. +Merging cifs/for-next (bb9055b Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ 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 +Already up-to-date. +Merging ext4/dev (e615573 ext4: limit group search loop for non-extent files) +$ git merge ext4/dev +Auto-merging fs/ext4/mballoc.c +Merge made by the 'recursive' strategy. + fs/ext4/extents.c | 9 +++++---- + fs/ext4/extents_status.c | 17 ++++++++++++----- + fs/ext4/extents_status.h | 3 ++- + fs/ext4/file.c | 4 ++-- + fs/ext4/mballoc.c | 6 +++++- + include/trace/events/ext4.h | 4 ++-- + 6 files changed, 28 insertions(+), 15 deletions(-) +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 +Already up-to-date. +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 +Already up-to-date. +Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (d497ab9 NFSv3: match sec= flavor against server list) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/clnt.c +Auto-merging net/sunrpc/auth_gss/auth_gss.c +Auto-merging fs/nfs/super.c +Merge made by the 'recursive' strategy. + fs/nfs/nfs4_fs.h | 3 +- + fs/nfs/nfs4proc.c | 119 +++++++++++++++++++++++++++++++---------- + fs/nfs/nfs4state.c | 11 ++-- + fs/nfs/nfs4xdr.c | 2 +- + fs/nfs/super.c | 48 ++++++++++++++--- + include/linux/nfs_xdr.h | 2 +- + net/sunrpc/auth_gss/auth_gss.c | 3 +- + net/sunrpc/clnt.c | 2 +- + 8 files changed, 146 insertions(+), 44 deletions(-) +Merging nfsd/nfsd-next (676e4eb NFSD: SECINFO doesn't handle unsupported pseudoflavors correctly) +$ git merge nfsd/nfsd-next +Already up-to-date. +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 (7dfbcbe xfs: fallback to vmalloc for large buffers in xfs_compat_attrlist_by_handle) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/Kconfig | 13 +++++++++++++ + fs/xfs/mrlock.h | 12 ++++++------ + fs/xfs/xfs.h | 5 +++++ + fs/xfs/xfs_alloc_btree.c | 4 ++-- + fs/xfs/xfs_bmap_btree.c | 4 ++-- + fs/xfs/xfs_btree.h | 2 +- + fs/xfs/xfs_dir2_node.c | 4 ++-- + fs/xfs/xfs_ialloc_btree.c | 4 ++-- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_ioctl.c | 14 ++++++++++---- + fs/xfs/xfs_ioctl32.c | 14 ++++++++++---- + fs/xfs/xfs_linux.h | 24 ++++++++++++++++++------ + fs/xfs/xfs_message.c | 8 ++++++++ + fs/xfs/xfs_message.h | 1 + + fs/xfs/xfs_trans.h | 4 ++-- + 15 files changed, 83 insertions(+), 32 deletions(-) +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 (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge jdelvare-hwmon/master +Already up-to-date. +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 (abc88a2 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (3d9b935 libata: change maintainer) +$ git merge libata/for-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 0b04977] 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 +Already up-to-date. +Merging pm/linux-next (efe7428 Merge branch 'pm-cpufreq-next' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/processor_driver.c | 8 ++++---- + drivers/acpi/processor_idle.c | 29 +++++++++++++++++++---------- + drivers/cpufreq/Kconfig | 2 +- + drivers/cpufreq/Kconfig.arm | 15 ++++++++------- + drivers/cpufreq/arm_big_little.c | 7 +------ + drivers/cpufreq/arm_big_little.h | 5 +++++ + drivers/cpufreq/arm_big_little_dt.c | 9 +++++---- + drivers/cpufreq/cpufreq-cpu0.c | 27 ++++++++++++++++++++------- + drivers/cpufreq/cpufreq.c | 6 +++--- + drivers/cpufreq/cpufreq_governor.c | 11 +++++++---- + drivers/cpufreq/cpufreq_governor.h | 1 + + include/acpi/acpiosxf.h | 2 +- + include/acpi/processor.h | 10 ++++++++-- + 13 files changed, 83 insertions(+), 49 deletions(-) +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 47a2367] 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 (df30341 [SCSI] pm80xx: thermal, sas controller config and error handling update) +$ 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/Kconfig | 2 + + 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/pm8001/Makefile | 7 +- + drivers/scsi/pm8001/pm8001_ctl.c | 74 +- + drivers/scsi/pm8001/pm8001_defs.h | 34 +- + drivers/scsi/pm8001/pm8001_hwi.c | 799 ++++-- + drivers/scsi/pm8001/pm8001_hwi.h | 4 +- + drivers/scsi/pm8001/pm8001_init.c | 381 ++- + drivers/scsi/pm8001/pm8001_sas.c | 105 +- + drivers/scsi/pm8001/pm8001_sas.h | 177 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 4130 +++++++++++++++++++++++++++++ + drivers/scsi/pm8001/pm80xx_hwi.h | 1523 +++++++++++ + 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_error.c | 37 +- + 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/ufs.h | 122 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 217 ++ + drivers/scsi/ufs/ufshcd.c | 443 +++- + drivers/scsi/ufs/ufshcd.h | 22 +- + drivers/scsi/ufs/ufshci.h | 2 +- + include/linux/pci_ids.h | 6 +- + include/scsi/osd_protocol.h | 2 +- + 80 files changed, 10756 insertions(+), 1329 deletions(-) + create mode 100644 drivers/scsi/fnic/fnic_fip.h + create mode 100644 drivers/scsi/pm8001/pm80xx_hwi.c + create mode 100644 drivers/scsi/pm8001/pm80xx_hwi.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 +Auto-merging Documentation/acpi/enumeration.txt +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 (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) +$ 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 (26b5afc Bluetooth: Mgmt Device Found Event) +$ git merge bluetooth/master +Auto-merging net/bluetooth/l2cap_sock.c +Merge made by the 'recursive' strategy. + include/net/bluetooth/hci_core.h | 29 ++--- + include/net/bluetooth/l2cap.h | 2 +- + net/bluetooth/hci_core.c | 182 +++++++++---------------------- + net/bluetooth/hci_event.c | 67 +----------- + net/bluetooth/l2cap_core.c | 121 ++++++++++++++------- + net/bluetooth/l2cap_sock.c | 4 +- + net/bluetooth/mgmt.c | 229 ++++++++++++++++++++++++++------------- + net/bluetooth/smp.c | 4 +- + 8 files changed, 308 insertions(+), 330 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 +Auto-merging arch/arm/mach-pxa/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 (307b9c0 qxl: update to new idr interfaces.) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-intel/for-linux-next (1ffc528 drm/i915: clear the stolen fb before resuming) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_crtc.c | 4 ++ + drivers/gpu/drm/drm_mm.c | 34 ++++++++-------- + drivers/gpu/drm/i915/i915_gem.c | 8 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 15 +------- + drivers/gpu/drm/i915/i915_reg.h | 2 - + drivers/gpu/drm/i915/intel_ddi.c | 5 +++ + drivers/gpu/drm/i915/intel_dp.c | 77 +++++++++++++++++++++++-------------- + drivers/gpu/drm/i915/intel_drv.h | 1 + + drivers/gpu/drm/i915/intel_fb.c | 16 +++++++- + drivers/gpu/drm/i915/intel_pm.c | 44 ++++++++++----------- + 10 files changed, 116 insertions(+), 90 deletions(-) +Merging sound/for-next (2195b06 ALSA: HDA: Fix Oops caused by dereference NULL pointer) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/atmel/abdac.c | 2 -- + sound/atmel/ac97c.c | 2 -- + sound/mips/hal2.c | 1 - + sound/mips/sgio2audio.c | 1 - + sound/oss/Kconfig | 1 + + sound/pci/hda/hda_codec.c | 3 +++ + sound/pci/hda/hda_intel.c | 2 +- + sound/pci/hda/patch_conexant.c | 17 ++++++++++++++--- + sound/soc/codecs/wm8994.c | 1 + + sound/soc/davinci/davinci-mcasp.c | 7 +++++-- + sound/soc/soc-dapm.c | 4 ++-- + 11 files changed, 27 insertions(+), 14 deletions(-) +Merging sound-asoc/for-next (2be8ff0 Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/codecs/wm0010.c +Merge made by the 'recursive' strategy. + sound/soc/codecs/wm0010.c | 1 + + 1 file changed, 1 insertion(+) +Merging modules/modules-next (a53a11f3 modpost: fix unwanted VMLINUX_SYMBOL_STR expansion) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (01d779a caif_virtio: Remove bouncing email addresses) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (3e056a3 Input: gpio_mouse - remove redundant platform_set_drvdata()) +$ git merge input/next +Auto-merging drivers/input/touchscreen/egalax_ts.c +Merge made by the 'recursive' strategy. + drivers/input/misc/ab8500-ponkey.c | 2 -- + drivers/input/misc/bfin_rotary.c | 1 - + drivers/input/misc/gpio_tilt_polled.c | 2 -- + drivers/input/misc/max8925_onkey.c | 2 -- + drivers/input/misc/mc13783-pwrbutton.c | 1 - + drivers/input/misc/pm8xxx-vibrator.c | 2 -- + drivers/input/misc/pmic8xxx-pwrkey.c | 2 -- + drivers/input/misc/pwm-beeper.c | 1 - + drivers/input/misc/rotary_encoder.c | 2 -- + drivers/input/mouse/amimouse.c | 1 - + drivers/input/mouse/gpio_mouse.c | 3 -- + drivers/input/serio/altera_ps2.c | 1 - + drivers/input/serio/at32psif.c | 2 -- + drivers/input/serio/q40kbd.c | 1 - + drivers/input/touchscreen/88pm860x-ts.c | 1 - + drivers/input/touchscreen/atmel-wm97xx.c | 2 -- + drivers/input/touchscreen/da9052_tsi.c | 2 -- + drivers/input/touchscreen/egalax_ts.c | 53 ++++++++--------------------- + drivers/input/touchscreen/intel-mid-touch.c | 2 -- + drivers/input/touchscreen/jornada720_ts.c | 2 -- + drivers/input/touchscreen/mc13783_ts.c | 2 -- + drivers/input/touchscreen/ti_am335x_tsc.c | 1 - + drivers/input/touchscreen/tnetv107x-ts.c | 2 -- + 23 files changed, 14 insertions(+), 76 deletions(-) +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 e1bed77] 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 (3e2495a Share configuration option processing code between the dm cache ctr and message functions.) +$ git merge device-mapper/master +Merge made by the 'recursive' strategy. + drivers/md/dm-bufio.c | 24 ++- + drivers/md/dm-cache-metadata.c | 4 +- + drivers/md/dm-cache-policy.h | 4 +- + drivers/md/dm-cache-target.c | 100 ++++++----- + drivers/md/dm-snap.c | 1 + + drivers/md/dm-table.c | 2 +- + drivers/md/dm-thin-metadata.c | 36 +++- + drivers/md/dm-thin-metadata.h | 7 + + drivers/md/dm-thin.c | 200 ++++++++++++++++----- + drivers/md/persistent-data/dm-space-map-disk.c | 3 +- + drivers/md/persistent-data/dm-space-map-metadata.c | 127 +++++++++++-- + drivers/md/persistent-data/dm-space-map.h | 23 +++ + include/linux/device-mapper.h | 15 ++ + 13 files changed, 435 insertions(+), 111 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 +Already up-to-date. +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 (8a965b3 mm, slab_common: Fix bootstrap creation of kmalloc caches) +$ git merge slab/for-next +Already up-to-date. +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 (d7ab730 Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next) +$ git merge mfd/master +Already up-to-date. +Merging battery/master (237a1b0 lp8788-charger: Fix kconfig dependency) +$ git merge battery/master +Auto-merging drivers/power/Kconfig +Merge made by the 'recursive' strategy. + drivers/power/Kconfig | 1 + + 1 file changed, 1 insertion(+) +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 +Already up-to-date. +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 (3132f62 Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD) +$ 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 + Documentation/devicetree/usage-model.txt | 8 +++++--- + drivers/of/base.c | 4 ++-- + include/linux/of_platform.h | 5 +++-- + 7 files changed, 10 insertions(+), 7 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 +Already up-to-date. +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 (bdba7ad Merge remote-tracking branch 'spi/fix/grant' into spi-linus) +$ git merge spi-mb/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-atmel.c | 47 ++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 38 insertions(+), 9 deletions(-) +Merging tip/auto-latest (57e87c1 Merge branch 'timers/urgent') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + Documentation/kernel-per-CPU-kthreads.txt | 202 +++++++++++ + arch/Kconfig | 3 + + kernel/events/core.c | 240 +++++-------- + kernel/printk.c | 2 +- + kernel/sched/Makefile | 2 +- + kernel/sched/core.c | 569 ----------------------------- + kernel/sched/fair.c | 18 + + kernel/sched/proc.c | 578 ++++++++++++++++++++++++++++++ + kernel/sched/sched.h | 26 +- + kernel/time/tick-broadcast.c | 10 +- + 10 files changed, 905 insertions(+), 745 deletions(-) + create mode 100644 Documentation/kernel-per-CPU-kthreads.txt + create mode 100644 kernel/sched/proc.c +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 (db6ae61 kvm: Add compat_ioctl for device control API) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/kvm-arm-next (b8022d7 arm: kvm: arch_timer: use symbolic constants) +$ git merge kvm-arm/kvm-arm-next +Resolved 'arch/arm/include/asm/kvm_host.h' using previous resolution. +Resolved 'arch/arm/kvm/arm.c' using previous resolution. +Auto-merging arch/arm/kvm/arm.c +CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c +Auto-merging arch/arm/include/asm/kvm_host.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/kvm_host.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c26a60e] Merge remote-tracking branch 'kvm-arm/kvm-arm-next' +$ git diff -M --stat --summary HEAD^.. +Merging kvm-ppc/kvm-ppc-next (5975a2e KVM: PPC: Book3S: Add API for in-kernel XICS emulation) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +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-virt/virt.c +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 bae7b63] 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 +Already up-to-date. +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 68426e9] 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 (057c052 x86: uaccess s/might_sleep/might_fault/) +$ git merge vhost/linux-next +Auto-merging arch/tile/include/asm/uaccess.h +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/uaccess.h | 4 ++-- + arch/frv/include/asm/uaccess.h | 4 ++-- + arch/m32r/include/asm/uaccess.h | 12 ++++++------ + arch/microblaze/include/asm/uaccess.h | 6 +++--- + arch/mn10300/include/asm/uaccess.h | 4 ++-- + arch/powerpc/include/asm/uaccess.h | 16 ++++++++-------- + arch/tile/include/asm/uaccess.h | 2 +- + arch/x86/include/asm/uaccess_64.h | 2 +- + include/asm-generic/uaccess.h | 10 +++++----- + 9 files changed, 30 insertions(+), 30 deletions(-) +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 +Already up-to-date. +Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq) +$ git merge irqdomain/irqdomain/next +Auto-merging kernel/irq/irqdomain.c +Merge made by the 'recursive' strategy. + kernel/irq/irqdomain.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging gpio/gpio/next (08ffb22 gpio: grgpio: Add irq support) +$ git merge gpio/gpio/next +Already up-to-date. +Merging gpio-lw/for-next (ab6ec0f gpio/omap: ensure gpio context is initialised) +$ git merge gpio-lw/for-next +Auto-merging drivers/gpio/gpio-omap.c +Auto-merging drivers/gpio/Kconfig +Merge made by the 'recursive' strategy. + drivers/gpio/Kconfig | 2 +- + drivers/gpio/gpio-omap.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 46 insertions(+), 4 deletions(-) +Merging gen-gpio/for_next (f4c5405 gpio: update gpio Chinese documentation) +$ git merge gen-gpio/for_next +Resolved 'arch/arm/plat-orion/Makefile' using previous resolution. +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/pinctrl/sh-pfc/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/gpio.c +Auto-merging arch/arm/plat-orion/Makefile +CONFLICT (content): Merge conflict in 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 4ef1dbb] 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 45812c1] 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 e69e112] 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 ab5e960] 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/mach-omap2/Makefile +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 (ddc8234 Merge remote-tracking branch 'torvalds/master' into for-next) +$ git merge arm-soc/for-next +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 - + arch/arm/arm-soc-for-next-contents.txt | 616 +++++++++++++++++++++++++++++++++ + arch/arm/configs/omap2plus_defconfig | 2 + + arch/arm/kernel/devtree.c | 7 + + arch/arm/kernel/setup.c | 13 +- + arch/arm/mach-imx/headsmp.S | 2 +- + arch/arm/mach-omap2/Kconfig | 2 - + arch/arm/mach-omap2/Makefile | 8 +- + arch/arm/mach-omap2/timer.c | 4 + + arch/arm/mach-prima2/Kconfig | 2 +- + arch/arm/mach-spear/spear13xx.c | 2 + + arch/arm/mach-tegra/Kconfig | 1 + + arch/arm/mach-ux500/Kconfig | 2 + + drivers/gpio/gpio-pl061.c | 2 +- + 14 files changed, 653 insertions(+), 11 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +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 19df6ed] 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/boot/dts/exynos5250.dtsi' using previous resolution. +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 +CONFLICT (content): Merge conflict in 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 11b21e2] 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 (c1be5a5 Linux 3.9) +$ git merge tegra/for-next +Already up-to-date. +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 +Already up-to-date. +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 (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (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: 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 + + 016fddb...d72588e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (d72588e 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 +- + 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 + + 267 files changed, 6335 insertions(+), 2416 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..1d1ff1ec1eb7 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,49 @@ +Importing jdelvare-hwmon based on 1aaf6d3d3d1e95f4be07e32dd84aa1c93855fbbd +Unchanged quilt series jdelvare-hwmon +Importing device-mapper based on v3.9 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +HEAD is now at c1be5a5 Linux 3.9 +$ git am ../quilt/device-mapper/dm-cache-fix-error-return-code-in-cache_create.patch +Applying: Return -ENOMEM if memory allocation fails in cache_create +$ git am ../quilt/device-mapper/dm-snapshot-fix-error-return-code-in-snapshot_ctr.patch +Applying: Return -ENOMEM instead of success if unable to allocate pending +$ git am ../quilt/device-mapper/dm-bufio-avoid-a-possible-__vmalloc-deadlock.patch +Applying: This patch uses memalloc_noio_save to avoid a possible deadlock in +$ git am ../quilt/device-mapper/dm-table-fix-write-same-support.patch +Applying: If device_not_write_same_capable() returns true then the iterate_devices +$ git am ../quilt/device-mapper/dm-cache-tune-migration-throttling.patch +Applying: Tune the dm cache migration throttling. +$ git am ../quilt/device-mapper/dm-persistent-data-fix-error-message-typos.patch +Applying: Fix some typos in dm-space-map-metadata.c error messages. +$ git am ../quilt/device-mapper/dm-document-iterate_devices.patch +Applying: Document iterate_devices in device-mapper.h. +$ git am ../quilt/device-mapper/dm-cache-policy-fix-description-of-lookup-fn.patch +Applying: Correct the documented requirement on the return code from dm cache policy +$ git am ../quilt/device-mapper/dm-cache-fix-typos-in-comments.patch +Applying: Fix up some typos in dm-cache comments. +$ git am ../quilt/device-mapper/dm-cache-replace-memcpy-with-struct-assignment.patch +Applying: Use struct assignment rather than memcpy in dm cache. +$ git am ../quilt/device-mapper/dm-thin-refactor-data-dev-resize.patch +Applying: Refactor device size functions in preparation for similar metadata +$ git am ../quilt/device-mapper/dm-thin-open-dev-read-only-when-possible.patch +Applying: If a thin pool is created in read-only-metadata mode then only open the +$ git am ../quilt/device-mapper/dm-persistent-data-support-space-map-resizing.patch +Applying: Support extending a dm persistent data metadata space map. +$ git am ../quilt/device-mapper/dm-thin-detect-metadata-device-resizing.patch +Applying: Allow the dm thin pool metadata device to be extended. +$ git am ../quilt/device-mapper/dm-persistent-data-add-threshold-callback-to-space-map.patch +Applying: Add a threshold callback function to the persistent data space map +$ git am ../quilt/device-mapper/dm-persistent-metadata-add-space-map-threshold-callback.patch +Applying: Add a threshold callback to dm persistent data space maps. +$ git am ../quilt/device-mapper/dm-thin-generate-event-when-metadata-threshold-passed.patch +Applying: Generate a dm event when the amount of remaining thin pool metadata +$ git am ../quilt/device-mapper/dm-cache-move-config-fns.patch +Applying: Move process_config_option() in dm-cache-target.c to make the +$ git am ../quilt/device-mapper/dm-cache-set-config-value.patch +Applying: Share configuration option processing code between the dm cache +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:device-mapper/master +From ../quilt-tmp + + adf9566...3e2495a master -> device-mapper/master (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..a9cc797ee8f9 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20130508 |