diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-01 15:52:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-01 15:52:01 +1100 |
| commit | 106edea2fe051df65a1a6231e9ffa2876cc391cc (patch) | |
| tree | f0308ee97ea222b6e82a179d459c531cfe583025 | |
| parent | 9c9ce516d8594d02b113cd27b92b15b272e13859 (diff) | |
Add linux-next specific files for 20130301next-20130301
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 218 | ||||
| -rw-r--r-- | Next/Trees | 220 | ||||
| -rw-r--r-- | Next/merge.log | 4661 | ||||
| -rw-r--r-- | Next/quilt-import.log | 70 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5170 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..21c226a91518 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,218 @@ +Name SHA1 +---- ---- +origin de1a2262b006220dae2561a299a6ea128c46f4fe +fixes d287b8750e47c1702dab0e37ac11012bb751ece0 +kbuild-current 02f3e53a131c8aa3fe3c954058f1add5beeae621 +arm-current e36815e2e4a2fb675207d8968bb68e22bc938328 +m68k-current 561839598e61f03c9175183ea066b2b7fa58ce85 +powerpc-merge eda8eebdd153c48a4e2a3a3ac3cd9e2e31f5c6b3 +sparc f9fd3488f6a3c2c5cc8613e4fd7fbbaa57f6bf8f +net 32fcafbcd1c9f6c7013016a22a5369b4acb93577 +ipsec 85dfb745ee40232876663ae206cba35f24ab2a40 +sound-current d0ec95fe6a8d9c7da6f9ff885cecbe7e328e2a2e +pci-current 249bfb83cf8ba658955f0245ac3981d941f746ee +wireless 466026989f112e0546ca39ab00a759af82dbe83a +driver-core.current 949db153b6466c6f7cad5a427ecea94985927311 +tty.current 8b5628ab83b671f96ac9f174c1bd51c92589fc82 +usb.current 221f8dfca89276d8aec54c6d07fbe20c281668f0 +staging.current 8b5628ab83b671f96ac9f174c1bd51c92589fc82 +char-misc.current 302a3c0f2757ae1a3e7df3f9fa1f20e2214ab945 +input-current 171fb58da00277b099d5a1c5e114fa57b77c4f90 +md-current f3378b48705154b9089affb2d2e939622aea68f1 +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current 8fd61d34226014fe7886babfca6f45a7eff89d25 +ide 9974e43d900af7979e0a571b8e0c9674c7399b79 +dwmw2 084a0ec1e3704d6c3714a665db755d581f797f67 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +irqdomain-current a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 +devicetree-current ab28698d33af05abab0bcf8021eafe38f7434f24 +spi-current d3601e56cf64a3f2df6f6380cccb3644274406e2 +gpio-current bc1008cf7d243cf6ad87b1e16d3dbbd8c8d6f35c +rr-fixes 6515925b8259549b7f2187e25d3260306e3e85e5 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 8ccfe6675fa974bd06d64f74d0fdee6a5267d2aa +arm 3576216ce5bdbd9f4196491df8b69a7d5b4d16e6 +arm-perf 5ef1240dcbc8db427172480f6abe85cb12113b28 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +xilinx 42ead3a591aeadb2722753aecf59f2ae63719075 +arm64 ec45d1cfd3cb65121fc52f39efc17d832f4f7b91 +blackfin f656c240ae07c48ddf8552e83b64692121044c42 +c6x 93bbd0c087eb299e0fe11c59d340932180c082b5 +cris 77c8006d8df4d5bafeb1d15eafa0886ae96e9b17 +hexagon e1858b2a21cd84a855945a4747fb2db41b250c22 +ia64 c9500a763ce7a88d6b9648a12038d02ae6724d58 +m68k 561839598e61f03c9175183ea066b2b7fa58ce85 +m68knommu 8a67f216bacd9b0331210b968e54678276fe2a9c +metag 2149e40998b5c9bbee62a5bf97e04f28feb27ba8 +microblaze 711e5b4520986380700e6f095608021cf087170e +mips 19aa5ac095a19f81960cdc4159211f392875c210 +openrisc 545ebd0db1ca069f8991209afb5107100efab054 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +powerpc 8520e443aa56cc157b015205ea53e7b9fc831291 +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx fa59f178552f927bd96771ba84e9706655bea705 +galak 12c7e8f62de546bff9f8ffa5a03e0ad292bcf17d +s390 72a6b43e4bbb818ac1875a3a572cb2aa8c9af820 +sh 035688d9c64c61957dd272a1e773f27b0143704d +sparc-next c4271c6e37c32105492cbbed35f45330cb327b94 +tile ecc46c516df87aec7be48cb9ef744d8332444fd8 +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa 9cf81c759b7db1db593b2ca60b74ec350d5f9205 +btrfs dc81cdc58ad2f413b96b9004f8d681e5dc554473 +ceph 83ca14fdd35821554058e5fd4fa7b118ee504a33 +cifs c51bb0ea40ca038da26b1fa7d450f4078124af03 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 1111eae90fb64a9d9ed133e410712f1e34fdce4a +ext3 712ddc52ffa1f5324cd8f682d9e5b047b91f34d3 +ext4 8e919d13048cd5acaadb2b15b48acbfb8832d3c2 +f2fs 7dd690c82029ed34aafdb58ce7463cdead69abb5 +fuse 634734b63ac39e137a1c623ba74f3e062b6577db +gfs2 fd95e81cb1c74c9acd2356821faa9f24c2fec365 +jfs 9d48017bce890b19e3bba649850bdbc8a6f95903 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs f6488c9ba51d65410e2dbc4345413c0d9120971e +nfsd 56edc86b5a72bdbc86358e57fb09165136baf0b8 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs b6f4bee02f682d1c86ece297871b78ae01afaaf4 +ubifs 8afd500cb52a5d00bab4525dd5a560d199f979b9 +xfs 1e82379b018ceed0f0912327c60d73107dacbcb3 +vfs d3d009cb965eae7e002ea5badf603ea8f4c34915 +pci 018ba0a6efada61b9bc17500101d81c3d35807c2 +hid e3dc8bf504bc36d3fde152a9e216f3a3daa34fce +i2c 55827f4aa6442ddd1d6a4e1e32f2f457eb113c22 +jdelvare-hwmon 2a7d2b96d5cba7568139d9ab157a0e97ab32440f +hwmon-staging 796450c3b5f938fab49844b950a5b47d2b2ae8d4 +v4l-dvb eccaaad4b07a0c2c67b32be23e2067bdfc2fd24c +kbuild 26901f2560d9405a8f3625a4347fd0d60f5d5c51 +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata 53637e0760d56274177be7e6d630490bc49766c1 +infiniband ef4e359d9b9e2dc022f79840fd207796b524a893 +pstore ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6 +pm 4383822020c54c21eb2eb939a3233b44a51e8ca0 +idle ca62cf59ceef10ff2ebca0e7f764507186870270 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +cpuidle d1c3ed669a2d452cacfb48c2d171a1f364dae2ed +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal f5b6d45f8cf688f51140fd21f1da3b90562762a9 +ieee1394 db2cad2f55078e90f84960b84b721291efa83d36 +ubi 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +dlm f11722834605a155022a8098ad7d8adacf44b22f +swiotlb af51a9f1848ff50079a10def56a2c064f326af22 +scsi 319cc77eabb6548eea56f7cca0a3830788d9bfa4 +target-updates 2dbe10a202d2743582b5fb7c9864455ef6ecf9a6 +target-merge d1c3ed669a2d452cacfb48c2d171a1f364dae2ed +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +slave-dma f9c6a655a94042f94c0adb30d07d93cfd8915e95 +dmaengine 7f3498666c7b44f979720404d9ba883c309e60ad +net-next 1cef9350cbee6e3bcf2ff646b8978fbec33f8b85 +ipsec-next a0b1c42951dd06ec83cc1bc2c9788131d9fefcd8 +wireless-next b53cf458ea20dd7f5e32611366f63728e40c9021 +bluetooth 0d4b884172daae8d157d6f13b96a56eb14a32991 +mtd 0ce82b7f7b7373b16ecf7b5725e21e2975204500 +l2-mtd 24dea0c9feccf699749f860fa2f4ccd84d30390d +crypto 7eb9c5df92361c55daab4d8d4e8468eb774e297b +drm be88298b0a3f771a4802f20c5e66af74bfd1dff1 +drm-intel 90a72f8774b6060975f85687e9c8a60cfb68a72c +sound d0ec95fe6a8d9c7da6f9ff885cecbe7e328e2a2e +sound-asoc 54759313ececcbd07e43fad75e0683e39a1f2a25 +modules fffddfd6c8e0c10c42c6e2cc54ba880fcc36ebbb +pekey 4ea349d3bb1d3521b7df8dbf0e88fe41cd3c0683 +virtio 6515925b8259549b7f2187e25d3260306e3e85e5 +input 005a69d632cd8694061c2dd27492fe874780b5ee +input-mt 6f0c0580b70c89094b3422ba81118c7b959c7556 +cgroup 5d30b00ad6695c879ee1925c0aa85ad592bf1642 +block 833dd2e58737c3011da019cbc64726e04016337f +device-mapper 8678bfa300f74091e30c847309ad40c1f814c619 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc adf96e6f514a9e87aa3d26c8c9c03eca5be53df0 +kgdb 58bcdf6847831913b41e9dfee1cbc579f939ef8b +slab 7d557b3cb69398d83ceabad9cf147c93a3aa97fd +uclinux b69f0859dc8e633c5d8c06845811588fe17e68b3 +md f1e79cec10372b69260c4cb9c825b564ffe6040f +mfd ff7109fa632654eaef657186f2942f5b679023d6 +battery 845e37e009281b63fe15348f37bd7f815ea65da0 +fbdev a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 e7f5c9a16ea2648a3e85af8e34191026bf3dcb62 +regulator 2730fd82cbb922e6be8df08ba32c21be41757d3d +security 5b2660326039a32b28766cb4c1a8b1bdcfadc375 +selinux c2d7b247f0c028d325a5da5b9611b60ba160f237 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 9ebe0e8b02215890db7470edd9f60dccb221d9e7 +dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351 +iommu 604542b824f72fa5d7fd977af277538c1e15b5f0 +vfio d65530fbc799e4036d4d3da4ab6e9fa6d8c4a447 +osd 861d66601acda6d7a2038fb3c95f68009128003a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial df63447f1a4402d7d9c6a9cd1c39a6d6766452d1 +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +edac b0769891ba7baa53f270dc70d71934748beb4c5b +edac-amd e7d2c215e56dc9fa0a01e26f2acfc3d73c889ba3 +devicetree 02bbde7849e68e193cefaa1885fe0df0f03c9fcd +dt-rh 1421954bf9b967d819db23c911f950a2ccd60eff +spi 095c3752e673c0ba039a2f67fd867297fde75ae7 +spi-mb a3496855d9f1948d1b977afe8bd922725ded05d5 +tip 641e71aefd05caae67766c5b1f5f250a220321aa +ftrace 8c189ea64eea01ca20d102ddb74d6936dd16c579 +rcu 7a6b55e7108b3476d13ee9501ec69dbe1605d774 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 3ab66e8a455a4877889c65a848f2fb32be502f2c +kvm-ppc bd31a7f55777a46063ebe3d50e6536cfff51a757 +oprofile 44009105081b51417f311f4c3be0061870b6b8ed +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495 +xen-two 39ada15ed8266be9ed58c6331756ae028ac211eb +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu 5479c78ac6f688ea5ea8c49b44cf90ea87b63931 +workqueues a4791ca4279d2f7540313a69b1a1512ef77340b0 +drivers-x86 e6e522461d358891050522ddb4fbfe9c253947b4 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap a2b37efc4e2aa76a5be29bbde8a2cd1c9c9066bc +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 4b07c5d5123f76487c61cf9dc3f987d0b8c88a94 +driver-core 8b5628ab83b671f96ac9f174c1bd51c92589fc82 +tty 8b5628ab83b671f96ac9f174c1bd51c92589fc82 +usb 74e1a2a39355b2d3ae8c60c78d8add162c6d7183 +staging 8b5628ab83b671f96ac9f174c1bd51c92589fc82 +char-misc 09884964335e85e897876d17783c2ad33cf8a2e0 +tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 +writeback ed84825b785ceb932af7dd5aa08614801721320b +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl ade158eb53eed40f6090e9f7ee6ee3513ec1eec4 +vhost 0e9ff68cfd66b15cc80e622c11eff64aae00cba5 +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc 6f0c0580b70c89094b3422ba81118c7b959c7556 +irqdomain 560aa5394d2db5437b2deb3bb897655f0fd99f61 +gpio 9170100ee46402af6d318134525c728027318d67 +gpio-lw c7886b18273b07042e25e8d3ba5c983837b84123 +arm-soc 1ead4fbf64d2ad3642c65b60a90943e529d06fd1 +bcm2835 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 +cortex 6ebd4d038dbb626a43d87db3007e71f92f49d7b3 +ep93xx cf92d8632cc73503b62ff58c32bfbdb2459a1e60 +ixp4xx b94740b3b38fd8e37fcd3bb06a18ec2796061c7d +msm a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 +renesas 1b8b1c3fbc25faf5d81b2c1ef2563194f37d6521 +samsung 786b27035d1348bdefbdd658a8ea6d0a2126e799 +tegra 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +dma-mapping d589829107c5528164a9b7dfe50d0001780865ed +pwm a32e1d1057b0f7c10df702cc2415432fa4a35c41 +dma-buf 495c10cc1c0c359871d5bef32dd173252fc17995 +userns 139321c65c0584cd65c4c87a5eb3fdb4fdbd0e19 +ktest 7328735cbf68b7cd4d7ef16e172013743cdc2bc4 +signal 9e2d59ad580d590134285f361a0e80f0e98c0207 +clk fde8bc59c03c0ad1fa4f655e0ed5cc1f76d11e8b +random 6133705494bb02953e1e2cc3018a4373981b3c97 +lzo-update 0ec7382036922be063b515b2a3f1d6f7a607392c +modem_shm c68dc8d45b3145942d6c7000cd3b9c504604ea10 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm-current 6df6a56547983341cb067201177c3987ca22f300 +akpm cc321d523dc4a7e0e1a4adaa70342f1ca9af2964 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..9634dde8694b --- /dev/null +++ b/Next/Trees @@ -0,0 +1,220 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arm-current git git://ftp.arm.linux.org.uk/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 +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#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs.git#for-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +pstore git git://git.infradead.org/users/cbou/linux-pstore.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +cpuidle git git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git#linux-next +isci git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git#all +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-intel git git://people.freedesktop.org/~danvet/drm-intel#drm-intel-next-queued +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +pekey git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-modsign.git#devel-pekey +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-2.6.git#for-next +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/misc.git#spi-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-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-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +tmem git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +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 +irqdomain git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next +gpio-lw git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next +cortex git git://git.pengutronix.de/git/ukl/linux-2.6.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +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 +modem_shm git git://github.com/sjurbren/modem-ipc.git#remoteproc-next +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..4749e4a9f6a9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4661 @@ +$ date +Friday 1 March 11:03:02 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 309667e Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild +Merging origin/master (de1a226 Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux) +$ git merge origin/master +Updating 309667e..de1a226 +Fast-forward + Documentation/DMA-API-HOWTO.txt | 9 +- + Documentation/IPMI.txt | 18 +- + Documentation/block/cfq-iosched.txt | 58 + + Documentation/blockdev/nbd.txt | 38 +- + Documentation/cgroups/blkio-controller.txt | 37 +- + Documentation/kernel-parameters.txt | 5 + + MAINTAINERS | 28 +- + arch/Kconfig | 7 + + arch/alpha/Kconfig | 1 + + arch/arm/Kconfig | 1 + + arch/arm/kernel/kprobes.c | 6 +- + arch/avr32/Kconfig | 1 + + arch/blackfin/Kconfig | 1 + + arch/cris/Kconfig | 1 + + arch/frv/Kconfig | 1 + + arch/frv/mm/elf-fdpic.c | 49 +- + arch/h8300/Kconfig | 1 + + arch/ia64/Kconfig | 1 + + arch/ia64/kernel/kprobes.c | 8 +- + arch/m32r/Kconfig | 1 + + arch/m68k/Kconfig | 1 + + arch/microblaze/Kconfig | 1 + + arch/mips/Kconfig | 1 + + arch/mips/kernel/kprobes.c | 6 +- + arch/mn10300/Kconfig | 1 + + arch/openrisc/Kconfig | 1 + + arch/parisc/Kconfig | 1 + + arch/parisc/kernel/sys_parisc.c | 48 +- + arch/powerpc/Kconfig | 4 +- + arch/powerpc/kernel/kprobes.c | 6 +- + arch/powerpc/kvm/book3s_mmu_hpte.c | 18 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/kprobes.c | 8 +- + arch/s390/pci/pci_msi.c | 3 +- + arch/score/Kconfig | 1 + + arch/sh/Kconfig | 3 - + arch/sh/kernel/kprobes.c | 6 +- + arch/sparc/Kconfig | 3 - + arch/sparc/kernel/kprobes.c | 6 +- + arch/sparc/kernel/ldc.c | 3 +- + arch/tile/Kconfig | 1 + + arch/unicore32/Kconfig | 1 + + arch/x86/Kconfig | 1 + + arch/x86/boot/compressed/eboot.c | 26 +- + arch/x86/include/asm/efi.h | 9 +- + arch/x86/kernel/head.c | 53 +- + arch/x86/kernel/head_64.S | 4 +- + arch/x86/kernel/kprobes/core.c | 8 +- + arch/x86/kernel/setup.c | 3 +- + arch/x86/kvm/mmu.c | 26 +- + arch/x86/platform/efi/efi.c | 7 +- + arch/xtensa/Kconfig | 1 + + block/Kconfig | 1 - + block/blk-cgroup.c | 281 ++++- + block/blk-cgroup.h | 68 +- + block/blk-core.c | 18 +- + block/blk-exec.c | 4 +- + block/blk-flush.c | 2 +- + block/blk-ioc.c | 3 +- + block/blk-lib.c | 6 +- + block/blk-sysfs.c | 9 +- + block/blk.h | 2 +- + block/bsg.c | 29 +- + block/cfq-iosched.c | 632 ++++++++-- + block/elevator.c | 25 +- + block/genhd.c | 24 +- + block/partition-generic.c | 6 +- + block/partitions/check.c | 37 +- + block/partitions/check.h | 4 +- + block/partitions/efi.c | 12 +- + block/partitions/mac.c | 4 + + block/partitions/msdos.c | 11 +- + crypto/algapi.c | 6 +- + drivers/acpi/Kconfig | 3 +- + drivers/atm/atmtcp.c | 6 +- + drivers/atm/eni.c | 3 +- + drivers/atm/he.c | 3 +- + drivers/atm/nicstar.c | 25 +- + drivers/atm/solos-pci.c | 3 +- + drivers/block/DAC960.c | 1 + + drivers/block/Kconfig | 23 +- + drivers/block/Makefile | 3 +- + drivers/block/drbd/drbd_main.c | 29 +- + drivers/block/loop.c | 85 +- + drivers/block/mtip32xx/Kconfig | 2 +- + drivers/block/mtip32xx/mtip32xx.c | 431 +++++-- + drivers/block/mtip32xx/mtip32xx.h | 48 +- + drivers/block/nbd.c | 36 +- + drivers/block/rsxx/Makefile | 2 + + drivers/block/rsxx/config.c | 213 ++++ + drivers/block/rsxx/core.c | 649 ++++++++++ + drivers/block/rsxx/cregs.c | 758 ++++++++++++ + drivers/block/rsxx/dev.c | 367 ++++++ + drivers/block/rsxx/dma.c | 998 +++++++++++++++ + drivers/block/rsxx/rsxx.h | 45 + + drivers/block/rsxx/rsxx_cfg.h | 72 ++ + drivers/block/rsxx/rsxx_priv.h | 399 ++++++ + drivers/block/swim3.c | 5 +- + drivers/block/xd.c | 1123 ----------------- + drivers/block/xd.h | 134 -- + drivers/block/xen-blkback/blkback.c | 7 +- + drivers/block/xen-blkback/xenbus.c | 49 +- + drivers/block/xen-blkfront.c | 13 +- + drivers/char/ipmi/ipmi_si_intf.c | 66 +- + drivers/char/misc.c | 16 +- + drivers/clk/clk.c | 59 +- + drivers/dca/dca-sysfs.c | 23 +- + drivers/dma/dmaengine.c | 16 +- + drivers/firewire/core-cdev.c | 20 +- + drivers/firewire/core-device.c | 7 +- + drivers/firmware/efivars.c | 146 ++- + drivers/gpio/gpiolib.c | 11 +- + drivers/gpu/drm/drm_context.c | 19 +- + drivers/gpu/drm/drm_crtc.c | 20 +- + drivers/gpu/drm/drm_drv.c | 1 - + drivers/gpu/drm/drm_gem.c | 40 +- + drivers/gpu/drm/drm_hashtab.c | 19 +- + drivers/gpu/drm/drm_stub.c | 19 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 20 +- + drivers/gpu/drm/i915/i915_gem_context.c | 21 +- + drivers/gpu/drm/sis/sis_drv.c | 1 - + drivers/gpu/drm/sis/sis_mm.c | 13 +- + drivers/gpu/drm/via/via_map.c | 1 - + drivers/gpu/drm/via/via_mm.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 17 +- + drivers/i2c/i2c-core.c | 46 +- + drivers/infiniband/core/cm.c | 22 +- + drivers/infiniband/core/cma.c | 27 +- + drivers/infiniband/core/fmr_pool.c | 3 +- + drivers/infiniband/core/sa_query.c | 18 +- + drivers/infiniband/core/ucm.c | 16 +- + drivers/infiniband/core/ucma.c | 32 +- + drivers/infiniband/core/uverbs_cmd.c | 17 +- + drivers/infiniband/hw/amso1100/c2_qp.c | 19 +- + drivers/infiniband/hw/cxgb3/iwch.h | 24 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 27 +- + drivers/infiniband/hw/ehca/ehca_cq.c | 27 +- + drivers/infiniband/hw/ehca/ehca_qp.c | 34 +- + drivers/infiniband/hw/ipath/ipath_driver.c | 16 +- + drivers/infiniband/hw/mlx4/cm.c | 32 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 14 +- + drivers/infiniband/hw/qib/qib_init.c | 21 +- + drivers/isdn/mISDN/socket.c | 3 +- + drivers/isdn/mISDN/stack.c | 3 +- + drivers/md/dm-bio-prison.c | 3 +- + drivers/md/dm-bufio.c | 3 +- + drivers/md/dm-snap.c | 3 +- + drivers/md/dm.c | 56 +- + .../md/persistent-data/dm-transaction-manager.c | 7 +- + drivers/md/raid5.c | 14 +- + drivers/memstick/core/memstick.c | 21 +- + drivers/memstick/core/mspro_block.c | 17 +- + drivers/memstick/host/r592.c | 3 +- + drivers/mfd/rtsx_pcr.c | 13 +- + drivers/misc/c2port/core.c | 22 +- + drivers/misc/sgi-gru/grutlbpurge.c | 3 +- + drivers/misc/tifm_core.c | 11 +- + drivers/misc/vmw_vmci/vmci_doorbell.c | 7 +- + drivers/misc/vmw_vmci/vmci_resource.c | 6 +- + drivers/mmc/core/host.c | 11 +- + drivers/mmc/host/dw_mmc.c | 4 +- + drivers/mtd/mtdcore.c | 9 +- + drivers/mtd/tests/mtd_nandecctest.c | 2 +- + drivers/mtd/tests/mtd_oobtest.c | 49 +- + drivers/mtd/tests/mtd_pagetest.c | 43 +- + drivers/mtd/tests/mtd_speedtest.c | 9 +- + drivers/mtd/tests/mtd_stresstest.c | 3 +- + drivers/mtd/tests/mtd_subpagetest.c | 42 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 18 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 17 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 4 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 10 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 10 +- + drivers/net/ethernet/sun/sunvnet.c | 3 +- + drivers/net/macvlan.c | 6 +- + drivers/net/macvtap.c | 21 +- + drivers/net/ppp/ppp_generic.c | 33 +- + drivers/net/tun.c | 15 +- + drivers/net/vxlan.c | 12 +- + drivers/net/wireless/zd1201.c | 7 +- + drivers/pci/pci.c | 12 +- + drivers/power/bq2415x_charger.c | 11 +- + drivers/power/bq27x00_battery.c | 9 +- + drivers/power/ds2782_battery.c | 9 +- + drivers/pps/clients/pps-gpio.c | 6 +- + drivers/pps/kapi.c | 2 +- + drivers/pps/pps.c | 36 +- + drivers/remoteproc/remoteproc_core.c | 11 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 31 +- + drivers/scsi/aacraid/aacraid.h | 8 +- + drivers/scsi/aacraid/comminit.c | 11 +- + drivers/scsi/bfa/bfad.c | 2 +- + drivers/scsi/bfa/bfad_im.c | 15 +- + drivers/scsi/bnx2fc/bnx2fc.h | 27 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 21 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 29 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 8 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 95 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/ch.c | 21 +- + drivers/scsi/csiostor/csio_hw.c | 15 +- + drivers/scsi/csiostor/csio_init.c | 9 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 + + drivers/scsi/fnic/fnic_fcs.c | 6 +- + drivers/scsi/gdth.c | 10 +- + drivers/scsi/ipr.c | 1296 +++++++++++++++----- + drivers/scsi/ipr.h | 101 +- + drivers/scsi/lpfc/lpfc.h | 17 +- + drivers/scsi/lpfc/lpfc_bsg.c | 51 +- + drivers/scsi/lpfc/lpfc_crtn.h | 4 +- + drivers/scsi/lpfc/lpfc_ct.c | 37 +- + drivers/scsi/lpfc/lpfc_els.c | 25 +- + drivers/scsi/lpfc/lpfc_hw.h | 2 + + drivers/scsi/lpfc/lpfc_hw4.h | 176 +-- + drivers/scsi/lpfc/lpfc_init.c | 261 ++-- + drivers/scsi/lpfc/lpfc_nportdisc.c | 10 + + drivers/scsi/lpfc/lpfc_scsi.c | 24 +- + drivers/scsi/lpfc/lpfc_sli.c | 378 +++++- + drivers/scsi/lpfc/lpfc_sli4.h | 8 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 19 +- + drivers/scsi/mpt2sas/mpt2sas_base.h | 1 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 5 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 1 - + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 - + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 1 - + drivers/scsi/qla4xxx/ql4_83xx.c | 55 +- + drivers/scsi/qla4xxx/ql4_attr.c | 16 +- + drivers/scsi/qla4xxx/ql4_def.h | 10 +- + drivers/scsi/qla4xxx/ql4_fw.h | 6 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 6 +- + drivers/scsi/qla4xxx/ql4_init.c | 17 +- + drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- + drivers/scsi/qla4xxx/ql4_isr.c | 68 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 61 +- + drivers/scsi/qla4xxx/ql4_nx.c | 14 +- + drivers/scsi/qla4xxx/ql4_os.c | 160 ++- + drivers/scsi/qla4xxx/ql4_version.h | 2 +- + drivers/scsi/scsi_transport_iscsi.c | 12 + + drivers/scsi/sg.c | 43 +- + drivers/scsi/st.c | 27 +- + drivers/staging/android/binder.c | 19 +- + drivers/target/iscsi/iscsi_target.c | 15 +- + drivers/target/iscsi/iscsi_target_login.c | 15 +- + drivers/target/tcm_fc/tfc_sess.c | 12 +- + drivers/thermal/cpu_cooling.c | 17 +- + drivers/thermal/thermal_sys.c | 17 +- + drivers/uio/uio.c | 19 +- + drivers/vfio/vfio.c | 17 +- + drivers/video/backlight/Kconfig | 6 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/ams369fg06.c | 8 +- + drivers/video/backlight/lp8788_bl.c | 333 +++++ + drivers/w1/slaves/Kconfig | 13 +- + drivers/w1/slaves/Makefile | 3 +- + drivers/w1/slaves/w1_ds2413.c | 177 +++ + drivers/w1/w1_family.h | 1 + + fs/affs/amigaffs.c | 3 +- + fs/aio.c | 3 +- + fs/bio.c | 2 + + fs/block_dev.c | 6 +- + fs/btrfs/extent-tree.c | 20 +- + fs/buffer.c | 10 + + fs/cifs/inode.c | 3 +- + fs/coredump.c | 2 +- + fs/dcache.c | 9 +- + fs/dlm/lock.c | 18 +- + fs/dlm/lockspace.c | 1 - + fs/dlm/lowcomms.c | 11 +- + fs/dlm/recover.c | 52 +- + fs/ecryptfs/messaging.c | 6 +- + fs/exec.c | 10 +- + fs/exportfs/expfs.c | 3 +- + fs/ext4/inode.c | 8 +- + fs/fat/fat.h | 2 + + fs/fat/inode.c | 77 +- + fs/fat/nfs.c | 3 +- + fs/fs-writeback.c | 60 +- + fs/fscache/cookie.c | 11 +- + fs/hfsplus/Makefile | 4 +- + fs/hfsplus/attributes.c | 399 ++++++ + fs/hfsplus/bfind.c | 93 +- + fs/hfsplus/bnode.c | 8 +- + fs/hfsplus/brec.c | 23 +- + fs/hfsplus/btree.c | 8 + + fs/hfsplus/catalog.c | 36 +- + fs/hfsplus/dir.c | 55 +- + fs/hfsplus/extents.c | 4 +- + fs/hfsplus/hfsplus_fs.h | 52 +- + fs/hfsplus/hfsplus_raw.h | 68 +- + fs/hfsplus/inode.c | 18 +- + fs/hfsplus/ioctl.c | 108 -- + fs/hfsplus/super.c | 56 +- + fs/hfsplus/unicode.c | 7 +- + fs/hfsplus/xattr.c | 709 +++++++++++ + fs/hfsplus/xattr.h | 60 + + fs/hfsplus/xattr_security.c | 104 ++ + fs/hfsplus/xattr_trusted.c | 63 + + fs/hfsplus/xattr_user.c | 63 + + fs/inode.c | 19 +- + fs/lockd/host.c | 29 +- + fs/lockd/svcsubs.c | 7 +- + fs/nfs/client.c | 1 - + fs/nfs/nfs4client.c | 13 +- + fs/nfs/pnfs_dev.c | 9 +- + fs/nfsd/nfscache.c | 3 +- + fs/notify/fsnotify.c | 3 +- + fs/notify/inode_mark.c | 19 +- + fs/notify/inotify/inotify_fsnotify.c | 1 - + fs/notify/inotify/inotify_user.c | 24 +- + fs/notify/vfsmount_mark.c | 19 +- + fs/ocfs2/cluster/tcp.c | 32 +- + fs/ocfs2/dcache.c | 3 +- + fs/ocfs2/dlm/dlmrecovery.c | 6 +- + fs/ocfs2/suballoc.c | 7 +- + fs/ocfs2/suballoc.h | 2 +- + fs/ocfs2/xattr.c | 2 +- + fs/proc/base.c | 3 +- + fs/proc/generic.c | 27 +- + fs/proc/inode.c | 5 +- + fs/proc/internal.h | 3 +- + fs/proc/kcore.c | 3 +- + fs/proc/proc_devtree.c | 13 +- + fs/proc/proc_sysctl.c | 19 +- + fs/proc/vmcore.c | 35 +- + fs/seq_file.c | 40 +- + fs/super.c | 8 +- + fs/sysfs/bin.c | 3 +- + fs/xfs/xfs_log_recover.c | 3 +- + include/linux/blkdev.h | 3 +- + include/linux/blktrace_api.h | 1 + + include/linux/buffer_head.h | 2 +- + include/linux/completion.h | 3 + + include/linux/debug_locks.h | 4 +- + include/linux/elevator.h | 5 +- + include/linux/eventfd.h | 2 +- + include/linux/freezer.h | 3 + + include/linux/hashtable.h | 40 +- + include/linux/idr.h | 170 ++- + include/linux/if_team.h | 6 +- + include/linux/ipmi.h | 4 - + include/linux/list.h | 49 +- + include/linux/llist.h | 25 - + include/linux/mfd/lp8788.h | 24 +- + include/linux/pid.h | 3 +- + include/linux/rculist.h | 56 +- + include/linux/scatterlist.h | 41 +- + include/linux/sched.h | 5 - + include/linux/writeback.h | 6 +- + include/net/ax25.h | 8 +- + include/net/inet_hashtables.h | 4 +- + include/net/inet_timewait_sock.h | 8 +- + include/net/netrom.h | 16 +- + include/net/sch_generic.h | 3 +- + include/net/sctp/sctp.h | 4 +- + include/net/sock.h | 21 +- + include/trace/events/block.h | 104 +- + include/trace/events/writeback.h | 116 ++ + include/uapi/linux/ipmi.h | 10 +- + include/uapi/linux/msdos_fs.h | 38 +- + include/uapi/linux/nbd.h | 3 +- + include/uapi/linux/xattr.h | 13 +- + ipc/util.c | 30 +- + kernel/Makefile | 6 +- + kernel/cgroup.c | 43 +- + kernel/events/core.c | 16 +- + kernel/exit.c | 6 +- + kernel/fork.c | 7 +- + kernel/kexec.c | 44 +- + kernel/kprobes.c | 35 +- + kernel/lockdep.c | 17 +- + kernel/pid.c | 3 +- + kernel/posix-timers.c | 18 +- + kernel/sched/core.c | 63 +- + kernel/signal.c | 14 +- + kernel/smpboot.c | 2 +- + kernel/sys.c | 10 +- + kernel/sysctl.c | 2 +- + kernel/sysctl_binary.c | 3 +- + kernel/trace/blktrace.c | 28 +- + kernel/trace/ftrace.c | 24 +- + kernel/trace/trace_output.c | 3 +- + kernel/tracepoint.c | 6 +- + kernel/user-return-notifier.c | 4 +- + kernel/user.c | 3 +- + kernel/utsname.c | 2 +- + kernel/utsname_sysctl.c | 3 +- + kernel/workqueue.c | 13 +- + lib/Makefile | 2 +- + lib/debugobjects.c | 21 +- + lib/devres.c | 2 +- + lib/idr.c | 446 ++++--- + {kernel => lib}/kfifo.c | 6 +- + lib/lru_cache.c | 3 +- + lib/scatterlist.c | 86 +- + mm/Kconfig | 2 +- + mm/huge_memory.c | 3 +- + mm/internal.h | 2 +- + mm/kmemleak.c | 9 +- + mm/ksm.c | 15 +- + mm/mlock.c | 34 +- + mm/mmu_notifier.c | 18 +- + mm/page-writeback.c | 4 +- + net/9p/error.c | 4 +- + net/9p/trans_virtio.c | 2 +- + net/9p/util.c | 17 +- + net/appletalk/ddp.c | 9 +- + net/atm/common.c | 7 +- + net/atm/lec.c | 66 +- + net/atm/signaling.c | 3 +- + net/ax25/af_ax25.c | 15 +- + net/ax25/ax25_ds_subr.c | 6 +- + net/ax25/ax25_ds_timer.c | 3 +- + net/ax25/ax25_iface.c | 3 +- + net/ax25/ax25_uid.c | 11 +- + net/batman-adv/bat_iv_ogm.c | 12 +- + net/batman-adv/bridge_loop_avoidance.c | 39 +- + net/batman-adv/distributed-arp-table.c | 15 +- + net/batman-adv/gateway_client.c | 13 +- + net/batman-adv/main.c | 6 +- + net/batman-adv/originator.c | 31 +- + net/batman-adv/originator.h | 3 +- + net/batman-adv/routing.c | 6 +- + net/batman-adv/send.c | 6 +- + net/batman-adv/translation-table.c | 82 +- + net/batman-adv/vis.c | 38 +- + net/bluetooth/hci_sock.c | 15 +- + net/bluetooth/rfcomm/sock.c | 13 +- + net/bluetooth/sco.c | 14 +- + net/bridge/br_fdb.c | 23 +- + net/bridge/br_mdb.c | 6 +- + net/bridge/br_multicast.c | 25 +- + net/can/af_can.c | 18 +- + net/can/gw.c | 15 +- + net/can/proc.c | 3 +- + net/core/dev.c | 12 +- + net/core/flow.c | 11 +- + net/core/net-procfs.c | 3 +- + net/core/rtnetlink.c | 3 +- + net/decnet/af_decnet.c | 9 +- + net/decnet/dn_table.c | 13 +- + net/ieee802154/dgram.c | 3 +- + net/ieee802154/raw.c | 3 +- + net/ipv4/devinet.c | 10 +- + net/ipv4/fib_frontend.c | 15 +- + net/ipv4/fib_semantics.c | 23 +- + net/ipv4/fib_trie.c | 33 +- + net/ipv4/inet_connection_sock.c | 10 +- + net/ipv4/inet_fragment.c | 10 +- + net/ipv4/inet_hashtables.c | 8 +- + net/ipv4/inet_timewait_sock.c | 7 +- + net/ipv4/raw.c | 8 +- + net/ipv4/tcp_ipv4.c | 7 +- + net/ipv6/addrconf.c | 32 +- + net/ipv6/addrlabel.c | 18 +- + net/ipv6/inet6_connection_sock.c | 5 +- + net/ipv6/ip6_fib.c | 12 +- + net/ipv6/raw.c | 3 +- + net/ipv6/xfrm6_tunnel.c | 10 +- + net/ipx/af_ipx.c | 16 +- + net/ipx/ipx_proc.c | 5 +- + net/iucv/af_iucv.c | 21 +- + net/key/af_key.c | 3 +- + net/l2tp/l2tp_core.c | 12 +- + net/l2tp/l2tp_ip.c | 3 +- + net/l2tp/l2tp_ip6.c | 3 +- + net/llc/llc_sap.c | 3 +- + net/mac80211/main.c | 2 - + net/mac80211/mesh_pathtbl.c | 45 +- + net/mac80211/tx.c | 18 +- + net/netfilter/ipvs/ip_vs_conn.c | 26 +- + net/netfilter/nf_conntrack_expect.c | 17 +- + net/netfilter/nf_conntrack_helper.c | 13 +- + net/netfilter/nf_conntrack_netlink.c | 9 +- + net/netfilter/nf_conntrack_sip.c | 8 +- + net/netfilter/nf_nat_core.c | 3 +- + net/netfilter/nfnetlink_cthelper.c | 17 +- + net/netfilter/nfnetlink_log.c | 7 +- + net/netfilter/nfnetlink_queue_core.c | 10 +- + net/netfilter/xt_RATEEST.c | 3 +- + net/netfilter/xt_connlimit.c | 8 +- + net/netfilter/xt_hashlimit.c | 16 +- + net/netlink/af_netlink.c | 30 +- + net/netrom/af_netrom.c | 12 +- + net/netrom/nr_route.c | 30 +- + net/nfc/llcp/llcp.c | 16 +- + net/openvswitch/datapath.c | 10 +- + net/openvswitch/flow.c | 13 +- + net/openvswitch/vport.c | 3 +- + net/packet/af_packet.c | 3 +- + net/packet/diag.c | 3 +- + net/phonet/pep.c | 3 +- + net/phonet/socket.c | 9 +- + net/rds/bind.c | 3 +- + net/rds/connection.c | 9 +- + net/rose/af_rose.c | 14 +- + net/sched/sch_api.c | 4 +- + net/sched/sch_cbq.c | 18 +- + net/sched/sch_drr.c | 10 +- + net/sched/sch_hfsc.c | 15 +- + net/sched/sch_htb.c | 12 +- + net/sched/sch_qfq.c | 16 +- + net/sctp/associola.c | 31 +- + net/sctp/endpointola.c | 3 +- + net/sctp/input.c | 6 +- + net/sctp/proc.c | 9 +- + net/sctp/socket.c | 9 +- + net/sunrpc/auth.c | 5 +- + net/sunrpc/cache.c | 4 +- + net/sunrpc/svcauth.c | 3 +- + net/tipc/name_table.c | 8 +- + net/tipc/node.c | 3 +- + net/unix/af_unix.c | 6 +- + net/unix/diag.c | 7 +- + net/x25/af_x25.c | 12 +- + net/xfrm/xfrm_policy.c | 47 +- + net/xfrm/xfrm_state.c | 42 +- + scripts/checkpatch.pl | 2 +- + scripts/get_maintainer.pl | 4 + + scripts/kernel-doc | 2 +- + security/integrity/ima/ima_queue.c | 3 +- + security/selinux/avc.c | 19 +- + tools/perf/util/evlist.c | 3 +- + tools/testing/selftests/Makefile | 8 +- + tools/testing/selftests/README.txt | 42 + + tools/testing/selftests/efivarfs/Makefile | 12 + + tools/testing/selftests/efivarfs/create-read.c | 38 + + tools/testing/selftests/efivarfs/efivarfs.sh | 139 +++ + tools/testing/selftests/efivarfs/open-unlink.c | 63 + + virt/kvm/eventfd.c | 3 +- + virt/kvm/irq_comm.c | 18 +- + 533 files changed, 12863 insertions(+), 6214 deletions(-) + create mode 100644 drivers/block/rsxx/Makefile + create mode 100644 drivers/block/rsxx/config.c + create mode 100644 drivers/block/rsxx/core.c + create mode 100644 drivers/block/rsxx/cregs.c + create mode 100644 drivers/block/rsxx/dev.c + create mode 100644 drivers/block/rsxx/dma.c + create mode 100644 drivers/block/rsxx/rsxx.h + create mode 100644 drivers/block/rsxx/rsxx_cfg.h + create mode 100644 drivers/block/rsxx/rsxx_priv.h + delete mode 100644 drivers/block/xd.c + delete mode 100644 drivers/block/xd.h + create mode 100644 drivers/video/backlight/lp8788_bl.c + create mode 100644 drivers/w1/slaves/w1_ds2413.c + create mode 100644 fs/hfsplus/attributes.c + create mode 100644 fs/hfsplus/xattr.c + create mode 100644 fs/hfsplus/xattr.h + create mode 100644 fs/hfsplus/xattr_security.c + create mode 100644 fs/hfsplus/xattr_trusted.c + create mode 100644 fs/hfsplus/xattr_user.c + rename {kernel => lib}/kfifo.c (99%) + create mode 100644 tools/testing/selftests/README.txt + create mode 100644 tools/testing/selftests/efivarfs/Makefile + create mode 100644 tools/testing/selftests/efivarfs/create-read.c + create mode 100644 tools/testing/selftests/efivarfs/efivarfs.sh + create mode 100644 tools/testing/selftests/efivarfs/open-unlink.c +Merging fixes/master (d287b87 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (02f3e53 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/fixes (e36815e ARM: Fix broken commit 0cc41e4a21d43 corrupting kernel messages) +$ git merge arm-current/fixes +Auto-merging drivers/amba/tegra-ahb.c +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/include/asm/pgtable.h +Merge made by the 'recursive' strategy. + arch/arm/boot/Makefile | 4 ++-- + arch/arm/include/asm/delay.h | 1 + + arch/arm/include/asm/pgtable.h | 3 ++- + arch/arm/kernel/smp.c | 3 +++ + arch/arm/lib/delay.c | 1 + + arch/arm/mm/alignment.c | 11 ++++------- + arch/arm/vfp/vfphw.S | 37 ++++++++++++++++++++++--------------- + arch/arm/vfp/vfpmodule.c | 2 +- + drivers/amba/tegra-ahb.c | 2 +- + 9 files changed, 37 insertions(+), 27 deletions(-) +Merging m68k-current/for-linus (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge (eda8eeb powerpc/mm: Fix hash computation function) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (f9fd348 sparc32: refactor smp boot) +$ git merge sparc/master +Already up-to-date. +Merging net/master (32fcafb net/phy: micrel: Disable asymmetric pause for KSZ9021) +$ git merge net/master +Auto-merging net/sctp/socket.c +Merge made by the 'recursive' strategy. + drivers/connector/cn_proc.c | 8 ++ + drivers/isdn/hisax/st5481_usb.c | 12 ++- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.c | 4 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 ++ + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 64 +++++++++++++++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 3 +- + drivers/net/ethernet/realtek/r8169.c | 27 ++++--- + drivers/net/ethernet/sfc/efx.c | 16 +++- + drivers/net/ethernet/sfc/net_driver.h | 4 +- + drivers/net/ethernet/sfc/rx.c | 25 ++++--- + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/phy/micrel.c | 3 +- + drivers/net/phy/phy_device.c | 10 ++- + drivers/net/usb/asix_devices.c | 31 ++++++++ + drivers/net/usb/cdc_ncm.c | 8 ++ + include/linux/netfilter/ipset/ip_set_ahash.h | 4 +- + include/net/tcp.h | 4 + + net/irda/iriap.c | 7 +- + net/netfilter/ipset/ip_set_core.c | 3 +- + net/sctp/socket.c | 6 +- + net/sctp/tsnmap.c | 13 ++-- + net/sctp/ulpqueue.c | 87 ++++++++++++++++++---- + 24 files changed, 285 insertions(+), 66 deletions(-) +Merging ipsec/master (85dfb74 af_key: initialize satype in key_notify_policy_flush()) +$ git merge ipsec/master +Auto-merging net/key/af_key.c +Merge made by the 'recursive' strategy. + net/key/af_key.c | 1 + + 1 file changed, 1 insertion(+) +Merging sound-current/for-linus (d0ec95f ALSA: emu10k1: Allow to switch hardware sampe rate on EMU) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (249bfb8 PCI/PM: Clean up PME state when removing a device) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (4660269 libertas: fix crash for SD8688) +$ git merge wireless/master +Auto-merging net/mac80211/tx.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +Auto-merging drivers/bcma/driver_pci_host.c +Merge made by the 'recursive' strategy. + drivers/bcma/driver_pci_host.c | 2 + + drivers/net/wireless/ath/ath9k/common.h | 2 +- + drivers/net/wireless/ath/ath9k/htc.h | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 18 +++-- + drivers/net/wireless/ath/ath9k/hw.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 10 +-- + drivers/net/wireless/iwlwifi/iwl-phy-db.c | 16 ---- + drivers/net/wireless/iwlwifi/mvm/d3.c | 104 +++++++++++++++++++------- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 19 +++-- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 4 + + drivers/net/wireless/iwlwifi/pcie/internal.h | 9 +++ + drivers/net/wireless/iwlwifi/pcie/tx.c | 75 ++++++++++++++----- + drivers/net/wireless/libertas/if_sdio.c | 6 +- + drivers/net/wireless/mwifiex/pcie.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +- + net/mac80211/cfg.c | 12 ++- + net/mac80211/iface.c | 2 +- + net/mac80211/tx.c | 77 ++++++++++++------- + net/wireless/nl80211.c | 61 +-------------- + 19 files changed, 258 insertions(+), 174 deletions(-) +Merging driver-core.current/driver-core-linus (949db15 Linux 3.8-rc5) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (221f8df USB: EHCI: revert "remove ASS/PSS polling timeout") +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/host/ehci-timer.c | 29 ++++++++++++++--------------- + 1 file changed, 14 insertions(+), 15 deletions(-) +Merging staging.current/staging-linus (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (302a3c0 Drivers: hv: vmbus: Use the new infrastructure for delivering VMBUS interrupts) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/hv/channel_mgmt.c | 2 +- + drivers/hv/hv.c | 5 ++--- + drivers/hv/vmbus_drv.c | 11 +++++++---- + 3 files changed, 10 insertions(+), 8 deletions(-) +Merging input-current/for-linus (171fb58 Input: ALPS - update documentation for recent touchpad driver mods) +$ git merge input-current/for-linus +Auto-merging Documentation/input/alps.txt +Merge made by the 'recursive' strategy. + Documentation/input/alps.txt | 67 ++++++++++++++++++++++++++---- + drivers/input/mouse/alps.c | 85 +++++++++++++++++++++++++++++++++------ + drivers/input/mouse/alps.h | 1 + + drivers/input/mouse/cypress_ps2.c | 19 ++++++--- + 4 files changed, 146 insertions(+), 26 deletions(-) +Merging md-current/for-linus (f3378b4 md: expedite metadata update when switching read-auto -> active) +$ git merge md-current/for-linus +Auto-merging drivers/md/raid5.c +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-raid.txt | 44 ++++++++++-- + drivers/md/Kconfig | 11 --- + drivers/md/dm-raid.c | 123 ++++++++++++++++++++++++++------ + drivers/md/md.c | 19 ++++- + drivers/md/raid0.c | 13 +++- + drivers/md/raid1.c | 8 ++- + drivers/md/raid10.c | 97 +++++++++++++++++++------ + drivers/md/raid10.h | 5 ++ + drivers/md/raid5.c | 38 +--------- + 9 files changed, 256 insertions(+), 102 deletions(-) +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 (8fd61d3 crypto: user - ensure user supplied strings are nul-terminated) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option) +$ git merge dwmw2/master +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Auto-merging arch/x86/Makefile +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bb48acd] Merge remote-tracking branch 'dwmw2/master' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig.cpu | 4 ++++ + arch/x86/Makefile | 1 + + 2 files changed, 5 insertions(+) +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 (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().) +$ git merge spi-current/spi/merge +Already up-to-date. +Merging gpio-current/gpio/merge (bc1008c gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG) +$ git merge gpio-current/gpio/merge +Already up-to-date. +Merging rr-fixes/fixes (6515925 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (8ccfe66 ARC: split elf.h into uapi and export it for userspace) +$ git merge arc/for-next +Resolved 'init/Kconfig' using previous resolution. +Auto-merging tools/perf/perf.h +Auto-merging kernel/sysctl.c +Auto-merging init/Kconfig +CONFLICT (content): Merge conflict in init/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4c3e4f3] Merge remote-tracking branch 'arc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arc/interrupts.txt | 24 + + MAINTAINERS | 6 + + arch/arc/Kbuild | 2 + + arch/arc/Kconfig | 453 +++++++ + arch/arc/Kconfig.debug | 34 + + arch/arc/Makefile | 126 ++ + arch/arc/boot/Makefile | 26 + + arch/arc/boot/dts/Makefile | 13 + + arch/arc/boot/dts/angel4.dts | 55 + + arch/arc/boot/dts/skeleton.dts | 10 + + arch/arc/boot/dts/skeleton.dtsi | 37 + + arch/arc/configs/fpga_defconfig | 61 + + arch/arc/include/asm/Kbuild | 49 + + arch/arc/include/asm/arcregs.h | 433 +++++++ + arch/arc/include/asm/asm-offsets.h | 9 + + arch/arc/include/asm/atomic.h | 232 ++++ + arch/arc/include/asm/barrier.h | 42 + + arch/arc/include/asm/bitops.h | 516 ++++++++ + arch/arc/include/asm/bug.h | 37 + + arch/arc/include/asm/cache.h | 75 ++ + arch/arc/include/asm/cacheflush.h | 67 + + arch/arc/include/asm/checksum.h | 101 ++ + arch/arc/include/asm/clk.h | 22 + + arch/arc/include/asm/cmpxchg.h | 143 +++ + arch/arc/include/asm/current.h | 32 + + arch/arc/include/asm/defines.h | 56 + + arch/arc/include/asm/delay.h | 68 + + arch/arc/include/asm/disasm.h | 116 ++ + arch/arc/include/asm/dma-mapping.h | 221 ++++ + arch/arc/include/asm/dma.h | 14 + + arch/arc/include/asm/elf.h | 78 ++ + arch/arc/include/asm/entry.h | 724 +++++++++++ + arch/arc/include/asm/exec.h | 15 + + arch/arc/include/asm/futex.h | 151 +++ + arch/arc/include/asm/io.h | 105 ++ + arch/arc/include/asm/irq.h | 25 + + arch/arc/include/asm/irqflags.h | 153 +++ + arch/arc/include/asm/kdebug.h | 19 + + arch/arc/include/asm/kgdb.h | 61 + + arch/arc/include/asm/kprobes.h | 62 + + arch/arc/include/asm/linkage.h | 63 + + arch/arc/include/asm/mach_desc.h | 87 ++ + arch/arc/include/asm/mmu.h | 23 + + arch/arc/include/asm/mmu_context.h | 213 ++++ + arch/arc/include/asm/module.h | 28 + + arch/arc/include/asm/mutex.h | 18 + + arch/arc/include/asm/page.h | 109 ++ + arch/arc/include/asm/perf_event.h | 13 + + arch/arc/include/asm/pgalloc.h | 134 ++ + arch/arc/include/asm/pgtable.h | 405 ++++++ + arch/arc/include/asm/processor.h | 151 +++ + arch/arc/include/asm/prom.h | 14 + + arch/arc/include/asm/ptrace.h | 130 ++ + arch/arc/include/asm/sections.h | 18 + + arch/arc/include/asm/segment.h | 24 + + arch/arc/include/asm/serial.h | 25 + + arch/arc/include/asm/setup.h | 37 + + arch/arc/include/asm/smp.h | 130 ++ + arch/arc/include/asm/spinlock.h | 144 +++ + arch/arc/include/asm/spinlock_types.h | 35 + + arch/arc/include/asm/string.h | 40 + + arch/arc/include/asm/switch_to.h | 41 + + arch/arc/include/asm/syscall.h | 72 ++ + arch/arc/include/asm/syscalls.h | 29 + + arch/arc/include/asm/thread_info.h | 121 ++ + arch/arc/include/asm/timex.h | 18 + + arch/arc/include/asm/tlb-mmu1.h | 104 ++ + arch/arc/include/asm/tlb.h | 58 + + arch/arc/include/asm/tlbflush.h | 28 + + arch/arc/include/asm/uaccess.h | 751 +++++++++++ + arch/arc/include/asm/unaligned.h | 29 + + arch/arc/include/asm/unwind.h | 163 +++ + arch/arc/include/uapi/asm/Kbuild | 12 + + arch/arc/include/uapi/asm/byteorder.h | 18 + + arch/arc/include/uapi/asm/cachectl.h | 28 + + arch/arc/include/uapi/asm/elf.h | 26 + + arch/arc/include/uapi/asm/page.h | 39 + + arch/arc/include/uapi/asm/ptrace.h | 48 + + arch/arc/include/uapi/asm/setup.h | 6 + + arch/arc/include/uapi/asm/sigcontext.h | 22 + + arch/arc/include/uapi/asm/signal.h | 27 + + arch/arc/include/uapi/asm/swab.h | 98 ++ + arch/arc/include/uapi/asm/unistd.h | 34 + + arch/arc/kernel/Makefile | 33 + + arch/arc/kernel/arc_hostlink.c | 58 + + arch/arc/kernel/arcksyms.c | 56 + + arch/arc/kernel/asm-offsets.c | 64 + + arch/arc/kernel/clk.c | 21 + + arch/arc/kernel/ctx_sw.c | 109 ++ + arch/arc/kernel/ctx_sw_asm.S | 58 + + arch/arc/kernel/devtree.c | 123 ++ + arch/arc/kernel/disasm.c | 538 ++++++++ + arch/arc/kernel/entry.S | 839 ++++++++++++ + arch/arc/kernel/fpu.c | 55 + + arch/arc/kernel/head.S | 111 ++ + arch/arc/kernel/irq.c | 273 ++++ + arch/arc/kernel/kgdb.c | 205 +++ + arch/arc/kernel/kprobes.c | 525 ++++++++ + arch/arc/kernel/module.c | 145 +++ + arch/arc/kernel/process.c | 235 ++++ + arch/arc/kernel/ptrace.c | 158 +++ + arch/arc/kernel/reset.c | 33 + + arch/arc/kernel/setup.c | 473 +++++++ + arch/arc/kernel/signal.c | 360 ++++++ + arch/arc/kernel/smp.c | 332 +++++ + arch/arc/kernel/stacktrace.c | 254 ++++ + arch/arc/kernel/sys.c | 18 + + arch/arc/kernel/time.c | 265 ++++ + arch/arc/kernel/traps.c | 170 +++ + arch/arc/kernel/troubleshoot.c | 322 +++++ + arch/arc/kernel/unaligned.c | 245 ++++ + arch/arc/kernel/unwind.c | 1329 ++++++++++++++++++++ + arch/arc/kernel/vmlinux.lds.S | 163 +++ + arch/arc/lib/Makefile | 9 + + arch/arc/lib/memcmp.S | 124 ++ + arch/arc/lib/memcpy-700.S | 66 + + arch/arc/lib/memset.S | 59 + + arch/arc/lib/strchr-700.S | 123 ++ + arch/arc/lib/strcmp.S | 96 ++ + arch/arc/lib/strcpy-700.S | 70 ++ + arch/arc/lib/strlen.S | 83 ++ + arch/arc/mm/Makefile | 10 + + arch/arc/mm/cache_arc700.c | 768 +++++++++++ + arch/arc/mm/dma.c | 94 ++ + arch/arc/mm/extable.c | 63 + + arch/arc/mm/fault.c | 228 ++++ + arch/arc/mm/init.c | 187 +++ + arch/arc/mm/ioremap.c | 91 ++ + arch/arc/mm/tlb.c | 645 ++++++++++ + arch/arc/mm/tlbex.S | 408 ++++++ + arch/arc/oprofile/Makefile | 9 + + arch/arc/oprofile/common.c | 26 + + arch/arc/plat-arcfpga/Kconfig | 84 ++ + arch/arc/plat-arcfpga/Makefile | 12 + + arch/arc/plat-arcfpga/include/plat/irq.h | 31 + + arch/arc/plat-arcfpga/include/plat/memmap.h | 31 + + arch/arc/plat-arcfpga/include/plat/smp.h | 118 ++ + arch/arc/plat-arcfpga/irq.c | 25 + + arch/arc/plat-arcfpga/platform.c | 226 ++++ + arch/arc/plat-arcfpga/smp.c | 171 +++ + arch/parisc/Kconfig | 1 + + include/asm-generic/checksum.h | 4 + + include/asm-generic/uaccess.h | 14 +- + init/Kconfig | 8 + + kernel/sysctl.c | 5 + + lib/checksum.c | 2 + + tools/perf/perf.h | 6 + + 147 files changed, 19552 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/arc/interrupts.txt + create mode 100644 arch/arc/Kbuild + create mode 100644 arch/arc/Kconfig + create mode 100644 arch/arc/Kconfig.debug + create mode 100644 arch/arc/Makefile + create mode 100644 arch/arc/boot/Makefile + create mode 100644 arch/arc/boot/dts/Makefile + create mode 100644 arch/arc/boot/dts/angel4.dts + create mode 100644 arch/arc/boot/dts/skeleton.dts + create mode 100644 arch/arc/boot/dts/skeleton.dtsi + create mode 100644 arch/arc/configs/fpga_defconfig + create mode 100644 arch/arc/include/asm/Kbuild + create mode 100644 arch/arc/include/asm/arcregs.h + create mode 100644 arch/arc/include/asm/asm-offsets.h + create mode 100644 arch/arc/include/asm/atomic.h + create mode 100644 arch/arc/include/asm/barrier.h + create mode 100644 arch/arc/include/asm/bitops.h + create mode 100644 arch/arc/include/asm/bug.h + create mode 100644 arch/arc/include/asm/cache.h + create mode 100644 arch/arc/include/asm/cacheflush.h + create mode 100644 arch/arc/include/asm/checksum.h + create mode 100644 arch/arc/include/asm/clk.h + create mode 100644 arch/arc/include/asm/cmpxchg.h + create mode 100644 arch/arc/include/asm/current.h + create mode 100644 arch/arc/include/asm/defines.h + create mode 100644 arch/arc/include/asm/delay.h + create mode 100644 arch/arc/include/asm/disasm.h + create mode 100644 arch/arc/include/asm/dma-mapping.h + create mode 100644 arch/arc/include/asm/dma.h + create mode 100644 arch/arc/include/asm/elf.h + create mode 100644 arch/arc/include/asm/entry.h + create mode 100644 arch/arc/include/asm/exec.h + create mode 100644 arch/arc/include/asm/futex.h + create mode 100644 arch/arc/include/asm/io.h + create mode 100644 arch/arc/include/asm/irq.h + create mode 100644 arch/arc/include/asm/irqflags.h + create mode 100644 arch/arc/include/asm/kdebug.h + create mode 100644 arch/arc/include/asm/kgdb.h + create mode 100644 arch/arc/include/asm/kprobes.h + create mode 100644 arch/arc/include/asm/linkage.h + create mode 100644 arch/arc/include/asm/mach_desc.h + create mode 100644 arch/arc/include/asm/mmu.h + create mode 100644 arch/arc/include/asm/mmu_context.h + create mode 100644 arch/arc/include/asm/module.h + create mode 100644 arch/arc/include/asm/mutex.h + create mode 100644 arch/arc/include/asm/page.h + create mode 100644 arch/arc/include/asm/perf_event.h + create mode 100644 arch/arc/include/asm/pgalloc.h + create mode 100644 arch/arc/include/asm/pgtable.h + create mode 100644 arch/arc/include/asm/processor.h + create mode 100644 arch/arc/include/asm/prom.h + create mode 100644 arch/arc/include/asm/ptrace.h + create mode 100644 arch/arc/include/asm/sections.h + create mode 100644 arch/arc/include/asm/segment.h + create mode 100644 arch/arc/include/asm/serial.h + create mode 100644 arch/arc/include/asm/setup.h + create mode 100644 arch/arc/include/asm/smp.h + create mode 100644 arch/arc/include/asm/spinlock.h + create mode 100644 arch/arc/include/asm/spinlock_types.h + create mode 100644 arch/arc/include/asm/string.h + create mode 100644 arch/arc/include/asm/switch_to.h + create mode 100644 arch/arc/include/asm/syscall.h + create mode 100644 arch/arc/include/asm/syscalls.h + create mode 100644 arch/arc/include/asm/thread_info.h + create mode 100644 arch/arc/include/asm/timex.h + create mode 100644 arch/arc/include/asm/tlb-mmu1.h + create mode 100644 arch/arc/include/asm/tlb.h + create mode 100644 arch/arc/include/asm/tlbflush.h + create mode 100644 arch/arc/include/asm/uaccess.h + create mode 100644 arch/arc/include/asm/unaligned.h + create mode 100644 arch/arc/include/asm/unwind.h + create mode 100644 arch/arc/include/uapi/asm/Kbuild + create mode 100644 arch/arc/include/uapi/asm/byteorder.h + create mode 100644 arch/arc/include/uapi/asm/cachectl.h + create mode 100644 arch/arc/include/uapi/asm/elf.h + create mode 100644 arch/arc/include/uapi/asm/page.h + create mode 100644 arch/arc/include/uapi/asm/ptrace.h + create mode 100644 arch/arc/include/uapi/asm/setup.h + create mode 100644 arch/arc/include/uapi/asm/sigcontext.h + create mode 100644 arch/arc/include/uapi/asm/signal.h + create mode 100644 arch/arc/include/uapi/asm/swab.h + create mode 100644 arch/arc/include/uapi/asm/unistd.h + create mode 100644 arch/arc/kernel/Makefile + create mode 100644 arch/arc/kernel/arc_hostlink.c + create mode 100644 arch/arc/kernel/arcksyms.c + create mode 100644 arch/arc/kernel/asm-offsets.c + create mode 100644 arch/arc/kernel/clk.c + create mode 100644 arch/arc/kernel/ctx_sw.c + create mode 100644 arch/arc/kernel/ctx_sw_asm.S + create mode 100644 arch/arc/kernel/devtree.c + create mode 100644 arch/arc/kernel/disasm.c + create mode 100644 arch/arc/kernel/entry.S + create mode 100644 arch/arc/kernel/fpu.c + create mode 100644 arch/arc/kernel/head.S + create mode 100644 arch/arc/kernel/irq.c + create mode 100644 arch/arc/kernel/kgdb.c + create mode 100644 arch/arc/kernel/kprobes.c + create mode 100644 arch/arc/kernel/module.c + create mode 100644 arch/arc/kernel/process.c + create mode 100644 arch/arc/kernel/ptrace.c + create mode 100644 arch/arc/kernel/reset.c + create mode 100644 arch/arc/kernel/setup.c + create mode 100644 arch/arc/kernel/signal.c + create mode 100644 arch/arc/kernel/smp.c + create mode 100644 arch/arc/kernel/stacktrace.c + create mode 100644 arch/arc/kernel/sys.c + create mode 100644 arch/arc/kernel/time.c + create mode 100644 arch/arc/kernel/traps.c + create mode 100644 arch/arc/kernel/troubleshoot.c + create mode 100644 arch/arc/kernel/unaligned.c + create mode 100644 arch/arc/kernel/unwind.c + create mode 100644 arch/arc/kernel/vmlinux.lds.S + create mode 100644 arch/arc/lib/Makefile + create mode 100644 arch/arc/lib/memcmp.S + create mode 100644 arch/arc/lib/memcpy-700.S + create mode 100644 arch/arc/lib/memset.S + create mode 100644 arch/arc/lib/strchr-700.S + create mode 100644 arch/arc/lib/strcmp.S + create mode 100644 arch/arc/lib/strcpy-700.S + create mode 100644 arch/arc/lib/strlen.S + create mode 100644 arch/arc/mm/Makefile + create mode 100644 arch/arc/mm/cache_arc700.c + create mode 100644 arch/arc/mm/dma.c + create mode 100644 arch/arc/mm/extable.c + create mode 100644 arch/arc/mm/fault.c + create mode 100644 arch/arc/mm/init.c + create mode 100644 arch/arc/mm/ioremap.c + create mode 100644 arch/arc/mm/tlb.c + create mode 100644 arch/arc/mm/tlbex.S + create mode 100644 arch/arc/oprofile/Makefile + create mode 100644 arch/arc/oprofile/common.c + create mode 100644 arch/arc/plat-arcfpga/Kconfig + create mode 100644 arch/arc/plat-arcfpga/Makefile + create mode 100644 arch/arc/plat-arcfpga/include/plat/irq.h + create mode 100644 arch/arc/plat-arcfpga/include/plat/memmap.h + create mode 100644 arch/arc/plat-arcfpga/include/plat/smp.h + create mode 100644 arch/arc/plat-arcfpga/irq.c + create mode 100644 arch/arc/plat-arcfpga/platform.c + create mode 100644 arch/arc/plat-arcfpga/smp.c +Merging arm/for-next (3576216 Merge branches 'devel-stable', 'fixes' and 'mmci' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/kernel/smp.c +Merge made by the 'recursive' strategy. + arch/arm/kernel/smp.c | 2 -- + 1 file changed, 2 deletions(-) +Merging arm-perf/for-next/perf (5ef1240 Merge branches 'for-rmk/hw-breakpoint' and 'for-rmk/perf' into for-next/perf) +$ git merge arm-perf/for-next/perf +Already up-to-date! +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 (42ead3a arm: zynq: timer: Set clock_event cpumask) +$ git merge xilinx/arm-next +Resolved 'arch/arm/mach-zynq/common.c' using previous resolution. +Auto-merging arch/arm/mach-zynq/common.c +CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7d4c6c0] Merge remote-tracking branch 'xilinx/arm-next' +$ git diff -M --stat --summary HEAD^.. +Merging arm64/upstream (ec45d1c arm64: mm: update CONTEXTIDR register to contain PID of current process) +$ git merge arm64/upstream +Already up-to-date. +Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (93bbd0c c6x: use generic kvm_para.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (77c8006 UAPI: Fix up empty files in arch/cris/) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (c9500a7 Merge branch 'pstore' into next) +$ git merge ia64/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging m68k/for-next (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (8a67f21 m68knommu: fix trap on execing /bin/init) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. +Merging metag/for-next (2149e40 metag: remove SET_PERSONALITY()) +$ git merge metag/for-next +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/Makefile' using previous resolution. +Resolved 'drivers/irqchip/Makefile' using previous resolution. +Resolved 'tools/perf/perf.h' using previous resolution. +Auto-merging tools/perf/perf.h +CONFLICT (content): Merge conflict in tools/perf/perf.h +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/ring_buffer.c +Auto-merging include/uapi/linux/elf.h +Auto-merging include/linux/mm.h +Auto-merging include/asm-generic/io.h +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/irqchip/Makefile +CONFLICT (content): Merge conflict in drivers/irqchip/Makefile +Auto-merging drivers/clocksource/Makefile +CONFLICT (content): Merge conflict in drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/00-INDEX +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5607534] Merge remote-tracking branch 'metag/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/00-INDEX | 2 + + .../devicetree/bindings/metag/meta-intc.txt | 82 ++ + Documentation/kernel-parameters.txt | 4 + + Documentation/metag/00-INDEX | 4 + + Documentation/metag/kernel-ABI.txt | 256 ++++ + MAINTAINERS | 12 + + arch/Kconfig | 16 + + arch/metag/Kconfig | 293 ++++ + arch/metag/Kconfig.debug | 40 + + arch/metag/Kconfig.soc | 55 + + arch/metag/Makefile | 87 ++ + arch/metag/boot/.gitignore | 4 + + arch/metag/boot/Makefile | 68 + + arch/metag/boot/dts/Makefile | 16 + + arch/metag/boot/dts/skeleton.dts | 10 + + arch/metag/boot/dts/skeleton.dtsi | 14 + + arch/metag/configs/meta1_defconfig | 40 + + arch/metag/configs/meta2_defconfig | 41 + + arch/metag/configs/meta2_smp_defconfig | 42 + + arch/metag/include/asm/Kbuild | 54 + + arch/metag/include/asm/atomic.h | 53 + + arch/metag/include/asm/atomic_lnkget.h | 234 ++++ + arch/metag/include/asm/atomic_lock1.h | 160 +++ + arch/metag/include/asm/barrier.h | 85 ++ + arch/metag/include/asm/bitops.h | 132 ++ + arch/metag/include/asm/bug.h | 12 + + arch/metag/include/asm/cache.h | 23 + + arch/metag/include/asm/cacheflush.h | 250 ++++ + arch/metag/include/asm/cachepart.h | 42 + + arch/metag/include/asm/checksum.h | 92 ++ + arch/metag/include/asm/clock.h | 51 + + arch/metag/include/asm/cmpxchg.h | 65 + + arch/metag/include/asm/cmpxchg_irq.h | 42 + + arch/metag/include/asm/cmpxchg_lnkget.h | 86 ++ + arch/metag/include/asm/cmpxchg_lock1.h | 48 + + arch/metag/include/asm/core_reg.h | 35 + + arch/metag/include/asm/cpu.h | 14 + + arch/metag/include/asm/da.h | 43 + + arch/metag/include/asm/delay.h | 29 + + arch/metag/include/asm/div64.h | 12 + + arch/metag/include/asm/dma-mapping.h | 190 +++ + arch/metag/include/asm/elf.h | 125 ++ + arch/metag/include/asm/fixmap.h | 99 ++ + arch/metag/include/asm/ftrace.h | 23 + + arch/metag/include/asm/global_lock.h | 100 ++ + arch/metag/include/asm/gpio.h | 4 + + arch/metag/include/asm/highmem.h | 62 + + arch/metag/include/asm/hugetlb.h | 86 ++ + arch/metag/include/asm/hwthread.h | 40 + + arch/metag/include/asm/io.h | 165 +++ + arch/metag/include/asm/irq.h | 32 + + arch/metag/include/asm/irqflags.h | 93 ++ + arch/metag/include/asm/l2cache.h | 258 ++++ + arch/metag/include/asm/linkage.h | 7 + + arch/metag/include/asm/mach/arch.h | 86 ++ + arch/metag/include/asm/metag_isa.h | 81 ++ + arch/metag/include/asm/metag_mem.h | 1106 +++++++++++++++ + arch/metag/include/asm/metag_regs.h | 1184 ++++++++++++++++ + arch/metag/include/asm/mman.h | 11 + + arch/metag/include/asm/mmu.h | 77 ++ + arch/metag/include/asm/mmu_context.h | 113 ++ + arch/metag/include/asm/mmzone.h | 42 + + arch/metag/include/asm/module.h | 37 + + arch/metag/include/asm/page.h | 128 ++ + arch/metag/include/asm/perf_event.h | 4 + + arch/metag/include/asm/pgalloc.h | 79 ++ + arch/metag/include/asm/pgtable.h | 370 +++++ + arch/metag/include/asm/processor.h | 202 +++ + arch/metag/include/asm/prom.h | 23 + + arch/metag/include/asm/ptrace.h | 60 + + arch/metag/include/asm/setup.h | 8 + + arch/metag/include/asm/smp.h | 29 + + arch/metag/include/asm/sparsemem.h | 13 + + arch/metag/include/asm/spinlock.h | 22 + + arch/metag/include/asm/spinlock_lnkget.h | 249 ++++ + arch/metag/include/asm/spinlock_lock1.h | 184 +++ + arch/metag/include/asm/spinlock_types.h | 20 + + arch/metag/include/asm/stacktrace.h | 20 + + arch/metag/include/asm/string.h | 13 + + arch/metag/include/asm/switch.h | 21 + + arch/metag/include/asm/syscall.h | 104 ++ + arch/metag/include/asm/syscalls.h | 39 + + arch/metag/include/asm/tbx.h | 1425 ++++++++++++++++++++ + arch/metag/include/asm/tcm.h | 30 + + arch/metag/include/asm/thread_info.h | 155 +++ + arch/metag/include/asm/tlb.h | 36 + + arch/metag/include/asm/tlbflush.h | 77 ++ + arch/metag/include/asm/topology.h | 53 + + arch/metag/include/asm/traps.h | 48 + + arch/metag/include/asm/uaccess.h | 241 ++++ + arch/metag/include/asm/unistd.h | 12 + + arch/metag/include/asm/user_gateway.h | 44 + + arch/metag/include/uapi/asm/Kbuild | 13 + + arch/metag/include/uapi/asm/byteorder.h | 1 + + arch/metag/include/uapi/asm/ptrace.h | 113 ++ + arch/metag/include/uapi/asm/resource.h | 7 + + arch/metag/include/uapi/asm/sigcontext.h | 31 + + arch/metag/include/uapi/asm/siginfo.h | 8 + + arch/metag/include/uapi/asm/swab.h | 26 + + arch/metag/include/uapi/asm/unistd.h | 21 + + arch/metag/kernel/.gitignore | 1 + + arch/metag/kernel/Makefile | 39 + + arch/metag/kernel/asm-offsets.c | 14 + + arch/metag/kernel/cachepart.c | 124 ++ + arch/metag/kernel/clock.c | 53 + + arch/metag/kernel/core_reg.c | 117 ++ + arch/metag/kernel/da.c | 23 + + arch/metag/kernel/devtree.c | 114 ++ + arch/metag/kernel/dma.c | 507 +++++++ + arch/metag/kernel/ftrace.c | 126 ++ + arch/metag/kernel/ftrace_stub.S | 76 ++ + arch/metag/kernel/head.S | 57 + + arch/metag/kernel/irq.c | 323 +++++ + arch/metag/kernel/kick.c | 101 ++ + arch/metag/kernel/machines.c | 20 + + arch/metag/kernel/metag_ksyms.c | 48 + + arch/metag/kernel/module.c | 284 ++++ + arch/metag/kernel/perf/Makefile | 3 + + arch/metag/kernel/perf/perf_event.c | 861 ++++++++++++ + arch/metag/kernel/perf/perf_event.h | 106 ++ + arch/metag/kernel/perf_callchain.c | 96 ++ + arch/metag/kernel/process.c | 461 +++++++ + arch/metag/kernel/ptrace.c | 380 ++++++ + arch/metag/kernel/setup.c | 631 +++++++++ + arch/metag/kernel/signal.c | 344 +++++ + arch/metag/kernel/smp.c | 575 ++++++++ + arch/metag/kernel/stacktrace.c | 187 +++ + arch/metag/kernel/sys_metag.c | 180 +++ + arch/metag/kernel/tbiunexp.S | 22 + + arch/metag/kernel/tcm.c | 151 +++ + arch/metag/kernel/time.c | 15 + + arch/metag/kernel/topology.c | 77 ++ + arch/metag/kernel/traps.c | 995 ++++++++++++++ + arch/metag/kernel/user_gateway.S | 97 ++ + arch/metag/kernel/vmlinux.lds.S | 71 + + arch/metag/lib/Makefile | 22 + + arch/metag/lib/ashldi3.S | 33 + + arch/metag/lib/ashrdi3.S | 33 + + arch/metag/lib/checksum.c | 168 +++ + arch/metag/lib/clear_page.S | 17 + + arch/metag/lib/cmpdi2.S | 32 + + arch/metag/lib/copy_page.S | 20 + + arch/metag/lib/delay.c | 56 + + arch/metag/lib/div64.S | 108 ++ + arch/metag/lib/divsi3.S | 100 ++ + arch/metag/lib/ip_fast_csum.S | 32 + + arch/metag/lib/lshrdi3.S | 33 + + arch/metag/lib/memcpy.S | 185 +++ + arch/metag/lib/memmove.S | 345 +++++ + arch/metag/lib/memset.S | 86 ++ + arch/metag/lib/modsi3.S | 38 + + arch/metag/lib/muldi3.S | 44 + + arch/metag/lib/ucmpdi2.S | 27 + + arch/metag/lib/usercopy.c | 1354 +++++++++++++++++++ + arch/metag/mm/Kconfig | 153 +++ + arch/metag/mm/Makefile | 19 + + arch/metag/mm/cache.c | 521 +++++++ + arch/metag/mm/extable.c | 15 + + arch/metag/mm/fault.c | 239 ++++ + arch/metag/mm/highmem.c | 133 ++ + arch/metag/mm/hugetlbpage.c | 259 ++++ + arch/metag/mm/init.c | 451 +++++++ + arch/metag/mm/ioremap.c | 89 ++ + arch/metag/mm/l2cache.c | 192 +++ + arch/metag/mm/maccess.c | 68 + + arch/metag/mm/mmu-meta1.c | 157 +++ + arch/metag/mm/mmu-meta2.c | 207 +++ + arch/metag/mm/numa.c | 81 ++ + arch/metag/tbx/Makefile | 21 + + arch/metag/tbx/tbicore.S | 136 ++ + arch/metag/tbx/tbictx.S | 366 +++++ + arch/metag/tbx/tbictxfpu.S | 190 +++ + arch/metag/tbx/tbidefr.S | 175 +++ + arch/metag/tbx/tbidspram.S | 161 +++ + arch/metag/tbx/tbilogf.S | 48 + + arch/metag/tbx/tbipcx.S | 451 +++++++ + arch/metag/tbx/tbiroot.S | 87 ++ + arch/metag/tbx/tbisoft.S | 237 ++++ + arch/metag/tbx/tbistring.c | 114 ++ + arch/metag/tbx/tbitimer.S | 207 +++ + drivers/clocksource/Kconfig | 5 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/metag_generic.c | 198 +++ + drivers/irqchip/Makefile | 2 + + drivers/irqchip/irq-metag-ext.c | 868 ++++++++++++ + drivers/irqchip/irq-metag.c | 343 +++++ + fs/binfmt_elf.c | 4 + + include/asm-generic/io.h | 2 + + include/asm-generic/unistd.h | 9 +- + include/clocksource/metag_generic.h | 21 + + include/linux/irqchip/metag-ext.h | 33 + + include/linux/irqchip/metag.h | 24 + + include/linux/mm.h | 2 + + include/uapi/linux/elf.h | 2 + + kernel/trace/ring_buffer.c | 6 +- + lib/Kconfig.debug | 4 +- + scripts/checkstack.pl | 8 +- + scripts/genksyms/genksyms.c | 3 +- + scripts/recordmcount.c | 13 + + tools/perf/perf.h | 6 + + 200 files changed, 26933 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/metag/meta-intc.txt + create mode 100644 Documentation/metag/00-INDEX + create mode 100644 Documentation/metag/kernel-ABI.txt + create mode 100644 arch/metag/Kconfig + create mode 100644 arch/metag/Kconfig.debug + create mode 100644 arch/metag/Kconfig.soc + create mode 100644 arch/metag/Makefile + create mode 100644 arch/metag/boot/.gitignore + create mode 100644 arch/metag/boot/Makefile + create mode 100644 arch/metag/boot/dts/Makefile + create mode 100644 arch/metag/boot/dts/skeleton.dts + create mode 100644 arch/metag/boot/dts/skeleton.dtsi + create mode 100644 arch/metag/configs/meta1_defconfig + create mode 100644 arch/metag/configs/meta2_defconfig + create mode 100644 arch/metag/configs/meta2_smp_defconfig + create mode 100644 arch/metag/include/asm/Kbuild + create mode 100644 arch/metag/include/asm/atomic.h + create mode 100644 arch/metag/include/asm/atomic_lnkget.h + create mode 100644 arch/metag/include/asm/atomic_lock1.h + create mode 100644 arch/metag/include/asm/barrier.h + create mode 100644 arch/metag/include/asm/bitops.h + create mode 100644 arch/metag/include/asm/bug.h + create mode 100644 arch/metag/include/asm/cache.h + create mode 100644 arch/metag/include/asm/cacheflush.h + create mode 100644 arch/metag/include/asm/cachepart.h + create mode 100644 arch/metag/include/asm/checksum.h + create mode 100644 arch/metag/include/asm/clock.h + create mode 100644 arch/metag/include/asm/cmpxchg.h + create mode 100644 arch/metag/include/asm/cmpxchg_irq.h + create mode 100644 arch/metag/include/asm/cmpxchg_lnkget.h + create mode 100644 arch/metag/include/asm/cmpxchg_lock1.h + create mode 100644 arch/metag/include/asm/core_reg.h + create mode 100644 arch/metag/include/asm/cpu.h + create mode 100644 arch/metag/include/asm/da.h + create mode 100644 arch/metag/include/asm/delay.h + create mode 100644 arch/metag/include/asm/div64.h + create mode 100644 arch/metag/include/asm/dma-mapping.h + create mode 100644 arch/metag/include/asm/elf.h + create mode 100644 arch/metag/include/asm/fixmap.h + create mode 100644 arch/metag/include/asm/ftrace.h + create mode 100644 arch/metag/include/asm/global_lock.h + create mode 100644 arch/metag/include/asm/gpio.h + create mode 100644 arch/metag/include/asm/highmem.h + create mode 100644 arch/metag/include/asm/hugetlb.h + create mode 100644 arch/metag/include/asm/hwthread.h + create mode 100644 arch/metag/include/asm/io.h + create mode 100644 arch/metag/include/asm/irq.h + create mode 100644 arch/metag/include/asm/irqflags.h + create mode 100644 arch/metag/include/asm/l2cache.h + create mode 100644 arch/metag/include/asm/linkage.h + create mode 100644 arch/metag/include/asm/mach/arch.h + create mode 100644 arch/metag/include/asm/metag_isa.h + create mode 100644 arch/metag/include/asm/metag_mem.h + create mode 100644 arch/metag/include/asm/metag_regs.h + create mode 100644 arch/metag/include/asm/mman.h + create mode 100644 arch/metag/include/asm/mmu.h + create mode 100644 arch/metag/include/asm/mmu_context.h + create mode 100644 arch/metag/include/asm/mmzone.h + create mode 100644 arch/metag/include/asm/module.h + create mode 100644 arch/metag/include/asm/page.h + create mode 100644 arch/metag/include/asm/perf_event.h + create mode 100644 arch/metag/include/asm/pgalloc.h + create mode 100644 arch/metag/include/asm/pgtable.h + create mode 100644 arch/metag/include/asm/processor.h + create mode 100644 arch/metag/include/asm/prom.h + create mode 100644 arch/metag/include/asm/ptrace.h + create mode 100644 arch/metag/include/asm/setup.h + create mode 100644 arch/metag/include/asm/smp.h + create mode 100644 arch/metag/include/asm/sparsemem.h + create mode 100644 arch/metag/include/asm/spinlock.h + create mode 100644 arch/metag/include/asm/spinlock_lnkget.h + create mode 100644 arch/metag/include/asm/spinlock_lock1.h + create mode 100644 arch/metag/include/asm/spinlock_types.h + create mode 100644 arch/metag/include/asm/stacktrace.h + create mode 100644 arch/metag/include/asm/string.h + create mode 100644 arch/metag/include/asm/switch.h + create mode 100644 arch/metag/include/asm/syscall.h + create mode 100644 arch/metag/include/asm/syscalls.h + create mode 100644 arch/metag/include/asm/tbx.h + create mode 100644 arch/metag/include/asm/tcm.h + create mode 100644 arch/metag/include/asm/thread_info.h + create mode 100644 arch/metag/include/asm/tlb.h + create mode 100644 arch/metag/include/asm/tlbflush.h + create mode 100644 arch/metag/include/asm/topology.h + create mode 100644 arch/metag/include/asm/traps.h + create mode 100644 arch/metag/include/asm/uaccess.h + create mode 100644 arch/metag/include/asm/unistd.h + create mode 100644 arch/metag/include/asm/user_gateway.h + create mode 100644 arch/metag/include/uapi/asm/Kbuild + create mode 100644 arch/metag/include/uapi/asm/byteorder.h + create mode 100644 arch/metag/include/uapi/asm/ptrace.h + create mode 100644 arch/metag/include/uapi/asm/resource.h + create mode 100644 arch/metag/include/uapi/asm/sigcontext.h + create mode 100644 arch/metag/include/uapi/asm/siginfo.h + create mode 100644 arch/metag/include/uapi/asm/swab.h + create mode 100644 arch/metag/include/uapi/asm/unistd.h + create mode 100644 arch/metag/kernel/.gitignore + create mode 100644 arch/metag/kernel/Makefile + create mode 100644 arch/metag/kernel/asm-offsets.c + create mode 100644 arch/metag/kernel/cachepart.c + create mode 100644 arch/metag/kernel/clock.c + create mode 100644 arch/metag/kernel/core_reg.c + create mode 100644 arch/metag/kernel/da.c + create mode 100644 arch/metag/kernel/devtree.c + create mode 100644 arch/metag/kernel/dma.c + create mode 100644 arch/metag/kernel/ftrace.c + create mode 100644 arch/metag/kernel/ftrace_stub.S + create mode 100644 arch/metag/kernel/head.S + create mode 100644 arch/metag/kernel/irq.c + create mode 100644 arch/metag/kernel/kick.c + create mode 100644 arch/metag/kernel/machines.c + create mode 100644 arch/metag/kernel/metag_ksyms.c + create mode 100644 arch/metag/kernel/module.c + create mode 100644 arch/metag/kernel/perf/Makefile + create mode 100644 arch/metag/kernel/perf/perf_event.c + create mode 100644 arch/metag/kernel/perf/perf_event.h + create mode 100644 arch/metag/kernel/perf_callchain.c + create mode 100644 arch/metag/kernel/process.c + create mode 100644 arch/metag/kernel/ptrace.c + create mode 100644 arch/metag/kernel/setup.c + create mode 100644 arch/metag/kernel/signal.c + create mode 100644 arch/metag/kernel/smp.c + create mode 100644 arch/metag/kernel/stacktrace.c + create mode 100644 arch/metag/kernel/sys_metag.c + create mode 100644 arch/metag/kernel/tbiunexp.S + create mode 100644 arch/metag/kernel/tcm.c + create mode 100644 arch/metag/kernel/time.c + create mode 100644 arch/metag/kernel/topology.c + create mode 100644 arch/metag/kernel/traps.c + create mode 100644 arch/metag/kernel/user_gateway.S + create mode 100644 arch/metag/kernel/vmlinux.lds.S + create mode 100644 arch/metag/lib/Makefile + create mode 100644 arch/metag/lib/ashldi3.S + create mode 100644 arch/metag/lib/ashrdi3.S + create mode 100644 arch/metag/lib/checksum.c + create mode 100644 arch/metag/lib/clear_page.S + create mode 100644 arch/metag/lib/cmpdi2.S + create mode 100644 arch/metag/lib/copy_page.S + create mode 100644 arch/metag/lib/delay.c + create mode 100644 arch/metag/lib/div64.S + create mode 100644 arch/metag/lib/divsi3.S + create mode 100644 arch/metag/lib/ip_fast_csum.S + create mode 100644 arch/metag/lib/lshrdi3.S + create mode 100644 arch/metag/lib/memcpy.S + create mode 100644 arch/metag/lib/memmove.S + create mode 100644 arch/metag/lib/memset.S + create mode 100644 arch/metag/lib/modsi3.S + create mode 100644 arch/metag/lib/muldi3.S + create mode 100644 arch/metag/lib/ucmpdi2.S + create mode 100644 arch/metag/lib/usercopy.c + create mode 100644 arch/metag/mm/Kconfig + create mode 100644 arch/metag/mm/Makefile + create mode 100644 arch/metag/mm/cache.c + create mode 100644 arch/metag/mm/extable.c + create mode 100644 arch/metag/mm/fault.c + create mode 100644 arch/metag/mm/highmem.c + create mode 100644 arch/metag/mm/hugetlbpage.c + create mode 100644 arch/metag/mm/init.c + create mode 100644 arch/metag/mm/ioremap.c + create mode 100644 arch/metag/mm/l2cache.c + create mode 100644 arch/metag/mm/maccess.c + create mode 100644 arch/metag/mm/mmu-meta1.c + create mode 100644 arch/metag/mm/mmu-meta2.c + create mode 100644 arch/metag/mm/numa.c + create mode 100644 arch/metag/tbx/Makefile + create mode 100644 arch/metag/tbx/tbicore.S + create mode 100644 arch/metag/tbx/tbictx.S + create mode 100644 arch/metag/tbx/tbictxfpu.S + create mode 100644 arch/metag/tbx/tbidefr.S + create mode 100644 arch/metag/tbx/tbidspram.S + create mode 100644 arch/metag/tbx/tbilogf.S + create mode 100644 arch/metag/tbx/tbipcx.S + create mode 100644 arch/metag/tbx/tbiroot.S + create mode 100644 arch/metag/tbx/tbisoft.S + create mode 100644 arch/metag/tbx/tbistring.c + create mode 100644 arch/metag/tbx/tbitimer.S + create mode 100644 drivers/clocksource/metag_generic.c + create mode 100644 drivers/irqchip/irq-metag-ext.c + create mode 100644 drivers/irqchip/irq-metag.c + create mode 100644 include/clocksource/metag_generic.h + create mode 100644 include/linux/irqchip/metag-ext.h + create mode 100644 include/linux/irqchip/metag.h +Merging microblaze/next (711e5b4 asm-generic: io: Fix ioread16/32be and iowrite16/32be) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (19aa5ac Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/net/ethernet/broadcom/bgmac.c +Auto-merging arch/mips/sni/a20r.c +Removing arch/mips/pnx8550/stb810/prom_init.c +Removing arch/mips/pnx8550/stb810/irqmap.c +Removing arch/mips/pnx8550/stb810/board_setup.c +Removing arch/mips/pnx8550/stb810/Makefile +Removing arch/mips/pnx8550/jbs/irqmap.c +Removing arch/mips/pnx8550/jbs/init.c +Removing arch/mips/pnx8550/jbs/board_setup.c +Removing arch/mips/pnx8550/jbs/Makefile +Removing arch/mips/pnx8550/common/time.c +Removing arch/mips/pnx8550/common/setup.c +Removing arch/mips/pnx8550/common/reset.c +Removing arch/mips/pnx8550/common/prom.c +Removing arch/mips/pnx8550/common/proc.c +Removing arch/mips/pnx8550/common/platform.c +Removing arch/mips/pnx8550/common/pci.c +Removing arch/mips/pnx8550/common/int.c +Removing arch/mips/pnx8550/common/Makefile +Removing arch/mips/pnx8550/Platform +Removing arch/mips/pnx8550/Makefile +Auto-merging arch/mips/pmcs-msp71xx/msp_usb.c +Auto-merging arch/mips/pmcs-msp71xx/msp_time.c +Auto-merging arch/mips/pmcs-msp71xx/msp_setup.c +Auto-merging arch/mips/pmcs-msp71xx/msp_serial.c +Auto-merging arch/mips/pmcs-msp71xx/msp_prom.c +Auto-merging arch/mips/pmcs-msp71xx/msp_pci.c +Auto-merging arch/mips/pmcs-msp71xx/msp_irq_slp.c +Auto-merging arch/mips/pmcs-msp71xx/msp_irq_per.c +Auto-merging arch/mips/pmcs-msp71xx/msp_irq_cic.c +Auto-merging arch/mips/pmcs-msp71xx/msp_irq.c +Removing arch/mips/pmc-sierra/Platform +Auto-merging arch/mips/pci/pci-lantiq.c +Removing arch/mips/pci/ops-pnx8550.c +Removing arch/mips/pci/fixup-pnx8550.c +Removing arch/mips/mti-sead3/sead3-memory.c +Auto-merging arch/mips/kernel/vpe.c +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/mips/kernel/syscall.c +CONFLICT (content): Merge conflict in arch/mips/kernel/syscall.c +Auto-merging arch/mips/kernel/signal_n32.c +CONFLICT (content): Merge conflict in arch/mips/kernel/signal_n32.c +Auto-merging arch/mips/kernel/signal32.c +CONFLICT (content): Merge conflict in arch/mips/kernel/signal32.c +Auto-merging arch/mips/kernel/signal.c +CONFLICT (content): Merge conflict in arch/mips/kernel/signal.c +Auto-merging arch/mips/kernel/scall64-o32.S +CONFLICT (content): Merge conflict in arch/mips/kernel/scall64-o32.S +Auto-merging arch/mips/kernel/scall64-n32.S +Auto-merging arch/mips/kernel/scall64-64.S +Auto-merging arch/mips/kernel/scall32-o32.S +Auto-merging arch/mips/kernel/rtlx.c +Auto-merging arch/mips/kernel/process.c +CONFLICT (content): Merge conflict in arch/mips/kernel/process.c +Auto-merging arch/mips/kernel/linux32.c +CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c +Auto-merging arch/mips/kernel/kprobes.c +Auto-merging arch/mips/include/uapi/asm/signal.h +Auto-merging arch/mips/include/asm/octeon/cvmx-helper-util.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/octeon/cvmx-helper-util.h +Auto-merging arch/mips/include/asm/mach-ralink/war.h +Removing arch/mips/include/asm/mach-pnx8550/usb.h +Removing arch/mips/include/asm/mach-pnx8550/uart.h +Removing arch/mips/include/asm/mach-pnx8550/pci.h +Removing arch/mips/include/asm/mach-pnx8550/nand.h +Removing arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h +Removing arch/mips/include/asm/mach-pnx8550/int.h +Removing arch/mips/include/asm/mach-pnx8550/glb.h +Removing arch/mips/include/asm/mach-pnx8550/cm.h +Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/war.h +Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h +Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h +Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h +Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h +Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h +Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h +Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h +Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h +Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h +Auto-merging arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h +Removing arch/mips/include/asm/mach-ath79/pci.h +Auto-merging arch/mips/include/asm/compat.h +RemovResolved 'arch/mips/cavium-octeon/executive/cvmx-helper-util.c' using previous resolution. +Resolved 'arch/mips/include/asm/octeon/cvmx-helper-util.h' using previous resolution. +Resolved 'arch/mips/kernel/linux32.c' using previous resolution. +Resolved 'arch/mips/kernel/process.c' using previous resolution. +Resolved 'arch/mips/kernel/scall64-o32.S' using previous resolution. +Resolved 'arch/mips/kernel/signal.c' using previous resolution. +Resolved 'arch/mips/kernel/signal32.c' using previous resolution. +Resolved 'arch/mips/kernel/signal_n32.c' using previous resolution. +Resolved 'arch/mips/kernel/syscall.c' using previous resolution. +ing arch/mips/configs/pnx8550_stb810_defconfig +Removing arch/mips/configs/pnx8550_jbs_defconfig +Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-util.c +CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-util.c +Auto-merging arch/mips/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4762766] Merge remote-tracking branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/mips/cpu_irq.txt | 47 + + .../devicetree/bindings/serial/lantiq_asc.txt | 16 + + arch/mips/Kbuild.platforms | 4 +- + arch/mips/Kconfig | 49 +- + arch/mips/Makefile | 2 +- + arch/mips/alchemy/Platform | 6 +- + arch/mips/alchemy/board-gpr.c | 12 +- + arch/mips/alchemy/board-mtx1.c | 8 +- + arch/mips/alchemy/common/dbdma.c | 14 +- + arch/mips/alchemy/common/gpiolib.c | 14 +- + arch/mips/alchemy/common/irq.c | 178 +-- + arch/mips/alchemy/common/platform.c | 4 +- + arch/mips/alchemy/common/setup.c | 2 +- + arch/mips/alchemy/common/sleeper.S | 20 +- + arch/mips/alchemy/common/time.c | 2 +- + arch/mips/alchemy/common/usb.c | 2 +- + arch/mips/alchemy/devboards/bcsr.c | 2 +- + arch/mips/alchemy/devboards/db1000.c | 16 +- + arch/mips/alchemy/devboards/db1200.c | 28 +- + arch/mips/alchemy/devboards/db1300.c | 10 +- + arch/mips/alchemy/devboards/db1550.c | 18 +- + arch/mips/alchemy/devboards/pm.c | 2 +- + arch/mips/ar7/Platform | 6 +- + arch/mips/ar7/platform.c | 12 +- + arch/mips/ath79/Kconfig | 20 +- + arch/mips/ath79/Makefile | 1 + + arch/mips/ath79/clock.c | 80 +- + arch/mips/ath79/common.c | 4 + + arch/mips/ath79/dev-common.c | 9 +- + arch/mips/ath79/dev-usb.c | 126 ++- + arch/mips/ath79/dev-wmac.c | 30 +- + arch/mips/ath79/early_printk.c | 2 + + arch/mips/ath79/gpio.c | 52 +- + arch/mips/ath79/irq.c | 187 ++- + arch/mips/ath79/mach-ap121.c | 2 +- + arch/mips/ath79/mach-ap136.c | 156 +++ + arch/mips/ath79/mach-ap81.c | 2 +- + arch/mips/ath79/mach-db120.c | 2 +- + arch/mips/ath79/mach-pb44.c | 6 +- + arch/mips/ath79/machtypes.h | 1 + + arch/mips/ath79/pci.c | 165 ++- + arch/mips/ath79/pci.h | 1 + + arch/mips/ath79/setup.c | 18 +- + arch/mips/bcm47xx/Makefile | 2 +- + arch/mips/bcm47xx/nvram.c | 163 ++- + arch/mips/bcm47xx/setup.c | 6 +- + arch/mips/bcm47xx/sprom.c | 26 +- + arch/mips/bcm47xx/wgt634u.c | 40 +- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 26 +- + arch/mips/bcm63xx/early_printk.c | 4 +- + arch/mips/boot/Makefile | 2 +- + arch/mips/boot/compressed/Makefile | 8 +- + arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 4 +- + arch/mips/boot/compressed/decompress.c | 4 +- + arch/mips/boot/compressed/head.S | 4 +- + arch/mips/boot/ecoff.h | 62 +- + arch/mips/boot/elf2ecoff.c | 8 +- + arch/mips/cavium-octeon/Kconfig | 9 + + arch/mips/cavium-octeon/Makefile | 3 +- + arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 10 +- + .../cavium-octeon/executive/cvmx-helper-board.c | 28 +- + .../cavium-octeon/executive/cvmx-helper-jtag.c | 4 +- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 22 +- + .../cavium-octeon/executive/cvmx-helper-sgmii.c | 4 +- + .../mips/cavium-octeon/executive/cvmx-helper-spi.c | 8 +- + .../cavium-octeon/executive/cvmx-helper-util.c | 34 +- + .../cavium-octeon/executive/cvmx-helper-xaui.c | 4 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +- + .../cavium-octeon/executive/cvmx-interrupt-rsl.c | 6 +- + arch/mips/cavium-octeon/executive/cvmx-l2c.c | 66 +- + arch/mips/cavium-octeon/executive/cvmx-pko.c | 28 +- + arch/mips/cavium-octeon/executive/cvmx-spi.c | 70 +- + arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 16 +- + arch/mips/cavium-octeon/oct_ilm.c | 206 ++++ + arch/mips/cavium-octeon/octeon-irq.c | 4 +- + arch/mips/cavium-octeon/octeon-memcpy.S | 22 +- + arch/mips/cavium-octeon/octeon-platform.c | 2 +- + arch/mips/cavium-octeon/octeon_3xxx.dts | 34 +- + arch/mips/cavium-octeon/octeon_68xx.dts | 34 +- + arch/mips/cavium-octeon/octeon_boot.h | 14 +- + arch/mips/cavium-octeon/setup.c | 8 +- + arch/mips/cavium-octeon/smp.c | 10 +- + arch/mips/cobalt/led.c | 2 +- + arch/mips/cobalt/mtd.c | 2 +- + arch/mips/cobalt/rtc.c | 2 +- + arch/mips/configs/ath79_defconfig | 1 + + arch/mips/configs/pnx8550_jbs_defconfig | 98 -- + arch/mips/configs/pnx8550_stb810_defconfig | 92 -- + arch/mips/configs/rt305x_defconfig | 167 +++ + arch/mips/dec/int-handler.S | 98 +- + arch/mips/dec/kn02xa-berr.c | 4 +- + arch/mips/dec/prom/call_o32.S | 2 +- + arch/mips/dec/prom/dectypes.h | 2 +- + arch/mips/dec/prom/init.c | 2 +- + arch/mips/dec/prom/memory.c | 2 +- + arch/mips/dec/setup.c | 4 +- + arch/mips/dec/wbflush.c | 6 +- + arch/mips/emma/markeins/irq.c | 2 +- + arch/mips/emma/markeins/platform.c | 2 +- + arch/mips/emma/markeins/setup.c | 2 +- + arch/mips/fw/arc/file.c | 4 +- + arch/mips/fw/arc/identify.c | 2 +- + arch/mips/fw/arc/memory.c | 2 +- + arch/mips/fw/arc/promlib.c | 2 +- + arch/mips/fw/lib/call_o32.S | 2 +- + arch/mips/fw/sni/sniprom.c | 16 +- + arch/mips/include/asm/abi.h | 8 +- + arch/mips/include/asm/addrspace.h | 6 +- + arch/mips/include/asm/asm.h | 98 +- + arch/mips/include/asm/atomic.h | 4 +- + arch/mips/include/asm/barrier.h | 10 +- + arch/mips/include/asm/bcache.h | 2 +- + arch/mips/include/asm/bitops.h | 22 +- + arch/mips/include/asm/bootinfo.h | 20 +- + arch/mips/include/asm/break.h | 26 + + arch/mips/include/asm/cacheops.h | 14 +- + arch/mips/include/asm/checksum.h | 2 +- + arch/mips/include/asm/cmpxchg.h | 6 +- + arch/mips/include/asm/compat-signal.h | 4 +- + arch/mips/include/asm/compat.h | 6 +- + arch/mips/include/asm/cpu-features.h | 38 +- + arch/mips/include/asm/cpu-info.h | 18 +- + arch/mips/include/asm/cpu.h | 37 +- + arch/mips/include/asm/dec/ioasic_addrs.h | 22 +- + arch/mips/include/asm/dec/kn01.h | 12 +- + arch/mips/include/asm/dec/kn02ca.h | 2 +- + arch/mips/include/asm/dec/prom.h | 2 +- + arch/mips/include/asm/dma-mapping.h | 2 +- + arch/mips/include/asm/dma.h | 112 +- + arch/mips/include/asm/elf.h | 30 +- + arch/mips/include/asm/emma/emma2rh.h | 112 +- + arch/mips/include/asm/emma/markeins.h | 2 +- + arch/mips/include/asm/fixmap.h | 4 +- + arch/mips/include/asm/floppy.h | 4 +- + arch/mips/include/asm/fpregdef.h | 10 +- + arch/mips/include/asm/fpu.h | 6 +- + arch/mips/include/asm/futex.h | 12 +- + arch/mips/include/asm/fw/arc/hinv.h | 10 +- + arch/mips/include/asm/fw/arc/types.h | 12 +- + arch/mips/include/asm/fw/cfe/cfe_api.h | 6 +- + arch/mips/include/asm/fw/cfe/cfe_error.h | 18 +- + arch/mips/include/asm/gcmpregs.h | 100 +- + arch/mips/include/asm/gic.h | 17 +- + arch/mips/include/asm/gio_device.h | 14 +- + arch/mips/include/asm/gt64120.h | 22 +- + arch/mips/include/asm/hazards.h | 8 +- + arch/mips/include/asm/highmem.h | 4 +- + arch/mips/include/asm/inst.h | 348 +----- + arch/mips/include/asm/io.h | 30 +- + arch/mips/include/asm/ip32/crime.h | 8 +- + arch/mips/include/asm/ip32/ip32_ints.h | 2 +- + arch/mips/include/asm/ip32/mace.h | 12 +- + arch/mips/include/asm/irq.h | 6 +- + arch/mips/include/asm/irq_cpu.h | 6 + + arch/mips/include/asm/isadep.h | 4 +- + arch/mips/include/asm/jazz.h | 166 +-- + arch/mips/include/asm/jazzdma.h | 50 +- + arch/mips/include/asm/kmap_types.h | 2 +- + arch/mips/include/asm/kprobes.h | 2 +- + arch/mips/include/asm/lasat/eeprom.h | 12 +- + arch/mips/include/asm/lasat/lasat.h | 14 +- + arch/mips/include/asm/lasat/serial.h | 2 +- + arch/mips/include/asm/local.h | 6 +- + arch/mips/include/asm/m48t37.h | 2 +- + arch/mips/include/asm/mach-ar7/ar7.h | 18 +- + arch/mips/include/asm/mach-ar7/irq.h | 2 +- + arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 132 ++- + arch/mips/include/asm/mach-ath79/ar933x_uart.h | 12 +- + arch/mips/include/asm/mach-ath79/ath79.h | 17 + + .../include/asm/mach-ath79/cpu-feature-overrides.h | 2 +- + arch/mips/include/asm/mach-ath79/irq.h | 27 +- + arch/mips/include/asm/mach-ath79/pci.h | 28 - + arch/mips/include/asm/mach-au1x00/au1000.h | 198 ++-- + arch/mips/include/asm/mach-au1x00/au1000_dma.h | 10 +- + arch/mips/include/asm/mach-au1x00/au1100_mmc.h | 2 +- + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 16 +- + arch/mips/include/asm/mach-au1x00/au1xxx_ide.h | 22 +- + arch/mips/include/asm/mach-au1x00/au1xxx_psc.h | 8 +- + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 20 +- + arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 2 +- + .../asm/mach-bcm47xx/{nvram.h => bcm47xx_nvram.h} | 13 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 2 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h | 2 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h | 2 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 24 +- + arch/mips/include/asm/mach-bcm63xx/irq.h | 2 +- + arch/mips/include/asm/mach-cavium-octeon/irq.h | 4 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 36 +- + .../asm/mach-cobalt/cpu-feature-overrides.h | 4 +- + arch/mips/include/asm/mach-cobalt/mach-gt64120.h | 2 +- + arch/mips/include/asm/mach-db1x00/bcsr.h | 4 +- + arch/mips/include/asm/mach-db1x00/db1200.h | 2 +- + arch/mips/include/asm/mach-db1x00/db1300.h | 2 +- + arch/mips/include/asm/mach-emma2rh/irq.h | 2 +- + .../asm/mach-generic/cpu-feature-overrides.h | 2 +- + arch/mips/include/asm/mach-generic/floppy.h | 4 +- + arch/mips/include/asm/mach-generic/ide.h | 4 +- + arch/mips/include/asm/mach-generic/irq.h | 4 +- + arch/mips/include/asm/mach-generic/spaces.h | 2 +- + .../mips/include/asm/mach-ip27/kernel-entry-init.h | 4 +- + arch/mips/include/asm/mach-ip27/mmzone.h | 2 +- + arch/mips/include/asm/mach-ip27/topology.h | 2 +- + .../include/asm/mach-ip28/cpu-feature-overrides.h | 2 +- + arch/mips/include/asm/mach-ip28/spaces.h | 2 +- + arch/mips/include/asm/mach-ip32/dma-coherence.h | 2 +- + arch/mips/include/asm/mach-ip32/war.h | 2 +- + arch/mips/include/asm/mach-jazz/floppy.h | 2 +- + arch/mips/include/asm/mach-jz4740/clock.h | 2 +- + arch/mips/include/asm/mach-jz4740/dma.h | 10 +- + arch/mips/include/asm/mach-jz4740/gpio.h | 2 +- + arch/mips/include/asm/mach-jz4740/irq.h | 2 +- + arch/mips/include/asm/mach-jz4740/platform.h | 2 +- + arch/mips/include/asm/mach-jz4740/timer.h | 2 +- + .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 2 +- + arch/mips/include/asm/mach-lantiq/lantiq.h | 2 + + arch/mips/include/asm/mach-lantiq/war.h | 24 +- + arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 4 +- + arch/mips/include/asm/mach-lasat/mach-gt64120.h | 6 +- + .../asm/mach-loongson/cpu-feature-overrides.h | 8 +- + .../mips/include/asm/mach-loongson/cs5536/cs5536.h | 422 +++---- + .../asm/mach-loongson/cs5536/cs5536_mfgpt.h | 2 +- + .../include/asm/mach-loongson/cs5536/cs5536_pci.h | 122 +- + .../include/asm/mach-loongson/cs5536/cs5536_vsm.h | 4 +- + arch/mips/include/asm/mach-loongson/gpio.h | 4 +- + arch/mips/include/asm/mach-loongson/loongson.h | 50 +- + arch/mips/include/asm/mach-loongson/machine.h | 4 +- + arch/mips/include/asm/mach-loongson/mem.h | 4 +- + arch/mips/include/asm/mach-loongson1/irq.h | 4 +- + arch/mips/include/asm/mach-loongson1/loongson1.h | 4 +- + arch/mips/include/asm/mach-loongson1/platform.h | 4 +- + arch/mips/include/asm/mach-loongson1/prom.h | 4 +- + arch/mips/include/asm/mach-loongson1/regs-clk.h | 4 +- + arch/mips/include/asm/mach-loongson1/regs-wdt.h | 4 +- + .../include/asm/mach-malta/cpu-feature-overrides.h | 8 +- + arch/mips/include/asm/mach-malta/irq.h | 2 +- + arch/mips/include/asm/mach-malta/mach-gt64120.h | 2 +- + .../cpu-feature-overrides.h | 0 + .../msp71xx => mach-pmcs-msp71xx}/gpio.h | 0 + .../msp71xx => mach-pmcs-msp71xx}/msp_cic_int.h | 110 +- + .../msp_gpio_macros.h | 4 +- + .../msp71xx => mach-pmcs-msp71xx}/msp_int.h | 4 +- + .../msp71xx => mach-pmcs-msp71xx}/msp_pci.h | 46 +- + .../msp71xx => mach-pmcs-msp71xx}/msp_prom.h | 8 +- + .../msp71xx => mach-pmcs-msp71xx}/msp_regops.h | 2 +- + .../msp71xx => mach-pmcs-msp71xx}/msp_regs.h | 416 +++---- + .../msp71xx => mach-pmcs-msp71xx}/msp_slp_int.h | 96 +- + .../msp71xx => mach-pmcs-msp71xx}/msp_usb.h | 2 +- + .../msp71xx => mach-pmcs-msp71xx}/war.h | 4 +- + arch/mips/include/asm/mach-pnx833x/irq-mapping.h | 18 +- + arch/mips/include/asm/mach-pnx833x/pnx833x.h | 12 +- + arch/mips/include/asm/mach-pnx8550/cm.h | 43 - + arch/mips/include/asm/mach-pnx8550/glb.h | 86 -- + arch/mips/include/asm/mach-pnx8550/int.h | 140 --- + .../include/asm/mach-pnx8550/kernel-entry-init.h | 262 ----- + arch/mips/include/asm/mach-pnx8550/nand.h | 121 -- + arch/mips/include/asm/mach-pnx8550/pci.h | 185 --- + arch/mips/include/asm/mach-pnx8550/uart.h | 30 - + arch/mips/include/asm/mach-pnx8550/usb.h | 32 - + arch/mips/include/asm/mach-powertv/asic.h | 8 +- + arch/mips/include/asm/mach-powertv/asic_regs.h | 4 +- + arch/mips/include/asm/mach-powertv/dma-coherence.h | 2 +- + arch/mips/include/asm/mach-powertv/interrupts.h | 62 +- + arch/mips/include/asm/mach-ralink/ralink_regs.h | 39 + + arch/mips/include/asm/mach-ralink/rt305x.h | 139 +++ + .../asm/{mach-pnx8550 => mach-ralink}/war.h | 7 +- + arch/mips/include/asm/mach-rc32434/ddr.h | 2 +- + arch/mips/include/asm/mach-rc32434/dma.h | 12 +- + arch/mips/include/asm/mach-rc32434/dma_v.h | 4 +- + arch/mips/include/asm/mach-rc32434/eth.h | 6 +- + arch/mips/include/asm/mach-rc32434/gpio.h | 6 +- + arch/mips/include/asm/mach-rc32434/irq.h | 12 +- + arch/mips/include/asm/mach-rc32434/pci.h | 60 +- + arch/mips/include/asm/mach-rc32434/rb.h | 6 +- + arch/mips/include/asm/mach-rc32434/rc32434.h | 2 +- + arch/mips/include/asm/mach-rc32434/timer.h | 18 +- + .../include/asm/mach-sead3/cpu-feature-overrides.h | 8 +- + arch/mips/include/asm/mach-sead3/irq.h | 2 +- + arch/mips/include/asm/mach-sibyte/war.h | 4 +- + arch/mips/include/asm/mach-wrppmc/mach-gt64120.h | 16 +- + arch/mips/include/asm/mc146818-time.h | 4 +- + arch/mips/include/asm/mips-boards/bonito64.h | 106 +- + arch/mips/include/asm/mips-boards/generic.h | 70 +- + arch/mips/include/asm/mips-boards/launch.h | 10 +- + arch/mips/include/asm/mips-boards/malta.h | 10 +- + arch/mips/include/asm/mips-boards/maltaint.h | 8 +- + arch/mips/include/asm/mips-boards/piix4.h | 8 +- + arch/mips/include/asm/mips-boards/prom.h | 6 +- + arch/mips/include/asm/mips-boards/sead3int.h | 4 +- + arch/mips/include/asm/mips-boards/sim.h | 14 +- + arch/mips/include/asm/mipsmtregs.h | 8 +- + arch/mips/include/asm/mipsregs.h | 735 ++++++------ + arch/mips/include/asm/mmu_context.h | 6 +- + arch/mips/include/asm/msc01_ic.h | 174 +-- + arch/mips/include/asm/netlogic/common.h | 16 +- + arch/mips/include/asm/netlogic/haldefs.h | 2 +- + arch/mips/include/asm/netlogic/mips-extns.h | 83 +- + arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 4 +- + .../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 2 + + arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 48 +- + arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 46 +- + arch/mips/include/asm/netlogic/xlp-hal/pic.h | 118 +- + arch/mips/include/asm/netlogic/xlp-hal/sys.h | 160 +-- + arch/mips/include/asm/netlogic/xlp-hal/uart.h | 4 +- + arch/mips/include/asm/netlogic/xlr/fmn.h | 242 ++-- + arch/mips/include/asm/netlogic/xlr/iomap.h | 88 +- + arch/mips/include/asm/netlogic/xlr/msidef.h | 18 +- + arch/mips/include/asm/netlogic/xlr/pic.h | 58 +- + arch/mips/include/asm/nile4.h | 38 +- + arch/mips/include/asm/octeon/cvmx-address.h | 50 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 14 +- + arch/mips/include/asm/octeon/cvmx-bootmem.h | 72 +- + arch/mips/include/asm/octeon/cvmx-cmd-queue.h | 44 +- + arch/mips/include/asm/octeon/cvmx-config.h | 30 +- + arch/mips/include/asm/octeon/cvmx-fau.h | 162 +-- + arch/mips/include/asm/octeon/cvmx-fpa.h | 32 +- + arch/mips/include/asm/octeon/cvmx-helper-board.h | 16 +- + arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper-util.h | 18 +- + arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 4 +- + arch/mips/include/asm/octeon/cvmx-helper.h | 12 +- + arch/mips/include/asm/octeon/cvmx-ipd.h | 14 +- + arch/mips/include/asm/octeon/cvmx-l2c.h | 210 ++-- + arch/mips/include/asm/octeon/cvmx-mdio.h | 40 +- + arch/mips/include/asm/octeon/cvmx-pip-defs.h | 2 +- + arch/mips/include/asm/octeon/cvmx-pip.h | 62 +- + arch/mips/include/asm/octeon/cvmx-pko.h | 60 +- + arch/mips/include/asm/octeon/cvmx-pow.h | 122 +- + arch/mips/include/asm/octeon/cvmx-scratch.h | 2 +- + arch/mips/include/asm/octeon/cvmx-spi.h | 66 +- + arch/mips/include/asm/octeon/cvmx-spinlock.h | 78 +- + arch/mips/include/asm/octeon/cvmx-sysinfo.h | 16 +- + arch/mips/include/asm/octeon/cvmx-wqe.h | 104 +- + arch/mips/include/asm/octeon/cvmx.h | 48 +- + arch/mips/include/asm/octeon/octeon-feature.h | 10 +- + arch/mips/include/asm/octeon/octeon-model.h | 240 ++-- + arch/mips/include/asm/octeon/octeon.h | 12 +- + arch/mips/include/asm/octeon/pci-octeon.h | 2 +- + arch/mips/include/asm/paccess.h | 2 +- + arch/mips/include/asm/page.h | 14 +- + arch/mips/include/asm/pci.h | 11 +- + arch/mips/include/asm/pci/bridge.h | 30 +- + arch/mips/include/asm/pgtable-32.h | 20 +- + arch/mips/include/asm/pgtable-64.h | 4 +- + arch/mips/include/asm/pgtable-bits.h | 42 +- + arch/mips/include/asm/pgtable.h | 4 +- + arch/mips/include/asm/processor.h | 46 +- + arch/mips/include/asm/r4kcache.h | 12 +- + arch/mips/include/asm/regdef.h | 66 +- + arch/mips/include/asm/rtlx.h | 2 +- + arch/mips/include/asm/seccomp.h | 2 +- + arch/mips/include/asm/sgi/gio.h | 16 +- + arch/mips/include/asm/sgi/hpc3.h | 82 +- + arch/mips/include/asm/sgi/ioc.h | 4 +- + arch/mips/include/asm/sgi/ip22.h | 6 +- + arch/mips/include/asm/sgi/mc.h | 26 +- + arch/mips/include/asm/sgi/pi1.h | 20 +- + arch/mips/include/asm/sgialib.h | 2 +- + arch/mips/include/asm/sgiarcs.h | 136 +-- + arch/mips/include/asm/shmparam.h | 2 +- + arch/mips/include/asm/sibyte/bcm1480_int.h | 424 +++---- + arch/mips/include/asm/sibyte/bcm1480_l2c.h | 138 +-- + arch/mips/include/asm/sibyte/bcm1480_mc.h | 1192 ++++++++++---------- + arch/mips/include/asm/sibyte/bcm1480_regs.h | 806 ++++++------- + arch/mips/include/asm/sibyte/bcm1480_scd.h | 276 ++--- + arch/mips/include/asm/sibyte/bigsur.h | 20 +- + arch/mips/include/asm/sibyte/carmel.h | 52 +- + arch/mips/include/asm/sibyte/sb1250.h | 4 +- + arch/mips/include/asm/sibyte/sb1250_defs.h | 94 +- + arch/mips/include/asm/sibyte/sb1250_dma.h | 426 +++---- + arch/mips/include/asm/sibyte/sb1250_genbus.h | 26 +- + arch/mips/include/asm/sibyte/sb1250_int.h | 274 ++--- + arch/mips/include/asm/sibyte/sb1250_l2c.h | 92 +- + arch/mips/include/asm/sibyte/sb1250_ldt.h | 14 +- + arch/mips/include/asm/sibyte/sb1250_mac.h | 568 +++++----- + arch/mips/include/asm/sibyte/sb1250_mc.h | 712 ++++++------ + arch/mips/include/asm/sibyte/sb1250_regs.h | 854 +++++++------- + arch/mips/include/asm/sibyte/sb1250_scd.h | 668 +++++------ + arch/mips/include/asm/sibyte/sb1250_smbus.h | 158 +-- + arch/mips/include/asm/sibyte/sb1250_syncser.h | 136 +-- + arch/mips/include/asm/sibyte/sb1250_uart.h | 262 ++--- + arch/mips/include/asm/sibyte/sentosa.h | 6 +- + arch/mips/include/asm/sibyte/swarm.h | 26 +- + arch/mips/include/asm/smp.h | 12 +- + arch/mips/include/asm/smtc.h | 4 +- + arch/mips/include/asm/sn/addrs.h | 54 +- + arch/mips/include/asm/sn/agent.h | 12 +- + arch/mips/include/asm/sn/arch.h | 8 +- + arch/mips/include/asm/sn/fru.h | 12 +- + arch/mips/include/asm/sn/gda.h | 24 +- + arch/mips/include/asm/sn/intr.h | 16 +- + arch/mips/include/asm/sn/io.h | 4 +- + arch/mips/include/asm/sn/ioc3.h | 8 +- + arch/mips/include/asm/sn/klconfig.h | 526 ++++----- + arch/mips/include/asm/sn/kldir.h | 182 +-- + arch/mips/include/asm/sn/launch.h | 16 +- + arch/mips/include/asm/sn/mapped_kernel.h | 4 +- + arch/mips/include/asm/sn/nmi.h | 8 +- + arch/mips/include/asm/sn/sn0/addrs.h | 20 +- + arch/mips/include/asm/sn/sn0/arch.h | 22 +- + arch/mips/include/asm/sn/sn0/hub.h | 12 +- + arch/mips/include/asm/sn/sn0/hubio.h | 442 ++++---- + arch/mips/include/asm/sn/sn0/hubmd.h | 214 ++-- + arch/mips/include/asm/sn/sn0/hubni.h | 78 +- + arch/mips/include/asm/sn/sn0/hubpi.h | 184 +-- + arch/mips/include/asm/sn/sn0/ip27.h | 28 +- + arch/mips/include/asm/sn/types.h | 4 +- + arch/mips/include/asm/sni.h | 104 +- + arch/mips/include/asm/sparsemem.h | 2 +- + arch/mips/include/asm/spinlock.h | 4 +- + arch/mips/include/asm/spinlock_types.h | 2 +- + arch/mips/include/asm/stackframe.h | 14 +- + arch/mips/include/asm/string.h | 8 +- + arch/mips/include/asm/switch_to.h | 4 +- + arch/mips/include/asm/thread_info.h | 2 +- + arch/mips/include/asm/time.h | 6 +- + arch/mips/include/asm/tlb.h | 2 +- + arch/mips/include/asm/topology.h | 2 +- + arch/mips/include/asm/traps.h | 2 +- + arch/mips/include/asm/txx9/jmr3927.h | 14 +- + arch/mips/include/asm/txx9/rbtx4927.h | 6 +- + arch/mips/include/asm/txx9/rbtx4938.h | 20 +- + arch/mips/include/asm/txx9/rbtx4939.h | 14 +- + arch/mips/include/asm/txx9/smsc_fdc37m81x.h | 54 +- + arch/mips/include/asm/txx9/tx3927.h | 16 +- + arch/mips/include/asm/txx9/tx4927.h | 18 +- + arch/mips/include/asm/txx9/tx4927pcic.h | 6 +- + arch/mips/include/asm/txx9/tx4938.h | 32 +- + arch/mips/include/asm/txx9/tx4939.h | 50 +- + arch/mips/include/asm/txx9tmr.h | 4 +- + arch/mips/include/asm/uaccess.h | 102 +- + arch/mips/include/asm/uasm.h | 2 +- + arch/mips/include/asm/user.h | 2 +- + arch/mips/include/asm/vr41xx/pci.h | 2 +- + arch/mips/include/asm/vr41xx/tb0287.h | 2 +- + arch/mips/include/asm/war.h | 46 +- + arch/mips/include/asm/xtalk/xtalk.h | 24 +- + arch/mips/include/asm/xtalk/xwidget.h | 8 +- + arch/mips/include/uapi/asm/Kbuild | 1 + + arch/mips/include/uapi/asm/break.h | 16 +- + arch/mips/include/uapi/asm/cachectl.h | 10 +- + arch/mips/include/uapi/asm/errno.h | 188 +-- + arch/mips/include/uapi/asm/fcntl.h | 4 +- + arch/mips/include/uapi/asm/inst.h | 331 ++++++ + arch/mips/include/uapi/asm/ioctls.h | 22 +- + arch/mips/include/uapi/asm/mman.h | 10 +- + arch/mips/include/uapi/asm/ptrace.h | 8 +- + arch/mips/include/uapi/asm/sembuf.h | 4 +- + arch/mips/include/uapi/asm/siginfo.h | 8 +- + arch/mips/include/uapi/asm/signal.h | 24 +- + arch/mips/include/uapi/asm/socket.h | 14 +- + arch/mips/include/uapi/asm/sockios.h | 2 +- + arch/mips/include/uapi/asm/stat.h | 2 +- + arch/mips/include/uapi/asm/statfs.h | 6 +- + arch/mips/include/uapi/asm/sysmips.h | 8 +- + arch/mips/include/uapi/asm/termbits.h | 158 +-- + arch/mips/include/uapi/asm/termios.h | 12 +- + arch/mips/include/uapi/asm/unistd.h | 60 +- + arch/mips/jazz/Makefile | 2 +- + arch/mips/jazz/irq.c | 4 +- + arch/mips/jazz/jazzdma.c | 6 +- + arch/mips/jazz/setup.c | 20 +- + arch/mips/jz4740/board-qi_lb60.c | 8 +- + arch/mips/jz4740/clock-debugfs.c | 2 +- + arch/mips/jz4740/clock.c | 4 +- + arch/mips/jz4740/dma.c | 2 +- + arch/mips/jz4740/gpio.c | 2 +- + arch/mips/jz4740/irq.c | 2 +- + arch/mips/jz4740/irq.h | 2 +- + arch/mips/jz4740/platform.c | 12 +- + arch/mips/jz4740/pm.c | 2 +- + arch/mips/jz4740/prom.c | 2 +- + arch/mips/jz4740/reset.c | 2 +- + arch/mips/jz4740/setup.c | 2 +- + arch/mips/jz4740/time.c | 2 +- + arch/mips/jz4740/timer.c | 2 +- + arch/mips/kernel/Makefile | 36 +- + arch/mips/kernel/binfmt_elfn32.c | 10 +- + arch/mips/kernel/binfmt_elfo32.c | 10 +- + arch/mips/kernel/bmips_vec.S | 6 +- + arch/mips/kernel/branch.c | 10 +- + arch/mips/kernel/cevt-bcm1480.c | 4 +- + arch/mips/kernel/cevt-ds1287.c | 4 +- + arch/mips/kernel/cevt-gt641xx.c | 4 +- + arch/mips/kernel/cevt-r4k.c | 6 +- + arch/mips/kernel/cevt-sb1250.c | 4 +- + arch/mips/kernel/cevt-smtc.c | 2 +- + arch/mips/kernel/cevt-txx9.c | 6 +- + arch/mips/kernel/cpu-bugs64.c | 10 +- + arch/mips/kernel/cpu-probe.c | 132 ++- + arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 19 +- + arch/mips/kernel/crash.c | 2 +- + arch/mips/kernel/csrc-bcm1480.c | 2 +- + arch/mips/kernel/csrc-gic.c | 49 + + arch/mips/kernel/csrc-ioasic.c | 2 +- + arch/mips/kernel/csrc-powertv.c | 6 +- + arch/mips/kernel/csrc-sb1250.c | 2 +- + arch/mips/kernel/early_printk.c | 5 +- + arch/mips/kernel/ftrace.c | 12 +- + arch/mips/kernel/genex.S | 14 +- + arch/mips/kernel/head.S | 4 +- + arch/mips/kernel/i8259.c | 2 +- + arch/mips/kernel/irq-gt641xx.c | 4 +- + arch/mips/kernel/irq-msc01.c | 6 +- + arch/mips/kernel/irq-rm7000.c | 4 +- + arch/mips/kernel/irq.c | 2 +- + arch/mips/kernel/irq_cpu.c | 50 +- + arch/mips/kernel/irq_txx9.c | 10 +- + arch/mips/kernel/kgdb.c | 6 +- + arch/mips/kernel/kprobes.c | 10 +- + arch/mips/kernel/linux32.c | 10 +- + arch/mips/kernel/mips_ksyms.c | 4 +- + arch/mips/kernel/module-rela.c | 6 +- + arch/mips/kernel/module.c | 10 +- + arch/mips/kernel/octeon_switch.S | 104 +- + arch/mips/kernel/perf_event_mipsxx.c | 30 +- + arch/mips/kernel/proc.c | 26 +- + arch/mips/kernel/ptrace.c | 12 +- + arch/mips/kernel/ptrace32.c | 2 +- + arch/mips/kernel/r2300_fpu.S | 128 +-- + arch/mips/kernel/r2300_switch.S | 2 +- + arch/mips/kernel/r4k_switch.S | 4 +- + arch/mips/kernel/relocate_kernel.S | 12 +- + arch/mips/kernel/rtlx.c | 18 +- + arch/mips/kernel/scall32-o32.S | 14 +- + arch/mips/kernel/scall64-64.S | 6 +- + arch/mips/kernel/scall64-n32.S | 10 +- + arch/mips/kernel/scall64-o32.S | 14 +- + arch/mips/kernel/setup.c | 101 +- + arch/mips/kernel/signal.c | 12 +- + arch/mips/kernel/signal32.c | 10 +- + arch/mips/kernel/signal_n32.c | 6 +- + arch/mips/kernel/smp-cmp.c | 2 +- + arch/mips/kernel/smp-mt.c | 4 +- + arch/mips/kernel/smtc-asm.S | 2 +- + arch/mips/kernel/smtc-proc.c | 6 +- + arch/mips/kernel/smtc.c | 21 +- + arch/mips/kernel/sync-r4k.c | 2 +- + arch/mips/kernel/syscall.c | 4 +- + arch/mips/kernel/time.c | 12 +- + arch/mips/kernel/traps.c | 32 +- + arch/mips/kernel/unaligned.c | 34 +- + arch/mips/kernel/vmlinux.lds.S | 8 +- + arch/mips/kernel/vpe.c | 113 +- + arch/mips/kernel/watch.c | 4 +- + arch/mips/lantiq/clk.c | 18 +- + arch/mips/lantiq/clk.h | 7 +- + arch/mips/lantiq/dts/danube.dtsi | 2 +- + arch/mips/lantiq/dts/easy50712.dts | 2 +- + arch/mips/lantiq/falcon/sysctrl.c | 4 +- + arch/mips/lantiq/irq.c | 105 +- + arch/mips/lantiq/prom.h | 2 +- + arch/mips/lantiq/xway/clk.c | 43 + + arch/mips/lantiq/xway/reset.c | 9 + + arch/mips/lantiq/xway/sysctrl.c | 15 +- + arch/mips/lasat/Makefile | 2 +- + arch/mips/lasat/ds1603.h | 2 +- + arch/mips/lasat/image/Makefile | 2 +- + arch/mips/lasat/image/head.S | 2 +- + arch/mips/lasat/picvue.c | 34 +- + arch/mips/lasat/picvue.h | 16 +- + arch/mips/lasat/serial.c | 2 +- + arch/mips/lasat/sysctl.c | 4 +- + arch/mips/lib/bitops.c | 4 +- + arch/mips/lib/csum_partial.S | 42 +- + arch/mips/lib/delay.c | 2 +- + arch/mips/lib/dump_tlb.c | 2 +- + arch/mips/lib/memcpy.S | 34 +- + arch/mips/lib/memset.S | 4 +- + arch/mips/lib/r3k_dump_tlb.c | 2 +- + arch/mips/lib/strncpy_user.S | 2 +- + arch/mips/lib/strnlen_user.S | 6 +- + arch/mips/lib/uncached.c | 2 +- + arch/mips/loongson/Makefile | 2 +- + arch/mips/loongson/common/bonito-irq.c | 6 +- + arch/mips/loongson/common/cmdline.c | 4 +- + arch/mips/loongson/common/cs5536/cs5536_acc.c | 4 +- + arch/mips/loongson/common/cs5536/cs5536_ehci.c | 4 +- + arch/mips/loongson/common/cs5536/cs5536_ide.c | 4 +- + arch/mips/loongson/common/cs5536/cs5536_isa.c | 4 +- + arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 6 +- + arch/mips/loongson/common/cs5536/cs5536_ohci.c | 4 +- + arch/mips/loongson/common/cs5536/cs5536_pci.c | 4 +- + arch/mips/loongson/common/early_printk.c | 6 +- + arch/mips/loongson/common/env.c | 4 +- + arch/mips/loongson/common/gpio.c | 16 +- + arch/mips/loongson/common/init.c | 4 +- + arch/mips/loongson/common/irq.c | 6 +- + arch/mips/loongson/common/machtype.c | 20 +- + arch/mips/loongson/common/mem.c | 4 +- + arch/mips/loongson/common/pci.c | 34 +- + arch/mips/loongson/common/platform.c | 4 +- + arch/mips/loongson/common/reset.c | 10 +- + arch/mips/loongson/common/serial.c | 18 +- + arch/mips/loongson/common/setup.c | 6 +- + arch/mips/loongson/common/time.c | 6 +- + arch/mips/loongson/common/uart_base.c | 4 +- + arch/mips/loongson/fuloong-2e/irq.c | 12 +- + arch/mips/loongson/fuloong-2e/reset.c | 4 +- + arch/mips/loongson/lemote-2f/ec_kb3310b.h | 216 ++-- + arch/mips/loongson/lemote-2f/irq.c | 20 +- + arch/mips/loongson/lemote-2f/machtype.c | 14 +- + arch/mips/loongson/lemote-2f/reset.c | 10 +- + arch/mips/loongson1/Platform | 2 +- + arch/mips/loongson1/common/clock.c | 4 +- + arch/mips/loongson1/common/irq.c | 4 +- + arch/mips/loongson1/common/platform.c | 6 +- + arch/mips/loongson1/common/prom.c | 6 +- + arch/mips/loongson1/common/reset.c | 4 +- + arch/mips/loongson1/common/setup.c | 4 +- + arch/mips/loongson1/ls1b/board.c | 4 +- + arch/mips/math-emu/Makefile | 1 - + arch/mips/math-emu/cp1emu.c | 8 +- + arch/mips/math-emu/dp_add.c | 2 +- + arch/mips/math-emu/dp_sqrt.c | 6 +- + arch/mips/math-emu/dp_sub.c | 2 +- + arch/mips/math-emu/ieee754.c | 18 +- + arch/mips/math-emu/ieee754dp.c | 2 +- + arch/mips/math-emu/ieee754int.h | 2 +- + arch/mips/math-emu/ieee754sp.c | 2 +- + arch/mips/math-emu/ieee754xcpt.c | 2 +- + arch/mips/math-emu/kernel_linkage.c | 2 +- + arch/mips/math-emu/sp_add.c | 2 +- + arch/mips/math-emu/sp_mul.c | 4 +- + arch/mips/math-emu/sp_sub.c | 2 +- + arch/mips/mm/Makefile | 6 +- + arch/mips/mm/c-octeon.c | 2 +- + arch/mips/mm/c-r3k.c | 8 +- + arch/mips/mm/c-r4k.c | 27 +- + arch/mips/mm/c-tx39.c | 12 +- + arch/mips/mm/cerr-sb1.c | 30 +- + arch/mips/mm/cex-gen.S | 6 +- + arch/mips/mm/cex-oct.S | 36 +- + arch/mips/mm/cex-sb1.S | 8 +- + arch/mips/mm/dma-default.c | 2 +- + arch/mips/mm/fault.c | 4 +- + arch/mips/mm/gup.c | 2 +- + arch/mips/mm/init.c | 4 +- + arch/mips/mm/ioremap.c | 4 +- + arch/mips/mm/page.c | 6 +- + arch/mips/mm/pgtable-64.c | 4 +- + arch/mips/mm/sc-ip22.c | 2 +- + arch/mips/mm/sc-r5k.c | 4 +- + arch/mips/mm/tlb-r4k.c | 2 +- + arch/mips/mm/tlbex.c | 33 +- + arch/mips/mm/uasm.c | 16 +- + arch/mips/mti-malta/malta-amon.c | 6 +- + arch/mips/mti-malta/malta-cmdline.c | 2 +- + arch/mips/mti-malta/malta-display.c | 6 +- + arch/mips/mti-malta/malta-init.c | 14 +- + arch/mips/mti-malta/malta-int.c | 40 +- + arch/mips/mti-malta/malta-memory.c | 4 +- + arch/mips/mti-malta/malta-pci.c | 6 +- + arch/mips/mti-malta/malta-platform.c | 2 +- + arch/mips/mti-malta/malta-setup.c | 4 +- + arch/mips/mti-malta/malta-smtc.c | 2 +- + arch/mips/mti-malta/malta-time.c | 83 +- + arch/mips/mti-sead3/Makefile | 10 +- + arch/mips/mti-sead3/leds-sead3.c | 5 +- + arch/mips/mti-sead3/sead3-console.c | 4 +- + arch/mips/mti-sead3/sead3-display.c | 2 +- + arch/mips/mti-sead3/sead3-i2c-drv.c | 28 +- + arch/mips/mti-sead3/sead3-init.c | 5 +- + arch/mips/mti-sead3/sead3-memory.c | 138 --- + arch/mips/mti-sead3/sead3-net.c | 4 +- + arch/mips/mti-sead3/sead3-pic32-bus.c | 6 +- + arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 58 +- + arch/mips/mti-sead3/sead3-setup.c | 27 + + arch/mips/mti-sead3/sead3-time.c | 8 +- + arch/mips/mti-sead3/sead3.dts | 26 + + arch/mips/netlogic/Platform | 4 +- + arch/mips/netlogic/common/irq.c | 43 +- + arch/mips/netlogic/common/smp.c | 8 +- + arch/mips/netlogic/common/smpboot.S | 20 +- + arch/mips/netlogic/common/time.c | 56 + + arch/mips/netlogic/dts/xlp_evp.dts | 2 +- + arch/mips/netlogic/xlp/nlm_hal.c | 4 +- + arch/mips/netlogic/xlp/usb-init.c | 2 +- + arch/mips/netlogic/xlp/wakeup.c | 35 +- + arch/mips/netlogic/xlr/fmn-config.c | 6 +- + arch/mips/netlogic/xlr/platform-flash.c | 12 +- + arch/mips/netlogic/xlr/platform.c | 12 +- + arch/mips/netlogic/xlr/setup.c | 4 +- + arch/mips/oprofile/common.c | 7 +- + arch/mips/oprofile/op_model_loongson2.c | 10 +- + arch/mips/oprofile/op_model_mipsxx.c | 38 +- + arch/mips/pci/Makefile | 5 +- + arch/mips/pci/fixup-cobalt.c | 28 +- + arch/mips/pci/fixup-emma2rh.c | 2 +- + arch/mips/pci/fixup-fuloong2e.c | 8 +- + arch/mips/pci/fixup-ip32.c | 14 +- + arch/mips/pci/fixup-lemote2f.c | 14 +- + arch/mips/pci/fixup-malta.c | 14 +- + arch/mips/pci/fixup-pmcmsp.c | 224 ++-- + arch/mips/pci/fixup-pnx8550.c | 57 - + arch/mips/pci/fixup-sni.c | 68 +- + arch/mips/pci/fixup-tb0219.c | 2 +- + arch/mips/pci/fixup-tb0287.c | 2 +- + arch/mips/pci/fixup-wrppmc.c | 2 +- + arch/mips/pci/ops-bcm63xx.c | 16 +- + arch/mips/pci/ops-bonito64.c | 4 +- + arch/mips/pci/ops-gt64xxx_pci0.c | 24 +- + arch/mips/pci/ops-lantiq.c | 2 +- + arch/mips/pci/ops-loongson2.c | 2 +- + arch/mips/pci/ops-msc.c | 22 +- + arch/mips/pci/ops-nile4.c | 2 +- + arch/mips/pci/ops-pmcmsp.c | 450 ++++---- + arch/mips/pci/ops-pnx8550.c | 282 ----- + arch/mips/pci/ops-rc32434.c | 2 +- + arch/mips/pci/ops-sni.c | 8 +- + arch/mips/pci/ops-tx4927.c | 8 +- + arch/mips/pci/ops-vr41xx.c | 6 +- + arch/mips/pci/pci-alchemy.c | 6 +- + arch/mips/pci/pci-ar71xx.c | 194 ++-- + arch/mips/pci/pci-ar724x.c | 304 +++-- + arch/mips/pci/pci-bcm1480.c | 8 +- + arch/mips/pci/pci-bcm1480ht.c | 6 +- + arch/mips/pci/pci-bcm47xx.c | 2 +- + arch/mips/pci/pci-bcm63xx.c | 62 +- + arch/mips/pci/pci-bcm63xx.h | 2 +- + arch/mips/pci/pci-ip27.c | 8 +- + arch/mips/pci/pci-ip32.c | 6 +- + arch/mips/pci/pci-lantiq.c | 12 +- + arch/mips/pci/pci-lasat.c | 26 +- + arch/mips/pci/pci-octeon.c | 30 +- + arch/mips/pci/pci-rc32434.c | 6 +- + arch/mips/pci/pci-sb1250.c | 8 +- + arch/mips/pci/pci-vr41xx.c | 22 +- + arch/mips/pci/pci-vr41xx.h | 2 +- + arch/mips/pci/pci-xlp.c | 156 ++- + arch/mips/pci/pci-xlr.c | 34 +- + arch/mips/pci/pci.c | 19 +- + arch/mips/pci/pcie-octeon.c | 58 +- + arch/mips/pmc-sierra/Platform | 7 - + arch/mips/{pmc-sierra => pmcs-msp71xx}/Kconfig | 0 + .../{pmc-sierra/msp71xx => pmcs-msp71xx}/Makefile | 0 + arch/mips/pmcs-msp71xx/Platform | 7 + + .../{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio.c | 0 + .../msp71xx => pmcs-msp71xx}/gpio_extended.c | 0 + .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_elb.c | 0 + .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_eth.c | 0 + .../msp71xx => pmcs-msp71xx}/msp_hwbutton.c | 0 + .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq.c | 4 +- + .../msp71xx => pmcs-msp71xx}/msp_irq_cic.c | 6 +- + .../msp71xx => pmcs-msp71xx}/msp_irq_per.c | 4 +- + .../msp71xx => pmcs-msp71xx}/msp_irq_slp.c | 4 +- + .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_pci.c | 2 +- + .../msp71xx => pmcs-msp71xx}/msp_prom.c | 4 +- + .../msp71xx => pmcs-msp71xx}/msp_serial.c | 32 +- + .../msp71xx => pmcs-msp71xx}/msp_setup.c | 8 +- + .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smp.c | 0 + .../msp71xx => pmcs-msp71xx}/msp_smtc.c | 0 + .../msp71xx => pmcs-msp71xx}/msp_time.c | 2 +- + .../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_usb.c | 54 +- + arch/mips/pnx833x/Platform | 2 +- + arch/mips/pnx833x/common/interrupts.c | 110 +- + arch/mips/pnx833x/common/platform.c | 34 +- + arch/mips/pnx833x/common/prom.c | 2 +- + arch/mips/pnx833x/common/reset.c | 2 +- + arch/mips/pnx833x/common/setup.c | 2 +- + arch/mips/pnx833x/stb22x/board.c | 2 +- + arch/mips/pnx8550/Makefile | 3 - + arch/mips/pnx8550/Platform | 7 - + arch/mips/pnx8550/common/Makefile | 26 - + arch/mips/pnx8550/common/int.c | 236 ---- + arch/mips/pnx8550/common/pci.c | 134 --- + arch/mips/pnx8550/common/platform.c | 162 --- + arch/mips/pnx8550/common/proc.c | 110 -- + arch/mips/pnx8550/common/prom.c | 128 --- + arch/mips/pnx8550/common/reset.c | 40 - + arch/mips/pnx8550/common/setup.c | 142 --- + arch/mips/pnx8550/common/time.c | 151 --- + arch/mips/pnx8550/jbs/Makefile | 4 - + arch/mips/pnx8550/jbs/board_setup.c | 56 - + arch/mips/pnx8550/jbs/init.c | 53 - + arch/mips/pnx8550/jbs/irqmap.c | 35 - + arch/mips/pnx8550/stb810/Makefile | 4 - + arch/mips/pnx8550/stb810/board_setup.c | 41 - + arch/mips/pnx8550/stb810/irqmap.c | 22 - + arch/mips/pnx8550/stb810/prom_init.c | 46 - + arch/mips/power/cpu.c | 2 +- + arch/mips/power/hibernate.S | 2 +- + arch/mips/powertv/asic/asic-calliope.c | 10 +- + arch/mips/powertv/asic/asic-cronus.c | 6 +- + arch/mips/powertv/asic/asic-gaia.c | 2 +- + arch/mips/powertv/asic/asic-zeus.c | 6 +- + arch/mips/powertv/asic/asic_devices.c | 8 +- + arch/mips/powertv/asic/asic_int.c | 4 +- + arch/mips/powertv/asic/irq_asic.c | 4 +- + arch/mips/powertv/asic/prealloc-calliope.c | 10 +- + arch/mips/powertv/asic/prealloc-cronus.c | 12 +- + arch/mips/powertv/asic/prealloc-cronuslite.c | 8 +- + arch/mips/powertv/asic/prealloc-gaia.c | 382 +++---- + arch/mips/powertv/asic/prealloc-zeus.c | 10 +- + arch/mips/powertv/init.c | 2 +- + arch/mips/powertv/ioremap.c | 4 +- + arch/mips/powertv/memory.c | 2 +- + arch/mips/powertv/powertv-usb.c | 46 +- + arch/mips/ralink/Kconfig | 32 + + arch/mips/ralink/Makefile | 15 + + arch/mips/ralink/Platform | 10 + + arch/mips/ralink/clk.c | 72 ++ + arch/mips/ralink/common.h | 44 + + arch/mips/ralink/dts/Makefile | 1 + + arch/mips/ralink/dts/rt3050.dtsi | 106 ++ + arch/mips/ralink/dts/rt3052_eval.dts | 52 + + arch/mips/ralink/early_printk.c | 44 + + arch/mips/ralink/irq.c | 180 +++ + arch/mips/ralink/of.c | 107 ++ + arch/mips/ralink/prom.c | 69 ++ + arch/mips/ralink/reset.c | 44 + + arch/mips/ralink/rt305x.c | 242 ++++ + arch/mips/rb532/devices.c | 12 +- + arch/mips/rb532/gpio.c | 8 +- + arch/mips/rb532/irq.c | 4 +- + arch/mips/sgi-ip22/ip22-eisa.c | 14 +- + arch/mips/sgi-ip22/ip22-gio.c | 14 +- + arch/mips/sgi-ip22/ip22-int.c | 36 +- + arch/mips/sgi-ip22/ip22-mc.c | 44 +- + arch/mips/sgi-ip22/ip22-nvram.c | 16 +- + arch/mips/sgi-ip22/ip22-platform.c | 8 +- + arch/mips/sgi-ip22/ip22-reset.c | 4 +- + arch/mips/sgi-ip22/ip28-berr.c | 16 +- + arch/mips/sgi-ip27/ip27-berr.c | 4 +- + arch/mips/sgi-ip27/ip27-console.c | 2 +- + arch/mips/sgi-ip27/ip27-hubio.c | 14 +- + arch/mips/sgi-ip27/ip27-init.c | 2 +- + arch/mips/sgi-ip27/ip27-irq.c | 6 +- + arch/mips/sgi-ip27/ip27-memory.c | 12 +- + arch/mips/sgi-ip27/ip27-nmi.c | 6 +- + arch/mips/sgi-ip27/ip27-reset.c | 2 +- + arch/mips/sgi-ip27/ip27-smp.c | 4 +- + arch/mips/sgi-ip27/ip27-timer.c | 6 +- + arch/mips/sgi-ip27/ip27-xtalk.c | 16 +- + arch/mips/sgi-ip32/ip32-irq.c | 8 +- + arch/mips/sibyte/Platform | 6 +- + arch/mips/sibyte/bcm1480/irq.c | 8 +- + arch/mips/sibyte/common/cfe.c | 10 +- + arch/mips/sibyte/common/sb_tbprof.c | 18 +- + arch/mips/sibyte/sb1250/bus_watcher.c | 6 +- + arch/mips/sibyte/sb1250/irq.c | 8 +- + arch/mips/sibyte/sb1250/setup.c | 18 +- + arch/mips/sibyte/swarm/platform.c | 4 +- + arch/mips/sibyte/swarm/rtc_xicor1241.c | 50 +- + arch/mips/sni/a20r.c | 44 +- + arch/mips/sni/eisa.c | 2 +- + arch/mips/sni/irq.c | 20 +- + arch/mips/sni/pcimt.c | 36 +- + arch/mips/sni/pcit.c | 40 +- + arch/mips/sni/rm200.c | 38 +- + arch/mips/sni/setup.c | 24 +- + arch/mips/sni/time.c | 30 +- + arch/mips/txx9/Platform | 4 +- + arch/mips/txx9/generic/irq_tx4927.c | 2 +- + arch/mips/txx9/generic/irq_tx4939.c | 4 +- + arch/mips/txx9/generic/mem_tx4927.c | 2 +- + arch/mips/txx9/generic/pci.c | 4 +- + arch/mips/txx9/generic/setup.c | 8 +- + arch/mips/txx9/generic/setup_tx3927.c | 2 +- + arch/mips/txx9/generic/setup_tx4927.c | 2 +- + arch/mips/txx9/generic/setup_tx4938.c | 2 +- + arch/mips/txx9/generic/setup_tx4939.c | 4 +- + arch/mips/txx9/generic/smsc_fdc37m81x.c | 48 +- + arch/mips/txx9/rbtx4927/irq.c | 2 +- + arch/mips/txx9/rbtx4927/prom.c | 2 +- + arch/mips/txx9/rbtx4927/setup.c | 2 +- + arch/mips/txx9/rbtx4938/setup.c | 8 +- + arch/mips/txx9/rbtx4939/setup.c | 4 +- + arch/mips/vr41xx/common/bcu.c | 4 +- + arch/mips/vr41xx/common/cmu.c | 16 +- + arch/mips/vr41xx/common/giu.c | 2 +- + arch/mips/vr41xx/common/icu.c | 8 +- + arch/mips/vr41xx/common/pmu.c | 2 +- + arch/mips/vr41xx/common/rtc.c | 2 +- + arch/mips/vr41xx/common/type.c | 2 +- + arch/mips/wrppmc/Platform | 2 +- + arch/mips/wrppmc/irq.c | 4 +- + arch/mips/wrppmc/serial.c | 2 +- + drivers/mtd/bcm47xxpart.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 4 +- + drivers/net/ethernet/broadcom/bgmac.c | 6 +- + drivers/ssb/driver_chipcommon_pmu.c | 4 +- + drivers/tty/serial/Kconfig | 10 +- + 883 files changed, 16129 insertions(+), 15920 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/cpu_irq.txt + create mode 100644 Documentation/devicetree/bindings/serial/lantiq_asc.txt + create mode 100644 arch/mips/ath79/mach-ap136.c + create mode 100644 arch/mips/cavium-octeon/oct_ilm.c + delete mode 100644 arch/mips/configs/pnx8550_jbs_defconfig + delete mode 100644 arch/mips/configs/pnx8550_stb810_defconfig + create mode 100644 arch/mips/configs/rt305x_defconfig + create mode 100644 arch/mips/include/asm/break.h + delete mode 100644 arch/mips/include/asm/mach-ath79/pci.h + rename arch/mips/include/asm/mach-bcm47xx/{nvram.h => bcm47xx_nvram.h} (84%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/cpu-feature-overrides.h (100%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/gpio.h (100%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_cic_int.h (61%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_gpio_macros.h (99%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_int.h (91%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_pci.h (87%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_prom.h (96%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regops.h (99%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regs.h (65%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_slp_int.h (63%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_usb.h (99%) + rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/war.h (91%) + delete mode 100644 arch/mips/include/asm/mach-pnx8550/cm.h + delete mode 100644 arch/mips/include/asm/mach-pnx8550/glb.h + delete mode 100644 arch/mips/include/asm/mach-pnx8550/int.h + delete mode 100644 arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h + delete mode 100644 arch/mips/include/asm/mach-pnx8550/nand.h + delete mode 100644 arch/mips/include/asm/mach-pnx8550/pci.h + delete mode 100644 arch/mips/include/asm/mach-pnx8550/uart.h + delete mode 100644 arch/mips/include/asm/mach-pnx8550/usb.h + create mode 100644 arch/mips/include/asm/mach-ralink/ralink_regs.h + create mode 100644 arch/mips/include/asm/mach-ralink/rt305x.h + rename arch/mips/include/asm/{mach-pnx8550 => mach-ralink}/war.h (83%) + create mode 100644 arch/mips/include/uapi/asm/inst.h + create mode 100644 arch/mips/kernel/csrc-gic.c + delete mode 100644 arch/mips/mti-sead3/sead3-memory.c + create mode 100644 arch/mips/mti-sead3/sead3.dts + delete mode 100644 arch/mips/pci/fixup-pnx8550.c + delete mode 100644 arch/mips/pci/ops-pnx8550.c + delete mode 100644 arch/mips/pmc-sierra/Platform + rename arch/mips/{pmc-sierra => pmcs-msp71xx}/Kconfig (100%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/Makefile (100%) + create mode 100644 arch/mips/pmcs-msp71xx/Platform + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio.c (100%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio_extended.c (100%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_elb.c (100%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_eth.c (100%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_hwbutton.c (100%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq.c (97%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_cic.c (96%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_per.c (95%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_slp.c (94%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_pci.c (97%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_prom.c (99%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_serial.c (87%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_setup.c (95%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smp.c (100%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smtc.c (100%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_time.c (99%) + rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_usb.c (87%) + delete mode 100644 arch/mips/pnx8550/Makefile + delete mode 100644 arch/mips/pnx8550/Platform + delete mode 100644 arch/mips/pnx8550/common/Makefile + delete mode 100644 arch/mips/pnx8550/common/int.c + delete mode 100644 arch/mips/pnx8550/common/pci.c + delete mode 100644 arch/mips/pnx8550/common/platform.c + delete mode 100644 arch/mips/pnx8550/common/proc.c + delete mode 100644 arch/mips/pnx8550/common/prom.c + delete mode 100644 arch/mips/pnx8550/common/reset.c + delete mode 100644 arch/mips/pnx8550/common/setup.c + delete mode 100644 arch/mips/pnx8550/common/time.c + delete mode 100644 arch/mips/pnx8550/jbs/Makefile + delete mode 100644 arch/mips/pnx8550/jbs/board_setup.c + delete mode 100644 arch/mips/pnx8550/jbs/init.c + delete mode 100644 arch/mips/pnx8550/jbs/irqmap.c + delete mode 100644 arch/mips/pnx8550/stb810/Makefile + delete mode 100644 arch/mips/pnx8550/stb810/board_setup.c + delete mode 100644 arch/mips/pnx8550/stb810/irqmap.c + delete mode 100644 arch/mips/pnx8550/stb810/prom_init.c + create mode 100644 arch/mips/ralink/Kconfig + create mode 100644 arch/mips/ralink/Makefile + create mode 100644 arch/mips/ralink/Platform + create mode 100644 arch/mips/ralink/clk.c + create mode 100644 arch/mips/ralink/common.h + create mode 100644 arch/mips/ralink/dts/Makefile + create mode 100644 arch/mips/ralink/dts/rt3050.dtsi + create mode 100644 arch/mips/ralink/dts/rt3052_eval.dts + create mode 100644 arch/mips/ralink/early_printk.c + create mode 100644 arch/mips/ralink/irq.c + create mode 100644 arch/mips/ralink/of.c + create mode 100644 arch/mips/ralink/prom.c + create mode 100644 arch/mips/ralink/reset.c + create mode 100644 arch/mips/ralink/rt305x.c +Merging openrisc/for-upstream (545ebd0 openrisc: require gpiolib) +$ git merge openrisc/for-upstream +Merge made by the 'recursive' strategy. + arch/openrisc/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (8520e44 powerpc/kexec: Disable hard IRQ before kexec) +$ 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 (fa59f17 powerpc/5200: Use the gpt* labels to simplify mpc5200 dts files) +$ git merge mpc5xxx/next +Already up-to-date. +Merging galak/next (12c7e8f powerpc/85xx: l2sram - Add compatible string for BSC9131 platform) +$ git merge galak/next +Already up-to-date. +Merging s390/features (72a6b43 s390/module: fix compile warning) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/futex.h | 6 -- + arch/s390/include/asm/pgtable.h | 2 + + arch/s390/include/asm/uaccess.h | 23 ++----- + arch/s390/kernel/compat_signal.c | 14 ----- + arch/s390/kernel/dis.c | 4 +- + arch/s390/kernel/module.c | 2 +- + arch/s390/kernel/signal.c | 8 --- + arch/s390/lib/uaccess_mvcos.c | 26 ++++---- + arch/s390/lib/uaccess_pt.c | 129 ++++++++++++++++++++++++++++----------- + arch/s390/lib/uaccess_std.c | 48 ++++++--------- + arch/s390/mm/dump_pagetables.c | 25 ++++++-- + arch/s390/mm/vmem.c | 3 +- + drivers/input/serio/Kconfig | 2 +- + drivers/s390/block/dasd_eckd.c | 10 ++- + drivers/s390/cio/qdio_debug.c | 9 +-- + drivers/s390/cio/qdio_debug.h | 3 +- + drivers/s390/cio/qdio_main.c | 2 +- + 17 files changed, 172 insertions(+), 144 deletions(-) +Merging sh/sh-latest (035688d sh: ecovec: add sample amixer settings) +$ git merge sh/sh-latest +Already up-to-date. +Merging sparc-next/master (c4271c6 NFS: Kill fscache warnings when mounting without -ofsc) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (ecc46c5 tile: support atomic64_dec_if_positive()) +$ git merge tile/master +Auto-merging arch/tile/kernel/intvec_64.S +Auto-merging arch/tile/include/asm/syscalls.h +Auto-merging arch/tile/Kconfig +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 3 +++ + arch/tile/include/asm/atomic.h | 21 ++++++++++++++++++++ + arch/tile/include/asm/ptrace.h | 3 ++- + arch/tile/include/asm/syscall.h | 6 ++++++ + arch/tile/include/asm/syscalls.h | 6 ------ + arch/tile/include/asm/thread_info.h | 8 ++++++++ + arch/tile/include/uapi/asm/unistd.h | 2 ++ + arch/tile/kernel/intvec_32.S | 10 ++++++++-- + arch/tile/kernel/intvec_64.S | 24 +++++++++++++++++------ + arch/tile/kernel/ptrace.c | 39 +++++++++++++++++++------------------ + 10 files changed, 88 insertions(+), 34 deletions(-) +Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (9cf81c7 xtensa: add accept4 syscall) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (dc81cdc Btrfs: fix remount vs autodefrag) +$ git merge btrfs/next +Resolved 'fs/btrfs/extent-tree.c' using previous resolution. +Auto-merging include/uapi/linux/btrfs.h +Auto-merging fs/btrfs/transaction.c +Auto-merging fs/btrfs/send.c +Auto-merging fs/btrfs/relocation.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/extent-tree.c +CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7825dee] Merge remote-tracking branch 'btrfs/next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/Kconfig | 3 + + fs/btrfs/Makefile | 2 +- + fs/btrfs/backref.h | 2 +- + fs/btrfs/btrfs_inode.h | 20 + + fs/btrfs/check-integrity.c | 3 +- + fs/btrfs/compression.c | 4 +- + fs/btrfs/ctree.c | 68 +- + fs/btrfs/ctree.h | 141 +- + fs/btrfs/delayed-inode.c | 147 +- + fs/btrfs/delayed-inode.h | 1 + + fs/btrfs/delayed-ref.c | 82 +- + fs/btrfs/delayed-ref.h | 52 +- + fs/btrfs/dev-replace.c | 6 +- + fs/btrfs/disk-io.c | 222 ++- + fs/btrfs/disk-io.h | 7 + + fs/btrfs/extent-tree.c | 442 +++-- + fs/btrfs/extent_io.c | 108 +- + fs/btrfs/extent_io.h | 5 +- + fs/btrfs/file-item.c | 67 +- + fs/btrfs/file.c | 54 +- + fs/btrfs/free-space-cache.c | 62 +- + fs/btrfs/inode.c | 998 ++++++++++-- + fs/btrfs/ioctl.c | 120 +- + fs/btrfs/locking.c | 5 +- + fs/btrfs/ordered-data.c | 98 +- + fs/btrfs/ordered-data.h | 14 +- + fs/btrfs/print-tree.c | 1 + + fs/btrfs/qgroup.c | 6 +- + fs/btrfs/raid56.c | 2080 ++++++++++++++++++++++++ + fs/btrfs/raid56.h | 51 + + fs/btrfs/relocation.c | 2 +- + fs/btrfs/scrub.c | 10 +- + fs/btrfs/send.c | 53 +- + fs/btrfs/send.h | 1 + + fs/btrfs/super.c | 89 +- + fs/btrfs/transaction.c | 132 +- + fs/btrfs/transaction.h | 6 +- + fs/btrfs/tree-defrag.c | 19 +- + fs/btrfs/tree-log.c | 139 +- + fs/btrfs/volumes.c | 634 ++++++-- + fs/btrfs/volumes.h | 11 +- + include/linux/btrfs.h | 6 + + include/uapi/linux/Kbuild | 1 + + fs/btrfs/ioctl.h => include/uapi/linux/btrfs.h | 18 +- + 44 files changed, 5171 insertions(+), 821 deletions(-) + create mode 100644 fs/btrfs/raid56.c + create mode 100644 fs/btrfs/raid56.h + create mode 100644 include/linux/btrfs.h + rename fs/btrfs/ioctl.h => include/uapi/linux/btrfs.h (96%) +Merging ceph/master (83ca14f libceph: add support for HASHPSPOOL pool flag) +$ git merge ceph/master +Auto-merging net/ceph/ceph_common.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/mds_client.h +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/ioctl.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/caps.c +Auto-merging fs/ceph/addr.c +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 1852 ++++++++++++++++++++++-------------- + fs/ceph/addr.c | 38 +- + fs/ceph/caps.c | 32 +- + fs/ceph/file.c | 8 +- + fs/ceph/ioctl.c | 6 +- + fs/ceph/mds_client.c | 33 +- + fs/ceph/mds_client.h | 6 + + fs/ceph/mdsmap.c | 12 +- + fs/ceph/strings.c | 4 + + fs/ceph/super.c | 7 +- + fs/ceph/super.h | 10 +- + fs/ceph/xattr.c | 214 ++++- + include/linux/ceph/ceph_features.h | 38 +- + include/linux/ceph/ceph_fs.h | 32 +- + include/linux/ceph/decode.h | 29 +- + include/linux/ceph/libceph.h | 16 +- + include/linux/ceph/mdsmap.h | 4 +- + include/linux/ceph/messenger.h | 2 + + include/linux/ceph/osd_client.h | 74 +- + include/linux/ceph/osdmap.h | 30 +- + include/linux/ceph/rados.h | 158 ++- + include/linux/crush/crush.h | 2 + + net/ceph/ceph_common.c | 22 +- + net/ceph/ceph_strings.c | 39 + + net/ceph/crush/mapper.c | 15 +- + net/ceph/crypto.c | 7 +- + net/ceph/debugfs.c | 29 +- + net/ceph/messenger.c | 260 +++-- + net/ceph/mon_client.c | 2 +- + net/ceph/osd_client.c | 635 +++++++------ + net/ceph/osdmap.c | 290 +++--- + net/ceph/pagevec.c | 24 +- + 32 files changed, 2402 insertions(+), 1528 deletions(-) +Merging cifs/for-next (c51bb0e cifs: bugfix for unreclaimed writeback pages in cifs_writev_requeue()) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 5 +++++ + fs/cifs/cifssmb.c | 5 ++++- + fs/cifs/connect.c | 2 +- + fs/cifs/file.c | 12 +++++++++--- + 4 files changed, 19 insertions(+), 5 deletions(-) +Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (1111eae eCryptfs: Fix redundant error check on ecryptfs_find_daemon_by_euid()) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/messaging.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/file.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 9 +++------ + fs/ecryptfs/dentry.c | 2 -- + fs/ecryptfs/file.c | 2 -- + fs/ecryptfs/inode.c | 8 ++++---- + fs/ecryptfs/keystore.c | 5 ++--- + fs/ecryptfs/messaging.c | 5 ++--- + 6 files changed, 11 insertions(+), 20 deletions(-) +Merging ext3/for_next (712ddc5 Ext2: remove the static function release_blocks to optimize the kernel) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (8e919d1 ext4: fix extent status tree regression for file systems > 512GB) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (7dd690c f2fs: avoid build warning) +$ git merge f2fs/dev +Already up-to-date. +Merging fuse/for-next (634734b fuse: allow control of adaptive readdirplus use) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (fd95e81 GFS2: Reinstate withdraw ack system) +$ git merge gfs2/master +Already up-to-date. +Merging jfs/jfs-next (9d48017 jfs: avoid undefined behavior from left-shifting by 32 bits) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/jfs_imap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +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 (f6488c9 nfs: don't allow nfs_find_actor to match inodes of the wrong type) +$ git merge nfs/linux-next +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/nfs/inode.c | 2 ++ + fs/nfs/nfs4filelayout.c | 6 ++++-- + fs/nfs/nfs4proc.c | 11 +++++++++-- + fs/nfs/pnfs.c | 14 ++++++++++---- + fs/nfs/pnfs.h | 6 ++++-- + fs/nfs/unlink.c | 20 +++++++++++++------- + net/sunrpc/xprt.c | 6 +++++- + 7 files changed, 47 insertions(+), 18 deletions(-) +Merging nfsd/nfsd-next (dc10740 SUNRPC: make AF_LOCAL connect synchronous) +$ git merge nfsd/nfsd-next +Recorded preimage for 'fs/nfsd/nfscache.c' +Resolved 'net/sunrpc/svcauth_unix.c' using previous resolution. +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/xprtrdma/transport.c +Auto-merging net/sunrpc/svcauth_unix.c +CONFLICT (content): Merge conflict in net/sunrpc/svcauth_unix.c +Auto-merging net/sunrpc/clnt.c +Auto-merging net/sunrpc/cache.c +Auto-merging net/sunrpc/auth_gss/svcauth_gss.c +Auto-merging include/linux/lockd/lockd.h +Auto-merging fs/nfsd/nfssvc.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfscache.c +CONFLICT (content): Merge conflict in fs/nfsd/nfscache.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs4recover.c +Auto-merging fs/nfsd/nfs4idmap.c +Auto-merging fs/nfsd/fault_inject.c +Auto-merging fs/nfsd/export.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/nfs4client.c +Auto-merging fs/lockd/svcsubs.c +Auto-merging fs/lockd/host.c +Auto-merging fs/lockd/clntproc.c +Auto-merging fs/lockd/clntlock.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/nfsd/nfscache.c'. +[master 5c9ebe3] Merge remote-tracking branch 'nfsd/nfsd-next' +$ git diff -M --stat --summary HEAD^.. + fs/lockd/clntlock.c | 14 +- + fs/lockd/clntproc.c | 6 +- + fs/lockd/host.c | 1 + + fs/lockd/mon.c | 1 + + fs/lockd/svcsubs.c | 2 +- + fs/nfs/cache_lib.c | 12 +- + fs/nfs/cache_lib.h | 2 - + fs/nfs/dns_resolve.c | 67 +++---- + fs/nfs/nfs4client.c | 1 + + fs/nfs/nfs4filelayoutdev.c | 1 + + fs/nfs/nfs4namespace.c | 1 + + fs/nfs/super.c | 1 + + fs/nfsd/cache.h | 17 +- + fs/nfsd/export.c | 16 +- + fs/nfsd/fault_inject.c | 2 +- + fs/nfsd/nfs4idmap.c | 16 +- + fs/nfsd/nfs4proc.c | 7 +- + fs/nfsd/nfs4recover.c | 6 + + fs/nfsd/nfs4state.c | 102 ++++++----- + fs/nfsd/nfs4xdr.c | 21 +-- + fs/nfsd/nfscache.c | 352 ++++++++++++++++++++++++++++-------- + fs/nfsd/nfsctl.c | 81 ++++++--- + fs/nfsd/nfssvc.c | 6 +- + fs/nfsd/xdr4.h | 2 +- + include/linux/lockd/lockd.h | 3 +- + include/linux/sunrpc/addr.h | 170 +++++++++++++++++ + include/linux/sunrpc/cache.h | 10 +- + include/linux/sunrpc/clnt.h | 152 ---------------- + include/linux/sunrpc/svc.h | 1 + + include/linux/sunrpc/xdr.h | 3 +- + net/sunrpc/addr.c | 3 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 + + net/sunrpc/auth_gss/svcauth_gss.c | 18 +- + net/sunrpc/cache.c | 51 +++--- + net/sunrpc/clnt.c | 1 + + net/sunrpc/rpcb_clnt.c | 1 + + net/sunrpc/svc.c | 13 +- + net/sunrpc/svc_xprt.c | 81 +++++---- + net/sunrpc/svcauth_unix.c | 16 +- + net/sunrpc/xdr.c | 41 +++++ + net/sunrpc/xprtrdma/transport.c | 1 + + net/sunrpc/xprtsock.c | 36 +++- + 42 files changed, 833 insertions(+), 507 deletions(-) + create mode 100644 include/linux/sunrpc/addr.h +$ git reset --hard HEAD^ +HEAD is now at 48e2e50 Merge remote-tracking branch 'nfs/linux-next' +Merging 20130228 version of nfsd +$ git merge -m 20130228/nfsd 56edc86b5a72bdbc86358e57fb09165136baf0b8 +Resolved 'fs/nfsd/nfscache.c' using previous resolution. +Resolved 'net/sunrpc/svcauth_unix.c' using previous resolution. +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/xprtrdma/transport.c +Auto-merging net/sunrpc/svcauth_unix.c +CONFLICT (content): Merge conflict in net/sunrpc/svcauth_unix.c +Auto-merging net/sunrpc/clnt.c +Auto-merging net/sunrpc/cache.c +Auto-merging net/sunrpc/auth_gss/svcauth_gss.c +Auto-merging include/linux/lockd/lockd.h +Auto-merging fs/nfsd/nfssvc.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfscache.c +CONFLICT (content): Merge conflict in fs/nfsd/nfscache.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs4recover.c +Auto-merging fs/nfsd/nfs4idmap.c +Auto-merging fs/nfsd/fault_inject.c +Auto-merging fs/nfsd/export.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/nfs4client.c +Auto-merging fs/lockd/svcsubs.c +Auto-merging fs/lockd/host.c +Auto-merging fs/lockd/clntproc.c +Auto-merging fs/lockd/clntlock.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a879319] 20130228/nfsd +$ git diff -M --stat --summary HEAD^.. + fs/lockd/clntlock.c | 14 +- + fs/lockd/clntproc.c | 6 +- + fs/lockd/host.c | 1 + + fs/lockd/mon.c | 1 + + fs/lockd/svcsubs.c | 2 +- + fs/nfs/cache_lib.c | 12 +- + fs/nfs/cache_lib.h | 2 - + fs/nfs/dns_resolve.c | 67 +++---- + fs/nfs/nfs4client.c | 1 + + fs/nfs/nfs4filelayoutdev.c | 1 + + fs/nfs/nfs4namespace.c | 1 + + fs/nfs/super.c | 1 + + fs/nfsd/cache.h | 17 +- + fs/nfsd/export.c | 16 +- + fs/nfsd/fault_inject.c | 2 +- + fs/nfsd/nfs4idmap.c | 16 +- + fs/nfsd/nfs4proc.c | 7 +- + fs/nfsd/nfs4recover.c | 6 + + fs/nfsd/nfs4state.c | 102 ++++++----- + fs/nfsd/nfs4xdr.c | 21 +-- + fs/nfsd/nfscache.c | 352 ++++++++++++++++++++++++++++-------- + fs/nfsd/nfsctl.c | 81 ++++++--- + fs/nfsd/nfssvc.c | 6 +- + fs/nfsd/xdr4.h | 2 +- + include/linux/lockd/lockd.h | 3 +- + include/linux/sunrpc/addr.h | 170 +++++++++++++++++ + include/linux/sunrpc/cache.h | 10 +- + include/linux/sunrpc/clnt.h | 152 ---------------- + include/linux/sunrpc/svc.h | 1 + + include/linux/sunrpc/xdr.h | 3 +- + net/sunrpc/addr.c | 3 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 + + net/sunrpc/auth_gss/svcauth_gss.c | 18 +- + net/sunrpc/cache.c | 51 +++--- + net/sunrpc/clnt.c | 1 + + net/sunrpc/rpcb_clnt.c | 1 + + net/sunrpc/svc.c | 13 +- + net/sunrpc/svc_xprt.c | 81 +++++---- + net/sunrpc/svcauth_unix.c | 16 +- + net/sunrpc/xdr.c | 41 +++++ + net/sunrpc/xprtrdma/transport.c | 1 + + net/sunrpc/xprtsock.c | 1 + + 42 files changed, 806 insertions(+), 499 deletions(-) + create mode 100644 include/linux/sunrpc/addr.h +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 (b6f4bee fs/9p: Fix atomic_open) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (8afd500 UBIFS: fix double free of ubifs_orphan objects) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (1e82379 xfs: xfs_bmap_add_attrfork_local is too generic) +$ git merge xfs/for-next +Already up-to-date. +Merging vfs/for-next (d3d009c saner proc_get_inode() calling conventions) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (018ba0a Merge branch 'pci/yinghai-root-bus-hotplug' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (e3dc8bf Merge branch 'for-3.9/logitech' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (55827f4 i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (2a7d2b9 Merge branch 'akpm' (final batch from Andrew)) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (796450c hwmon: (pmbus/ltc2978) Use detected chip ID to select supported functionality) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/adm1275 | 2 +- + Documentation/hwmon/jc42 | 2 +- + Documentation/hwmon/lineage-pem | 2 +- + Documentation/hwmon/lm25066 | 2 +- + Documentation/hwmon/ltc2978 | 6 +++--- + Documentation/hwmon/ltc4261 | 2 +- + Documentation/hwmon/max16064 | 2 +- + Documentation/hwmon/max16065 | 2 +- + Documentation/hwmon/max34440 | 2 +- + Documentation/hwmon/max8688 | 2 +- + Documentation/hwmon/pmbus | 2 +- + Documentation/hwmon/smm665 | 2 +- + Documentation/hwmon/ucd9000 | 2 +- + Documentation/hwmon/ucd9200 | 2 +- + Documentation/hwmon/zl6100 | 2 +- + drivers/hwmon/pmbus/ltc2978.c | 30 ++++++++++++++++-------------- + 16 files changed, 33 insertions(+), 31 deletions(-) +Merging v4l-dvb/master (eccaaad Merge /home/v4l/v4l/patchwork) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (26901f2 Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' 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/NEXT (53637e0 [libata] fix smatch warning for zpodd_wake_dev) +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next (ef4e359 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'misc', 'mlx4', 'qib' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging pstore/master (ebacfd1 pstore/ftrace: Adjust for ftrace_ops->func prototype change) +$ git merge pstore/master +Already up-to-date. +Merging pm/linux-next (4383822 Merge branch 'acpi-pm' into fixes) +$ git merge pm/linux-next +Already up-to-date. +Merging idle/next (ca62cf5 Merge branch 'misc' into release) +$ git merge idle/next +Already up-to-date. +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 (d1c3ed6 Linux 3.8-rc2) +$ git merge cpuidle/cpuidle-next +Already up-to-date. +Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (f5b6d45 thermal: rcar: remove __devinitconst) +$ git merge thermal/next +Resolved 'drivers/thermal/exynos_thermal.c' using previous resolution. +Auto-merging kernel/time/tick-sched.c +Auto-merging drivers/thermal/thermal_sys.c +Auto-merging drivers/thermal/exynos_thermal.c +CONFLICT (content): Merge conflict in drivers/thermal/exynos_thermal.c +Auto-merging drivers/thermal/cpu_cooling.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d793c22] Merge remote-tracking branch 'thermal/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/thermal/dove-thermal.txt | 18 + + .../bindings/thermal/kirkwood-thermal.txt | 15 + + .../devicetree/bindings/thermal/rcar-thermal.txt | 29 + + Documentation/thermal/exynos_thermal_emulation | 53 ++ + Documentation/thermal/intel_powerclamp.txt | 307 ++++++++ + Documentation/thermal/sysfs-api.txt | 18 +- + arch/x86/kernel/nmi.c | 1 + + drivers/thermal/Kconfig | 55 +- + drivers/thermal/Makefile | 10 +- + drivers/thermal/cpu_cooling.c | 4 +- + drivers/thermal/db8500_cpufreq_cooling.c | 5 +- + drivers/thermal/db8500_thermal.c | 4 +- + drivers/thermal/dove_thermal.c | 209 ++++++ + drivers/thermal/exynos_thermal.c | 211 ++++-- + drivers/thermal/intel_powerclamp.c | 794 +++++++++++++++++++++ + drivers/thermal/kirkwood_thermal.c | 134 ++++ + drivers/thermal/rcar_thermal.c | 490 +++++++++---- + drivers/thermal/spear_thermal.c | 7 +- + drivers/thermal/step_wise.c | 122 ++-- + drivers/thermal/thermal_sys.c | 105 ++- + include/linux/platform_data/exynos_thermal.h | 3 + + include/linux/thermal.h | 10 +- + kernel/time/tick-sched.c | 2 + + 23 files changed, 2337 insertions(+), 269 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/rcar-thermal.txt + create mode 100644 Documentation/thermal/exynos_thermal_emulation + create mode 100644 Documentation/thermal/intel_powerclamp.txt + create mode 100644 drivers/thermal/dove_thermal.c + create mode 100644 drivers/thermal/intel_powerclamp.c + create mode 100644 drivers/thermal/kirkwood_thermal.c +$ git am -3 ../patches/0001-sched-rt-fix-PowerClamp-Driver-for-define-move.patch +Applying: sched/rt: fix PowerClamp Driver for define move +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/thermal/intel_powerclamp.c +$ git add -A . +$ git commit -v -a --amend +[master d72e83a] Merge remote-tracking branch 'thermal/next' +Merging ieee1394/for-next (db2cad2 firewire: net: remove unused variable in fwnet_receive_broadcast()) +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (19f949f Linux 3.8) +$ git merge ubi/linux-next +Already up-to-date. +Merging dlm/next (f117228 dlm: avoid scanning unchanged toss lists) +$ 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 (319cc77 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/storvsc_drv.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-fcoe | 45 +- + Documentation/scsi/ChangeLog.megaraid_sas | 9 + + drivers/scsi/aacraid/src.c | 4 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 256 +++++----- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/fcoe/fcoe.c | 266 ++++++---- + drivers/scsi/fcoe/fcoe.h | 6 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 45 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 186 +++++-- + drivers/scsi/fcoe/fcoe_transport.c | 199 +++++++- + drivers/scsi/fcoe/libfcoe.h | 20 +- + drivers/scsi/fnic/Makefile | 2 + + drivers/scsi/fnic/fnic.h | 60 +++ + drivers/scsi/fnic/fnic_debugfs.c | 314 ++++++++++++ + drivers/scsi/fnic/fnic_io.h | 6 +- + drivers/scsi/fnic/fnic_main.c | 17 + + drivers/scsi/fnic/fnic_scsi.c | 721 ++++++++++++++++++++++++++-- + drivers/scsi/fnic/fnic_trace.c | 273 +++++++++++ + drivers/scsi/fnic/fnic_trace.h | 90 ++++ + drivers/scsi/hpsa.c | 117 +++-- + drivers/scsi/ipr.c | 33 +- + drivers/scsi/ipr.h | 1 + + drivers/scsi/libfc/fc_fcp.c | 6 +- + drivers/scsi/libfc/fc_libfc.h | 38 +- + drivers/scsi/libfc/fc_rport.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 56 +-- + drivers/scsi/megaraid/megaraid_sas.h | 6 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 5 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 1 - + drivers/scsi/mpt2sas/mpt2sas_base.c | 8 + + drivers/scsi/mpt2sas/mpt2sas_base.h | 6 + + drivers/scsi/mvsas/mv_sas.c | 10 +- + drivers/scsi/mvsas/mv_sas.h | 1 + + drivers/scsi/osd/osd_initiator.c | 4 + + drivers/scsi/pm8001/pm8001_init.c | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 35 +- + drivers/scsi/qla2xxx/qla_bsg.c | 199 +++++--- + drivers/scsi/qla2xxx/qla_bsg.h | 2 +- + drivers/scsi/qla2xxx/qla_dbg.c | 17 +- + drivers/scsi/qla2xxx/qla_dbg.h | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 54 ++- + drivers/scsi/qla2xxx/qla_dfs.c | 2 +- + drivers/scsi/qla2xxx/qla_fw.h | 7 +- + drivers/scsi/qla2xxx/qla_gbl.h | 15 +- + drivers/scsi/qla2xxx/qla_gs.c | 10 +- + drivers/scsi/qla2xxx/qla_init.c | 200 ++++++-- + drivers/scsi/qla2xxx/qla_inline.h | 28 +- + drivers/scsi/qla2xxx/qla_iocb.c | 39 +- + drivers/scsi/qla2xxx/qla_isr.c | 82 +++- + drivers/scsi/qla2xxx/qla_mbx.c | 207 ++++++-- + drivers/scsi/qla2xxx/qla_mid.c | 9 +- + drivers/scsi/qla2xxx/qla_nx.c | 13 +- + drivers/scsi/qla2xxx/qla_nx.h | 4 +- + drivers/scsi/qla2xxx/qla_os.c | 147 +++++- + drivers/scsi/qla2xxx/qla_settings.h | 2 +- + drivers/scsi/qla2xxx/qla_sup.c | 18 +- + drivers/scsi/qla2xxx/qla_target.c | 169 ++++++- + drivers/scsi/qla2xxx/qla_target.h | 19 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 6 +- + drivers/scsi/storvsc_drv.c | 137 ++++-- + include/scsi/Kbuild | 3 - + include/scsi/fc/Kbuild | 4 - + include/scsi/fcoe_sysfs.h | 11 +- + include/scsi/libfcoe.h | 32 +- + include/scsi/scsi_host.h | 4 +- + include/uapi/scsi/Kbuild | 3 + + include/uapi/scsi/fc/Kbuild | 4 + + include/{ => uapi}/scsi/fc/fc_els.h | 0 + include/{ => uapi}/scsi/fc/fc_fs.h | 0 + include/{ => uapi}/scsi/fc/fc_gs.h | 0 + include/{ => uapi}/scsi/fc/fc_ns.h | 0 + include/{ => uapi}/scsi/scsi_bsg_fc.h | 0 + include/{ => uapi}/scsi/scsi_netlink.h | 0 + include/{ => uapi}/scsi/scsi_netlink_fc.h | 0 + 76 files changed, 3520 insertions(+), 786 deletions(-) + create mode 100644 drivers/scsi/fnic/fnic_debugfs.c + create mode 100644 drivers/scsi/fnic/fnic_trace.c + create mode 100644 drivers/scsi/fnic/fnic_trace.h + rename include/{ => uapi}/scsi/fc/fc_els.h (100%) + rename include/{ => uapi}/scsi/fc/fc_fs.h (100%) + rename include/{ => uapi}/scsi/fc/fc_gs.h (100%) + rename include/{ => uapi}/scsi/fc/fc_ns.h (100%) + rename include/{ => uapi}/scsi/scsi_bsg_fc.h (100%) + rename include/{ => uapi}/scsi/scsi_netlink.h (100%) + rename include/{ => uapi}/scsi/scsi_netlink_fc.h (100%) +Merging target-updates/for-next (2dbe10a target/pscsi: Rename sg_num to nr_vecs in pscsi_get_bio()) +$ git merge target-updates/for-next +Auto-merging drivers/target/target_core_file.c +Auto-merging drivers/target/sbp/sbp_target.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Merge made by the 'recursive' strategy. + drivers/target/iscsi/iscsi_target.c | 11 +++++++++-- + drivers/target/sbp/sbp_target.c | 2 +- + drivers/target/target_core_file.c | 2 +- + drivers/target/target_core_iblock.c | 2 +- + drivers/target/target_core_pscsi.c | 9 +++------ + 5 files changed, 15 insertions(+), 11 deletions(-) +Merging target-merge/for-next-merge (d1c3ed6 Linux 3.8-rc2) +$ 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 (f9c6a65 dmaengine: dw_dmac: move to generic DMA binding) +$ git merge slave-dma/next +Auto-merging drivers/dma/dw_dmac.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/snps-dma.txt | 70 +++++----- + drivers/dma/dw_dmac.c | 145 ++++++++++----------- + drivers/dma/dw_dmac_regs.h | 7 +- + include/linux/dmaengine.h | 16 +++ + include/linux/dw_dmac.h | 5 - + 5 files changed, 127 insertions(+), 116 deletions(-) +Merging dmaengine/next (7f34986 dma: ipu: Drop unused spinlock) +$ git merge dmaengine/next +Resolved 'drivers/dma/ioat/dma_v3.c' using previous resolution. +Auto-merging drivers/dma/ioat/dma_v3.c +CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f964b48] Merge remote-tracking branch 'dmaengine/next' +$ git diff -M --stat --summary HEAD^.. +Merging net-next/master (1cef935 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (a0b1c42 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (b53cf45 net: wireless: hostap: hostap_ap.c: Return -ENOMEM instead of -1 for if kmalloc() fails.) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (0d4b884 Bluetooth: Remove redundant RFCOMM BT_CLOSED settings) +$ git merge bluetooth/master +Recorded preimage for 'net/bluetooth/rfcomm/core.c' +Auto-merging net/bluetooth/sco.c +Auto-merging net/bluetooth/rfcomm/sock.c +Auto-merging net/bluetooth/rfcomm/core.c +CONFLICT (content): Merge conflict in net/bluetooth/rfcomm/core.c +Auto-merging net/bluetooth/hci_sock.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/af_bluetooth.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'net/bluetooth/rfcomm/core.c'. +[master a88b32c] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + include/net/bluetooth/bluetooth.h | 2 +- + include/net/bluetooth/hci_core.h | 2 +- + include/net/bluetooth/rfcomm.h | 6 -- + net/bluetooth/af_bluetooth.c | 15 +--- + net/bluetooth/bnep/sock.c | 4 +- + net/bluetooth/cmtp/sock.c | 4 +- + net/bluetooth/hci_conn.c | 4 +- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/hci_event.c | 4 +- + net/bluetooth/hci_sock.c | 4 +- + net/bluetooth/hidp/core.c | 4 + + net/bluetooth/hidp/sock.c | 4 +- + net/bluetooth/l2cap_sock.c | 4 +- + net/bluetooth/rfcomm/core.c | 163 ++++++++++++++++++-------------------- + net/bluetooth/rfcomm/sock.c | 3 +- + net/bluetooth/sco.c | 3 +- + 16 files changed, 97 insertions(+), 131 deletions(-) +Merging mtd/master (0ce82b7 mtd: nand: onfi don't WARN if we are in 16 bits mode) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (24dea0c mtd: map: BUG() in non handled cases) +$ git merge l2-mtd/master +Auto-merging include/linux/bcma/bcma_driver_chipcommon.h +Auto-merging drivers/mtd/tests/mtd_stresstest.c +Auto-merging drivers/mtd/tests/mtd_nandecctest.c +Auto-merging drivers/mtd/nand/omap2.c +Auto-merging drivers/mtd/nand/nandsim.c +Auto-merging drivers/mtd/nand/nand_base.c +Auto-merging drivers/mtd/nand/mxc_nand.c +Auto-merging drivers/mtd/nand/davinci_nand.c +Auto-merging drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c +Auto-merging drivers/mtd/maps/physmap_of.c +Auto-merging drivers/mtd/bcm47xxpart.c +Auto-merging drivers/mtd/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mtd/elm.txt | 16 + + .../devicetree/bindings/mtd/mtd-physmap.txt | 3 + + drivers/mtd/Kconfig | 4 +- + drivers/mtd/ar7part.c | 6 + + drivers/mtd/bcm47xxpart.c | 49 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 217 ++++++++ + drivers/mtd/cmdlinepart.c | 47 +- + drivers/mtd/devices/Makefile | 4 +- + drivers/mtd/devices/bcm47xxsflash.c | 55 +- + drivers/mtd/devices/bcm47xxsflash.h | 15 + + drivers/mtd/devices/elm.c | 404 ++++++++++++++ + drivers/mtd/devices/m25p80.c | 100 ++++ + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/maps/physmap_of.c | 9 +- + drivers/mtd/maps/uclinux.c | 30 +- + drivers/mtd/nand/atmel_nand.c | 141 ++++- + drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 4 + + drivers/mtd/nand/bcm47xxnflash/main.c | 14 +- + drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c | 4 +- + drivers/mtd/nand/davinci_nand.c | 24 +- + drivers/mtd/nand/fsl_ifc_nand.c | 233 ++++---- + drivers/mtd/nand/gpmi-nand/bch-regs.h | 22 + + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 9 + + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 63 ++- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 4 + + drivers/mtd/nand/mxc_nand.c | 11 + + drivers/mtd/nand/nand_base.c | 8 +- + drivers/mtd/nand/nand_ecc.c | 5 +- + drivers/mtd/nand/nandsim.c | 6 +- + drivers/mtd/nand/omap2.c | 583 +++++++++++++++++++-- + drivers/mtd/ofpart.c | 7 + + drivers/mtd/tests/mtd_nandecctest.c | 10 +- + drivers/mtd/tests/mtd_stresstest.c | 8 +- + drivers/mtd/tests/mtd_torturetest.c | 25 +- + drivers/mtd/ubi/debug.h | 6 +- + include/linux/bcma/bcma_driver_chipcommon.h | 1 + + include/linux/mtd/map.h | 9 +- + include/linux/platform_data/elm.h | 54 ++ + 38 files changed, 1881 insertions(+), 331 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/elm.txt + create mode 100644 drivers/mtd/devices/bcm47xxsflash.h + create mode 100644 drivers/mtd/devices/elm.c + create mode 100644 include/linux/platform_data/elm.h +Merging crypto/master (7eb9c5d crypto: caam - Added property fsl,sec-era in SEC4.0 device tree binding.) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (be88298 drm/tilcdc: only build on arm) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-intel/drm-intel-next-queued (90a72f8 drm/i915: Refactor gen2 to gen4 vblank interrupt handling) +$ git merge drm-intel/drm-intel-next-queued +Auto-merging include/linux/pm.h +Auto-merging drivers/video/fbmem.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_dma.c | 18 ++++++ + drivers/gpu/drm/i915/i915_drv.c | 35 +++++++---- + drivers/gpu/drm/i915/i915_irq.c | 119 ++++++++++++++++++++++++----------- + drivers/gpu/drm/i915/i915_reg.h | 4 ++ + drivers/gpu/drm/i915/i915_suspend.c | 8 ++- + drivers/gpu/drm/i915/i915_sysfs.c | 16 ++--- + drivers/gpu/drm/i915/intel_ddi.c | 4 +- + drivers/gpu/drm/i915/intel_display.c | 46 ++++++++++++-- + drivers/gpu/drm/i915/intel_dp.c | 77 ++++++++--------------- + drivers/gpu/drm/i915/intel_drv.h | 7 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 74 +++++++++++----------- + drivers/video/fbmem.c | 7 +++ + include/linux/fb.h | 2 + + include/linux/pm.h | 13 ++++ + kernel/power/console.c | 116 ++++++++++++++++++++++++++++++++++ + 15 files changed, 389 insertions(+), 157 deletions(-) +Merging sound/for-next (d0ec95f ALSA: emu10k1: Allow to switch hardware sampe rate on EMU) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (5475931 Merge remote-tracking branch 'asoc/topic/da7213' into asoc-next) +$ git merge sound-asoc/for-next +Already up-to-date. +Merging modules/modules-next (fffddfd Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) +$ git merge modules/modules-next +Already up-to-date. +Merging pekey/devel-pekey (4ea349d MODSIGN: Fix including certificate twice when the signing_key.x509 already exists) +$ git merge pekey/devel-pekey +Auto-merging kernel/system_certificates.S +Removing kernel/modsign_pubkey.c +Auto-merging kernel/Makefile +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + crypto/asymmetric_keys/Kconfig | 20 +- + crypto/asymmetric_keys/Makefile | 30 ++ + crypto/asymmetric_keys/mscode.asn1 | 28 ++ + crypto/asymmetric_keys/mscode_parser.c | 110 +++++ + crypto/asymmetric_keys/pefile_parser.c | 479 +++++++++++++++++++++ + crypto/asymmetric_keys/pefile_parser.h | 36 ++ + crypto/asymmetric_keys/pkcs7.asn1 | 127 ++++++ + crypto/asymmetric_keys/pkcs7_parser.c | 326 ++++++++++++++ + crypto/asymmetric_keys/pkcs7_parser.h | 72 ++++ + crypto/asymmetric_keys/pkcs7_trust.c | 149 +++++++ + crypto/asymmetric_keys/pkcs7_verify.c | 260 +++++++++++ + crypto/asymmetric_keys/public_key.c | 60 ++- + crypto/asymmetric_keys/public_key.h | 6 + + crypto/asymmetric_keys/x509.asn1 | 2 +- + crypto/asymmetric_keys/x509_cert_parser.c | 55 ++- + crypto/asymmetric_keys/x509_parser.h | 28 +- + crypto/asymmetric_keys/x509_public_key.c | 119 ++--- + include/crypto/public_key.h | 9 +- + include/keys/system_keyring.h | 23 + + include/linux/key-type.h | 1 + + include/linux/key.h | 3 + + include/linux/oid_registry.h | 7 +- + include/linux/pe.h | 448 +++++++++++++++++++ + init/Kconfig | 13 + + kernel/Makefile | 47 +- + kernel/modsign_pubkey.c | 104 ----- + kernel/module-internal.h | 2 - + kernel/module_signing.c | 7 +- + ...modsign_certificate.S => system_certificates.S} | 7 +- + kernel/system_keyring.c | 103 +++++ + security/keys/key.c | 8 + + security/keys/keyring.c | 4 + + 32 files changed, 2478 insertions(+), 215 deletions(-) + create mode 100644 crypto/asymmetric_keys/mscode.asn1 + create mode 100644 crypto/asymmetric_keys/mscode_parser.c + create mode 100644 crypto/asymmetric_keys/pefile_parser.c + create mode 100644 crypto/asymmetric_keys/pefile_parser.h + create mode 100644 crypto/asymmetric_keys/pkcs7.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs7_parser.c + create mode 100644 crypto/asymmetric_keys/pkcs7_parser.h + create mode 100644 crypto/asymmetric_keys/pkcs7_trust.c + create mode 100644 crypto/asymmetric_keys/pkcs7_verify.c + create mode 100644 include/keys/system_keyring.h + create mode 100644 include/linux/pe.h + delete mode 100644 kernel/modsign_pubkey.c + rename kernel/{modsign_certificate.S => system_certificates.S} (72%) + create mode 100644 kernel/system_keyring.c +Merging virtio/virtio-next (6515925 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (005a69d Input: cyttsp-spi - remove duplicate MODULE_ALIAS()) +$ git merge input/next +Already up-to-date. +Merging input-mt/for-next (6f0c058 Linux 3.7-rc2) +$ git merge input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (5d30b00 Merge branch 'for-3.9' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging block/for-next (833dd2e Merge branch 'for-3.9/drivers' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/master (8678bfa A simple cache policy that writes back all data to the origin.) +$ git merge device-mapper/master +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/dm-snap.c +Auto-merging drivers/md/dm-raid.c +Auto-merging drivers/md/dm-bufio.c +Auto-merging drivers/md/dm-bio-prison.c +Auto-merging drivers/md/Kconfig +Merge made by the 'recursive' strategy. + Documentation/device-mapper/cache-policies.txt | 51 + + Documentation/device-mapper/cache.txt | 266 +++ + drivers/md/Kconfig | 55 +- + drivers/md/Makefile | 6 + + drivers/md/dm-bio-prison.c | 155 +- + drivers/md/dm-bio-prison.h | 58 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-cache-block-types.h | 54 + + drivers/md/dm-cache-metadata.c | 1146 +++++++++++ + drivers/md/dm-cache-metadata.h | 142 ++ + drivers/md/dm-cache-policy-cleaner.c | 465 +++++ + drivers/md/dm-cache-policy-internal.h | 124 ++ + drivers/md/dm-cache-policy-mq.c | 1194 +++++++++++ + drivers/md/dm-cache-policy.c | 161 ++ + drivers/md/dm-cache-policy.h | 228 +++ + drivers/md/dm-cache-target.c | 2565 ++++++++++++++++++++++++ + drivers/md/dm-crypt.c | 45 +- + drivers/md/dm-delay.c | 12 +- + drivers/md/dm-flakey.c | 11 +- + drivers/md/dm-ioctl.c | 130 +- + drivers/md/dm-kcopyd.c | 121 +- + drivers/md/dm-linear.c | 13 +- + drivers/md/dm-mpath.c | 12 +- + drivers/md/dm-raid.c | 10 +- + drivers/md/dm-raid1.c | 17 +- + drivers/md/dm-snap.c | 33 +- + drivers/md/dm-stripe.c | 27 +- + drivers/md/dm-table.c | 11 +- + drivers/md/dm-target.c | 2 +- + drivers/md/dm-thin-metadata.c | 12 +- + drivers/md/dm-thin.c | 277 ++- + drivers/md/dm-verity.c | 8 +- + drivers/md/dm-zero.c | 2 +- + drivers/md/dm.c | 452 +++-- + drivers/md/persistent-data/Kconfig | 2 +- + drivers/md/persistent-data/Makefile | 2 + + drivers/md/persistent-data/dm-array.c | 808 ++++++++ + drivers/md/persistent-data/dm-array.h | 166 ++ + drivers/md/persistent-data/dm-bitset.c | 163 ++ + drivers/md/persistent-data/dm-bitset.h | 165 ++ + drivers/md/persistent-data/dm-block-manager.c | 1 + + drivers/md/persistent-data/dm-btree-internal.h | 1 + + drivers/md/persistent-data/dm-btree-spine.c | 7 + + drivers/md/persistent-data/dm-btree.c | 52 + + drivers/md/persistent-data/dm-btree.h | 15 +- + include/linux/device-mapper.h | 49 +- + include/linux/dm-kcopyd.h | 25 +- + include/uapi/linux/dm-ioctl.h | 6 +- + 48 files changed, 8729 insertions(+), 600 deletions(-) + create mode 100644 Documentation/device-mapper/cache-policies.txt + create mode 100644 Documentation/device-mapper/cache.txt + create mode 100644 drivers/md/dm-cache-block-types.h + create mode 100644 drivers/md/dm-cache-metadata.c + create mode 100644 drivers/md/dm-cache-metadata.h + create mode 100644 drivers/md/dm-cache-policy-cleaner.c + create mode 100644 drivers/md/dm-cache-policy-internal.h + create mode 100644 drivers/md/dm-cache-policy-mq.c + create mode 100644 drivers/md/dm-cache-policy.c + create mode 100644 drivers/md/dm-cache-policy.h + create mode 100644 drivers/md/dm-cache-target.c + create mode 100644 drivers/md/persistent-data/dm-array.c + create mode 100644 drivers/md/persistent-data/dm-array.h + create mode 100644 drivers/md/persistent-data/dm-bitset.c + create mode 100644 drivers/md/persistent-data/dm-bitset.h +$ git am -3 ../patches/0001-hlist-drop-the-node-parameter-from-iterators-dm-cach.patch +Applying: hlist-drop-the-node-parameter-from-iterators-dm-cache-policy-fix +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/md/dm-cache-policy-cleaner.c +M drivers/md/dm-cache-policy-mq.c +$ git add -A . +$ git commit -v -a --amend +[master db572d5] Merge branch 'device-mapper/master' +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 (adf96e6 sysrq: don't depend on weak undefined arrays to have an address that compares as NULL) +$ git merge mmc/mmc-next +Already up-to-date. +Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (7d557b3 slub: correctly bootstrap boot caches) +$ git merge slab/for-next +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Removing include/linux/kmalloc_sizes.h +Merge made by the 'recursive' strategy. + fs/proc/stat.c | 2 +- + include/linux/kmalloc_sizes.h | 45 --- + include/linux/slab.h | 231 +++++++++---- + include/linux/slab_def.h | 48 +-- + include/linux/slub_def.h | 136 +------- + mm/slab.c | 789 ++++++++++++++++++------------------------ + mm/slab.h | 43 ++- + mm/slab_common.c | 165 ++++++++- + mm/slub.c | 188 ++-------- + 9 files changed, 745 insertions(+), 902 deletions(-) + delete mode 100644 include/linux/kmalloc_sizes.h +Merging uclinux/for-next (b69f085 Linux 3.7-rc8) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (f1e79ce raid5: create multiple threads to handle stripes) +$ git merge md/for-next +Auto-merging drivers/md/raid5.c +Merge made by the 'recursive' strategy. + drivers/md/md.c | 8 +- + drivers/md/md.h | 8 ++ + drivers/md/raid5.c | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++--- + drivers/md/raid5.h | 19 +++ + 4 files changed, 419 insertions(+), 24 deletions(-) +Merging mfd/for-next (ff7109f mfd: lpc_ich: Use devres API to allocate private data) +$ git merge mfd/for-next +Already up-to-date. +Merging battery/master (845e37e Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux) +$ git merge battery/master +Resolved 'include/linux/mfd/abx500/ab8500-bm.h' using previous resolution. +Auto-merging include/linux/mfd/abx500/ab8500-bm.h +CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500-bm.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8d82dd0] Merge remote-tracking branch 'battery/master' +$ git diff -M --stat --summary HEAD^.. +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 (e7f5c9a Merge tag 'omapdss-for-3.8' of git://gitorious.org/linux-omap-dss2/linux into for-linus) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (2730fd8 Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next) +$ git merge regulator/for-next +Already up-to-date. +Merging security/next (5b26603 tpm/ibmvtpm: build only when IBM pseries is configured) +$ 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 (9ebe0e8 watchdog: sp805_wdt depends on ARM) +$ git merge watchdog/master +Resolved 'drivers/rtc/rtc-stmp3xxx.c' using previous resolution. +Resolved 'drivers/watchdog/Kconfig' using previous resolution. +Resolved 'drivers/watchdog/Makefile' using previous resolution. +Removing drivers/watchdog/stmp3xxx_wdt.c +Auto-merging drivers/watchdog/pnx4008_wdt.c +Auto-merging drivers/watchdog/at91sam9_wdt.c +Auto-merging drivers/watchdog/Makefile +CONFLICT (content): Merge conflict in drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig +Auto-merging drivers/rtc/rtc-stmp3xxx.c +CONFLICT (content): Merge conflict in drivers/rtc/rtc-stmp3xxx.c +Auto-merging arch/mips/ath79/dev-common.c +Auto-merging Documentation/devicetree/bindings/watchdog/samsung-wdt.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 06c1981] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + .../bindings/watchdog/atmel-at91rm9200-wdt.txt | 9 + + .../devicetree/bindings/watchdog/atmel-wdt.txt | 4 + + .../devicetree/bindings/watchdog/marvel.txt | 5 + + .../devicetree/bindings/watchdog/pnx4008-wdt.txt | 4 + + .../bindings/watchdog/qca-ar7130-wdt.txt | 13 + + .../devicetree/bindings/watchdog/samsung-wdt.txt | 3 + + Documentation/watchdog/watchdog-kernel-api.txt | 14 +- + arch/mips/ath79/dev-common.c | 15 +- + drivers/rtc/rtc-stmp3xxx.c | 64 ++++ + drivers/watchdog/Kconfig | 35 ++- + drivers/watchdog/Makefile | 3 +- + drivers/watchdog/at91rm9200_wdt.c | 9 + + drivers/watchdog/at91sam9_wdt.c | 168 +++------- + drivers/watchdog/ath79_wdt.c | 66 +++- + drivers/watchdog/bcm47xx_wdt.c | 339 +++++++++------------ + drivers/watchdog/booke_wdt.c | 185 ++++------- + drivers/watchdog/davinci_wdt.c | 29 +- + drivers/watchdog/gef_wdt.c | 1 + + drivers/watchdog/omap_wdt.c | 6 +- + drivers/watchdog/orion_wdt.c | 11 +- + drivers/watchdog/pnx4008_wdt.c | 7 +- + drivers/watchdog/retu_wdt.c | 178 +++++++++++ + drivers/watchdog/s3c2410_wdt.c | 48 +-- + drivers/watchdog/sp5100_tco.c | 27 +- + drivers/watchdog/stmp3xxx_rtc_wdt.c | 111 +++++++ + drivers/watchdog/stmp3xxx_wdt.c | 288 ----------------- + drivers/watchdog/watchdog_core.c | 66 +++- + drivers/watchdog/watchdog_dev.c | 3 +- + include/linux/bcm47xx_wdt.h | 9 + + include/linux/stmp3xxx_rtc_wdt.h | 15 + + include/linux/watchdog.h | 9 + + 31 files changed, 888 insertions(+), 856 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/qca-ar7130-wdt.txt + create mode 100644 drivers/watchdog/retu_wdt.c + create mode 100644 drivers/watchdog/stmp3xxx_rtc_wdt.c + delete mode 100644 drivers/watchdog/stmp3xxx_wdt.c + create mode 100644 include/linux/stmp3xxx_rtc_wdt.h +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 (604542b Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile', 'arm/exynos', 'x86/vt-d' and 'x86/amd' into next) +$ git merge iommu/next +Already up-to-date. +Merging vfio/next (d65530f drivers/vfio: remove depends on CONFIG_EXPERIMENTAL) +$ 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 (df63447 DocBook: update EXPORT_SYMBOL entry to point at export.h) +$ 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 (b076989 i5100_edac: convert to use simple_open()) +$ git merge edac/linux_next +Auto-merging include/linux/pci_ids.h +Auto-merging drivers/edac/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + drivers/acpi/apei/ghes.c | 71 ++---- + drivers/edac/Kconfig | 23 ++ + drivers/edac/Makefile | 1 + + drivers/edac/edac_core.h | 5 + + drivers/edac/edac_mc.c | 152 +++++++----- + drivers/edac/edac_mc_sysfs.c | 36 ++- + drivers/edac/edac_module.c | 2 +- + drivers/edac/edac_pci_sysfs.c | 2 +- + drivers/edac/ghes_edac.c | 537 ++++++++++++++++++++++++++++++++++++++++++ + drivers/edac/i3200_edac.c | 37 ++- + drivers/edac/i5100_edac.c | 178 +++++++++++++- + drivers/edac/i7core_edac.c | 8 +- + drivers/edac/sb_edac.c | 2 +- + include/acpi/ghes.h | 72 ++++++ + include/linux/edac.h | 79 ++++++- + include/linux/pci_ids.h | 1 + + include/ras/ras_event.h | 4 +- + 18 files changed, 1077 insertions(+), 140 deletions(-) + create mode 100644 drivers/edac/ghes_edac.c + create mode 100644 include/acpi/ghes.h +Merging edac-amd/for-next (e7d2c21 mpc85xx_edac: Fix typo) +$ git merge edac-amd/for-next +Already up-to-date. +Merging devicetree/devicetree/next (02bbde7 Revert "of: use platform_device_add") +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (1421954 documentation/devicetree: Fix a typo in exynos-dw-mshc.txt) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/spi/next (095c375 spi: Document cs_gpios and cs_gpio in kernel-doc) +$ git merge spi/spi/next +Already up-to-date. +Merging spi-mb/spi-next (a349685 spi/pxa2xx: add support for Lynxpoint SPI controllers) +$ git merge spi-mb/spi-next +Already up-to-date. +Merging tip/auto-latest (641e71a Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Resolved 'arch/x86/include/asm/pgtable.h' using previous resolution. +Auto-merging kernel/printk.c +Auto-merging arch/x86/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 80f32ac] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/pgtable.h | 1 - + kernel/printk.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging ftrace/for-next (6c895ca tracing: Add rmdir to remove multibuffer instances) +$ git merge ftrace/for-next +Merge made by the 'recursive' strategy. + include/linux/ftrace_event.h | 58 ++- + include/trace/ftrace.h | 12 +- + kernel/trace/trace.c | 819 ++++++++++++++++++++++++----------- + kernel/trace/trace.h | 76 +++- + kernel/trace/trace_branch.c | 6 +- + kernel/trace/trace_events.c | 819 ++++++++++++++++++++++++----------- + kernel/trace/trace_events_filter.c | 5 +- + kernel/trace/trace_functions.c | 4 +- + kernel/trace/trace_functions_graph.c | 4 +- + kernel/trace/trace_irqsoff.c | 6 +- + kernel/trace/trace_kdb.c | 4 +- + kernel/trace/trace_mmiotrace.c | 4 +- + kernel/trace/trace_sched_switch.c | 4 +- + kernel/trace/trace_sched_wakeup.c | 14 +- + kernel/trace/trace_syscalls.c | 80 ++-- + 15 files changed, 1331 insertions(+), 584 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 80f32ac Merge remote-tracking branch 'tip/auto-latest' +Merging 20130228 version of ftrace +$ git merge -m 20130228/ftrace 8c189ea64eea01ca20d102ddb74d6936dd16c579 +Already up-to-date. +Merging rcu/rcu/next (7a6b55e srcu: use ACCESS_ONCE() to access sp->completed in srcu_read_lock()) +$ git merge rcu/rcu/next +Already up-to-date. +Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) +$ git merge cputime/cputime +Already up-to-date. +Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (3ab66e8 KVM: VMX: Pass vcpu to __vmx_complete_interrupts) +$ git merge kvm/linux-next +Recorded preimage for 'arch/x86/kernel/kvmclock.c' +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kernel/kvmclock.c +CONFLICT (content): Merge conflict in arch/x86/kernel/kvmclock.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/kvmclock.c'. +[master f93a2aa] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/kvmclock.c | 9 +++- + arch/x86/kvm/vmx.c | 103 +++++++++++++++++++++++++++++++++------------ + arch/x86/kvm/x86.c | 2 +- + 3 files changed, 85 insertions(+), 29 deletions(-) +Merging kvm-ppc/kvm-ppc-next (bd31a7f KVM: nVMX: Trap unconditionally if msr bitmap access fails) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()) +$ 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 (39ada15 Merge branch 'stable/for-linus-3.9-take-two' into linux-next) +$ git merge xen-two/linux-next +Auto-merging drivers/xen/events.c +Auto-merging drivers/net/xen-netback/netback.c +Auto-merging arch/x86/xen/setup.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging arch/x86/xen/enlighten.c +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 | 10 +++ + arch/x86/xen/enlighten.c | 76 ++++++++++++----- + arch/x86/xen/irq.c | 5 +- + arch/x86/xen/mmu.c | 159 ++++++++++++++++++++++++++++++++--- + 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/net/xen-netback/netback.c | 11 ++- + 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 | 115 +++++++++++++------------ + drivers/xen/privcmd.c | 2 +- + drivers/xen/xenbus/xenbus_client.c | 9 +- + include/xen/grant_table.h | 12 --- + 20 files changed, 415 insertions(+), 140 deletions(-) +$ git am -3 ../patches/0001-xen-fix-bad-merge-of-arch-x86-xen-mmu.c.patch +Applying: xen: fix bad merge of arch/x86/xen/mmu.c +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/xen/mmu.c +$ git add -A . +$ git commit -v -a --amend +[master ee972f5] Merge remote-tracking branch 'xen-two/linux-next' +Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging percpu/for-next (5479c78 mm, percpu: Make sure percpu_alloc early parameter has an argument) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (a4791ca Merge branch 'for-3.9' 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 +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/sony-laptop.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-msi-laptop | 83 +++++ + drivers/platform/x86/Kconfig | 15 +- + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 21 ++ + drivers/platform/x86/asus-laptop.c | 85 +++-- + drivers/platform/x86/asus-nb-wmi.c | 76 ++++- + drivers/platform/x86/asus-wmi.c | 108 +++++- + drivers/platform/x86/asus-wmi.h | 9 + + drivers/platform/x86/chromeos_laptop.c | 371 ++++++++++++++++++++ + drivers/platform/x86/eeepc-wmi.c | 2 + + drivers/platform/x86/hp-wmi.c | 117 ++++--- + drivers/platform/x86/msi-laptop.c | 374 ++++++++++++++++----- + drivers/platform/x86/msi-wmi.c | 224 +++++++----- + drivers/platform/x86/sony-laptop.c | 145 +++++++- + drivers/platform/x86/thinkpad_acpi.c | 17 +- + 15 files changed, 1375 insertions(+), 273 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-msi-laptop + create mode 100644 drivers/platform/x86/chromeos_laptop.c +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 (a2b37ef Merge remote-tracking branch 'regmap/topic/no-bus' 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 (4b07c5d leds: leds-sunfire: use dev_err()/pr_err() instead of printk()) +$ git merge leds/for-next +Already up-to-date. +Merging driver-core/driver-core-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (74e1a2a Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (0988496 mm: do not grow the stack vma just because of an overrun on preceding vma) +$ git merge char-misc/char-misc-next +Already up-to-date. +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 (ade158e pinctrl: tegra: add clfvs function to Tegra114 support) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency) +$ git merge vhost/linux-next +Auto-merging drivers/vhost/Kconfig +Merge made by the 'recursive' strategy. + drivers/vhost/Kconfig | 1 + + drivers/vhost/Kconfig.blk | 10 + + drivers/vhost/Makefile | 2 + + drivers/vhost/blk.c | 727 ++++++++++++++++++++++++++++++++++++++++++++++ + drivers/vhost/blk.h | 8 + + 5 files changed, 748 insertions(+) + create mode 100644 drivers/vhost/Kconfig.blk + create mode 100644 drivers/vhost/blk.c + create mode 100644 drivers/vhost/blk.h +Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) +$ git merge memblock/memblock-kill-early_node_map +Already up-to-date. +Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2) +$ git merge remoteproc/for-next +Already up-to-date. +Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq) +$ git merge irqdomain/irqdomain/next +Merge made by the 'recursive' strategy. + kernel/irq/irqdomain.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging gpio/gpio/next (9170100 arm64: select ARCH_WANT_OPTIONAL_GPIOLIB) +$ git merge gpio/gpio/next +Already up-to-date. +Merging gpio-lw/for-next (c7886b1 gpio: em: Use irq_domain_add_simple() to fix runtime error) +$ git merge gpio-lw/for-next +Already up-to-date. +Merging arm-soc/for-next (1ead4fb Merge branch 'late/mvebu-dt' into for-next) +$ git merge arm-soc/for-next +Resolved 'arch/arm/boot/dts/armada-370-xp.dtsi' using previous resolution. +Resolved 'arch/arm/mach-omap2/board-4430sdp.c' using previous resolution. +Resolved 'drivers/mmc/card/block.c' using previous resolution. +Resolved 'drivers/mmc/core/core.c' using previous resolution. +Resolved 'drivers/mmc/core/sdio.c' using previous resolution. +Resolved 'drivers/mmc/host/sdhci-bcm2835.c' using previous resolution. +Resolved 'drivers/mmc/host/sdhci-esdhc-imx.c' using previous resolution. +Resolved 'drivers/mmc/host/sdhci-pxav3.c' using previous resolution. +Resolved 'drivers/mmc/host/sh_mmcif.c' using previous resolution. +Resolved 'include/linux/mmc/host.h' using previous resolution. +Auto-merging include/linux/mmc/host.h +CONFLICT (content): Merge conflict in include/linux/mmc/host.h +Auto-merging drivers/w1/masters/mxc_w1.c +Auto-merging drivers/mmc/host/sh_mmcif.c +CONFLICT (content): Merge conflict in drivers/mmc/host/sh_mmcif.c +Auto-merging drivers/mmc/host/sdhci-pxav3.c +CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-pxav3.c +Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c +CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-esdhc-imx.c +Auto-merging drivers/mmc/host/sdhci-bcm2835.c +CONFLICT (add/add): Merge conflict in drivers/mmc/host/sdhci-bcm2835.c +Auto-merging drivers/mmc/core/sdio.c +CONFLICT (content): Merge conflict in drivers/mmc/core/sdio.c +Auto-merging drivers/mmc/core/core.c +CONFLICT (content): Merge conflict in drivers/mmc/core/core.c +Auto-merging drivers/mmc/card/block.c +CONFLICT (content): Merge conflict in drivers/mmc/card/block.c +Auto-merging drivers/media/platform/omap3isp/isp.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c +Auto-merging arch/arm/mach-omap2/devices.c +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/arm/boot/dts/imx27-pdk.dts +Auto-merging arch/arm/boot/dts/armada-370-xp.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-370-xp.dtsi +Auto-merging arch/arm/Kconfig +Auto-merging Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 86635a1] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/armadeus.txt | 6 + + Documentation/devicetree/bindings/arm/fsl.txt | 8 + + .../devicetree/bindings/clock/imx5-clock.txt | 1 + + .../devicetree/bindings/clock/imx6q-clock.txt | 2 + + .../marvell,armada-370-xp-timer.txt} | 11 +- + .../devicetree/bindings/w1/fsl-imx-owire.txt | 19 + + arch/arm/Kconfig | 1 - + arch/arm/arm-soc-for-next-contents.txt | 398 ++++++++++ + arch/arm/boot/dts/Makefile | 13 +- + arch/arm/boot/dts/am33xx.dtsi | 14 + + arch/arm/boot/dts/armada-370-db.dts | 35 + + arch/arm/boot/dts/armada-370-mirabox.dts | 18 + + arch/arm/boot/dts/armada-370-rd.dts | 68 ++ + arch/arm/boot/dts/armada-370-xp.dtsi | 49 +- + arch/arm/boot/dts/armada-370.dtsi | 21 + + arch/arm/boot/dts/armada-xp-db.dts | 31 + + arch/arm/boot/dts/armada-xp-gp.dts | 113 +++ + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 6 + + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 + + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 + + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 18 + + arch/arm/boot/dts/armada-xp.dtsi | 19 +- + arch/arm/boot/dts/dove-cubox.dts | 28 +- + arch/arm/boot/dts/dove.dtsi | 24 +- + arch/arm/boot/dts/imx25-karo-tx25.dts | 30 +- + arch/arm/boot/dts/imx25-pdk.dts | 36 + + arch/arm/boot/dts/imx25.dtsi | 2 +- + arch/arm/boot/dts/imx27-apf27.dts | 82 +-- + arch/arm/boot/dts/{imx27-3ds.dts => imx27-pdk.dts} | 24 +- + arch/arm/boot/dts/imx31-bug.dts | 12 +- + arch/arm/boot/dts/imx51-apf51.dts | 52 ++ + arch/arm/boot/dts/imx51-babbage.dts | 478 ++++++------ + arch/arm/boot/dts/imx51.dtsi | 53 ++ + arch/arm/boot/dts/imx53-ard.dts | 126 ++-- + arch/arm/boot/dts/imx53-evk.dts | 194 +++-- + arch/arm/boot/dts/imx53-mba53.dts | 130 ++++ + arch/arm/boot/dts/imx53-qsb.dts | 380 +++++----- + arch/arm/boot/dts/imx53-smd.dts | 294 ++++---- + arch/arm/boot/dts/imx53-tqma53.dtsi | 172 +++++ + arch/arm/boot/dts/imx53.dtsi | 68 ++ + arch/arm/boot/dts/imx6dl.dtsi | 59 ++ + arch/arm/boot/dts/imx6q-arm2.dts | 124 ++-- + arch/arm/boot/dts/imx6q-sabreauto.dts | 64 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 216 +++--- + arch/arm/boot/dts/imx6q-sabresd.dts | 102 ++- + arch/arm/boot/dts/imx6q.dtsi | 796 +------------------- + arch/arm/boot/dts/imx6qdl.dtsi | 800 +++++++++++++++++++++ + arch/arm/boot/dts/kirkwood-6282.dtsi | 17 + + arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 + + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 94 +++ + arch/arm/boot/dts/kirkwood-mplcec4.dts | 11 +- + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 6 + + arch/arm/boot/dts/kirkwood-nsa310.dts | 126 ++++ + arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 +++ + arch/arm/boot/dts/kirkwood-topkick.dts | 102 +++ + arch/arm/boot/dts/kirkwood.dtsi | 8 + + arch/arm/configs/dove_defconfig | 28 +- + arch/arm/configs/mvebu_defconfig | 26 +- + arch/arm/mach-dove/Kconfig | 7 + + arch/arm/mach-dove/Makefile | 4 +- + arch/arm/mach-dove/board-dt.c | 92 +++ + arch/arm/mach-dove/common.c | 85 --- + arch/arm/mach-imx/clk-imx51-imx53.c | 4 +- + arch/arm/mach-imx/clk-imx6q.c | 26 +- + arch/arm/mach-imx/mach-imx6q.c | 65 ++ + arch/arm/mach-kirkwood/Kconfig | 7 + + arch/arm/mach-kirkwood/Makefile | 1 + + arch/arm/mach-kirkwood/board-dreamplug.c | 6 - + arch/arm/mach-kirkwood/board-dt.c | 16 +- + arch/arm/mach-kirkwood/board-guruplug.c | 39 + + arch/arm/mach-kirkwood/board-mplcec4.c | 7 - + arch/arm/mach-kirkwood/board-ns2.c | 14 - + arch/arm/mach-kirkwood/board-nsa310.c | 68 -- + arch/arm/mach-kirkwood/board-openblocks_a6.c | 44 -- + arch/arm/mach-kirkwood/board-usi_topkick.c | 48 -- + arch/arm/mach-kirkwood/common.h | 11 +- + arch/arm/mach-mvebu/irq-armada-370-xp.c | 87 ++- + arch/arm/mach-omap2/Makefile | 3 +- + arch/arm/mach-omap2/am33xx-restart.c | 34 + + arch/arm/mach-omap2/am35xx-emac.c | 3 +- + arch/arm/mach-omap2/board-generic.c | 1 + + arch/arm/mach-omap2/cclock33xx_data.c | 10 +- + arch/arm/mach-omap2/cclock3xxx_data.c | 10 +- + arch/arm/mach-omap2/cclock44xx_data.c | 13 +- + arch/arm/mach-omap2/clock.h | 11 + + arch/arm/mach-omap2/cm33xx.c | 3 - + arch/arm/mach-omap2/cm33xx.h | 9 +- + arch/arm/mach-omap2/common.h | 8 + + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/dpll3xxx.c | 5 +- + arch/arm/mach-omap2/id.c | 14 +- + arch/arm/mach-omap2/omap_hwmod.c | 23 +- + arch/arm/mach-omap2/omap_hwmod.h | 8 + + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 443 +++++++----- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 7 +- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 51 +- + arch/arm/mach-omap2/omap_hwmod_reset.c | 53 ++ + arch/arm/mach-omap2/pm.c | 20 +- + arch/arm/mach-omap2/pm24xx.c | 12 +- + arch/arm/mach-omap2/pm44xx.c | 21 +- + arch/arm/mach-omap2/prm33xx.c | 11 +- + arch/arm/mach-omap2/prm33xx.h | 4 +- + arch/arm/mach-omap2/sleep24xx.S | 19 - + arch/arm/mach-omap2/soc.h | 1 + + arch/arm/mach-omap2/sr_device.c | 2 +- + arch/arm/plat-omap/Kconfig | 9 - + arch/arm/plat-omap/include/plat/timex.h | 8 - + drivers/clocksource/time-armada-370-xp.c | 150 +++- + drivers/media/platform/omap3isp/isp.c | 18 +- + drivers/media/platform/omap3isp/isp.h | 8 +- + drivers/w1/masters/mxc_w1.c | 9 +- + include/sound/aess.h | 53 ++ + 112 files changed, 4905 insertions(+), 2532 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/armadeus.txt + rename Documentation/devicetree/bindings/{arm/armada-370-xp-timer.txt => timer/marvell,armada-370-xp-timer.txt} (55%) + create mode 100644 Documentation/devicetree/bindings/w1/fsl-imx-owire.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/armada-370-rd.dts + create mode 100644 arch/arm/boot/dts/armada-xp-gp.dts + create mode 100644 arch/arm/boot/dts/imx25-pdk.dts + rename arch/arm/boot/dts/{imx27-3ds.dts => imx27-pdk.dts} (59%) + create mode 100644 arch/arm/boot/dts/imx51-apf51.dts + create mode 100644 arch/arm/boot/dts/imx53-mba53.dts + create mode 100644 arch/arm/boot/dts/imx53-tqma53.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts + create mode 100644 arch/arm/mach-dove/board-dt.c + create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c + create mode 100644 arch/arm/mach-omap2/am33xx-restart.c + create mode 100644 arch/arm/mach-omap2/omap_hwmod_reset.c + create mode 100644 include/sound/aess.h +Merging bcm2835/for-next (836dc9e Linux 3.8-rc7) +$ git merge bcm2835/for-next +Already up-to-date. +Merging cortex/for-next (6ebd4d0 ARM: stub out read_cpuid and read_cpuid_ext for CPU_CP15=n) +$ git merge cortex/for-next +Resolved 'arch/arm/include/asm/cputype.h' using previous resolution. +Auto-merging arch/arm/mm/mmu.c +Auto-merging arch/arm/mm/alignment.c +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm/mach-omap2/omap-smp.c +Auto-merging arch/arm/mach-omap2/id.c +Auto-merging arch/arm/kernel/smp_scu.c +Auto-merging arch/arm/include/asm/cputype.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/cputype.h +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a4cb821] Merge remote-tracking branch 'cortex/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 3 ++- + arch/arm/include/asm/cp15.h | 16 +++++++++++++++- + arch/arm/include/asm/cputype.h | 31 +++++++++++++++++++++++++++---- + arch/arm/include/asm/glue-df.h | 20 ++++++++++---------- + arch/arm/kernel/head-common.S | 9 +++++++-- + arch/arm/kernel/head-nommu.S | 8 +++++++- + arch/arm/kernel/setup.c | 2 +- + arch/arm/kernel/smp_scu.c | 2 +- + arch/arm/mach-omap2/id.c | 4 ++-- + arch/arm/mach-omap2/omap-smp.c | 2 +- + arch/arm/mm/Kconfig | 9 ++++++++- + arch/arm/mm/alignment.c | 2 ++ + arch/arm/mm/mmu.c | 17 +++++++++++++++++ + 13 files changed, 100 insertions(+), 25 deletions(-) +Merging ep93xx/ep93xx-for-next (cf92d86 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 ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO) +$ git merge ixp4xx/next +Merge made by the 'recursive' strategy. +Merging msm/for-next (a0d271c Linux 3.6) +$ git merge msm/for-next +Already up-to-date. +Merging renesas/next (1b8b1c3 Merge branches 'heads/defconfig', 'heads/boards3', 'heads/pfc' and 'heads/clocksource' into next) +$ git merge renesas/next +Resolved 'arch/arm/mach-shmobile/board-armadillo800eva.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/board-mackerel.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/setup-sh73a0.c' using previous resolution. +Auto-merging arch/arm/mach-shmobile/setup-sh73a0.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh73a0.c +Removing arch/arm/mach-shmobile/hotplug.c +Auto-merging arch/arm/mach-shmobile/headsmp-scu.S +Auto-merging arch/arm/mach-shmobile/board-mackerel.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-mackerel.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/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d81000d] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/r8a7779-marzen-reference.dts | 47 ++++++ + arch/arm/boot/dts/r8a7779.dtsi | 86 ++++++++++ + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 77 +++++++++ + arch/arm/configs/armadillo800eva_defconfig | 1 + + arch/arm/configs/kzm9g_defconfig | 1 - + arch/arm/configs/mackerel_defconfig | 4 + + arch/arm/mach-shmobile/Kconfig | 27 +++ + arch/arm/mach-shmobile/Makefile | 9 +- + arch/arm/mach-shmobile/board-armadillo800eva.c | 144 ++++++++++++---- + arch/arm/mach-shmobile/board-kzm9g-reference.c | 104 ++++++++++++ + arch/arm/mach-shmobile/board-mackerel.c | 106 +++++------- + arch/arm/mach-shmobile/board-marzen-reference.c | 72 ++++++++ + arch/arm/mach-shmobile/board-marzen.c | 1 + + arch/arm/mach-shmobile/clock-r8a7740.c | 4 + + arch/arm/mach-shmobile/clock-sh73a0.c | 7 +- + .../{headsmp-sh73a0.S => headsmp-scu.S} | 15 +- + arch/arm/mach-shmobile/hotplug.c | 68 -------- + arch/arm/mach-shmobile/include/mach/common.h | 18 +- + arch/arm/mach-shmobile/intc-r8a7779.c | 27 ++- + arch/arm/mach-shmobile/intc-sh73a0.c | 8 - + arch/arm/mach-shmobile/setup-emev2.c | 4 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 54 +++++- + arch/arm/mach-shmobile/setup-sh73a0.c | 36 ++-- + arch/arm/mach-shmobile/smp-emev2.c | 86 ++-------- + arch/arm/mach-shmobile/smp-r8a7779.c | 129 +++++++------- + arch/arm/mach-shmobile/smp-sh73a0.c | 36 ++-- + drivers/clocksource/sh_cmt.c | 187 +++++++++++++-------- + 28 files changed, 889 insertions(+), 471 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts + create mode 100644 arch/arm/boot/dts/r8a7779.dtsi + create mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts + create mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c + create mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c + rename arch/arm/mach-shmobile/{headsmp-sh73a0.S => headsmp-scu.S} (85%) + delete mode 100644 arch/arm/mach-shmobile/hotplug.c +Merging samsung/for-next (786b270 Merge branch 'next/cpufreq-exynos' into for-next) +$ git merge samsung/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos5440.dtsi | 5 ----- + arch/arm/mach-s5pc100/common.h | 9 --------- + arch/arm/mach-s5pv210/common.h | 9 --------- + 3 files changed, 23 deletions(-) +Merging tegra/for-next (19f949f Linux 3.8) +$ git merge tegra/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (d589829 ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (a32e1d1 pwm_backlight: remove unnecessary ifdefs) +$ git merge pwm/for-next +Auto-merging drivers/video/backlight/pwm_bl.c +Merge made by the 'recursive' strategy. + drivers/video/backlight/pwm_bl.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) +Merging dma-buf/for-next (495c10c CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. + Documentation/dma-buf-sharing.txt | 6 +++- + drivers/base/dma-buf.c | 66 ++++++++++++++++++++++++++++++++------- + include/linux/dma-buf.h | 4 ++- + 3 files changed, 63 insertions(+), 13 deletions(-) +Merging userns/for-next (139321c cifs: Enable building with user namespaces enabled.) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (7328735 ktest: Remove indexes from warnings check) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (9e2d59a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (fde8bc5 clk: sunxi: remove stale Makefile entry) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (6133705 random: Mix cputime from each thread that exits to the pool) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (0ec7382 crypto: testmgr - update LZO compression test vectors) +$ git merge lzo-update/lzo-update +Removing lib/lzo/lzo1x_decompress.c +Merge made by the 'recursive' strategy. + crypto/testmgr.h | 38 ++--- + include/linux/lzo.h | 15 +- + lib/decompress_unlzo.c | 2 +- + lib/lzo/Makefile | 2 +- + lib/lzo/lzo1x_compress.c | 335 +++++++++++++++++++++++----------------- + lib/lzo/lzo1x_decompress.c | 255 ------------------------------ + lib/lzo/lzo1x_decompress_safe.c | 237 ++++++++++++++++++++++++++++ + lib/lzo/lzodefs.h | 38 +++-- + 8 files changed, 488 insertions(+), 434 deletions(-) + delete mode 100644 lib/lzo/lzo1x_decompress.c + create mode 100644 lib/lzo/lzo1x_decompress_safe.c +Merging modem_shm/remoteproc-next (c68dc8d remoteproc: Always perserve resource table data) +$ git merge modem_shm/remoteproc-next +Auto-merging drivers/remoteproc/remoteproc_virtio.c +Auto-merging drivers/remoteproc/remoteproc_core.c +Merge made by the 'recursive' strategy. + drivers/remoteproc/remoteproc_core.c | 146 +++++++++++++++++------------ + drivers/remoteproc/remoteproc_elf_loader.c | 96 +++++++++++++------ + drivers/remoteproc/remoteproc_internal.h | 13 +++ + drivers/remoteproc/remoteproc_virtio.c | 38 +++++++- + drivers/remoteproc/ste_modem_rproc.c | 50 +++++++--- + include/linux/remoteproc.h | 7 +- + 6 files changed, 240 insertions(+), 110 deletions(-) +Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) +Merging akpm-current/current (6df6a56 device_cgroup: don't grab mutex in rcu callback) +$ git merge akpm-current/current +Merge made by the 'recursive' strategy. +$ 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: x86: make 'mem=' option to work for efi platform +Applying: mm: remove free_area_cache use in powerpc architecture +Applying: mm: use vm_unmapped_area() on powerpc architecture +Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress +Applying: cyber2000fb: avoid palette corruption at higher clocks +Applying: timer_list: split timer_list_show_tickdevices() +Applying: timer_list: convert timer list to be a proper seq_file +Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix +Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2 +Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2-fix +Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix +Applying: block: restore /proc/partitions to not display non-partitionable removable devices +Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget() +Applying: fs: return EAGAIN when O_NONBLOCK write should block on frozen fs +Applying: fs: fix hang with BSD accounting on frozen filesystem +Applying: ocfs2: add freeze protection to ocfs2_file_splice_write() +Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic +Applying: mm: memmap_init_zone() performance improvement +Applying: mm: remove free_area_cache +Applying: include/linux/mmzone.h: cleanups +Applying: include-linux-mmzoneh-cleanups-fix +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: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes +Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq +Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock +Applying: kernel/smp.c: cleanups +Applying: MAINTAINERS: Remove Mark M. Hoffman +Applying: maintainers-remove-mark-m-hoffman-fix +Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask +Applying: epoll: support for disabling items, and a self-test app +Using index info to reconstruct a base tree... +M tools/testing/selftests/Makefile +Falling back to patching base and 3-way merge... +Auto-merging tools/testing/selftests/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile +Failed to merge in the changes. +Patch failed at 0043 epoll: support for disabling items, and a self-test app +The copy of the patch that failed is found in: + /home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ git rebase --continue +Applying: epoll: stop comparing pointers with 0 in self-test app +Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting +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-ds1307.c: long block operations bugfix +Applying: rtc-ds1307-long-block-operations-bugfix-fix +Applying: arm: mvebu: add RTC support for Armada 370 and Armada XP +Applying: vfork: don't freezer_count() for in-kernel users of CLONE_VFORK +Applying: coredump: abort core dump piping only due to a fatal signal +Applying: nfsd: idr_destroy() no longer needs idr_remove_all() +Applying: ipc/sem.c: alternatives to preempt_disable() +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: aio: remove retry-based AIO +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-kiocb_cancel-fix +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: refcounting cleanup +Using index info to reconstruct a base tree... +M fs/aio.c +Falling back to patching base and 3-way merge... +Auto-merging fs/aio.c +CONFLICT (content): Merge conflict in fs/aio.c +Failed to merge in the changes. +Patch failed at 0214 aio: refcounting cleanup +The copy of the patch that failed is found in: + /home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ git rebase --continue +Applying: wait: add wait_event_hrtimeout() +Applying: wait-add-wait_event_hrtimeout-fix +Applying: aio: make aio_read_evt() more efficient, convert to hrtimers +Applying: aio: use flush_dcache_page() +Applying: aio: use cancellation list lazily +Applying: aio-use-cancellation-list-lazily-fix +Applying: aio-use-cancellation-list-lazily-fix-fix +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-give-shared-kioctx-fields-their-own-cachelines-fix +Applying: aio: reqs_active -> reqs_available +Applying: aio: percpu reqs_available +Applying: generic dynamic per cpu refcounting +Applying: generic-dynamic-per-cpu-refcounting-fix +Applying: percpu-refcount: sparse fixes +Applying: generic-dynamic-per-cpu-refcounting-sparse-fixes-fix +Applying: generic-dynamic-per-cpu-refcounting-doc +Applying: generic-dynamic-per-cpu-refcounting-doc-fix +Applying: aio: percpu ioctx refcount +Using index info to reconstruct a base tree... +M fs/aio.c +Falling back to patching base and 3-way merge... +Auto-merging fs/aio.c +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-dont-include-aioh-in-schedh-fix-fix +Applying: aio-dont-include-aioh-in-schedh-fix-3 +Applying: aio-dont-include-aioh-in-schedh-fix-3-fix +Applying: aio-dont-include-aioh-in-schedh-fix-3-fix-fix +Applying: aio: kill ki_key +Applying: aio: kill ki_retry +Applying: aio-kill-ki_retry-fix +Applying: aio-kill-ki_retry-fix-fix +Applying: block, aio: batch completion for bios/kiocbs +Applying: block-aio-batch-completion-for-bios-kiocbs-fix +Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix +Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix +Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix +Applying: Fix build error due to bio_endio_batch +Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix-fix-fix +Applying: aio: Fix a null pointer deref in batch_complete_aio +Applying: virtio-blk: convert to batch completion +Applying: mtip32xx: convert to batch completion +Applying: aio: fix aio_read_events_ring() types +Applying: aio: document, clarify aio_read_events() and shadow_tail +Applying: aio: correct calculation of available events +Applying: aio: fix kioctx not being freed after cancellation at exit time +Applying: aio: v3: fix kioctx not being freed after cancellation at exit time +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 5635534...985d8f9 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (cc321d5 aio: v3: fix kioctx not being freed after cancellation at exit time) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + CREDITS | 5 + + Documentation/cgroups/memory.txt | 16 + + Documentation/sysctl/vm.txt | 33 +- + MAINTAINERS | 17 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 6 + + arch/arm/mm/mmap.c | 2 - + arch/arm64/mm/mmap.c | 2 - + arch/mips/mm/mmap.c | 2 - + arch/powerpc/include/asm/page_64.h | 3 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/mm/mmap_64.c | 2 - + arch/powerpc/mm/slice.c | 223 ++-- + arch/powerpc/platforms/cell/spufs/file.c | 2 +- + arch/s390/hypfs/inode.c | 1 + + arch/s390/mm/mmap.c | 4 - + arch/sparc/kernel/sys_sparc_64.c | 2 - + arch/tile/mm/mmap.c | 2 - + arch/x86/ia32/ia32_aout.c | 2 - + arch/x86/include/asm/e820.h | 2 + + arch/x86/kernel/e820.c | 72 +- + arch/x86/mm/mmap.c | 2 - + arch/x86/platform/efi/efi.c | 15 +- + block/blk-core.c | 34 +- + block/blk-flush.c | 2 +- + block/blk.h | 3 +- + block/genhd.c | 2 +- + block/scsi_ioctl.c | 1 + + drivers/block/mtip32xx/mtip32xx.c | 64 +- + drivers/block/mtip32xx/mtip32xx.h | 8 +- + drivers/block/swim3.c | 2 +- + drivers/block/virtio_blk.c | 31 +- + drivers/char/mem.c | 36 + + 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/dm.c | 2 +- + drivers/rtc/rtc-ds1307.c | 60 +- + drivers/rtc/rtc-pxa.c | 64 +- + drivers/scsi/sg.c | 1 + + drivers/staging/android/logger.c | 1 + + drivers/usb/gadget/amd5536udc.c | 16 +- + drivers/usb/gadget/inode.c | 42 +- + drivers/video/cyber2000fb.c | 3 + + fs/9p/vfs_addr.c | 1 + + fs/afs/write.c | 1 + + fs/aio.c | 1788 +++++++++++--------------- + fs/binfmt_aout.c | 2 - + fs/binfmt_elf.c | 23 +- + fs/bio.c | 52 +- + fs/block_dev.c | 9 +- + fs/btrfs/file.c | 4 +- + fs/btrfs/inode.c | 1 + + fs/ceph/file.c | 1 + + fs/cifs/file.c | 3 +- + fs/compat.c | 1 + + fs/coredump.c | 6 +- + fs/direct-io.c | 21 +- + fs/drop_caches.c | 2 + + fs/ecryptfs/file.c | 1 + + fs/eventpoll.c | 40 +- + 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 | 1 + + fs/f2fs/data.c | 1 + + fs/fat/inode.c | 1 + + fs/fuse/cuse.c | 1 + + fs/fuse/dev.c | 1 + + fs/fuse/file.c | 4 +- + fs/gfs2/aops.c | 1 + + fs/gfs2/file.c | 1 + + fs/hfs/inode.c | 1 + + fs/hfsplus/inode.c | 1 + + fs/jfs/inode.c | 1 + + fs/nfsd/nfs4state.c | 1 - + fs/nilfs2/inode.c | 2 +- + fs/ntfs/file.c | 4 +- + fs/ntfs/inode.c | 1 + + fs/ocfs2/aops.h | 2 + + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/file.c | 7 +- + fs/ocfs2/inode.h | 2 + + fs/pipe.c | 1 + + fs/read_write.c | 35 +- + fs/reiserfs/inode.c | 1 + + fs/splice.c | 3 +- + fs/ubifs/file.c | 1 + + fs/udf/inode.c | 1 + + fs/xfs/xfs_aops.c | 1 + + fs/xfs/xfs_file.c | 4 +- + include/linux/aio.h | 199 +-- + include/linux/balloon_compaction.h | 7 + + include/linux/batch_complete.h | 23 + + include/linux/bio.h | 36 +- + include/linux/blk_types.h | 11 +- + include/linux/blkdev.h | 12 +- + include/linux/cgroup.h | 1 + + include/linux/errno.h | 1 - + include/linux/fs.h | 12 + + include/linux/hardirq.h | 5 + + include/linux/mm_types.h | 3 - + include/linux/mmzone.h | 20 +- + include/linux/percpu-refcount.h | 114 ++ + include/linux/pid_namespace.h | 1 + + include/linux/rtc-pxa.h | 18 + + include/linux/sched.h | 4 - + include/linux/vm_event_item.h | 7 +- + include/linux/wait.h | 86 ++ + include/linux/writeback.h | 1 + + include/uapi/linux/eventpoll.h | 1 + + init/Kconfig | 17 + + ipc/sem.c | 250 ++-- + kernel/acct.c | 3 +- + kernel/fork.c | 11 +- + kernel/printk.c | 1 + + kernel/ptrace.c | 1 + + kernel/smp.c | 102 +- + kernel/time/timer_list.c | 112 +- + kernel/watchdog.c | 10 +- + lib/Makefile | 2 +- + lib/percpu-refcount.c | 243 ++++ + mm/balloon_compaction.c | 2 + + mm/dmapool.c | 5 +- + mm/filemap.c | 3 +- + mm/memcontrol.c | 192 ++- + mm/migrate.c | 1 + + mm/mmap.c | 28 - + mm/mmu_context.c | 3 - + mm/nommu.c | 4 - + mm/page_alloc.c | 5 +- + mm/page_io.c | 1 + + mm/shmem.c | 1 + + mm/swap.c | 1 + + mm/util.c | 1 - + mm/vmstat.c | 9 +- + scripts/pnmtologo.c | 8 +- + security/keys/internal.h | 2 + + security/keys/keyctl.c | 1 + + sound/core/pcm_native.c | 2 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/epoll/Makefile | 11 + + tools/testing/selftests/epoll/test_epoll.c | 364 ++++++ + 145 files changed, 2988 insertions(+), 1828 deletions(-) + create mode 100644 include/linux/batch_complete.h + create mode 100644 include/linux/percpu-refcount.h + create mode 100644 include/linux/rtc-pxa.h + create mode 100644 lib/percpu-refcount.c + create mode 100644 tools/testing/selftests/epoll/Makefile + create mode 100644 tools/testing/selftests/epoll/test_epoll.c +$ git am -3 ../patches/0001-aio-fixup-for-hlist_for_each_entry_safe-API-change.patch +Applying: aio: fixup for hlist_for_each_entry_safe API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/aio.c +$ git add -A . +$ git commit -v -a --amend +[master 9c9ce51] Merge branch 'akpm/master' diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..c8b8a9b67a3d --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,70 @@ +Importing jdelvare-hwmon based on 2a7d2b96d5cba7568139d9ab157a0e97ab32440f + quilt series is empty +$ git branch -f jdelvare-hwmon/master 2a7d2b96d5cba7568139d9ab157a0e97ab32440f +Importing device-mapper based on v3.8 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +HEAD is now at 19f949f Linux 3.8 +$ git am ../quilt/device-mapper/dm-do-not-replace-bioset-for-request-based-dm.patch +Applying: This patch fixes a regression introduced in v3.8, which causes oops +$ git am ../quilt/device-mapper/dm-fix-truncated-status-strings.patch +Applying: Avoid returning a truncated table or status string instead of setting +$ git am ../quilt/device-mapper/dm-thin-support-a-non-power-of-2-discard_granularity.patch +Applying: Support a non-power-of-2 discard granularity in dm-thin, now that the block +$ git am ../quilt/device-mapper/dm-table-remove-superfluous-variable-reset.patch +Applying: If allocation fails, the local var *t is not used any more after kfree. +$ git am ../quilt/device-mapper/dm-bufio-use-WRITE_FLUSH-instead-of-REQ_FLUSH.patch +Applying: Use WRITE_FLUSH instead of REQ_FLUSH for submitted requests to make it +$ git am ../quilt/device-mapper/dm-thin-use-block_size_is_power_of_two.patch +Applying: Use block_size_is_power_of_two() rather than checking +$ git am ../quilt/device-mapper/dm-remove-CONFIG_EXPERIMENTAL.patch +Applying: Remove EXPERIMENTAL from all existing device-mapper targets. +$ git am ../quilt/device-mapper/dm-persistent-data-remove-CONFIG_EXPERIMENTAL.patch +Applying: The CONFIG_EXPERIMENTAL config item has not carried much meaning for a +$ git am ../quilt/device-mapper/dm-clean-up-clone_bio.patch +Applying: Remove the no-longer-used struct bio_set argument from clone_bio and split_bvec. +$ git am ../quilt/device-mapper/dm-rename-request-variables-to-bios.patch +Applying: Use 'bio' in the name of variables and functions that deal with +$ git am ../quilt/device-mapper/dm-rename-bio-cloning-functions.patch +Applying: Rename functions involved in splitting and cloning bios. +$ git am ../quilt/device-mapper/dm-refactor-bio-cloning.patch +Applying: Refactor part of the bio splitting and cloning code to try to make it +$ git am ../quilt/device-mapper/dm-btree-set-some-fn-parms-const.patch +Applying: Mark some constant parameters constant in some dm-btree functions. +$ git am ../quilt/device-mapper/dm-snapshot-add-missing-module-aliases.patch +Applying: Add module aliases so that autoloading works correctly if the user +$ git am ../quilt/device-mapper/dm-fix-limits-initialization-when-there-are-no-data-devices.patch +Applying: dm_calculate_queue_limits will first reset the provided limits to +$ git am ../quilt/device-mapper/dm-remove-unused-_rq_bio_info_cache.patch +Applying: Remove _rq_bio_info_cache, which is no longer used. +$ git am ../quilt/device-mapper/dm-merge-io_pool-and-tio_pool.patch +Applying: This patch merges io_pool and tio_pool into io_pool and cleans up +$ git am ../quilt/device-mapper/dm-ioctl-introduce-ioctl_flags.patch +Applying: This patch introduces flags for each ioctl function. +$ git am ../quilt/device-mapper/dm-ioctl-optimize-functions-without-variable-params.patch +Applying: Device-mapper ioctls receive and send data in a buffer supplied +$ git am ../quilt/device-mapper/dm-kcopyd-introduce-configurable-throttling.patch +Applying: This patch allows the administrator to reduce the rate at which kcopyd +$ git am ../quilt/device-mapper/dm-add-target-num_write_bios-fn.patch +Applying: Add a num_write_bios function to struct target. +$ git am ../quilt/device-mapper/dm-persistent-data-add-btree_walk.patch +Applying: Add dm_btree_walk to iterate through the contents of a btree. +$ git am ../quilt/device-mapper/dm-bio-prison-pass-cell-memory-in.patch +Applying: Change the dm_bio_prison interface so that instead of allocating memory +$ git am ../quilt/device-mapper/dm-thin-remove-cells-from-stack.patch +Applying: This patch takes advantage of the new bio-prison interface where the +$ git am ../quilt/device-mapper/dm-persistent-data-add-transactional-array.patch +Applying: Add a transactional array. +$ git am ../quilt/device-mapper/dm-persistent-data-add-bitset.patch +Applying: Add a persistent bitset as a wrapper around dm-array. +$ git am ../quilt/device-mapper/dm-add-cache-target.patch +Applying: Add a target that allows a fast device such as an SSD to be used as a +$ git am ../quilt/device-mapper/dm-cache-add-mq-policy.patch +Applying: A cache policy that uses a multiqueue ordered by recent hit +$ git am ../quilt/device-mapper/dm-cache-add-cleaner-policy.patch +Applying: A simple cache policy that writes back all data to the origin. +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:device-mapper/master +From ../quilt-tmp + + 9c44464...8678bfa master -> device-mapper/master (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..8f16af01f1da --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20130301 |