diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-19 15:05:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-19 15:05:16 +1100 |
| commit | 155181db74d92bb1153420cb8357cd524cd9f2c9 (patch) | |
| tree | 25a63670bd88d52b76b7cc46545509954716d4e2 | |
| parent | 0559139627a4e8a81d85f8260f6f40fc92307ced (diff) | |
Add linux-next specific files for 20130319next-20130319
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 222 | ||||
| -rw-r--r-- | Next/Trees | 224 | ||||
| -rw-r--r-- | Next/merge.log | 5211 | ||||
| -rw-r--r-- | Next/quilt-import.log | 53 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5711 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..09219b02d341 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,222 @@ +Name SHA1 +---- ---- +origin 35f8c769aa5f3d9a81d50e9bdcbfd4151e72a0c9 +fixes d287b8750e47c1702dab0e37ac11012bb751ece0 +kbuild-current 02f3e53a131c8aa3fe3c954058f1add5beeae621 +arc-current a37b2dc52b88ccd926099d852eae1bb324bc92eb +arm-current 418df63adac56841ef6b0f1fcf435bc64d4ed177 +m68k-current 561839598e61f03c9175183ea066b2b7fa58ce85 +powerpc-merge af81d7878c641629f2693ae3fdaf74b4af14dfca +sparc 76950e6e54ccfc98a25b501dbb1bc879cce1aa29 +net 0d4f0608619de59fd8169dd8e72aadc28d80e715 +ipsec 85dfb745ee40232876663ae206cba35f24ab2a40 +sound-current a86b1a2cd2f81f74e815e07f756edd7bc5b6f034 +pci-current 249bfb83cf8ba658955f0245ac3981d941f746ee +wireless 36ef0b473fbf43d5db23eea4616cc1d18cec245f +driver-core.current f6161aa153581da4a3867a2d1a7caf4be19b6ec9 +tty.current 8b5c913f7ee6464849570bacb6bcd9ef0eaf7dce +usb.current 2a40f324541ee61c22146214349c2ce9f5c30bcf +staging.current a937536b868b8369b98967929045f1df54234323 +char-misc.current 347e0899b1c75d907f01ac883ca38d37fe9bfa42 +input-current 4b7d293c64fde133cc2b669d0d7637b8a4c6d62f +md-current f3378b48705154b9089affb2d2e939622aea68f1 +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current 8fd61d34226014fe7886babfca6f45a7eff89d25 +ide bf6b4388c61cf88c6faa19cc45390fd36be8fb66 +dwmw2 63662139e519ce06090b2759cf4a1d291b9cc0e2 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +irqdomain-current a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 +devicetree-current ab28698d33af05abab0bcf8021eafe38f7434f24 +spi-current d3601e56cf64a3f2df6f6380cccb3644274406e2 +gpio-current e97f9b5277afeabb54892ebc6f68500098467ba1 +rr-fixes aabd6a8fa5a933bdf968cd86e34122745c1960e8 +mfd-fixes 037154105e3767324db7c34bf8f540a12cb61d70 +vfio-fixes 25e9789ddd9d14a8971f4a421d04f282719ab733 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 191db3fdaad2d4c4effdcda705427b573d13254b +arm f4bea8b2eac02fd633eceb4065f539626f0d31f3 +arm-perf a937536b868b8369b98967929045f1df54234323 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +xilinx 42ead3a591aeadb2722753aecf59f2ae63719075 +arm64 18931c892724cb9408811c793fe2656d11573b3a +blackfin f656c240ae07c48ddf8552e83b64692121044c42 +c6x 93bbd0c087eb299e0fe11c59d340932180c082b5 +cris 77c8006d8df4d5bafeb1d15eafa0886ae96e9b17 +hexagon e1858b2a21cd84a855945a4747fb2db41b250c22 +ia64 c9500a763ce7a88d6b9648a12038d02ae6724d58 +m68k 561839598e61f03c9175183ea066b2b7fa58ce85 +m68knommu 7538a2c717d864275e96daae90a090f0ac33bc3c +metag f6161aa153581da4a3867a2d1a7caf4be19b6ec9 +microblaze 01cc2cb1c9ee0eb0b813cc3a4404220d11160493 +mips 42982568ed25185411c39d962e71de55bda4f454 +openrisc 6af609515d788bd4c94116344f00601b058f75a6 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +powerpc 9e2d59ad580d590134285f361a0e80f0e98c0207 +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx cb1dc320320243e9db8289e77c4242e4c3910d85 +galak 22aebe69e5b26e7a95abaa7246a4c12d66260b0b +s390 043f62028ce6201feeb6362c05e046f153fa295f +sh 37284bd93103ae36b5ea274a985d688fb16f7a38 +sparc-next c4271c6e37c32105492cbbed35f45330cb327b94 +tile ecc46c516df87aec7be48cb9ef744d8332444fd8 +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa 9cf81c759b7db1db593b2ca60b74ec350d5f9205 +btrfs 6aec51f7d1db54c0e4c36f051dc77b52edadda85 +ceph d6c0dd6b0c196979fa7b34c1d99432fcb1b7e1df +cifs 885fa95225e31f790764c68153016c1687cfef5c +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs f6161aa153581da4a3867a2d1a7caf4be19b6ec9 +ext3 c288d2969627be7ffc90904ac8c6aae0295fbf9f +ext4 0e401101db49959f5783f6ee9e676124b5a183ac +f2fs 330900bc245f318bb8421a45156ead8f14aba21b +fuse 634734b63ac39e137a1c623ba74f3e062b6577db +gfs2 26217f50b084f4bc48f2712d41c9e65819bfd97c +jfs 9d48017bce890b19e3bba649850bdbc8a6f95903 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 90eabc5dfde58de5c37de3866f427da02e86ce17 +nfsd 6dbe51c251a327e012439c4772097a13df43c5b8 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs b6f4bee02f682d1c86ece297871b78ae01afaaf4 +ubifs 67e753ca41782913d805ff4a8a2b0f60b26b7915 +xfs 56cea2d088811b8cf7d2893e29bcf369a912de69 +vfs dcf787f39162ce32ca325b3e784aba2d2444619a +pci f6161aa153581da4a3867a2d1a7caf4be19b6ec9 +hid 26c379191fa28c7375f4a40d741903adae71a997 +i2c 21ea3f44cb505ce419971da1d24e3ccdfac8009c +jdelvare-hwmon 4aafa4f9e7d149b88b564f2fd0aa4cf8f75e0f3d +hwmon-staging 497b8b41ca6a2d6c674f3482eefcb996870b7dca +v4l-dvb eccaaad4b07a0c2c67b32be23e2067bdfc2fd24c +kbuild 4382a9934be0835943e877efd28fd57e17f8291e +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata b186affe0c9d39e4d3152cd34bffea8fe1fa17f4 +infiniband ef4e359d9b9e2dc022f79840fd207796b524a893 +pstore ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6 +pm 6348aa0413f423daf5741f276d91ace405d0e18f +idle deda402f5753f9017a18d856cef6ed71d9dfbc79 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +cpuidle d1c3ed669a2d452cacfb48c2d171a1f364dae2ed +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 043e4652bf3378883e7c0db38fa47fa8e2558f9c +ieee1394 6dbe51c251a327e012439c4772097a13df43c5b8 +ubi f6161aa153581da4a3867a2d1a7caf4be19b6ec9 +dlm f11722834605a155022a8098ad7d8adacf44b22f +swiotlb af51a9f1848ff50079a10def56a2c064f326af22 +scsi 6dbe51c251a327e012439c4772097a13df43c5b8 +target-updates b7f7722e32a77a5125d984390b4e1db7fe5a560d +target-merge a937536b868b8369b98967929045f1df54234323 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +slave-dma ca85cb87f4f8306449e3670e4b284aa7f3229ea9 +dmaengine 7f3498666c7b44f979720404d9ba883c309e60ad +net-next 1bc277f79260ae6f0888b1234942b6aedfff1289 +ipsec-next 05600a799f6c67b139f2bc565e358b913b230cf5 +wireless-next 856a850afdd778fad7ded4240d333a8c3b05b136 +bluetooth feb94d3d13af7b724b353d82237ca6f503c98d62 +mtd 35f8c769aa5f3d9a81d50e9bdcbfd4151e72a0c9 +l2-mtd dc656666c4508a953453ab88eed4251a73871833 +crypto 6375bcf7867fb18241fda47bfaeec85b925221f3 +drm be88298b0a3f771a4802f20c5e66af74bfd1dff1 +drm-intel 41fda596826c5db206f67ce5d639f65a19924a99 +sound 9f5c6faf72d5ecc1c16e6a8737b21ba7d5e3c87d +sound-asoc e2d2cf77ce33b1968d0c28b511c469069e57c136 +modules b92021b09df70c1609e3547f3d6128dd560be97f +pekey 4ea349d3bb1d3521b7df8dbf0e88fe41cd3c0683 +virtio 29266e2e29f1f87b93321e56812f9fb16f91cb6d +input 16142655269aaf580488e074eabfdcf0fb4e3687 +input-mt 6f0c0580b70c89094b3422ba81118c7b959c7556 +cgroup 664e218eb00fab60b95617154bba752894149a87 +block 833dd2e58737c3011da019cbc64726e04016337f +device-mapper fc2f1ae9b29dcc0fa153cfd65201134ece5830b9 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 9665f7f234d095fc7c28c70df819a3f7b6a7b4e8 +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 7d557b3cb69398d83ceabad9cf147c93a3aa97fd +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md f1e79cec10372b69260c4cb9c825b564ffe6040f +mfd a937536b868b8369b98967929045f1df54234323 +battery 845e37e009281b63fe15348f37bd7f815ea65da0 +fbdev a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 e7f5c9a16ea2648a3e85af8e34191026bf3dcb62 +regulator 457e7a48cf3b7628bc1ba1323357521c28bec52c +security 921f3ac4c3f2fd46ae99195a1168383ca9b41ed1 +selinux c2d7b247f0c028d325a5da5b9611b60ba160f237 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog a4f06858f731db269e9920adc8d57d15bf041444 +dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351 +iommu ae1915892b4774655a5dc01039ce94efdff4b3fc +vfio dad9f8972e04cd081a028d8fb1249d746d97fc03 +osd 861d66601acda6d7a2038fb3c95f68009128003a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial cf2fbdd26f80046725a11a80683a03baf27fae82 +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +edac b0769891ba7baa53f270dc70d71934748beb4c5b +edac-amd 9713faecff3d071de1208b081d4943b002e9cb1c +devicetree 02bbde7849e68e193cefaa1885fe0df0f03c9fcd +dt-rh 1421954bf9b967d819db23c911f950a2ccd60eff +spi 095c3752e673c0ba039a2f67fd867297fde75ae7 +spi-mb b66c7730027509620ced3c7ebc84e28f623ebe9a +tip c56c9489ce49947fc719fb37c42d3f12a9efce8a +ftrace 0d3006d22fb6de9b225b758dceb572efd1ae2e6c +rcu 53bbeb2f14b0b60af4f61b38668417e5c0514d7f +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 5da596078f915a62e39a20e582308eab91b88c9a +kvm-ppc bd31a7f55777a46063ebe3d50e6536cfff51a757 +oprofile 44009105081b51417f311f4c3be0061870b6b8ed +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495 +xen-two 849b022f891394b318ca2f571797076fa25a98b9 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +percpu 5479c78ac6f688ea5ea8c49b44cf90ea87b63931 +workqueues 4b2e435820a1178299b05daa43e9cdb5e1761dd7 +drivers-x86 e6e522461d358891050522ddb4fbfe9c253947b4 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 14379a95d3bf0f0a431bbeddb8be014e7667cbe3 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 103e6ad868cd432c24e6f7cbc63d1f27251e1e22 +driver-core 8f46baaa7ec6cd0851794020b31958e64679dd26 +tty afa80ccb4c7d39702dfb0832ce02a054848191a8 +usb 413fd1e9aa3e0441e64ed4703ce1bba164e135c0 +usb-gadget af6882be363d3a7bf0f72dd17ac2a639c4da0059 +staging c45bb8cb72136bf23d18926113bff04c8cc90813 +char-misc 388f7bd24d2ffc945ad08be3a592672c1e32156e +bcon 06c6942645eb82a7f69ed0759e23b272c253cd3c +tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 +writeback ed84825b785ceb932af7dd5aa08614801721320b +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl f440836e1a8b3e3c710c2ddb8f17d3d15275e1e7 +vhost 0e9ff68cfd66b15cc80e622c11eff64aae00cba5 +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc 6f0c0580b70c89094b3422ba81118c7b959c7556 +irqdomain 560aa5394d2db5437b2deb3bb897655f0fd99f61 +gpio 7ff2db457ba4e1547d4817bc4642bbd74b8f3d70 +gpio-lw c7886b18273b07042e25e8d3ba5c983837b84123 +arm-soc 5ad6b8734b5fb28bb2cf793fa074ddcffb369764 +bcm2835 4c4d4492e7a428f8cffbee491f2ac3232687afde +cortex 6ebd4d038dbb626a43d87db3007e71f92f49d7b3 +ep93xx 7ec44295ef66efcac08433298661a18008883885 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm 5bc31f8813c1b2386fba3e5714ddf18ab429b0bc +renesas 811689afc214564c4a5f238ecf4d8bdc0e52b615 +samsung 9daee5a39559ebf6eabdf75b297a9103340f0a6c +tegra b063ec69032271e861a6af0782aa83d5cefde636 +dma-mapping a937536b868b8369b98967929045f1df54234323 +pwm a32e1d1057b0f7c10df702cc2415432fa4a35c41 +dma-buf 6dbe51c251a327e012439c4772097a13df43c5b8 +userns 92f28d973cce45ef5823209aab3138eb45d8b349 +ktest 7328735cbf68b7cd4d7ef16e172013743cdc2bc4 +signal 99e621f796d7f0341a51e8cdf32b81663b10b448 +clk fde8bc59c03c0ad1fa4f655e0ed5cc1f76d11e8b +random b980955236922ae6106774511c5c05003d3ad225 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm-current 9f225788cc047fb7c2ef2326eb4f86dee890e2ef +akpm c487d7f239b9818f245715762f248e1458db92c9 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..3c03e748f073 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,224 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +sh-current git git://github.com/pmundt/linux-sh.git#sh-fixes-for-linus +irqdomain-current git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/merge +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +gpio-current git git://git.secretlab.ca/git/linux-2.6#gpio/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next +xilinx git git://git.xilinx.com/linux-xlnx.git#arm-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git#upstream +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://github.com/pmundt/linux-sh.git#sh-latest +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#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-next.git#master +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://github.com/schandinat/linux-2.6.git#fbdev-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://sources.calxeda.com/kernel/linux.git#for-next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +spi-mb git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/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 +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +bcon git git://git.kernel.org/pub/scm/linux/kernel/git/joern/bcon2.git#master +tmem git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +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 +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..8ed7a3af7d00 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5211 @@ +$ date +Tuesday 19 March 09:59:21 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 0863702 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs +Merging origin/master (35f8c76 Merge tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd) +$ git merge origin/master +Updating 0863702..35f8c76 +Fast-forward + Makefile | 2 +- + arch/arm/Kconfig | 11 +-- + arch/arm/boot/dts/at91sam9x5.dtsi | 28 ++++++- + arch/arm/boot/dts/exynos4.dtsi | 9 +++ + arch/arm/boot/dts/exynos5440.dtsi | 6 ++ + arch/arm/kernel/smp.c | 2 +- + arch/arm/lib/memset.S | 33 +++----- + arch/arm/mach-at91/include/mach/gpio.h | 8 ++ + arch/arm/mach-at91/irq.c | 20 ++--- + arch/arm/mach-at91/pm.c | 10 ++- + arch/arm/mach-davinci/dma.c | 3 + + arch/arm/mach-footbridge/Kconfig | 1 + + arch/arm/mach-imx/clk-imx35.c | 1 + + arch/arm/mach-imx/imx25-dt.c | 5 ++ + arch/arm/mach-mmp/gplugd.c | 1 + + arch/arm/mach-s5pv210/clock.c | 36 ++++----- + arch/arm/mach-s5pv210/mach-goni.c | 2 +- + arch/arm/mach-shmobile/board-marzen.c | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/mmu-hash64.h | 128 +++++++++++++++--------------- + arch/powerpc/kernel/cputable.c | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 34 +++++--- + arch/powerpc/kernel/prom_init.c | 14 ++-- + arch/powerpc/kernel/ptrace.c | 1 + + arch/powerpc/kvm/book3s_64_mmu_host.c | 4 +- + arch/powerpc/mm/hash_utils_64.c | 22 +++-- + arch/powerpc/mm/mmu_context_hash64.c | 11 +-- + arch/powerpc/mm/pgtable_64.c | 2 +- + arch/powerpc/mm/slb_low.S | 50 ++++++------ + arch/powerpc/mm/tlb_hash64.c | 2 +- + arch/powerpc/platforms/Kconfig.cputype | 6 +- + arch/s390/include/asm/eadm.h | 6 +- + arch/s390/include/asm/tlbflush.h | 2 - + arch/s390/kernel/entry.S | 3 +- + arch/s390/kernel/entry64.S | 5 +- + arch/s390/kernel/setup.c | 2 + + arch/x86/kernel/cpu/perf_event_intel_ds.c | 4 +- + drivers/amba/tegra-ahb.c | 2 +- + drivers/clk/clk-vt8500.c | 2 +- + drivers/i2c/Kconfig | 2 +- + drivers/i2c/busses/Kconfig | 6 +- + drivers/input/joystick/analog.c | 8 +- + drivers/mtd/bcm47xxpart.c | 52 +++++++----- + drivers/mtd/nand/nand_base.c | 16 ++++ + drivers/mtd/nand/nand_ids.c | 80 ++++++++++--------- + drivers/pinctrl/pinctrl-at91.c | 61 +++++++++++++- + drivers/s390/block/scm_blk.c | 69 ++++++++++++++-- + drivers/s390/block/scm_blk.h | 2 + + drivers/s390/block/scm_drv.c | 23 ++++-- + drivers/s390/char/sclp_cmd.c | 2 + + drivers/s390/cio/chsc.c | 17 ++++ + drivers/s390/cio/chsc.h | 2 + + drivers/s390/cio/scm.c | 18 ++++- + drivers/video/atmel_lcdfb.c | 22 +++-- + include/linux/mtd/nand.h | 7 ++ + include/linux/perf_event.h | 6 +- + include/video/atmel_lcdc.h | 2 +- + security/selinux/xfrm.c | 2 +- + 58 files changed, 587 insertions(+), 292 deletions(-) +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 arc-current/for-curr (a37b2dc ARC: Remove SET_PERSONALITY (tracks cross-arch change)) +$ git merge arc-current/for-curr +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + arch/arc/include/asm/elf.h | 3 --- + arch/arc/include/asm/kgdb.h | 6 ++---- + arch/arc/include/asm/syscalls.h | 2 -- + arch/arc/include/uapi/asm/ptrace.h | 4 ++-- + arch/arc/kernel/entry.S | 25 ------------------------- + arch/arc/kernel/kgdb.c | 1 + + arch/arc/kernel/setup.c | 4 +--- + arch/arc/kernel/sys.c | 2 -- + 9 files changed, 8 insertions(+), 42 deletions(-) +Merging arm-current/fixes (418df63a ARM: 7670/1: fix the memset fix) +$ git merge arm-current/fixes +Already up-to-date. +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 (af81d78 powerpc: Rename USER_ESID_BITS* to ESID_BITS*) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (76950e6 sparc64: correctly recognize SPARC64-X chips) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/spitfire.h | 1 + + arch/sparc/kernel/cpu.c | 6 ++++++ + arch/sparc/kernel/head_64.S | 25 ++++++++++++++++++++-- + arch/sparc/kernel/leon_pci_grpci2.c | 41 +++++++++++++++++++++++-------------- + drivers/tty/serial/sunsu.c | 21 ++++++++----------- + 5 files changed, 65 insertions(+), 29 deletions(-) +Merging net/master (0d4f060 tcp: dont handle MTU reduction on LISTEN socket) +$ git merge net/master +Merge made by the 'recursive' strategy. + arch/arm/net/bpf_jit_32.c | 2 +- + drivers/bluetooth/ath3k.c | 4 + + drivers/bluetooth/btusb.c | 2 + + drivers/infiniband/hw/cxgb4/cm.c | 12 +++ + drivers/isdn/hisax/Kconfig | 6 +- + drivers/net/bonding/bond_main.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 3 +- + drivers/net/ethernet/broadcom/tg3.c | 8 ++ + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 12 ++- + drivers/net/ethernet/dec/tulip/Kconfig | 1 + + drivers/net/ethernet/freescale/fec.c | 27 ++++--- + drivers/net/ethernet/freescale/fec.h | 1 + + drivers/net/ethernet/sfc/nic.c | 3 +- + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/davinci_emac.c | 2 +- + drivers/net/netconsole.c | 15 ++-- + drivers/net/usb/Kconfig | 2 +- + drivers/net/usb/cdc_mbim.c | 11 +-- + drivers/net/usb/cdc_ncm.c | 49 ++++++++----- + drivers/net/usb/qmi_wwan.c | 49 ++++--------- + drivers/net/wireless/mwifiex/join.c | 7 +- + drivers/net/wireless/rt2x00/Kconfig | 4 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 14 ++-- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 89 +++++++++-------------- + drivers/vhost/net.c | 3 +- + include/linux/skbuff.h | 13 +++- + include/linux/usb/cdc_ncm.h | 1 + + include/net/dst.h | 6 +- + include/net/ip_fib.h | 12 ++- + net/batman-adv/bat_iv_ogm.c | 6 +- + net/bridge/br_netlink.c | 2 + + net/core/dev.c | 2 +- + net/core/rtnetlink.c | 2 +- + net/ipv4/ip_gre.c | 5 +- + net/ipv4/ip_options.c | 5 +- + net/ipv4/tcp.c | 2 +- + net/ipv4/tcp_ipv4.c | 14 ++-- + net/ipv4/tcp_output.c | 1 - + net/ipv6/tcp_ipv6.c | 7 ++ + net/nfc/llcp/llcp.c | 62 +++++++++++++--- + net/nfc/llcp/sock.c | 2 + + net/openvswitch/actions.c | 4 +- + net/openvswitch/datapath.c | 3 + + net/openvswitch/flow.c | 6 +- + net/openvswitch/vport-netdev.c | 3 +- + net/openvswitch/vport.c | 3 +- + net/sctp/associola.c | 2 +- + net/sctp/sm_statefuns.c | 2 +- + 49 files changed, 287 insertions(+), 213 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 (a86b1a2c ALSA: hda/cirrus - Fix the digital beep registration) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- + Documentation/sound/alsa/seq_oss.html | 2 +- + sound/pci/hda/patch_conexant.c | 16 +++++++++++----- + 3 files changed, 13 insertions(+), 7 deletions(-) +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 (36ef0b47 rtlwifi: usb: add missing freeing of skbuff) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 4 ++++ + drivers/bluetooth/btusb.c | 2 ++ + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 4 ++++ + drivers/net/wireless/ath/ath9k/link.c | 26 +++++++++++++------------- + drivers/net/wireless/iwlegacy/3945-mac.c | 22 ++++++++++++---------- + drivers/net/wireless/mwifiex/cmdevt.c | 22 ++++++++++++++++------ + drivers/net/wireless/mwifiex/init.c | 8 ++++++++ + drivers/net/wireless/mwifiex/main.h | 4 ++-- + drivers/net/wireless/mwifiex/scan.c | 8 ++++---- + drivers/net/wireless/mwifiex/sta_ioctl.c | 10 ++-------- + drivers/net/wireless/rtlwifi/usb.c | 1 + + net/bluetooth/sco.c | 1 + + 12 files changed, 69 insertions(+), 43 deletions(-) +Merging driver-core.current/driver-core-linus (f6161aa Linux 3.9-rc2) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (8b5c913 serial: 8250_pci: Add WCH CH352 quirk to avoid Xscale detection) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/8250/8250_pci.c | 13 +++++++++++++ + drivers/tty/serial/atmel_serial.c | 11 +++++------ + 2 files changed, 18 insertions(+), 6 deletions(-) +Merging usb.current/usb-linus (2a40f32 USB: EHCI: fix regression during bus resume) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/hcd-pci.c | 23 ++++++++++++++--------- + drivers/usb/host/ehci-hcd.c | 1 + + drivers/usb/host/ehci-hub.c | 2 +- + drivers/usb/host/ehci-q.c | 13 +++++++++++++ + drivers/usb/host/xhci.c | 3 ++- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 6 files changed, 38 insertions(+), 11 deletions(-) +Merging staging.current/staging-linus (a937536 Linux 3.9-rc3) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (347e089 VMCI: Fix process-to-process DRGAMs.) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-max77693.c | 103 ++++++++++++++++++++++++++-------- + drivers/extcon/extcon-max8997.c | 56 ++++++++++-------- + drivers/misc/mei/hw-me.c | 29 +++++++--- + drivers/misc/mei/init.c | 18 ++++++ + drivers/misc/mei/mei_dev.h | 1 + + drivers/misc/mei/pci-me.c | 52 +++-------------- + drivers/misc/vmw_vmci/vmci_datagram.c | 4 +- + include/linux/mfd/max77693-private.h | 23 ++++++++ + 8 files changed, 186 insertions(+), 100 deletions(-) +Merging input-current/for-linus (4b7d293 Input: mms114 - Fix regulator enable and disable paths) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (f3378b4 md: expedite metadata update when switching read-auto -> active) +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (8fd61d3 crypto: user - ensure user supplied strings are nul-terminated) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/gayle.c | 15 +-------------- + drivers/ide/tx4938ide.c | 13 +------------ + drivers/ide/tx4939ide.c | 13 +------------ + 3 files changed, 3 insertions(+), 38 deletions(-) +Merging dwmw2/master (63662139 params: Fix potential memory leak in add_sysfs_param()) +$ git merge dwmw2/master +Merge made by the 'recursive' strategy. + drivers/platform/x86/dell-laptop.c | 10 ++++++---- + kernel/params.c | 5 ++++- + 2 files changed, 10 insertions(+), 5 deletions(-) +Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) +$ git merge irqdomain-current/irqdomain/merge +Already up-to-date. +Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging spi-current/spi/merge (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 (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect) +$ git merge gpio-current/gpio/merge +Already up-to-date. +Merging rr-fixes/fixes (aabd6a8 Revert "virtio_console: Initialize guest_connected=true for rproc_serial") +$ git merge rr-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/char/virtio_console.c | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) +Merging mfd-fixes/master (0371541 mfd: twl4030-madc: Remove __exit_p annotation) +$ git merge mfd-fixes/master +Already up-to-date. +Merging vfio-fixes/for-linus (25e9789 vfio: include <linux/slab.h> for kmalloc) +$ git merge vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci_config.c | 1 + + drivers/vfio/pci/vfio_pci_intrs.c | 1 + + 2 files changed, 2 insertions(+) +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 (191db3f ARC: remove #ifdef-ed out include of dead header) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/kernel/asm-offsets.c | 2 +- + arch/arc/kernel/clk.c | 2 +- + arch/arc/kernel/disasm.c | 2 +- + arch/arc/kernel/irq.c | 2 +- + arch/arc/kernel/kprobes.c | 1 - + arch/arc/kernel/module.c | 4 ++-- + arch/arc/kernel/setup.c | 3 +-- + arch/arc/kernel/time.c | 1 - + arch/arc/kernel/traps.c | 6 +++--- + arch/arc/mm/extable.c | 4 ++-- + arch/arc/mm/fault.c | 1 - + arch/arc/mm/init.c | 3 --- + arch/arc/mm/ioremap.c | 2 +- + arch/arc/mm/tlb.c | 2 +- + 14 files changed, 14 insertions(+), 21 deletions(-) +Merging arm/for-next (f4bea8b Merge branches 'devel-stable' and 'fixes' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 3 +- + arch/arm/include/asm/cp15.h | 16 ++++++++- + arch/arm/include/asm/cputype.h | 61 ++++++++++++++++++++++---------- + arch/arm/include/asm/glue-df.h | 20 +++++------ + arch/arm/kernel/entry-armv.S | 13 ++++--- + arch/arm/kernel/head-common.S | 9 +++-- + arch/arm/kernel/head-nommu.S | 8 ++++- + arch/arm/kernel/process.c | 13 +++---- + arch/arm/kernel/setup.c | 2 +- + arch/arm/kernel/smp_scu.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 6 ++-- + arch/arm/mach-integrator/integrator_cp.c | 7 ++-- + arch/arm/mach-omap2/id.c | 4 +-- + arch/arm/mach-omap2/omap-smp.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 11 +++--- + arch/arm/mach-omap2/pm-debug.c | 6 ++-- + arch/arm/mach-omap2/powerdomain.c | 2 +- + arch/arm/mach-tegra/board-harmony-pcie.c | 6 ++-- + arch/arm/mach-tegra/tegra2_emc.c | 2 +- + arch/arm/mach-ux500/cpu.c | 5 ++- + arch/arm/mm/Kconfig | 9 ++++- + arch/arm/mm/alignment.c | 2 ++ + arch/arm/mm/mmu.c | 17 +++++++++ + arch/arm/plat-omap/dmtimer.c | 10 +++--- + 24 files changed, 151 insertions(+), 85 deletions(-) +Merging arm-perf/for-next/perf (a937536 Linux 3.9-rc3) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +Already up-to-date. +Merging 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 fd34c56] Merge remote-tracking branch 'xilinx/arm-next' +$ git diff -M --stat --summary HEAD^.. +Merging arm64/upstream (18931c8 arm64: fix padding computation in struct ucontext) +$ git merge arm64/upstream +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/ucontext.h | 2 +- + arch/arm64/kernel/arm64ksyms.c | 2 ++ + arch/arm64/kernel/signal32.c | 1 - + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (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 (7538a2c m68k: drop "select EMAC_INC") +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. +Merging metag/for-next (f6161aa Linux 3.9-rc2) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (01cc2cb microblaze: intc: set the default irq_domain) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/kernel/intc.c | 2 ++ + arch/microblaze/pci/pci-common.c | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging mips/mips-for-linux-next (4298256 Merge branches 'next/3.9-fixes', 'next/kvm' and 'next/micromips' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kbuild | 4 + + arch/mips/Kconfig | 25 +- + arch/mips/configs/malta_kvm_defconfig | 2267 ++++++++++++++++++++ + arch/mips/configs/malta_kvm_guest_defconfig | 2237 +++++++++++++++++++ + arch/mips/include/asm/kvm.h | 55 + + arch/mips/include/asm/kvm_host.h | 667 ++++++ + arch/mips/include/asm/mach-generic/spaces.h | 9 +- + .../include/asm/mach-sead3/cpu-feature-overrides.h | 4 - + arch/mips/include/asm/mipsregs.h | 18 + + arch/mips/include/asm/mmu_context.h | 6 + + arch/mips/include/asm/processor.h | 5 + + arch/mips/include/asm/uaccess.h | 11 +- + arch/mips/include/asm/uasm.h | 66 +- + arch/mips/include/uapi/asm/inst.h | 449 ++++ + arch/mips/kernel/asm-offsets.c | 66 + + arch/mips/kernel/binfmt_elfo32.c | 4 + + arch/mips/kernel/cevt-r4k.c | 4 + + arch/mips/kernel/cpu-probe.c | 7 +- + arch/mips/kernel/linux32.c | 2 +- + arch/mips/kernel/proc.c | 2 +- + arch/mips/kernel/smp.c | 1 + + arch/mips/kernel/traps.c | 7 +- + arch/mips/kvm/00README.txt | 31 + + arch/mips/kvm/Kconfig | 49 + + arch/mips/kvm/Makefile | 13 + + arch/mips/kvm/kvm_cb.c | 14 + + arch/mips/kvm/kvm_locore.S | 650 ++++++ + arch/mips/kvm/kvm_mips.c | 966 +++++++++ + arch/mips/kvm/kvm_mips_comm.h | 23 + + arch/mips/kvm/kvm_mips_commpage.c | 37 + + arch/mips/kvm/kvm_mips_dyntrans.c | 149 ++ + arch/mips/kvm/kvm_mips_emul.c | 1829 ++++++++++++++++ + arch/mips/kvm/kvm_mips_int.c | 243 +++ + arch/mips/kvm/kvm_mips_int.h | 49 + + arch/mips/kvm/kvm_mips_opcode.h | 24 + + arch/mips/kvm/kvm_mips_stats.c | 82 + + arch/mips/kvm/kvm_tlb.c | 932 ++++++++ + arch/mips/kvm/kvm_trap_emul.c | 482 +++++ + arch/mips/kvm/trace.h | 46 + + arch/mips/lib/bitops.c | 16 +- + arch/mips/lib/csum_partial.S | 4 +- + arch/mips/mm/Makefile | 4 +- + arch/mips/mm/c-r4k.c | 6 +- + arch/mips/mm/cache.c | 1 + + arch/mips/mm/tlb-r4k.c | 2 + + arch/mips/mm/uasm-micromips.c | 220 ++ + arch/mips/mm/uasm-mips.c | 196 ++ + arch/mips/mm/uasm.c | 326 +-- + arch/mips/mti-malta/Platform | 6 +- + arch/mips/mti-malta/malta-time.c | 13 + + mm/bootmem.c | 1 + + virt/kvm/kvm_main.c | 2 +- + 52 files changed, 12031 insertions(+), 301 deletions(-) + create mode 100644 arch/mips/configs/malta_kvm_defconfig + create mode 100644 arch/mips/configs/malta_kvm_guest_defconfig + create mode 100644 arch/mips/include/asm/kvm.h + create mode 100644 arch/mips/include/asm/kvm_host.h + create mode 100644 arch/mips/kvm/00README.txt + create mode 100644 arch/mips/kvm/Kconfig + create mode 100644 arch/mips/kvm/Makefile + create mode 100644 arch/mips/kvm/kvm_cb.c + create mode 100644 arch/mips/kvm/kvm_locore.S + create mode 100644 arch/mips/kvm/kvm_mips.c + create mode 100644 arch/mips/kvm/kvm_mips_comm.h + create mode 100644 arch/mips/kvm/kvm_mips_commpage.c + create mode 100644 arch/mips/kvm/kvm_mips_dyntrans.c + create mode 100644 arch/mips/kvm/kvm_mips_emul.c + create mode 100644 arch/mips/kvm/kvm_mips_int.c + create mode 100644 arch/mips/kvm/kvm_mips_int.h + create mode 100644 arch/mips/kvm/kvm_mips_opcode.h + create mode 100644 arch/mips/kvm/kvm_mips_stats.c + create mode 100644 arch/mips/kvm/kvm_tlb.c + create mode 100644 arch/mips/kvm/kvm_trap_emul.c + create mode 100644 arch/mips/kvm/trace.h + create mode 100644 arch/mips/mm/uasm-micromips.c + create mode 100644 arch/mips/mm/uasm-mips.c +Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging powerpc/next (9e2d59a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal) +$ 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 (cb1dc32 powerpc/mpc512x: create SoC devices for more nodes) +$ git merge mpc5xxx/next +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/512x/mpc512x_shared.c | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) +Merging galak/next (22aebe6 powerpc/qe: Fix Kconfig enablement of QE_USB support) +$ git merge galak/next +Auto-merging arch/powerpc/platforms/Kconfig.cputype +Auto-merging arch/powerpc/kernel/cputable.c +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/powerpc/fsl/cpus.txt | 22 ++ + arch/powerpc/Kconfig | 6 - + arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi | 1 + + arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi | 1 + + arch/powerpc/boot/dts/fsl/e6500_power_isa.dtsi | 65 +++++ + arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi | 41 +++ + arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi | 41 +++ + arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi | 41 +++ + arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi | 41 +++ + arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi | 109 ++++++++ + arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 307 +++++++++++++++++++++ + arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 127 +++++++++ + arch/powerpc/boot/dts/p1021rdb-pc.dtsi | 12 +- + arch/powerpc/boot/dts/t4240qds.dts | 220 +++++++++++++++ + arch/powerpc/configs/corenet64_smp_defconfig | 10 +- + arch/powerpc/configs/mpc85xx_defconfig | 8 +- + arch/powerpc/include/asm/cputable.h | 2 +- + arch/powerpc/include/asm/kvm_asm.h | 4 + + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 16 ++ + arch/powerpc/kernel/cputable.c | 9 +- + arch/powerpc/kernel/epapr_hcalls.S | 2 + + arch/powerpc/kernel/exceptions-64e.S | 47 ++++ + arch/powerpc/kernel/idle_book3e.S | 32 ++- + arch/powerpc/mm/tlb_nohash.c | 18 +- + arch/powerpc/platforms/85xx/Kconfig | 17 ++ + arch/powerpc/platforms/85xx/Makefile | 1 + + arch/powerpc/platforms/85xx/corenet_ds.c | 5 +- + arch/powerpc/platforms/85xx/t4240_qds.c | 98 +++++++ + arch/powerpc/platforms/Kconfig | 1 - + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 29 +- + arch/powerpc/sysdev/fsl_pci.h | 13 + + arch/powerpc/sysdev/qe_lib/Kconfig | 2 +- + 33 files changed, 1318 insertions(+), 32 deletions(-) + create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/cpus.txt + create mode 100644 arch/powerpc/boot/dts/fsl/e6500_power_isa.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-1.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-2.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-3.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.0-0.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/t4240qds.dts + create mode 100644 arch/powerpc/platforms/85xx/t4240_qds.c +Merging s390/features (043f620 s390/monreader: Remove redundant NULL check before kfree) +$ git merge s390/features +Merge made by the 'recursive' strategy. + Documentation/s390/s390dbf.txt | 3 ++- + arch/s390/include/asm/processor.h | 3 ++- + arch/s390/kernel/dis.c | 9 +++++---- + arch/s390/kvm/trace.h | 2 +- + arch/s390/mm/init.c | 10 +++++++++- + arch/s390/pci/pci.c | 3 +-- + drivers/s390/char/monreader.c | 3 +-- + 7 files changed, 21 insertions(+), 12 deletions(-) +Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) +$ git merge sh/sh-latest +Merge made by the 'recursive' strategy. + .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++ + arch/sh/include/asm/hw_breakpoint.h | 12 +- + arch/sh/include/cpu-common/cpu/ubc.h | 17 +++ + arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++ + arch/sh/kernel/cpu/sh2a/Makefile | 3 +- + arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++ + arch/sh/kernel/hw_breakpoint.c | 8 ++ + drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++- + include/linux/serial_sci.h | 4 + + 9 files changed, 376 insertions(+), 16 deletions(-) + create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt + create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h + create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h + create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c +Merging sparc-next/master (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 (6aec51f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-linus-3.9) +$ git merge btrfs/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ceph/master (d6c0dd6 libceph: fix decoding of pgids) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (885fa95 cifs: ignore everything in SPNEGO blob after mechTypes) +$ git merge cifs/for-next +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/cifs/asn1.c | 53 +++++------------------------------------------------ + fs/cifs/cifsfs.c | 24 ++++++++++++++++++++++++ + fs/cifs/cifsfs.h | 4 ++++ + fs/cifs/file.c | 6 +++++- + fs/cifs/inode.c | 10 ++++------ + fs/cifs/netmisc.c | 2 +- + 6 files changed, 43 insertions(+), 56 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 (f6161aa Linux 3.9-rc2) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (c288d29 ext2: Fix BUG_ON in evict() on inode deletion) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (0e40110 ext4: fix memory leakage in mext_check_coverage) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/move_extent.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/extents.c +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 6 +- + fs/ext4/extents.c | 105 ++++++++++++++++++----- + fs/ext4/extents_status.c | 212 +++++++++++++++++++++++++++++++++++++++++++++-- + fs/ext4/extents_status.h | 9 ++ + fs/ext4/ialloc.c | 4 +- + fs/ext4/inode.c | 175 ++++++++++++++++++++++++++++++++++++-- + fs/ext4/mballoc.c | 23 ++--- + fs/ext4/move_extent.c | 43 ++++++---- + fs/ext4/resize.c | 4 +- + fs/ext4/super.c | 4 +- + fs/jbd2/transaction.c | 15 ++-- + 11 files changed, 524 insertions(+), 76 deletions(-) +Merging f2fs/dev (330900b f2fs: avoid extra ++ while returning from get_node_path) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Merge made by the 'recursive' strategy. + fs/f2fs/data.c | 12 ++++++------ + fs/f2fs/dir.c | 3 +++ + fs/f2fs/f2fs.h | 12 ++++++++---- + fs/f2fs/file.c | 8 ++++---- + fs/f2fs/namei.c | 2 +- + fs/f2fs/node.c | 44 +++++++++++++++++++++----------------------- + fs/f2fs/recovery.c | 2 +- + fs/f2fs/segment.h | 3 +-- + fs/f2fs/super.c | 2 +- + include/linux/f2fs_fs.h | 17 +++++++++-------- + 10 files changed, 55 insertions(+), 50 deletions(-) +Merging fuse/for-next (634734b fuse: allow control of adaptive readdirplus use) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (26217f5 GFS2: Fix unlock of fcntl locks during withdrawn state) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/dlm/plock.c | 18 ++++- + fs/gfs2/bmap.c | 2 +- + fs/gfs2/file.c | 5 +- + fs/gfs2/glock.c | 13 ---- + fs/gfs2/glock.h | 1 - + fs/gfs2/incore.h | 1 + + fs/gfs2/inode.c | 188 ++++++++++++++++++----------------------------------- + fs/gfs2/lock_dlm.c | 39 +++++------ + fs/gfs2/rgrp.c | 26 +++----- + fs/gfs2/rgrp.h | 2 +- + fs/gfs2/super.c | 2 +- + 11 files changed, 117 insertions(+), 180 deletions(-) +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 +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (90eabc5 NFSv4: Fix the string length returned by the idmapper) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtsock.c +Merge made by the 'recursive' strategy. + fs/nfs/idmap.c | 13 ++++++++----- + net/sunrpc/clnt.c | 24 ++++++++++++++---------- + net/sunrpc/xprtsock.c | 8 ++++---- + 3 files changed, 26 insertions(+), 19 deletions(-) +Merging nfsd/nfsd-next (6dbe51c Linux 3.9-rc1) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/ocfs2/cluster/heartbeat.c +Merge made by the 'recursive' strategy. + fs/ocfs2/cluster/heartbeat.c | 40 +++++++++------------------------------- + fs/ocfs2/cluster/masklog.h | 3 ++- + fs/ocfs2/dlm/dlmmaster.c | 8 +++++++- + fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ + 4 files changed, 25 insertions(+), 33 deletions(-) +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (b6f4bee fs/9p: Fix atomic_open) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (67e753c UBIFS: make space fixup work in the remount case) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + fs/ubifs/super.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging xfs/for-next (56cea2d xfs: take inode version into account in XFS_LITINO) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/xfs_alloc.c | 2 +- + fs/xfs/xfs_attr_leaf.c | 6 +- + fs/xfs/xfs_bmap.c | 10679 +++++++++++++++++++++++------------------------ + fs/xfs/xfs_buf.c | 10 +- + fs/xfs/xfs_dinode.h | 6 +- + fs/xfs/xfs_error.c | 2 +- + fs/xfs/xfs_ialloc.c | 2 +- + fs/xfs/xfs_inode.h | 5 +- + fs/xfs/xfs_iomap.c | 6 +- + fs/xfs/xfs_log.c | 2 +- + fs/xfs/xfs_mount.h | 1 - + fs/xfs/xfs_vnodeops.c | 2 +- + 12 files changed, 5298 insertions(+), 5425 deletions(-) +Merging vfs/for-next (dcf787f constify path_get/path_put and fs_struct.c stuff) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (f6161aa Linux 3.9-rc2) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (26c3791 Merge branch 'for-3.10/upstream' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-hid-roccat-isku | 12 +- + .../ABI/testing/sysfs-driver-hid-roccat-konepure | 105 +++++++ + drivers/hid/Kconfig | 100 +++---- + drivers/hid/Makefile | 4 +- + drivers/hid/hid-apple.c | 1 - + drivers/hid/hid-axff.c | 6 +- + drivers/hid/hid-core.c | 28 +- + drivers/hid/hid-dr.c | 8 +- + drivers/hid/hid-emsff.c | 6 +- + drivers/hid/hid-gaff.c | 10 +- + drivers/hid/hid-holtekff.c | 4 +- + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-kye.c | 4 +- + drivers/hid/hid-lenovo-tpkbd.c | 4 +- + drivers/hid/hid-lg2ff.c | 6 +- + drivers/hid/hid-lg3ff.c | 6 +- + drivers/hid/hid-lg4ff.c | 18 +- + drivers/hid/hid-lgff.c | 8 +- + drivers/hid/hid-logitech-dj.c | 53 +--- + drivers/hid/hid-logitech-dj.h | 1 - + drivers/hid/hid-magicmouse.c | 1 - + drivers/hid/hid-multitouch.c | 55 ++-- + drivers/hid/hid-ntrig.c | 10 +- + drivers/hid/hid-picolcd.h | 4 +- + drivers/hid/hid-picolcd_backlight.c | 4 +- + drivers/hid/hid-picolcd_cir.c | 2 - + drivers/hid/hid-picolcd_core.c | 8 +- + drivers/hid/hid-picolcd_debugfs.c | 2 - + drivers/hid/hid-picolcd_fb.c | 12 +- + drivers/hid/hid-picolcd_lcd.c | 4 +- + drivers/hid/hid-picolcd_leds.c | 4 +- + drivers/hid/hid-pl.c | 6 +- + drivers/hid/hid-prodikeys.c | 3 +- + drivers/hid/hid-roccat-isku.c | 17 +- + drivers/hid/hid-roccat-isku.h | 4 +- + drivers/hid/hid-roccat-konepure.c | 304 +++++++++++++++++++++ + drivers/hid/hid-roccat-konepure.h | 72 +++++ + drivers/hid/hid-roccat.c | 2 +- + drivers/hid/hid-sensor-hub.c | 12 +- + drivers/hid/hid-sjoy.c | 6 +- + drivers/hid/hid-speedlink.c | 2 - + drivers/hid/hid-steelseries.c | 16 +- + drivers/hid/hid-thingm.c | 1 - + drivers/hid/hid-tmff.c | 6 +- + drivers/hid/hid-zpff.c | 6 +- + drivers/hid/i2c-hid/i2c-hid.c | 32 +++ + drivers/hid/usbhid/hid-core.c | 35 ++- + drivers/hid/usbhid/hid-pidff.c | 80 +++--- + drivers/hid/usbhid/hiddev.c | 8 +- + drivers/hid/usbhid/usbhid.h | 3 - + include/linux/hid.h | 99 ++++++- + 51 files changed, 877 insertions(+), 329 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-konepure + create mode 100644 drivers/hid/hid-roccat-konepure.c + create mode 100644 drivers/hid/hid-roccat-konepure.h +Merging i2c/i2c/for-next (21ea3f4 i2c: core: Pick i2c bus number from dt alias if present) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/i2c-core.c | 45 ++++++++++++++++++++++++++++++++++----------- + 1 file changed, 34 insertions(+), 11 deletions(-) +Merging jdelvare-hwmon/master (4aafa4f hwmon: (lm75) Add support for the Dallas/Maxim DS7505) +$ git merge jdelvare-hwmon/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 8 +++++ + Documentation/hwmon/lm75 | 17 ++++----- + MAINTAINERS | 17 ++------- + drivers/hwmon/Kconfig | 2 +- + drivers/hwmon/lm75.c | 92 ++++++++++++++++++++++++++++++++++++++++++++---- + drivers/hwmon/lm75.h | 2 +- + 6 files changed, 106 insertions(+), 32 deletions(-) +Merging hwmon-staging/hwmon-next (497b8b4 hwmon: (nct6775) Drop read/write lock) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ntc_thermistor.txt | 29 + + Documentation/hwmon/adt7410 | 47 +- + Documentation/hwmon/nct6775 | 188 + + drivers/hwmon/Kconfig | 34 + + drivers/hwmon/Makefile | 3 + + drivers/hwmon/abituguru.c | 11 +- + drivers/hwmon/abituguru3.c | 10 +- + drivers/hwmon/adt7310.c | 123 + + drivers/hwmon/adt7410.c | 442 +- + drivers/hwmon/adt7x10.c | 511 +++ + drivers/hwmon/adt7x10.h | 37 + + drivers/hwmon/applesmc.c | 2 +- + drivers/hwmon/f71805f.c | 3 +- + drivers/hwmon/gpio-fan.c | 2 +- + drivers/hwmon/mc13783-adc.c | 13 +- + drivers/hwmon/nct6775.c | 4229 ++++++++++++++++++++ + drivers/hwmon/ntc_thermistor.c | 145 +- + drivers/hwmon/s3c-hwmon.c | 19 +- + include/linux/platform_data/ntc_thermistor.h | 8 +- + 19 files changed, 5373 insertions(+), 483 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt + create mode 100644 Documentation/hwmon/nct6775 + create mode 100644 drivers/hwmon/adt7310.c + create mode 100644 drivers/hwmon/adt7x10.c + create mode 100644 drivers/hwmon/adt7x10.h + create mode 100644 drivers/hwmon/nct6775.c +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 (4382a99 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/NEXT (b186aff pata_samsung_cf: use module_platform_driver_probe()) +$ git merge libata/NEXT +Auto-merging drivers/ata/libata-acpi.c +Merge made by the 'recursive' strategy. + drivers/ata/Kconfig | 13 +++++++------ + drivers/ata/ahci.c | 2 ++ + drivers/ata/ata_piix.c | 4 ++++ + drivers/ata/libata-acpi.c | 2 +- + drivers/ata/pata_samsung_cf.c | 13 +------------ + drivers/ata/sata_fsl.c | 3 +-- + 6 files changed, 16 insertions(+), 21 deletions(-) +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 (6348aa0 Merge branch 'pm-cpufreq-next' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-firmware-acpi | 26 ++ + drivers/acpi/Kconfig | 3 +- + drivers/acpi/acpi_memhotplug.c | 309 +++----------------- + drivers/acpi/container.c | 150 +--------- + drivers/acpi/internal.h | 11 + + drivers/acpi/scan.c | 392 +++++++++++++++++++++----- + drivers/acpi/sysfs.c | 66 +++++ + drivers/cpufreq/cpufreq.c | 52 ++-- + include/acpi/acpi_bus.h | 19 ++ + 9 files changed, 513 insertions(+), 515 deletions(-) +Merging idle/next (deda402 tools/power turbostat: additional Haswell CPU-id) +$ git merge idle/next +Merge made by the 'recursive' strategy. + drivers/idle/intel_idle.c | 1 + + tools/power/x86/turbostat/turbostat.c | 3 +++ + 2 files changed, 4 insertions(+) +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 (043e465 thermal: exynos_thermal: return a proper error code while thermal_zone_device_register fail.) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/dove_thermal.c | 16 ++++++---------- + drivers/thermal/exynos_thermal.c | 2 +- + drivers/thermal/kirkwood_thermal.c | 8 +++----- + drivers/thermal/rcar_thermal.c | 29 ++++++++++++++--------------- + 4 files changed, 24 insertions(+), 31 deletions(-) +Merging ieee1394/for-next (6dbe51c Linux 3.9-rc1) +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (f6161aa Linux 3.9-rc2) +$ 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 (6dbe51c Linux 3.9-rc1) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (b7f7722 tcm_fc: using kfree_rcu() to simplify the code) +$ git merge target-updates/for-next +Merge made by the 'recursive' strategy. + drivers/target/iscsi/iscsi_target_auth.c | 28 +--------------------------- + drivers/target/iscsi/iscsi_target_nego.c | 14 ++++++-------- + drivers/target/tcm_fc/tfc_sess.c | 9 +-------- + 3 files changed, 8 insertions(+), 43 deletions(-) +Merging target-merge/for-next-merge (a937536 Linux 3.9-rc3) +$ 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 (ca85cb8 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/at_hdmac.c | 4 ++-- + drivers/dma/coh901318.c | 4 ++-- + drivers/dma/dw_dmac.c | 23 +++++++++++++++++++---- + drivers/dma/dw_dmac_regs.h | 1 + + drivers/dma/imx-dma.c | 4 ++-- + drivers/dma/imx-sdma.c | 4 ++-- + drivers/dma/ioat/dma.h | 2 +- + drivers/dma/ioat/dma_v3.c | 15 +++++---------- + drivers/dma/ipu/ipu_idmac.c | 4 ++-- + drivers/dma/pch_dma.c | 2 +- + drivers/dma/pl330.c | 3 +-- + drivers/dma/timb_dma.c | 2 +- + drivers/dma/txx9dmac.c | 8 ++++---- + 13 files changed, 43 insertions(+), 33 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 71995f1] Merge remote-tracking branch 'dmaengine/next' +$ git diff -M --stat --summary HEAD^.. +Merging net-next/master (1bc277f bnx2x: add RSS capability for GRE traffic) +$ git merge net-next/master +Auto-merging net/openvswitch/datapath.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv4/tcp_output.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/ip_gre.c +Auto-merging net/core/rtnetlink.c +Auto-merging net/core/dev.c +Auto-merging net/bridge/br_netlink.c +Removing include/net/caif/caif_shm.h +Auto-merging include/linux/skbuff.h +Auto-merging drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/net/ethernet/sfc/nic.c +Auto-merging drivers/net/ethernet/freescale/fec.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +Removing drivers/net/caif/caif_shmcore.c +Removing drivers/net/caif/caif_shm_u5500.c +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-net-mesh | 8 + + Documentation/devicetree/bindings/net/cpsw.txt | 16 +- + Documentation/networking/ip-sysctl.txt | 18 +- + arch/arm/boot/dts/am33xx.dtsi | 2 +- + drivers/infiniband/hw/cxgb4/cm.c | 68 +- + drivers/infiniband/hw/cxgb4/device.c | 34 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 14 +- + drivers/infiniband/hw/cxgb4/mem.c | 155 +- + drivers/infiniband/hw/cxgb4/provider.c | 15 +- + drivers/infiniband/hw/cxgb4/qp.c | 113 +- + drivers/infiniband/hw/cxgb4/t4.h | 11 +- + drivers/isdn/capi/capidrv.c | 3 +- + drivers/isdn/hisax/fsm.c | 2 +- + drivers/isdn/hisax/hfc_sx.c | 2 +- + drivers/net/caif/Kconfig | 7 - + drivers/net/caif/Makefile | 4 - + drivers/net/caif/caif_shm_u5500.c | 128 -- + drivers/net/caif/caif_shmcore.c | 747 -------- + drivers/net/ethernet/adi/bfin_mac.c | 6 +- + drivers/net/ethernet/aeroflex/greth.c | 24 +- + drivers/net/ethernet/amd/7990.c | 2 - + drivers/net/ethernet/amd/a2065.c | 1 - + drivers/net/ethernet/amd/am79c961a.c | 1 - + drivers/net/ethernet/amd/ariadne.c | 1 - + drivers/net/ethernet/amd/atarilance.c | 6 +- + drivers/net/ethernet/amd/au1000_eth.c | 1 - + drivers/net/ethernet/amd/declance.c | 2 - + drivers/net/ethernet/amd/mvme147.c | 4 +- + drivers/net/ethernet/amd/ni65.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 1 - + drivers/net/ethernet/amd/sun3lance.c | 7 +- + drivers/net/ethernet/amd/sunlance.c | 9 +- + drivers/net/ethernet/apple/macmace.c | 16 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 6 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 3 - + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 73 +- + drivers/net/ethernet/broadcom/bgmac.c | 84 +- + drivers/net/ethernet/broadcom/bgmac.h | 1 + + drivers/net/ethernet/broadcom/bnx2.c | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 42 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 325 +++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 24 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 29 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 87 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 252 ++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 101 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 121 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 77 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 20 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 327 +++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 13 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 9 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 5 +- + drivers/net/ethernet/broadcom/tg3.c | 389 +++-- + drivers/net/ethernet/broadcom/tg3.h | 18 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 +- + drivers/net/ethernet/brocade/bna/bnad.c | 5 +- + drivers/net/ethernet/cadence/at91_ether.c | 33 +- + drivers/net/ethernet/cadence/macb.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 55 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 778 ++++++++- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 89 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 256 ++- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 1 - + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 53 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 98 ++ + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 1 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 35 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 24 + + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 14 +- + drivers/net/ethernet/cirrus/cs89x0.c | 20 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 13 +- + drivers/net/ethernet/davicom/dm9000.c | 17 +- + drivers/net/ethernet/dec/tulip/xircom_cb.c | 9 +- + drivers/net/ethernet/dlink/dl2k.c | 7 +- + drivers/net/ethernet/emulex/benet/be.h | 2 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 31 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 10 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 11 +- + drivers/net/ethernet/emulex/benet/be_hw.h | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 60 +- + drivers/net/ethernet/emulex/benet/be_roce.c | 2 +- + drivers/net/ethernet/emulex/benet/be_roce.h | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 22 +- + drivers/net/ethernet/faraday/ftmac100.c | 8 +- + drivers/net/ethernet/freescale/fec.c | 30 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 17 +- + drivers/net/ethernet/freescale/gianfar.c | 13 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 - + drivers/net/ethernet/i825xx/82596.c | 8 +- + drivers/net/ethernet/i825xx/lib82596.c | 6 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 +- + drivers/net/ethernet/ibm/emac/mal.c | 9 +- + drivers/net/ethernet/ibm/ibmveth.c | 6 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 6 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 7 - + drivers/net/ethernet/intel/e1000e/80003es2lan.c | 131 +- + drivers/net/ethernet/intel/e1000e/82571.c | 38 +- + drivers/net/ethernet/intel/e1000e/82571.h | 2 + + drivers/net/ethernet/intel/e1000e/defines.h | 25 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 18 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 177 +- + drivers/net/ethernet/intel/e1000e/hw.h | 4 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 195 ++- + drivers/net/ethernet/intel/e1000e/mac.c | 10 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 268 ++- + drivers/net/ethernet/intel/e1000e/nvm.c | 2 +- + drivers/net/ethernet/intel/e1000e/param.c | 62 +- + drivers/net/ethernet/intel/e1000e/phy.c | 130 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 - + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 42 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 83 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 32 + + drivers/net/ethernet/marvell/mvneta.c | 14 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 27 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 76 - + drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 5 +- + drivers/net/ethernet/micrel/ks8851_mll.c | 32 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 3 +- + drivers/net/ethernet/natsemi/jazzsonic.c | 12 +- + drivers/net/ethernet/natsemi/macsonic.c | 12 +- + drivers/net/ethernet/natsemi/sonic.c | 1 - + drivers/net/ethernet/natsemi/xtsonic.c | 12 +- + drivers/net/ethernet/neterion/s2io.c | 6 +- + drivers/net/ethernet/netx-eth.c | 2 - + drivers/net/ethernet/nuvoton/w90p910_ether.c | 20 +- + drivers/net/ethernet/nvidia/forcedeth.c | 1 - + drivers/net/ethernet/nxp/lpc_eth.c | 2 - + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 21 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 5 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 5 +- + .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 4 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 220 ++- + drivers/net/ethernet/qlogic/qla3xxx.c | 1 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 163 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 26 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 33 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 53 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 14 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 7 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 21 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 5 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 255 ++- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 6 - + drivers/net/ethernet/rdc/r6040.c | 12 +- + drivers/net/ethernet/realtek/8139too.c | 2 - + drivers/net/ethernet/realtek/atp.c | 2 - + drivers/net/ethernet/renesas/sh_eth.c | 9 +- + drivers/net/ethernet/seeq/ether3.c | 22 +- + drivers/net/ethernet/seeq/sgiseeq.c | 2 - + drivers/net/ethernet/sfc/efx.c | 267 ++- + drivers/net/ethernet/sfc/efx.h | 14 +- + drivers/net/ethernet/sfc/enum.h | 12 +- + drivers/net/ethernet/sfc/ethtool.c | 4 +- + drivers/net/ethernet/sfc/falcon.c | 17 +- + drivers/net/ethernet/sfc/filter.c | 249 ++- + drivers/net/ethernet/sfc/mcdi_pcol.h | 1 + + drivers/net/ethernet/sfc/net_driver.h | 97 +- + drivers/net/ethernet/sfc/nic.c | 94 +- + drivers/net/ethernet/sfc/ptp.c | 116 +- + drivers/net/ethernet/sfc/rx.c | 793 +++++---- + drivers/net/ethernet/sfc/siena.c | 25 +- + drivers/net/ethernet/sgi/meth.c | 5 +- + drivers/net/ethernet/sis/sis900.c | 7 +- + drivers/net/ethernet/smsc/smc9194.c | 2 - + drivers/net/ethernet/smsc/smc91x.c | 2 - + drivers/net/ethernet/smsc/smsc9420.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 24 +- + drivers/net/ethernet/sun/sunbmac.c | 4 +- + drivers/net/ethernet/sun/sunhme.c | 13 +- + drivers/net/ethernet/sun/sunqe.c | 5 +- + drivers/net/ethernet/tehuti/tehuti.c | 5 +- + drivers/net/ethernet/ti/cpsw.c | 159 +- + drivers/net/ethernet/ti/tlan.c | 4 +- + drivers/net/ethernet/toshiba/spider_net.c | 3 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 21 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 27 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 25 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 1 - + drivers/net/fddi/defxx.c | 9 +- + drivers/net/irda/ali-ircc.c | 6 +- + drivers/net/irda/au1k_ir.c | 5 +- + drivers/net/irda/bfin_sir.c | 3 +- + drivers/net/irda/nsc-ircc.c | 6 +- + drivers/net/irda/pxaficp_ir.c | 4 +- + drivers/net/irda/smsc-ircc2.c | 17 +- + drivers/net/irda/via-ircc.c | 6 +- + drivers/net/irda/w83977af_ir.c | 7 +- + drivers/net/phy/lxt.c | 2 +- + drivers/net/phy/marvell.c | 127 ++ + drivers/net/phy/micrel.c | 41 +- + drivers/net/phy/phy.c | 16 + + drivers/net/phy/vitesse.c | 3 +- + drivers/net/team/Kconfig | 12 + + drivers/net/team/Makefile | 1 + + drivers/net/team/team.c | 25 +- + drivers/net/team/team_mode_broadcast.c | 14 +- + drivers/net/team/team_mode_random.c | 71 + + drivers/net/team/team_mode_roundrobin.c | 36 +- + drivers/net/tun.c | 2 - + drivers/net/vxlan.c | 298 +++- + drivers/net/wireless/ath/wil6210/txrx.c | 2 - + drivers/net/wireless/b43/dma.c | 9 +- + drivers/net/wireless/b43legacy/dma.c | 8 +- + drivers/net/wireless/iwlegacy/3945.c | 4 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 4 +- + drivers/net/wireless/iwlegacy/common.c | 15 +- + drivers/net/wireless/iwlegacy/common.h | 5 +- + drivers/net/wireless/iwlwifi/pcie/tx.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 4 +- + drivers/scsi/csiostor/Makefile | 3 +- + drivers/scsi/csiostor/csio_hw.c | 559 ++---- + drivers/scsi/csiostor/csio_hw.h | 47 +- + drivers/scsi/csiostor/csio_hw_chip.h | 175 ++ + drivers/scsi/csiostor/csio_hw_t4.c | 403 +++++ + drivers/scsi/csiostor/csio_hw_t5.c | 397 +++++ + drivers/scsi/csiostor/csio_init.c | 48 +- + drivers/scsi/csiostor/csio_init.h | 29 +- + drivers/scsi/csiostor/csio_lnode.h | 2 +- + drivers/scsi/csiostor/csio_rnode.c | 10 +- + drivers/scsi/csiostor/csio_rnode.h | 2 +- + drivers/scsi/csiostor/csio_wr.c | 60 +- + include/linux/if_team.h | 25 +- + include/linux/micrel_phy.h | 1 + + include/linux/netdev_features.h | 9 +- + include/linux/netdevice.h | 27 +- + include/linux/openvswitch.h | 13 +- + include/linux/phy.h | 10 + + include/linux/platform_data/cpsw.h | 2 +- + include/linux/rtnetlink.h | 9 + + include/linux/skbuff.h | 36 + + include/linux/tcp.h | 16 +- + include/linux/vm_sockets.h | 23 + + include/net/caif/caif_shm.h | 26 - + include/net/inet_connection_sock.h | 5 +- + include/net/ip6_tunnel.h | 20 + + include/net/ipip.h | 3 - + include/net/ipv6.h | 20 +- + include/net/request_sock.h | 8 +- + include/net/tcp.h | 140 +- + include/uapi/linux/neighbour.h | 3 + + include/uapi/linux/pkt_sched.h | 1 + + include/uapi/linux/snmp.h | 2 + + include/uapi/linux/tcp.h | 26 - + include/uapi/linux/vm_sockets.h | 23 +- + net/batman-adv/Kconfig | 14 + + net/batman-adv/Makefile | 1 + + net/batman-adv/bat_iv_ogm.c | 5 + + net/batman-adv/debugfs.c | 18 + + net/batman-adv/distributed-arp-table.c | 22 +- + net/batman-adv/main.c | 6 + + net/batman-adv/main.h | 12 +- + net/batman-adv/network-coding.c | 1821 ++++++++++++++++++++ + net/batman-adv/network-coding.h | 123 ++ + net/batman-adv/originator.c | 6 + + net/batman-adv/packet.h | 33 + + net/batman-adv/routing.c | 49 +- + net/batman-adv/send.c | 5 + + net/batman-adv/soft-interface.c | 14 + + net/batman-adv/sysfs.c | 16 +- + net/batman-adv/translation-table.c | 29 +- + net/batman-adv/types.h | 136 ++ + net/batman-adv/unicast.c | 6 +- + net/bridge/br_fdb.c | 14 +- + net/bridge/br_multicast.c | 2 +- + net/bridge/br_netlink.c | 5 +- + net/caif/caif_dev.c | 9 +- + net/caif/caif_socket.c | 22 +- + net/caif/caif_usb.c | 4 +- + net/caif/cfcnfg.c | 19 +- + net/caif/cfctrl.c | 14 +- + net/caif/cffrml.c | 4 +- + net/caif/cfmuxl.c | 4 +- + net/caif/cfpkt_skbuff.c | 8 +- + net/caif/cfrfml.c | 4 +- + net/caif/cfserl.c | 4 +- + net/caif/cfsrvl.c | 13 +- + net/caif/chnl_net.c | 6 +- + net/can/af_can.c | 21 +- + net/core/dev.c | 72 +- + net/core/ethtool.c | 1 + + net/core/flow_dissector.c | 11 + + net/core/netpoll.c | 3 +- + net/core/rtnetlink.c | 83 +- + net/core/skbuff.c | 49 +- + net/dcb/dcbevent.c | 1 + + net/dccp/ipv4.c | 5 +- + net/dccp/ipv6.c | 5 +- + net/ipv4/af_inet.c | 9 +- + net/ipv4/devinet.c | 70 +- + net/ipv4/inet_connection_sock.c | 2 +- + net/ipv4/inet_diag.c | 4 +- + net/ipv4/inet_lro.c | 5 +- + net/ipv4/ip_gre.c | 16 +- + net/ipv4/ipip.c | 14 +- + net/ipv4/proc.c | 2 + + net/ipv4/syncookies.c | 3 +- + net/ipv4/sysctl_net_ipv4.c | 11 +- + net/ipv4/tcp.c | 268 +-- + net/ipv4/tcp_input.c | 132 +- + net/ipv4/tcp_ipv4.c | 108 +- + net/ipv4/tcp_minisocks.c | 41 +- + net/ipv4/tcp_output.c | 356 ++-- + net/ipv4/tcp_timer.c | 15 +- + net/ipv4/udp.c | 115 +- + net/ipv6/addrconf.c | 70 +- + net/ipv6/addrlabel.c | 6 - + net/ipv6/af_inet6.c | 6 +- + net/ipv6/datagram.c | 20 +- + net/ipv6/icmp.c | 2 +- + net/ipv6/inet6_connection_sock.c | 10 +- + net/ipv6/ip6_flowlabel.c | 11 +- + net/ipv6/ip6_gre.c | 17 +- + net/ipv6/ip6_offload.c | 4 +- + net/ipv6/ip6_tunnel.c | 15 +- + net/ipv6/ndisc.c | 2 - + net/ipv6/raw.c | 9 +- + net/ipv6/sit.c | 2 + + net/ipv6/syncookies.c | 3 +- + net/ipv6/tcp_ipv6.c | 56 +- + net/ipv6/udp.c | 13 +- + net/ipv6/udp_offload.c | 8 +- + net/openvswitch/datapath.c | 13 +- + net/openvswitch/datapath.h | 2 +- + net/openvswitch/vport-internal_dev.c | 13 +- + net/openvswitch/vport.h | 4 +- + net/sched/sch_htb.c | 31 +- + net/vmw_vsock/vmci_transport.c | 16 +- + net/vmw_vsock/vmci_transport.h | 3 + + 337 files changed, 10921 insertions(+), 5831 deletions(-) + delete mode 100644 drivers/net/caif/caif_shm_u5500.c + delete mode 100644 drivers/net/caif/caif_shmcore.c + create mode 100644 drivers/net/team/team_mode_random.c + create mode 100644 drivers/scsi/csiostor/csio_hw_chip.h + create mode 100644 drivers/scsi/csiostor/csio_hw_t4.c + create mode 100644 drivers/scsi/csiostor/csio_hw_t5.c + create mode 100644 include/linux/vm_sockets.h + delete mode 100644 include/net/caif/caif_shm.h + create mode 100644 net/batman-adv/network-coding.c + create mode 100644 net/batman-adv/network-coding.h +Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 1 + + include/uapi/linux/xfrm.h | 3 +++ + net/ipv4/ipcomp.c | 1 + + net/ipv4/xfrm4_mode_tunnel.c | 8 ++++++-- + net/ipv6/xfrm6_mode_tunnel.c | 7 +++++-- + net/xfrm/xfrm_state.c | 1 + + net/xfrm/xfrm_user.c | 17 +++++++++++++++-- + 7 files changed, 32 insertions(+), 6 deletions(-) +Merging wireless-next/master (856a850 rt2800: 5592: add more USB devices IDs) +$ git merge wireless-next/master +Auto-merging drivers/net/wireless/rtlwifi/usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00pci.c +Auto-merging drivers/net/wireless/mwifiex/sta_ioctl.c +Auto-merging drivers/net/wireless/mwifiex/main.h +Auto-merging drivers/net/wireless/mwifiex/init.c +Auto-merging drivers/net/wireless/mwifiex/cmdevt.c +Auto-merging drivers/net/wireless/iwlwifi/pcie/tx.c +Removing drivers/net/wireless/iwlwifi/pcie/cfg.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-7000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-6000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-2000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-1000.c +Auto-merging drivers/net/wireless/iwlegacy/common.h +Auto-merging drivers/net/wireless/iwlegacy/common.c +Auto-merging drivers/net/wireless/iwlegacy/4965-mac.c +Auto-merging drivers/net/wireless/iwlegacy/3945-mac.c +Auto-merging drivers/net/wireless/ath/wil6210/txrx.c +Removing drivers/net/wireless/ath/wil6210/dbg_hexdump.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/bcma/core.c | 8 +- + drivers/bcma/main.c | 5 + + drivers/net/wireless/ath/ath5k/ath5k.h | 3 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 6 +- + drivers/net/wireless/ath/ath5k/eeprom.h | 3 - + drivers/net/wireless/ath/ath5k/phy.c | 20 +- + drivers/net/wireless/ath/ath5k/reset.c | 4 +- + drivers/net/wireless/ath/ath6kl/Kconfig | 9 + + drivers/net/wireless/ath/ath6kl/Makefile | 5 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 15 +- + drivers/net/wireless/ath/ath6kl/core.h | 3 - + drivers/net/wireless/ath/ath6kl/debug.c | 72 +- + drivers/net/wireless/ath/ath6kl/debug.h | 11 +- + drivers/net/wireless/ath/ath6kl/hif.c | 3 + + drivers/net/wireless/ath/ath6kl/htc_mbox.c | 21 +- + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 15 +- + drivers/net/wireless/ath/ath6kl/init.c | 116 +- + drivers/net/wireless/ath/ath6kl/main.c | 41 +- + drivers/net/wireless/ath/ath6kl/sdio.c | 16 +- + drivers/net/wireless/ath/ath6kl/target.h | 2 +- + drivers/net/wireless/ath/ath6kl/trace.c | 23 + + drivers/net/wireless/ath/ath6kl/trace.h | 332 ++++ + drivers/net/wireless/ath/ath6kl/txrx.c | 5 +- + drivers/net/wireless/ath/ath6kl/usb.c | 38 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 6 + + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 17 + + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 49 +- + drivers/net/wireless/ath/ath9k/calib.c | 4 +- + drivers/net/wireless/ath/ath9k/common.h | 2 +- + drivers/net/wireless/ath/ath9k/debug.c | 5 + + drivers/net/wireless/ath/ath9k/debug.h | 2 + + drivers/net/wireless/ath/ath9k/hw.c | 188 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 - + drivers/net/wireless/ath/carl9170/tx.c | 69 +- + drivers/net/wireless/ath/wil6210/Makefile | 4 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 33 +- + drivers/net/wireless/ath/wil6210/dbg_hexdump.h | 20 - + drivers/net/wireless/ath/wil6210/debugfs.c | 58 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 25 +- + drivers/net/wireless/ath/wil6210/main.c | 60 +- + drivers/net/wireless/ath/wil6210/netdev.c | 3 - + drivers/net/wireless/ath/wil6210/pcie_bus.c | 3 - + drivers/net/wireless/ath/wil6210/txrx.c | 5 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 17 +- + drivers/net/wireless/ath/wil6210/wmi.c | 154 +- + drivers/net/wireless/ath/wil6210/wmi.h | 363 +++- + drivers/net/wireless/b43/Kconfig | 6 +- + drivers/net/wireless/b43/b43.h | 6 + + drivers/net/wireless/b43/main.c | 7 +- + drivers/net/wireless/b43/phy_ht.c | 610 ++++++- + drivers/net/wireless/b43/phy_ht.h | 77 +- + drivers/net/wireless/brcm80211/Kconfig | 5 +- + drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 + + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 7 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 30 +- + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 33 + + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 42 + + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 34 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 39 +- + .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 28 +- + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 382 ++++ + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h | 25 + + .../net/wireless/brcm80211/brcmfmac/tracepoint.c | 22 + + .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 87 + + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 37 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 +- + drivers/net/wireless/brcm80211/brcmsmac/Makefile | 4 + + drivers/net/wireless/brcm80211/brcmsmac/led.c | 126 ++ + drivers/net/wireless/brcm80211/brcmsmac/led.h | 36 + + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 + + .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 4 + + drivers/net/wireless/brcm80211/brcmsmac/main.c | 11 +- + drivers/net/wireless/brcm80211/brcmutil/utils.c | 25 + + .../net/wireless/brcm80211/include/brcmu_utils.h | 27 + + drivers/net/wireless/iwlegacy/3945-mac.c | 2 +- + drivers/net/wireless/iwlegacy/3945.h | 4 - + drivers/net/wireless/iwlegacy/4965-mac.c | 29 +- + drivers/net/wireless/iwlegacy/common.c | 2 +- + drivers/net/wireless/iwlegacy/common.h | 4 - + drivers/net/wireless/iwlwifi/Kconfig | 11 +- + drivers/net/wireless/iwlwifi/Makefile | 3 +- + drivers/net/wireless/iwlwifi/dvm/agn.h | 2 +- + drivers/net/wireless/iwlwifi/dvm/calib.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/calib.h | 2 +- + drivers/net/wireless/iwlwifi/dvm/commands.h | 3 +- + drivers/net/wireless/iwlwifi/dvm/debugfs.c | 26 +- + drivers/net/wireless/iwlwifi/dvm/lib.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 3 +- + drivers/net/wireless/iwlwifi/dvm/scan.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/testmode.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/tx.c | 13 +- + drivers/net/wireless/iwlwifi/dvm/ucode.c | 2 +- + .../wireless/iwlwifi/{pcie/1000.c => iwl-1000.c} | 1 - + .../wireless/iwlwifi/{pcie/2000.c => iwl-2000.c} | 1 - + .../wireless/iwlwifi/{pcie/5000.c => iwl-5000.c} | 1 - + .../wireless/iwlwifi/{pcie/6000.c => iwl-6000.c} | 1 - + .../wireless/iwlwifi/{pcie/7000.c => iwl-7000.c} | 63 +- + drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-config.h | 49 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-debug.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-drv.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-drv.h | 17 +- + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-eeprom-read.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-eeprom-read.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-fw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 19 +- + drivers/net/wireless/iwlwifi/iwl-modparams.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-notif-wait.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-notif-wait.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 51 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-op-mode.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-phy-db.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-phy-db.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-test.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-test.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-testmode.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-trans.h | 5 +- + drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/iwlwifi/mvm/binding.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 347 ++++ + drivers/net/wireless/iwlwifi/mvm/d3.c | 260 ++- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 138 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | 319 ++++ + drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 53 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 2 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 2 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 2 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 2 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 2 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 2 +- + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 12 +- + drivers/net/wireless/iwlwifi/mvm/fw.c | 14 +- + drivers/net/wireless/iwlwifi/mvm/led.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 45 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 57 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 17 +- + drivers/net/wireless/iwlwifi/mvm/nvm.c | 11 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 12 +- + drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/power.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/quota.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 14 +- + drivers/net/wireless/iwlwifi/mvm/rx.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/scan.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/sta.c | 91 +- + drivers/net/wireless/iwlwifi/mvm/sta.h | 4 +- + drivers/net/wireless/iwlwifi/mvm/time-event.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/time-event.h | 2 +- + drivers/net/wireless/iwlwifi/mvm/tx.c | 4 +- + drivers/net/wireless/iwlwifi/mvm/utils.c | 2 +- + drivers/net/wireless/iwlwifi/pcie/cfg.h | 115 -- + drivers/net/wireless/iwlwifi/pcie/drv.c | 4 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 25 +- + drivers/net/wireless/iwlwifi/pcie/tx.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 3 +- + drivers/net/wireless/mwifiex/Makefile | 1 + + drivers/net/wireless/mwifiex/cfg80211.c | 218 ++- + drivers/net/wireless/mwifiex/cmdevt.c | 2 +- + drivers/net/wireless/mwifiex/ethtool.c | 70 + + drivers/net/wireless/mwifiex/fw.h | 72 +- + drivers/net/wireless/mwifiex/init.c | 6 +- + drivers/net/wireless/mwifiex/ioctl.h | 23 + + drivers/net/wireless/mwifiex/main.c | 15 +- + drivers/net/wireless/mwifiex/main.h | 9 + + drivers/net/wireless/mwifiex/pcie.c | 156 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 79 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 + + drivers/net/wireless/mwifiex/sta_ioctl.c | 10 +- + drivers/net/wireless/mwifiex/txrx.c | 2 + + drivers/net/wireless/mwifiex/util.c | 5 +- + drivers/net/wireless/mwl8k.c | 111 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 2 +- + drivers/net/wireless/ray_cs.c | 6 +- + drivers/net/wireless/rndis_wlan.c | 5 +- + drivers/net/wireless/rt2x00/Kconfig | 7 + + drivers/net/wireless/rt2x00/rt2800.h | 103 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 857 ++++++++- + drivers/net/wireless/rt2x00/rt2800pci.c | 116 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 63 +- + drivers/net/wireless/rt2x00/rt2x00.h | 10 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 9 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 20 +- + drivers/net/wireless/rtlwifi/usb.c | 3 +- + drivers/net/wireless/rtlwifi/wifi.h | 3 - + drivers/net/wireless/ti/wlcore/main.c | 3 +- + drivers/nfc/microread/mei.c | 2 +- + drivers/ssb/driver_chipcommon.c | 2 +- + drivers/ssb/driver_chipcommon_pmu.c | 41 +- + drivers/ssb/driver_mipscore.c | 25 +- + drivers/ssb/driver_pcicore.c | 15 +- + drivers/ssb/embedded.c | 5 +- + drivers/ssb/main.c | 51 +- + drivers/ssb/pci.c | 97 +- + drivers/ssb/pcmcia.c | 46 +- + drivers/ssb/scan.c | 31 +- + drivers/ssb/sprom.c | 4 +- + drivers/ssb/ssb_private.h | 19 +- + include/linux/ieee80211.h | 52 +- + include/linux/socket.h | 1 + + include/linux/ssb/ssb.h | 6 +- + include/net/cfg80211.h | 126 +- + include/net/mac80211.h | 29 +- + include/uapi/linux/nfc.h | 16 + + include/uapi/linux/nl80211.h | 117 +- + net/mac80211/cfg.c | 151 +- + net/mac80211/debugfs_sta.c | 31 + + net/mac80211/driver-ops.h | 7 +- + net/mac80211/ht.c | 52 +- + net/mac80211/ibss.c | 29 +- + net/mac80211/ieee80211_i.h | 26 +- + net/mac80211/iface.c | 14 +- + net/mac80211/key.c | 103 +- + net/mac80211/key.h | 5 +- + net/mac80211/main.c | 55 +- + net/mac80211/mesh.c | 59 +- + net/mac80211/mesh.h | 12 - + net/mac80211/mesh_plink.c | 37 +- + net/mac80211/mlme.c | 100 +- + net/mac80211/offchannel.c | 2 +- + net/mac80211/pm.c | 117 +- + net/mac80211/rc80211_minstrel.c | 204 ++- + net/mac80211/rc80211_minstrel.h | 31 +- + net/mac80211/rc80211_minstrel_debugfs.c | 12 +- + net/mac80211/rc80211_minstrel_ht.c | 79 +- + net/mac80211/rc80211_minstrel_ht.h | 6 +- + net/mac80211/rx.c | 61 +- + net/mac80211/sta_info.c | 11 +- + net/mac80211/sta_info.h | 2 - + net/mac80211/trace.h | 11 +- + net/mac80211/util.c | 73 +- + net/mac80211/vht.c | 212 ++- + net/nfc/llcp/commands.c | 205 ++- + net/nfc/llcp/llcp.c | 112 +- + net/nfc/llcp/llcp.h | 36 +- + net/nfc/llcp/sock.c | 130 +- + net/nfc/netlink.c | 172 ++ + net/nfc/nfc.h | 14 + + net/rfkill/rfkill-regulator.c | 2 +- + net/wireless/ap.c | 62 - + net/wireless/core.c | 73 +- + net/wireless/core.h | 22 +- + net/wireless/mesh.c | 15 +- + net/wireless/mlme.c | 230 +-- + net/wireless/nl80211.c | 1885 +++++++++++++------- + net/wireless/nl80211.h | 68 - + net/wireless/rdev-ops.h | 20 +- + net/wireless/reg.c | 6 +- + net/wireless/sme.c | 26 +- + net/wireless/sysfs.c | 25 +- + net/wireless/trace.h | 46 + + 263 files changed, 9534 insertions(+), 3414 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath6kl/trace.c + create mode 100644 drivers/net/wireless/ath/ath6kl/trace.h + delete mode 100644 drivers/net/wireless/ath/wil6210/dbg_hexdump.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/led.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/led.h + rename drivers/net/wireless/iwlwifi/{pcie/1000.c => iwl-1000.c} (99%) + rename drivers/net/wireless/iwlwifi/{pcie/2000.c => iwl-2000.c} (99%) + rename drivers/net/wireless/iwlwifi/{pcie/5000.c => iwl-5000.c} (99%) + rename drivers/net/wireless/iwlwifi/{pcie/6000.c => iwl-6000.c} (99%) + rename drivers/net/wireless/iwlwifi/{pcie/7000.c => iwl-7000.c} (58%) + create mode 100644 drivers/net/wireless/iwlwifi/mvm/bt-coex.c + create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h + delete mode 100644 drivers/net/wireless/iwlwifi/pcie/cfg.h + create mode 100644 drivers/net/wireless/mwifiex/ethtool.c +Merging bluetooth/master (feb94d3 Bluetooth: Fix PIN/Confirm/Passkey response parameters) +$ git merge bluetooth/master +Auto-merging net/bluetooth/sco.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_sdio.c | 8 +- + include/net/bluetooth/bluetooth.h | 12 +- + include/net/bluetooth/hci.h | 21 +- + include/net/bluetooth/hci_core.h | 28 +- + include/net/bluetooth/rfcomm.h | 6 - + net/bluetooth/a2mp.c | 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 | 727 +++++++++++++++++++++++++++++++------- + net/bluetooth/hci_event.c | 605 ++++++------------------------- + net/bluetooth/hci_sock.c | 9 +- + net/bluetooth/hci_sysfs.c | 4 +- + net/bluetooth/hidp/core.c | 4 + + net/bluetooth/hidp/sock.c | 4 +- + net/bluetooth/l2cap_sock.c | 4 +- + net/bluetooth/mgmt.c | 680 ++++++++++++++++++++++++----------- + net/bluetooth/rfcomm/core.c | 163 ++++----- + net/bluetooth/rfcomm/sock.c | 3 +- + net/bluetooth/sco.c | 3 +- + 21 files changed, 1326 insertions(+), 988 deletions(-) +Merging mtd/master (35f8c76 Merge tag 'for-linus-20130318' of git://git.infradead.org/linux-mtd) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (dc65666 mtd: add 4 Toshiba nand chips for the full-id case) +$ git merge l2-mtd/master +Recorded preimage for 'drivers/mtd/nand/nand_ids.c' +Resolved 'include/linux/mtd/nand.h' using previous resolution. +Auto-merging include/linux/mtd/nand.h +CONFLICT (content): Merge conflict in include/linux/mtd/nand.h +Auto-merging drivers/ssb/driver_mipscore.c +Removing drivers/mtd/onenand/onenand_sim.c +Removing drivers/mtd/nand/rtc_from4.c +Removing drivers/mtd/nand/ppchameleonevb.c +Auto-merging drivers/mtd/nand/nand_ids.c +CONFLICT (content): Merge conflict in drivers/mtd/nand/nand_ids.c +Auto-merging drivers/mtd/nand/nand_base.c +Removing drivers/mtd/nand/h1910.c +Removing drivers/mtd/maps/tqm8xxl.c +Removing drivers/mtd/maps/rpxlite.c +Removing drivers/mtd/maps/mbx860.c +Removing drivers/mtd/maps/ixp2000.c +Removing drivers/mtd/maps/h720x-flash.c +Removing drivers/mtd/maps/dmv182.c +Removing drivers/mtd/maps/dilnetpc.c +Removing drivers/mtd/maps/dbox2-flash.c +Removing drivers/mtd/devices/docprobe.c +Removing drivers/mtd/devices/docecc.c +Removing drivers/mtd/devices/doc2001plus.c +Removing drivers/mtd/devices/doc2001.c +Removing drivers/mtd/devices/doc2000.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/mtd/nand/nand_ids.c'. +[master 175b113] Merge remote-tracking branch 'l2-mtd/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-mtd | 6 +- + .../devicetree/bindings/mtd/partition.txt | 36 +- + arch/arm/configs/lpc32xx_defconfig | 1 - + arch/arm/mach-pxa/Kconfig | 1 - + arch/cris/Kconfig | 1 - + arch/cris/arch-v32/drivers/Kconfig | 1 - + arch/m68k/include/asm/commproc.h | 17 - + drivers/bcma/driver_mips.c | 2 +- + drivers/mtd/Kconfig | 13 - + drivers/mtd/Makefile | 3 +- + drivers/mtd/chips/Kconfig | 1 - + drivers/mtd/devices/Kconfig | 64 -- + drivers/mtd/devices/Makefile | 5 - + drivers/mtd/devices/bcm47xxsflash.c | 13 +- + drivers/mtd/devices/bcm47xxsflash.h | 59 + + drivers/mtd/devices/doc2000.c | 1178 -------------------- + drivers/mtd/devices/doc2001.c | 824 -------------- + drivers/mtd/devices/doc2001plus.c | 1080 ------------------ + drivers/mtd/devices/docecc.c | 521 --------- + drivers/mtd/devices/docg3.c | 15 +- + drivers/mtd/devices/docprobe.c | 325 ------ + drivers/mtd/devices/elm.c | 9 +- + drivers/mtd/devices/m25p80.c | 25 +- + drivers/mtd/devices/mtd_dataflash.c | 4 +- + drivers/mtd/maps/Kconfig | 77 -- + drivers/mtd/maps/Makefile | 8 - + drivers/mtd/maps/bfin-async-flash.c | 3 +- + drivers/mtd/maps/ck804xrom.c | 3 +- + drivers/mtd/maps/dbox2-flash.c | 123 -- + drivers/mtd/maps/dc21285.c | 3 +- + drivers/mtd/maps/dilnetpc.c | 496 --------- + drivers/mtd/maps/dmv182.c | 146 --- + drivers/mtd/maps/gpio-addr-flash.c | 3 +- + drivers/mtd/maps/h720x-flash.c | 120 -- + drivers/mtd/maps/impa7.c | 7 +- + drivers/mtd/maps/intel_vr_nor.c | 4 +- + drivers/mtd/maps/ixp2000.c | 253 ----- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/maps/lantiq-flash.c | 3 +- + drivers/mtd/maps/mbx860.c | 98 -- + drivers/mtd/maps/pci.c | 3 +- + drivers/mtd/maps/physmap.c | 17 +- + drivers/mtd/maps/physmap_of.c | 16 +- + drivers/mtd/maps/plat-ram.c | 2 +- + drivers/mtd/maps/pxa2xx-flash.c | 4 +- + drivers/mtd/maps/rbtx4939-flash.c | 5 +- + drivers/mtd/maps/rpxlite.c | 64 -- + drivers/mtd/maps/sa1100-flash.c | 2 +- + drivers/mtd/maps/solutionengine.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 249 ----- + drivers/mtd/maps/tsunami_flash.c | 5 +- + drivers/mtd/mtdchar.c | 52 +- + drivers/mtd/mtdcore.c | 26 +- + drivers/mtd/mtdcore.h | 30 +- + drivers/mtd/mtdpart.c | 4 +- + drivers/mtd/nand/Kconfig | 30 - + drivers/mtd/nand/Makefile | 3 - + drivers/mtd/nand/atmel_nand.c | 15 +- + drivers/mtd/nand/cafe_nand.c | 6 - + drivers/mtd/nand/davinci_nand.c | 16 +- + drivers/mtd/nand/docg4.c | 13 +- + drivers/mtd/nand/fsmc_nand.c | 13 +- + drivers/mtd/nand/gpio.c | 8 +- + drivers/mtd/nand/h1910.c | 167 --- + drivers/mtd/nand/nand_base.c | 194 ++-- + drivers/mtd/nand/nand_bbt.c | 25 - + drivers/mtd/nand/nand_ids.c | 242 ++-- + drivers/mtd/nand/nandsim.c | 24 +- + drivers/mtd/nand/nuc900_nand.c | 9 - + drivers/mtd/nand/omap2.c | 5 +- + drivers/mtd/nand/orion_nand.c | 13 +- + drivers/mtd/nand/ppchameleonevb.c | 403 ------- + drivers/mtd/nand/pxa3xx_nand.c | 2 +- + drivers/mtd/nand/rtc_from4.c | 624 ----------- + drivers/mtd/nand/sh_flctl.c | 16 +- + drivers/mtd/nand/sm_common.c | 61 +- + drivers/mtd/nand/txx9ndfmc.c | 13 +- + drivers/mtd/ofpart.c | 7 +- + drivers/mtd/onenand/Kconfig | 7 - + drivers/mtd/onenand/Makefile | 3 - + drivers/mtd/onenand/onenand_sim.c | 564 ---------- + drivers/pcmcia/m8xx_pcmcia.c | 140 --- + drivers/ssb/driver_mipscore.c | 2 +- + include/linux/mtd/mtd.h | 8 +- + include/linux/mtd/nand.h | 117 +- + include/linux/mtd/physmap.h | 2 +- + include/linux/mtd/plat-ram.h | 4 +- + include/linux/platform_data/elm.h | 2 +- + 88 files changed, 557 insertions(+), 8235 deletions(-) + delete mode 100644 drivers/mtd/devices/doc2000.c + delete mode 100644 drivers/mtd/devices/doc2001.c + delete mode 100644 drivers/mtd/devices/doc2001plus.c + delete mode 100644 drivers/mtd/devices/docecc.c + delete mode 100644 drivers/mtd/devices/docprobe.c + delete mode 100644 drivers/mtd/maps/dbox2-flash.c + delete mode 100644 drivers/mtd/maps/dilnetpc.c + delete mode 100644 drivers/mtd/maps/dmv182.c + delete mode 100644 drivers/mtd/maps/h720x-flash.c + delete mode 100644 drivers/mtd/maps/ixp2000.c + delete mode 100644 drivers/mtd/maps/mbx860.c + delete mode 100644 drivers/mtd/maps/rpxlite.c + delete mode 100644 drivers/mtd/maps/tqm8xxl.c + delete mode 100644 drivers/mtd/nand/h1910.c + delete mode 100644 drivers/mtd/nand/ppchameleonevb.c + delete mode 100644 drivers/mtd/nand/rtc_from4.c + delete mode 100644 drivers/mtd/onenand/onenand_sim.c +Merging crypto/master (6375bcf hwrng: Fix a wrong comment in Documentation/hw_random.txt) +$ git merge crypto/master +Removing include/linux/platform_data/atmel-aes.h +Merge made by the 'recursive' strategy. + Documentation/hw_random.txt | 2 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 14 +- + arch/x86/crypto/Makefile | 2 +- + arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 5 +- + crypto/Kconfig | 10 - + crypto/crypto_user.c | 4 +- + drivers/crypto/Kconfig | 8 +- + drivers/crypto/atmel-aes.c | 471 +++++++++++++++++------ + drivers/crypto/atmel-sha-regs.h | 7 +- + drivers/crypto/atmel-sha.c | 586 ++++++++++++++++++++++++----- + drivers/crypto/atmel-tdes-regs.h | 2 + + drivers/crypto/atmel-tdes.c | 394 ++++++++++++++++--- + drivers/crypto/bfin_crc.c | 6 +- + drivers/crypto/caam/Kconfig | 2 +- + drivers/crypto/omap-aes.c | 15 +- + drivers/crypto/omap-sham.c | 15 +- + include/linux/platform_data/atmel-aes.h | 22 -- + include/linux/platform_data/crypto-atmel.h | 22 ++ + 18 files changed, 1236 insertions(+), 351 deletions(-) + delete mode 100644 include/linux/platform_data/atmel-aes.h + create mode 100644 include/linux/platform_data/crypto-atmel.h +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 (41fda59 drm/i915: Remove unneeded dev argument) +$ git merge drm-intel/drm-intel-next-queued +Resolved 'drivers/gpu/drm/i915/intel_hdmi.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_sdvo.c' using previous resolution. +Auto-merging include/linux/pm.h +Auto-merging drivers/video/fbmem.c +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_fb.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 +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2b04dbb] Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/i915_debugfs.c | 423 +++++++++-------------------- + drivers/gpu/drm/i915/i915_dma.c | 18 ++ + drivers/gpu/drm/i915/i915_drv.c | 37 ++- + drivers/gpu/drm/i915/i915_drv.h | 9 +- + drivers/gpu/drm/i915/i915_gem.c | 14 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 36 +-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 246 ++++++++++++----- + drivers/gpu/drm/i915/i915_reg.h | 129 +++++---- + drivers/gpu/drm/i915/i915_suspend.c | 15 +- + drivers/gpu/drm/i915/i915_sysfs.c | 16 +- + drivers/gpu/drm/i915/intel_ddi.c | 12 +- + drivers/gpu/drm/i915/intel_display.c | 163 ++++++----- + drivers/gpu/drm/i915/intel_dp.c | 88 +++--- + drivers/gpu/drm/i915/intel_drv.h | 7 +- + drivers/gpu/drm/i915/intel_fb.c | 2 - + drivers/gpu/drm/i915/intel_hdmi.c | 106 ++++---- + drivers/gpu/drm/i915/intel_lvds.c | 7 +- + drivers/gpu/drm/i915/intel_pm.c | 27 +- + drivers/gpu/drm/i915/intel_sdvo.c | 48 ++-- + drivers/video/fbmem.c | 7 + + include/linux/fb.h | 2 + + include/linux/pm.h | 13 + + kernel/power/console.c | 116 ++++++++ + 24 files changed, 830 insertions(+), 713 deletions(-) +Merging sound/for-next (9f5c6fa ALSA: hda - Add GPIO-based LED support on HP desktop machines) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + Documentation/DocBook/writing-an-alsa-driver.tmpl | 12 +- + Documentation/sound/alsa/HD-Audio.txt | 10 +- + include/linux/usb/audio-v2.h | 2 + + include/sound/control.h | 5 +- + include/sound/core.h | 26 +- + include/sound/pcm.h | 23 +- + sound/core/control.c | 41 +- + sound/core/device.c | 8 +- + sound/core/hwdep.c | 2 +- + sound/core/info.c | 41 +- + sound/core/init.c | 16 +- + sound/core/isadma.c | 2 +- + sound/core/jack.c | 6 +- + sound/core/memalloc.c | 20 +- + sound/core/memory.c | 4 +- + sound/core/pcm.c | 6 +- + sound/core/pcm_lib.c | 54 ++- + sound/core/pcm_memory.c | 19 +- + sound/core/pcm_misc.c | 28 +- + sound/core/pcm_native.c | 13 + + sound/core/rawmidi.c | 14 +- + sound/core/sound.c | 7 +- + sound/core/vmaster.c | 7 +- + sound/drivers/mpu401/mpu401_uart.c | 6 +- + sound/pci/ac97/ac97_codec.c | 16 +- + sound/pci/ac97/ac97_pcm.c | 10 +- + sound/pci/hda/hda_beep.c | 39 +- + sound/pci/hda/hda_beep.h | 1 + + sound/pci/hda/hda_codec.c | 17 +- + sound/pci/hda/hda_generic.c | 364 +++++++++++++---- + sound/pci/hda/hda_generic.h | 13 +- + sound/pci/hda/hda_local.h | 4 + + sound/pci/hda/patch_analog.c | 33 +- + sound/pci/hda/patch_conexant.c | 19 +- + sound/pci/hda/patch_hdmi.c | 198 ++++++---- + sound/pci/hda/patch_realtek.c | 204 ++++++---- + sound/pci/hda/patch_sigmatel.c | 33 +- + sound/pci/rme9652/hdspm.c | 382 +++++++++++------- + sound/sound_core.c | 22 +- + sound/usb/caiaq/audio.c | 459 +++++++++++----------- + sound/usb/caiaq/audio.h | 4 +- + sound/usb/caiaq/control.c | 67 ++-- + sound/usb/caiaq/control.h | 2 +- + sound/usb/caiaq/device.c | 248 ++++++------ + sound/usb/caiaq/device.h | 18 +- + sound/usb/caiaq/input.c | 328 ++++++++-------- + sound/usb/caiaq/input.h | 6 +- + sound/usb/caiaq/midi.c | 63 +-- + sound/usb/caiaq/midi.h | 5 +- + sound/usb/format.c | 20 +- + sound/usb/format.h | 2 +- + sound/usb/pcm.c | 7 + + sound/usb/quirks-table.h | 43 +- + sound/usb/quirks.c | 21 +- + sound/usb/stream.c | 2 +- + 55 files changed, 1785 insertions(+), 1237 deletions(-) +Merging sound-asoc/for-next (e2d2cf7 Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next) +$ git merge sound-asoc/for-next +Removing include/sound/tegra_wm8903.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak5386.txt | 19 + + .../devicetree/bindings/sound/ti,tas5086.txt | 32 ++ + drivers/mfd/wm5102-tables.c | 8 + + include/linux/mfd/arizona/registers.h | 40 ++ + include/sound/soc-dapm.h | 2 +- + include/sound/soc.h | 21 +- + include/sound/tas5086.h | 7 + + include/sound/tegra_wm8903.h | 26 - + sound/soc/atmel/atmel_ssc_dai.c | 43 ++ + sound/soc/codecs/Kconfig | 8 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/adau1373.c | 5 +- + sound/soc/codecs/ak4104.c | 55 +- + sound/soc/codecs/ak5386.c | 152 ++++++ + sound/soc/codecs/arizona.c | 295 +++++++--- + sound/soc/codecs/arizona.h | 20 +- + sound/soc/codecs/cs4271.c | 159 +++--- + sound/soc/codecs/cs42l73.c | 6 +- + sound/soc/codecs/max98088.c | 30 +- + sound/soc/codecs/max98090.c | 45 +- + sound/soc/codecs/si476x.c | 48 +- + sound/soc/codecs/tas5086.c | 591 +++++++++++++++++++++ + sound/soc/codecs/wm5102.c | 32 +- + sound/soc/codecs/wm5102.h | 6 +- + sound/soc/codecs/wm5110.c | 40 +- + sound/soc/codecs/wm5110.h | 6 +- + sound/soc/codecs/wm8960.c | 10 + + sound/soc/codecs/wm_adsp.c | 31 +- + sound/soc/codecs/wm_adsp.h | 2 + + sound/soc/codecs/wm_hubs.c | 9 +- + sound/soc/davinci/davinci-mcasp.c | 54 +- + sound/soc/davinci/davinci-pcm.c | 16 +- + sound/soc/davinci/davinci-pcm.h | 1 + + sound/soc/fsl/imx-audmux.c | 3 +- + sound/soc/fsl/imx-ssi.c | 7 +- + sound/soc/fsl/pcm030-audio-fabric.c | 2 +- + sound/soc/omap/omap-dmic.c | 16 +- + sound/soc/omap/omap-mcpdm.c | 14 +- + sound/soc/omap/omap3pandora.c | 8 +- + sound/soc/samsung/Kconfig | 5 +- + sound/soc/sh/fsi.c | 14 +- + sound/soc/soc-core.c | 110 +++- + sound/soc/soc-dapm.c | 15 +- + sound/soc/tegra/tegra_alc5632.c | 15 +- + sound/soc/tegra/tegra_asoc_utils.c | 4 - + sound/soc/tegra/tegra_wm8753.c | 15 +- + sound/soc/tegra/tegra_wm8903.c | 179 +++---- + sound/soc/tegra/tegra_wm9712.c | 5 - + sound/soc/tegra/trimslice.c | 56 +- + 49 files changed, 1786 insertions(+), 505 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ak5386.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,tas5086.txt + create mode 100644 include/sound/tas5086.h + delete mode 100644 include/sound/tegra_wm8903.h + create mode 100644 sound/soc/codecs/ak5386.c + create mode 100644 sound/soc/codecs/tas5086.c +Merging modules/modules-next (b92021b CONFIG_SYMBOL_PREFIX: cleanup.) +$ git merge modules/modules-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 +- + arch/Kconfig | 6 ++++++ + arch/blackfin/Kconfig | 5 +---- + arch/h8300/Kconfig | 5 +---- + arch/metag/Kconfig | 5 +---- + drivers/mtd/chips/gen_probe.c | 8 +++++--- + include/asm-generic/unistd.h | 12 ++++-------- + include/asm-generic/vmlinux.lds.h | 8 +------- + include/linux/export.h | 20 ++++++++++++++------ + include/linux/kernel.h | 7 ------- + include/linux/module.h | 4 ++-- + kernel/modsign_certificate.S | 13 +++---------- + kernel/module.c | 2 +- + scripts/Makefile.lib | 7 ------- + scripts/link-vmlinux.sh | 5 ++--- + scripts/mod/modpost.c | 36 +++++++++++++++--------------------- + 16 files changed, 57 insertions(+), 88 deletions(-) +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} (51%) + create mode 100644 kernel/system_keyring.c +Merging virtio/virtio-next (29266e2 Remove Documentation/virtual/virtio-spec.txt) +$ git merge virtio/virtio-next +Removing Documentation/virtual/virtio-spec.txt +Merge made by the 'recursive' strategy. + Documentation/virtual/00-INDEX | 3 - + Documentation/virtual/virtio-spec.txt | 3210 --------------------------------- + drivers/block/virtio_blk.c | 2 + + drivers/lguest/Kconfig | 5 +- + drivers/scsi/virtio_scsi.c | 8 +- + tools/lguest/lguest.txt | 2 +- + 6 files changed, 9 insertions(+), 3221 deletions(-) + delete mode 100644 Documentation/virtual/virtio-spec.txt +Merging input/next (1614265 USB: cdc-acm - blacklist IMS PCU device) +$ git merge input/next +Auto-merging include/uapi/linux/input.h +Auto-merging include/linux/device.h +Auto-merging drivers/usb/class/cdc-acm.c +Auto-merging drivers/input/serio/Kconfig +Auto-merging drivers/input/misc/Makefile +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/base/devres.c +Merge made by the 'recursive' strategy. + .../bindings/input/ps2keyb-mouse-apbps2.txt | 16 + + .../bindings/input/touchscreen/auo_pixcir_ts.txt | 30 + + drivers/base/devres.c | 74 + + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ims-pcu.c | 1900 ++++++++++++++++++++ + drivers/input/serio/Kconfig | 10 + + drivers/input/serio/Makefile | 1 + + drivers/input/serio/apbps2.c | 230 +++ + drivers/input/touchscreen/auo-pixcir-ts.c | 226 ++- + drivers/input/touchscreen/wm9712.c | 28 +- + drivers/input/touchscreen/wm97xx-core.c | 11 + + drivers/usb/class/cdc-acm.c | 13 + + drivers/usb/class/cdc-acm.h | 1 + + include/linux/device.h | 4 + + include/linux/input/auo-pixcir-ts.h | 4 +- + include/uapi/linux/input.h | 5 + + 17 files changed, 2467 insertions(+), 97 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/ps2keyb-mouse-apbps2.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/auo_pixcir_ts.txt + create mode 100644 drivers/input/misc/ims-pcu.c + create mode 100644 drivers/input/serio/apbps2.c +Merging input-mt/for-next (6f0c058 Linux 3.7-rc2) +$ git merge input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (664e218 cgroup: fix an off-by-one bug which may trigger BUG_ON()) +$ git merge cgroup/for-next +Resolved 'include/linux/res_counter.h' using previous resolution. +Auto-merging include/linux/res_counter.h +CONFLICT (content): Merge conflict in include/linux/res_counter.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6cd2cb7] Merge remote-tracking branch 'cgroup/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/cgroups/cgroups.txt | 1 + + block/blk-cgroup.h | 2 - + include/linux/cgroup.h | 44 +++++- + include/linux/cpuset.h | 1 - + include/linux/res_counter.h | 2 +- + kernel/cgroup.c | 287 ++++++++++++++------------------------ + kernel/cpuset.c | 34 ++--- + 7 files changed, 154 insertions(+), 217 deletions(-) +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 (fc2f1ae Correct the documented requirement on the return code from dm cache policy lookup functions stated in the policy module header file.) +$ git merge device-mapper/master +Merge made by the 'recursive' strategy. + drivers/md/dm-bufio.c | 2 + + drivers/md/dm-cache-metadata.c | 63 +++++++--- + drivers/md/dm-cache-metadata.h | 2 +- + drivers/md/dm-cache-policy-cleaner.c | 7 +- + drivers/md/dm-cache-policy-internal.h | 2 + + drivers/md/dm-cache-policy-mq.c | 8 +- + drivers/md/dm-cache-policy.c | 8 ++ + drivers/md/dm-cache-policy.h | 6 +- + drivers/md/dm-cache-target.c | 169 +++++++++++++++++---------- + drivers/md/dm-thin.c | 11 +- + drivers/md/dm-verity.c | 39 ++++++- + drivers/md/persistent-data/dm-btree-remove.c | 46 ++++---- + 12 files changed, 253 insertions(+), 110 deletions(-) +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (9665f7f mmc: dw_mmc: Make dw_mci_exynos_probe static) +$ git merge mmc/mmc-next +Merge made by the 'recursive' strategy. + drivers/mmc/host/dw_mmc-exynos.c | 2 +- + drivers/mmc/host/sdhci-tegra.c | 22 ++++++++++++++-------- + 2 files changed, 15 insertions(+), 9 deletions(-) +Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (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 (6dbe51c Linux 3.9-rc1) +$ 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/master (a937536 Linux 3.9-rc3) +$ git merge mfd/master +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 bb02086] 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 (457e7a4 Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/88pm8607.c | 36 +------ + drivers/regulator/core.c | 166 ++++++++++++++++++++++++++++----- + drivers/regulator/lp8788-ldo.c | 98 ++++--------------- + drivers/regulator/max8649.c | 39 ++------ + drivers/regulator/max8925-regulator.c | 5 +- + drivers/regulator/max8998.c | 9 +- + drivers/regulator/palmas-regulator.c | 38 ++++---- + drivers/regulator/s5m8767.c | 2 +- + drivers/regulator/tps6586x-regulator.c | 6 +- + include/linux/regulator/consumer.h | 14 +-- + include/linux/regulator/driver.h | 7 +- + 11 files changed, 214 insertions(+), 206 deletions(-) +Merging security/next (921f3ac tomoyo: use DEFINE_SRCU() to define tomoyo_ss) +$ git merge security/next +Merge made by the 'recursive' strategy. + security/tomoyo/tomoyo.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +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 (a4f0685 watchdog: sp5100_tco: Set the AcpiMmioSel bitmask value to 1 instead of 2) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/sp5100_tco.c | 126 ++---------------------------------------- + drivers/watchdog/sp5100_tco.h | 2 +- + 2 files changed, 7 insertions(+), 121 deletions(-) +Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (ae19158 iommu: OMAP: build only on OMAP2+) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/Kconfig | 2 +- + drivers/iommu/amd_iommu_init.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging vfio/next (dad9f89 VFIO-AER: Vfio-pci driver changes for supporting AER) +$ git merge vfio/next +Auto-merging drivers/vfio/pci/vfio_pci_intrs.c +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 44 ++++++++++++++++++++++++- + drivers/vfio/pci/vfio_pci_intrs.c | 64 +++++++++++++++++++++++++++++++++++++ + drivers/vfio/pci/vfio_pci_private.h | 1 + + drivers/vfio/vfio.c | 30 ++++++++++++++++- + include/linux/vfio.h | 3 ++ + include/uapi/linux/vfio.h | 1 + + 6 files changed, 141 insertions(+), 2 deletions(-) +Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (cf2fbdd treewide: Fix typos in printk and comment) +$ git merge trivial/for-next +Auto-merging drivers/isdn/i4l/isdn_tty.c +Auto-merging drivers/gpu/drm/radeon/radeon_irq_kms.c +Auto-merging arch/s390/kvm/trace.h +Auto-merging arch/arc/kernel/disasm.c +CONFLICT (modify/delete): Documentation/virtual/virtio-spec.txt deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of Documentation/virtual/virtio-spec.txt left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/virtual/virtio-spec.txt +Documentation/virtual/virtio-spec.txt: needs merge +rm 'Documentation/virtual/virtio-spec.txt' +$ git commit -v -a +[master fb14a21] Merge remote-tracking branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arc/kernel/disasm.c | 2 +- + arch/arc/plat-arcfpga/Kconfig | 2 +- + arch/arm/kernel/topology.c | 2 +- + arch/arm/mach-mvebu/irq-armada-370-xp.c | 2 +- + arch/blackfin/include/asm/bfin_sport3.h | 2 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/powerpc/kernel/nvram_64.c | 3 +-- + arch/powerpc/kvm/book3s_pr.c | 2 +- + arch/s390/kernel/irq.c | 2 +- + arch/s390/kvm/trace.h | 2 +- + drivers/crypto/caam/ctrl.c | 2 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- + drivers/hv/hv.c | 5 ++--- + drivers/i2c/busses/i2c-puv3.c | 2 +- + drivers/isdn/i4l/isdn_tty.c | 1 - + drivers/net/ethernet/sfc/Kconfig | 2 +- + drivers/scsi/qla4xxx/ql4_nx.c | 2 +- + drivers/tty/serial/icom.c | 3 +-- + drivers/tty/vt/consolemap.c | 3 +-- + drivers/usb/misc/uss720.c | 2 +- + drivers/usb/storage/isd200.c | 3 +-- + fs/befs/btree.c | 3 +-- + fs/ufs/util.c | 3 +-- + include/linux/iio/gyro/itg3200.h | 2 +- + include/net/sctp/sctp.h | 2 +- + include/trace/events/timer.h | 10 +++++----- + kernel/.gitignore | 1 + + mm/hugetlb.c | 4 ++-- + net/sctp/protocol.c | 2 +- + sound/pci/mixart/mixart.c | 2 +- + 30 files changed, 35 insertions(+), 42 deletions(-) +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge audit/for-next +Already up-to-date. +Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging edac/linux_next (b076989 i5100_edac: convert to use simple_open()) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/amd64_edac.c | 15 +++++++++------ + drivers/edac/edac_mc.c | 6 +++--- + drivers/edac/edac_mc_sysfs.c | 17 +++++------------ + include/linux/edac.h | 7 ++----- + 4 files changed, 19 insertions(+), 26 deletions(-) +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 (b66c773 spi/bcm63xx: use devm_ioremap_resource()) +$ git merge spi-mb/spi-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/brcm,bcm2835-spi.txt | 22 + + drivers/spi/Kconfig | 11 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-bcm2835.c | 456 +++++++++++++++++++++ + drivers/spi/spi-bcm63xx.c | 79 +--- + drivers/spi/spi-pxa2xx-pci.c | 6 +- + drivers/spi/spi-pxa2xx.c | 5 + + drivers/spi/spi-tegra20-slink.c | 25 +- + 8 files changed, 525 insertions(+), 80 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt + create mode 100644 drivers/spi/spi-bcm2835.c +Merging tip/auto-latest (c56c948 Merge branch 'x86/paravirt') +$ git merge tip/auto-latest +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/linux/perf_event.h +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 89 +++++++------- + arch/x86/boot/compressed/head_64.S | 2 +- + arch/x86/include/asm/context_tracking.h | 21 ---- + arch/x86/include/asm/hypervisor.h | 16 ++- + arch/x86/kernel/cpu/Makefile | 3 +- + arch/x86/kernel/kvm.c | 8 +- + arch/x86/kernel/traps.c | 68 ++++++----- + arch/x86/lguest/Kconfig | 3 +- + arch/x86/mm/fault.c | 8 +- + arch/x86/xen/Kconfig | 2 +- + drivers/hv/Kconfig | 2 +- + drivers/misc/Kconfig | 2 +- + include/linux/clockchips.h | 5 + + include/linux/context_tracking.h | 24 +++- + include/linux/perf_event.h | 18 +-- + include/linux/sched.h | 198 +------------------------------- + init/Kconfig | 1 + + init/main.c | 2 +- + kernel/events/core.c | 15 +++ + kernel/events/ring_buffer.c | 40 +++++-- + kernel/fork.c | 2 +- + kernel/printk.c | 2 +- + kernel/sched/core.c | 20 +++- + kernel/sched/cputime.c | 154 +++++++++++++------------ + kernel/sched/fair.c | 6 +- + kernel/sched/sched.h | 159 ++++++++++++++++++++++++- + kernel/time/tick-broadcast.c | 129 ++++++++++++--------- + kernel/time/tick-common.c | 1 + + kernel/time/tick-internal.h | 3 +- + 29 files changed, 529 insertions(+), 474 deletions(-) +Merging ftrace/for-next (0d3006d tracing: Update debugfs README file) +$ git merge ftrace/for-next +Resolved 'kernel/trace/ftrace.c' using previous resolution. +Auto-merging kernel/trace/trace_output.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/trace/ftrace.c +CONFLICT (content): Merge conflict in kernel/trace/ftrace.c +Auto-merging kernel/trace/blktrace.c +Auto-merging kernel/trace/Kconfig +Auto-merging include/linux/kernel.h +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e99b6c9] Merge remote-tracking branch 'ftrace/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 7 + + Documentation/trace/ftrace.txt | 2097 +++++++++++++++++++++---------- + include/linux/ftrace.h | 6 +- + include/linux/ftrace_event.h | 109 +- + include/linux/kernel.h | 70 +- + include/linux/ring_buffer.h | 6 + + include/linux/trace_clock.h | 1 + + include/trace/ftrace.h | 47 +- + kernel/trace/Kconfig | 49 + + kernel/trace/blktrace.c | 4 +- + kernel/trace/ftrace.c | 75 +- + kernel/trace/ring_buffer.c | 500 +++++++- + kernel/trace/trace.c | 2242 ++++++++++++++++++++++++---------- + kernel/trace/trace.h | 146 ++- + kernel/trace/trace_branch.c | 8 +- + kernel/trace/trace_clock.c | 10 + + kernel/trace/trace_entries.h | 23 +- + kernel/trace/trace_events.c | 1421 ++++++++++++++++----- + kernel/trace/trace_events_filter.c | 34 +- + kernel/trace/trace_export.c | 4 +- + kernel/trace/trace_functions.c | 207 +++- + kernel/trace/trace_functions_graph.c | 12 +- + kernel/trace/trace_irqsoff.c | 90 +- + kernel/trace/trace_kdb.c | 12 +- + kernel/trace/trace_mmiotrace.c | 12 +- + kernel/trace/trace_output.c | 119 +- + kernel/trace/trace_output.h | 4 +- + kernel/trace/trace_sched_switch.c | 8 +- + kernel/trace/trace_sched_wakeup.c | 93 +- + kernel/trace/trace_selftest.c | 51 +- + kernel/trace/trace_stack.c | 74 +- + kernel/trace/trace_syscalls.c | 90 +- + 32 files changed, 5726 insertions(+), 1905 deletions(-) +Merging rcu/rcu/next (53bbeb2 Merge branches 'doc.2013.03.12a', 'fixes.2013.03.12a' and 'idlenocb.2013.03.12a' into HEAD) +$ git merge rcu/rcu/next +Auto-merging init/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/RCU/checklist.txt | 26 +- + Documentation/RCU/lockdep.txt | 5 + + Documentation/RCU/rcubarrier.txt | 15 +- + Documentation/RCU/stallwarn.txt | 33 +- + Documentation/RCU/whatisRCU.txt | 4 +- + Documentation/kernel-parameters.txt | 35 ++- + include/linux/list_bl.h | 5 + + include/linux/rculist_bl.h | 2 +- + include/linux/rcupdate.h | 1 + + include/trace/events/rcu.h | 55 ++++ + init/Kconfig | 69 ++++- + kernel/rcutree.c | 260 ++++++++++++---- + kernel/rcutree.h | 41 ++- + kernel/rcutree_plugin.h | 601 +++++++++++++----------------------- + kernel/rcutree_trace.c | 2 - + 15 files changed, 636 insertions(+), 518 deletions(-) +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 (5da5960 KVM: MMU: Introduce a helper function for FIFO zapping) +$ git merge kvm/linux-next +Auto-merging virt/kvm/kvm_main.c +Auto-merging arch/powerpc/kvm/book3s_pr.c +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 8 + + arch/arm/kvm/arm.c | 15 +- + arch/ia64/kvm/kvm-ia64.c | 25 +- + arch/powerpc/include/asm/kvm_ppc.h | 2 +- + arch/powerpc/kvm/book3s_hv.c | 4 +- + arch/powerpc/kvm/book3s_pr.c | 2 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/powerpc.c | 13 +- + arch/s390/include/asm/pgtable.h | 2 + + arch/s390/include/uapi/asm/Kbuild | 1 + + arch/s390/include/uapi/asm/virtio-ccw.h | 21 ++ + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/Makefile | 2 +- + arch/s390/kvm/diag.c | 26 ++ + arch/s390/kvm/gaccess.h | 429 ++++++-------------------------- + arch/s390/kvm/intercept.c | 10 +- + arch/s390/kvm/interrupt.c | 245 ++++++------------ + arch/s390/kvm/kvm-s390.c | 11 +- + arch/s390/kvm/priv.c | 89 +++---- + arch/s390/mm/pgtable.c | 107 ++++++-- + arch/x86/include/asm/vmx.h | 4 + + arch/x86/kernel/kvmclock.c | 9 +- + arch/x86/kvm/mmu.c | 78 +++--- + arch/x86/kvm/vmx.c | 176 +++++++++---- + arch/x86/kvm/x86.c | 27 +- + drivers/s390/kvm/virtio_ccw.c | 16 +- + include/linux/kvm_host.h | 49 +++- + include/uapi/linux/kvm.h | 3 + + virt/kvm/eventfd.c | 24 +- + virt/kvm/kvm_main.c | 46 ++-- + 30 files changed, 627 insertions(+), 820 deletions(-) + create mode 100644 arch/s390/include/uapi/asm/virtio-ccw.h +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 (849b022 Merge branch 'stable/for-linus-3.9-take-two' into linux-next) +$ git merge xen-two/linux-next +Auto-merging arch/x86/xen/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/include/asm/xen/interface.h | 11 ++- + arch/x86/include/asm/xen/page.h | 3 + + arch/x86/xen/Kconfig | 8 ++ + arch/x86/xen/enlighten.c | 76 ++++++++++++----- + arch/x86/xen/irq.c | 5 +- + arch/x86/xen/mmu.c | 158 ++++++++++++++++++++++++++++++++--- + arch/x86/xen/mmu.h | 2 + + arch/x86/xen/p2m.c | 2 +- + arch/x86/xen/setup.c | 59 ++++++++++--- + arch/x86/xen/smp.c | 39 ++++++--- + arch/x86/xen/xen-head.S | 10 ++- + drivers/xen/balloon.c | 14 ++-- + drivers/xen/cpu_hotplug.c | 4 +- + drivers/xen/events.c | 9 +- + drivers/xen/gntdev.c | 3 +- + drivers/xen/grant-table.c | 64 +++++++++++++- + drivers/xen/privcmd.c | 2 +- + drivers/xen/xenbus/xenbus_client.c | 3 +- + 18 files changed, 401 insertions(+), 71 deletions(-) +Merging xen-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 (4b2e435 Merge branch 'for-3.10' into for-next) +$ git merge workqueues/for-next +Recorded preimage for 'kernel/workqueue.c' +Auto-merging kernel/workqueue.c +CONFLICT (content): Merge conflict in kernel/workqueue.c +Auto-merging include/linux/device.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/workqueue.c'. +[master e0258c5] Merge remote-tracking branch 'workqueues/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + drivers/base/base.h | 2 + + drivers/base/bus.c | 73 +- + drivers/base/core.c | 2 +- + include/linux/async.h | 13 +- + include/linux/cpumask.h | 15 + + include/linux/device.h | 2 + + include/linux/workqueue.h | 161 ++- + kernel/async.c | 40 +- + kernel/workqueue.c | 2110 ++++++++++++++++++++++++------------- + kernel/workqueue_internal.h | 6 +- + 11 files changed, 1638 insertions(+), 788 deletions(-) +Merging drivers-x86/linux-next (e6e5224 ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it) +$ git merge drivers-x86/linux-next +Resolved 'drivers/platform/x86/chromeos_laptop.c' using previous resolution. +Auto-merging drivers/platform/x86/chromeos_laptop.c +CONFLICT (content): Merge conflict in drivers/platform/x86/chromeos_laptop.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 629c236] Merge remote-tracking branch 'drivers-x86/linux-next' +$ git diff -M --stat --summary HEAD^.. +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 (14379a9 Merge remote-tracking branch 'regmap/topic/range' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 12 +++-- + drivers/base/regmap/regcache-lzo.c | 6 +-- + drivers/base/regmap/regcache-rbtree.c | 69 +++++++++++++------------ + drivers/base/regmap/regcache.c | 43 +++++++++------- + drivers/base/regmap/regmap-debugfs.c | 94 ++++++++++++++++++++++++++++++++--- + drivers/base/regmap/regmap.c | 64 +++++++++++++++++------- + include/trace/events/regmap.h | 48 ++++++++++++++++++ + 7 files changed, 249 insertions(+), 87 deletions(-) +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 (103e6ad leds: leds-pwm: Defer led_pwm_set() if PWM can sleep) +$ git merge leds/for-next +Auto-merging drivers/leds/trigger/ledtrig-transient.c +Auto-merging drivers/leds/trigger/ledtrig-timer.c +Auto-merging drivers/leds/trigger/ledtrig-oneshot.c +Auto-merging drivers/leds/trigger/ledtrig-heartbeat.c +Auto-merging drivers/leds/trigger/ledtrig-gpio.c +Auto-merging drivers/leds/trigger/ledtrig-default-on.c +Auto-merging drivers/leds/trigger/ledtrig-cpu.c +Auto-merging drivers/leds/trigger/ledtrig-backlight.c +Merge made by the 'recursive' strategy. + Documentation/leds/00-INDEX | 2 + + Documentation/leds/leds-lp5562.txt | 135 ++++++ + Documentation/leds/leds-lp55xx.txt | 46 +- + drivers/leds/Kconfig | 115 +---- + drivers/leds/Makefile | 11 +- + drivers/leds/leds-atmel-pwm.c | 4 +- + drivers/leds/leds-bd2802.c | 4 +- + drivers/leds/leds-lm355x.c | 2 + + drivers/leds/leds-lm3642.c | 2 + + drivers/leds/leds-lp5521.c | 3 +- + drivers/leds/leds-lp5562.c | 593 ++++++++++++++++++++++++ + drivers/leds/leds-lp55xx-common.c | 6 +- + drivers/leds/leds-lt3593.c | 5 +- + drivers/leds/leds-ns2.c | 6 +- + drivers/leds/leds-pwm.c | 50 +- + drivers/leds/leds-renesas-tpu.c | 3 +- + drivers/leds/leds-tca6507.c | 4 +- + drivers/leds/leds-wm8350.c | 5 +- + drivers/leds/trigger/Kconfig | 111 +++++ + drivers/leds/trigger/Makefile | 10 + + drivers/leds/{ => trigger}/ledtrig-backlight.c | 2 +- + drivers/leds/trigger/ledtrig-camera.c | 57 +++ + drivers/leds/{ => trigger}/ledtrig-cpu.c | 2 +- + drivers/leds/{ => trigger}/ledtrig-default-on.c | 2 +- + drivers/leds/{ => trigger}/ledtrig-gpio.c | 2 +- + drivers/leds/{ => trigger}/ledtrig-heartbeat.c | 2 +- + drivers/leds/{ => trigger}/ledtrig-ide-disk.c | 0 + drivers/leds/{ => trigger}/ledtrig-oneshot.c | 2 +- + drivers/leds/{ => trigger}/ledtrig-timer.c | 1 - + drivers/leds/{ => trigger}/ledtrig-transient.c | 2 +- + include/linux/leds.h | 33 +- + include/linux/mmc/host.h | 2 - + include/linux/platform_data/leds-lp55xx.h | 13 +- + 33 files changed, 1077 insertions(+), 160 deletions(-) + create mode 100644 Documentation/leds/leds-lp5562.txt + create mode 100644 drivers/leds/leds-lp5562.c + create mode 100644 drivers/leds/trigger/Kconfig + create mode 100644 drivers/leds/trigger/Makefile + rename drivers/leds/{ => trigger}/ledtrig-backlight.c (99%) + create mode 100644 drivers/leds/trigger/ledtrig-camera.c + rename drivers/leds/{ => trigger}/ledtrig-cpu.c (99%) + rename drivers/leds/{ => trigger}/ledtrig-default-on.c (98%) + rename drivers/leds/{ => trigger}/ledtrig-gpio.c (99%) + rename drivers/leds/{ => trigger}/ledtrig-heartbeat.c (99%) + rename drivers/leds/{ => trigger}/ledtrig-ide-disk.c (100%) + rename drivers/leds/{ => trigger}/ledtrig-oneshot.c (99%) + rename drivers/leds/{ => trigger}/ledtrig-timer.c (99%) + rename drivers/leds/{ => trigger}/ledtrig-transient.c (99%) +Merging driver-core/driver-core-next (8f46baa base: core: WARN() about bogus permissions on device attributes) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/device.h +Auto-merging drivers/base/core.c +Auto-merging drivers/base/bus.c +Merge made by the 'recursive' strategy. + drivers/base/bus.c | 8 ++++---- + drivers/base/core.c | 9 ++++++++- + include/linux/device.h | 12 +++--------- + 3 files changed, 15 insertions(+), 14 deletions(-) +Merging tty/tty-next (afa80cc sysrq: fix inconstistent help message of sysrq key) +$ git merge tty/tty-next +Auto-merging drivers/tty/serial/vt8500_serial.c +Merge made by the 'recursive' strategy. + drivers/tty/amiserial.c | 14 +--- + drivers/tty/ipwireless/hardware.c | 3 +- + drivers/tty/pty.c | 1 - + drivers/tty/serial/pch_uart.c | 103 +++++++++++++++++++------- + drivers/tty/serial/serial-tegra.c | 9 ++- + drivers/tty/serial/vt8500_serial.c | 7 +- + drivers/tty/sysrq.c | 38 +++++----- + drivers/tty/tty_io.c | 144 ++++++++++++++++++++++++------------- + 8 files changed, 204 insertions(+), 115 deletions(-) +Merging usb/usb-next (413fd1e USB: ehci-omap: Get rid of omap_ehci_init()) +$ git merge usb/usb-next +Auto-merging drivers/usb/host/ehci-hcd.c +Auto-merging drivers/usb/class/cdc-acm.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/ehci-omap.txt | 32 ++ + .../devicetree/bindings/usb/ohci-omap3.txt | 15 + + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/usb/chipidea/usbmisc_imx6q.c | 4 +- + drivers/usb/class/cdc-acm.c | 8 - + drivers/usb/host/Kconfig | 3 +- + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-hcd.c | 6 +- + drivers/usb/host/ehci-mv.c | 2 +- + drivers/usb/host/ehci-mxc.c | 8 +- + drivers/usb/host/ehci-omap.c | 331 +++++++++------------ + drivers/usb/host/ehci-orion.c | 4 +- + drivers/usb/host/ehci-sh.c | 4 +- + drivers/usb/host/ohci-omap3.c | 24 +- + drivers/usb/misc/sisusbvga/sisusb.c | 2 +- + drivers/usb/misc/usb3503.c | 13 +- + drivers/usb/otg/isp1301_omap.c | 4 +- + drivers/usb/otg/twl4030-usb.c | 4 +- + drivers/usb/otg/twl6030-usb.c | 4 +- + drivers/usb/phy/mv_u3d_phy.c | 2 +- + drivers/usb/serial/mos7840.c | 3 +- + drivers/usb/serial/usb-serial.c | 14 +- + drivers/usb/storage/onetouch.c | 4 +- + include/linux/usb.h | 4 +- + 25 files changed, 242 insertions(+), 257 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/ehci-omap.txt + create mode 100644 Documentation/devicetree/bindings/usb/ohci-omap3.txt +Merging usb-gadget/next (af6882b usb: phy: ab8500-usb: update irq handling code) +$ git merge usb-gadget/next +Removing drivers/usb/phy/samsung-usbphy.c +Auto-merging drivers/usb/phy/phy.c +Auto-merging drivers/usb/phy/phy-twl4030-usb.c +Auto-merging drivers/usb/phy/phy-nop.c +Auto-merging drivers/usb/phy/phy-mxs-usb.c +Auto-merging drivers/usb/phy/phy-mv-usb.c +Auto-merging drivers/usb/phy/phy-mv-u3d-usb.c +Auto-merging drivers/usb/phy/phy-isp1301-omap.c +Auto-merging drivers/usb/phy/phy-fsm-usb.c +Auto-merging drivers/usb/phy/phy-fsl-usb.c +Removing drivers/usb/phy/isp1301.c +Removing drivers/usb/otg/ab8500-usb.c +Removing drivers/usb/otg/Makefile +Removing drivers/usb/otg/Kconfig +Auto-merging drivers/usb/host/ehci-mv.c +Auto-merging drivers/usb/host/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/omap-usb.txt | 40 +- + .../devicetree/bindings/usb/samsung-usbphy.txt | 76 +- + .../devicetree/bindings/usb/usb-nop-xceiv.txt | 34 + + drivers/Makefile | 2 +- + drivers/power/Kconfig | 2 +- + drivers/power/pda_power.c | 14 +- + drivers/usb/Kconfig | 2 - + drivers/usb/Makefile | 4 +- + drivers/usb/chipidea/udc.c | 27 +- + drivers/usb/dwc3/Kconfig | 1 - + drivers/usb/dwc3/core.c | 201 ++++- + drivers/usb/dwc3/core.h | 72 +- + drivers/usb/dwc3/debugfs.c | 52 +- + drivers/usb/dwc3/dwc3-exynos.c | 98 ++- + drivers/usb/dwc3/dwc3-omap.c | 245 +++--- + drivers/usb/dwc3/dwc3-pci.c | 38 + + drivers/usb/dwc3/ep0.c | 33 +- + drivers/usb/dwc3/gadget.c | 321 +++++-- + drivers/usb/gadget/Kconfig | 4 - + drivers/usb/gadget/amd5536udc.c | 16 +- + drivers/usb/gadget/amd5536udc.h | 1 - + drivers/usb/gadget/at91_udc.c | 14 +- + drivers/usb/gadget/atmel_usba_udc.c | 44 +- + drivers/usb/gadget/atmel_usba_udc.h | 6 - + drivers/usb/gadget/bcm63xx_udc.c | 23 - + drivers/usb/gadget/dummy_hcd.c | 17 - + drivers/usb/gadget/f_uvc.c | 262 +++--- + drivers/usb/gadget/f_uvc.h | 12 +- + drivers/usb/gadget/fsl_qe_udc.c | 18 +- + drivers/usb/gadget/fsl_udc_core.c | 83 +- + drivers/usb/gadget/fusb300_udc.c | 35 +- + drivers/usb/gadget/goku_udc.c | 20 +- + drivers/usb/gadget/goku_udc.h | 3 +- + drivers/usb/gadget/imx_udc.c | 16 +- + drivers/usb/gadget/lpc32xx_udc.c | 51 +- + drivers/usb/gadget/m66592-udc.c | 17 - + drivers/usb/gadget/mv_u3d_core.c | 21 +- + drivers/usb/gadget/mv_udc_core.c | 84 +- + drivers/usb/gadget/net2272.c | 19 +- + drivers/usb/gadget/net2280.c | 17 +- + drivers/usb/gadget/omap_udc.c | 21 +- + drivers/usb/gadget/pch_udc.c | 17 +- + drivers/usb/gadget/pxa25x_udc.c | 16 - + drivers/usb/gadget/pxa27x_udc.c | 41 +- + drivers/usb/gadget/r8a66597-udc.c | 14 +- + drivers/usb/gadget/s3c-hsotg.c | 78 +- + drivers/usb/gadget/s3c-hsudc.c | 16 - + drivers/usb/gadget/s3c2410_udc.c | 15 - + drivers/usb/gadget/udc-core.c | 89 +- + drivers/usb/gadget/uvc.h | 3 +- + drivers/usb/gadget/uvc_v4l2.c | 23 +- + drivers/usb/gadget/uvc_video.c | 14 +- + drivers/usb/host/Kconfig | 1 - + drivers/usb/host/ehci-msm.c | 2 +- + drivers/usb/host/ehci-mv.c | 19 +- + drivers/usb/host/ehci-s5p.c | 2 +- + drivers/usb/host/ehci-tegra.c | 6 +- + drivers/usb/host/ohci-exynos.c | 2 +- + drivers/usb/musb/Kconfig | 6 +- + drivers/usb/musb/am35x.c | 8 +- + drivers/usb/musb/blackfin.c | 6 +- + drivers/usb/musb/cppi_dma.c | 17 +- + drivers/usb/musb/da8xx.c | 8 +- + drivers/usb/musb/davinci.c | 4 +- + drivers/usb/musb/musb_core.c | 58 +- + drivers/usb/musb/musb_dsps.c | 12 +- + drivers/usb/musb/musb_gadget.c | 150 +--- + drivers/usb/musb/musb_host.c | 2 +- + drivers/usb/musb/musb_virthub.c | 4 +- + drivers/usb/musb/omap2430.c | 31 +- + drivers/usb/musb/tusb6010.c | 14 +- + drivers/usb/musb/ux500.c | 107 +++ + drivers/usb/musb/ux500_dma.c | 20 +- + drivers/usb/otg/Kconfig | 141 ---- + drivers/usb/otg/Makefile | 24 - + drivers/usb/otg/ab8500-usb.c | 596 ------------- + drivers/usb/phy/Kconfig | 180 +++- + drivers/usb/phy/Makefile | 35 +- + drivers/usb/phy/isp1301.c | 71 -- + drivers/usb/phy/phy-ab8500-usb.c | 733 ++++++++++++++++ + drivers/usb/{otg/fsl_otg.c => phy/phy-fsl-usb.c} | 34 +- + drivers/usb/{otg/fsl_otg.h => phy/phy-fsl-usb.h} | 0 + drivers/usb/{otg/otg_fsm.c => phy/phy-fsm-usb.c} | 4 +- + drivers/usb/{otg/otg_fsm.h => phy/phy-fsm-usb.h} | 0 + .../{otg/gpio_vbus.c => phy/phy-gpio-vbus-usb.c} | 0 + .../{otg/isp1301_omap.c => phy/phy-isp1301-omap.c} | 6 +- + drivers/usb/phy/phy-isp1301.c | 162 ++++ + drivers/usb/{otg/msm_otg.c => phy/phy-msm-usb.c} | 0 + drivers/usb/phy/{mv_u3d_phy.c => phy-mv-u3d-usb.c} | 2 +- + drivers/usb/phy/{mv_u3d_phy.h => phy-mv-u3d-usb.h} | 0 + drivers/usb/{otg/mv_otg.c => phy/phy-mv-usb.c} | 2 +- + drivers/usb/{otg/mv_otg.h => phy/phy-mv-usb.h} | 0 + drivers/usb/{otg/mxs-phy.c => phy/phy-mxs-usb.c} | 41 +- + drivers/usb/{otg/nop-usb-xceiv.c => phy/phy-nop.c} | 143 +++- + .../phy/{omap-control-usb.c => phy-omap-control.c} | 0 + drivers/usb/phy/{omap-usb2.c => phy-omap-usb2.c} | 0 + drivers/usb/phy/{omap-usb3.c => phy-omap-usb3.c} | 0 + drivers/usb/phy/{rcar-phy.c => phy-rcar-usb.c} | 0 + drivers/usb/phy/phy-samsung-usb.c | 236 ++++++ + drivers/usb/phy/phy-samsung-usb.h | 327 ++++++++ + drivers/usb/phy/phy-samsung-usb2.c | 509 +++++++++++ + drivers/usb/phy/phy-samsung-usb3.c | 349 ++++++++ + .../usb/phy/{tegra_usb_phy.c => phy-tegra-usb.c} | 0 + .../{otg/twl4030-usb.c => phy/phy-twl4030-usb.c} | 38 +- + .../{otg/twl6030-usb.c => phy/phy-twl6030-usb.c} | 0 + .../ulpi_viewport.c => phy/phy-ulpi-viewport.c} | 0 + drivers/usb/{otg/ulpi.c => phy/phy-ulpi.c} | 0 + drivers/usb/{otg/otg.c => phy/phy.c} | 62 +- + drivers/usb/phy/samsung-usbphy.c | 928 --------------------- + drivers/usb/renesas_usbhs/fifo.c | 1 - + drivers/usb/renesas_usbhs/fifo.h | 2 - + drivers/usb/renesas_usbhs/mod_gadget.c | 18 +- + drivers/usb/usb-common.c | 47 ++ + include/linux/platform_data/dwc3-omap.h | 4 - + include/linux/usb/ch9.h | 9 + + include/linux/usb/dwc3-omap.h | 6 +- + include/linux/usb/gadget.h | 11 + + include/linux/usb/musb-ux500.h | 31 + + include/linux/usb/nop-usb-xceiv.h | 5 + + include/linux/usb/otg.h | 9 +- + include/linux/usb/phy.h | 33 +- + 121 files changed, 4278 insertions(+), 3392 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt + delete mode 100644 drivers/usb/otg/Kconfig + delete mode 100644 drivers/usb/otg/Makefile + delete mode 100644 drivers/usb/otg/ab8500-usb.c + delete mode 100644 drivers/usb/phy/isp1301.c + create mode 100644 drivers/usb/phy/phy-ab8500-usb.c + rename drivers/usb/{otg/fsl_otg.c => phy/phy-fsl-usb.c} (97%) + rename drivers/usb/{otg/fsl_otg.h => phy/phy-fsl-usb.h} (100%) + rename drivers/usb/{otg/otg_fsm.c => phy/phy-fsm-usb.c} (99%) + rename drivers/usb/{otg/otg_fsm.h => phy/phy-fsm-usb.h} (100%) + rename drivers/usb/{otg/gpio_vbus.c => phy/phy-gpio-vbus-usb.c} (100%) + rename drivers/usb/{otg/isp1301_omap.c => phy/phy-isp1301-omap.c} (99%) + create mode 100644 drivers/usb/phy/phy-isp1301.c + rename drivers/usb/{otg/msm_otg.c => phy/phy-msm-usb.c} (100%) + rename drivers/usb/phy/{mv_u3d_phy.c => phy-mv-u3d-usb.c} (99%) + rename drivers/usb/phy/{mv_u3d_phy.h => phy-mv-u3d-usb.h} (100%) + rename drivers/usb/{otg/mv_otg.c => phy/phy-mv-usb.c} (99%) + rename drivers/usb/{otg/mv_otg.h => phy/phy-mv-usb.h} (100%) + rename drivers/usb/{otg/mxs-phy.c => phy/phy-mxs-usb.c} (84%) + rename drivers/usb/{otg/nop-usb-xceiv.c => phy/phy-nop.c} (55%) + rename drivers/usb/phy/{omap-control-usb.c => phy-omap-control.c} (100%) + rename drivers/usb/phy/{omap-usb2.c => phy-omap-usb2.c} (100%) + rename drivers/usb/phy/{omap-usb3.c => phy-omap-usb3.c} (100%) + rename drivers/usb/phy/{rcar-phy.c => phy-rcar-usb.c} (100%) + create mode 100644 drivers/usb/phy/phy-samsung-usb.c + create mode 100644 drivers/usb/phy/phy-samsung-usb.h + create mode 100644 drivers/usb/phy/phy-samsung-usb2.c + create mode 100644 drivers/usb/phy/phy-samsung-usb3.c + rename drivers/usb/phy/{tegra_usb_phy.c => phy-tegra-usb.c} (100%) + rename drivers/usb/{otg/twl4030-usb.c => phy/phy-twl4030-usb.c} (96%) + rename drivers/usb/{otg/twl6030-usb.c => phy/phy-twl6030-usb.c} (100%) + rename drivers/usb/{otg/ulpi_viewport.c => phy/phy-ulpi-viewport.c} (100%) + rename drivers/usb/{otg/ulpi.c => phy/phy-ulpi.c} (100%) + rename drivers/usb/{otg/otg.c => phy/phy.c} (89%) + delete mode 100644 drivers/usb/phy/samsung-usbphy.c + create mode 100644 include/linux/usb/musb-ux500.h +Merging staging/staging-next (c45bb8c Merge 3.9-rc3 into staging-next) +$ git merge staging/staging-next +Removing drivers/staging/vt6656/ttype.h +Removing drivers/staging/omap-thermal/omap5-thermal.c +Auto-merging drivers/staging/omap-thermal/omap4-thermal-data.c +Removing drivers/staging/ccg/usbstring.c +Removing drivers/staging/ccg/u_serial.h +Removing drivers/staging/ccg/u_serial.c +Removing drivers/staging/ccg/u_ether.h +Removing drivers/staging/ccg/u_ether.c +Removing drivers/staging/ccg/sysfs-class-ccg_usb +Removing drivers/staging/ccg/storage_common.c +Removing drivers/staging/ccg/rndis.h +Removing drivers/staging/ccg/rndis.c +Removing drivers/staging/ccg/ndis.h +Removing drivers/staging/ccg/gadget_chips.h +Removing drivers/staging/ccg/f_rndis.c +Removing drivers/staging/ccg/f_mass_storage.c +Removing drivers/staging/ccg/f_fs.c +Removing drivers/staging/ccg/f_acm.c +Removing drivers/staging/ccg/epautoconf.c +Removing drivers/staging/ccg/config.c +Removing drivers/staging/ccg/composite.h +Removing drivers/staging/ccg/composite.c +Removing drivers/staging/ccg/ccg.c +Removing drivers/staging/ccg/TODO +Removing drivers/staging/ccg/Makefile +Removing drivers/staging/ccg/Kconfig +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 12 + + drivers/staging/Kconfig | 4 + + drivers/staging/Makefile | 2 + + drivers/staging/android/Kconfig | 29 +- + drivers/staging/android/Makefile | 2 + + drivers/staging/android/ashmem.c | 66 +- + drivers/staging/android/ashmem.h | 7 + + drivers/staging/android/logger.c | 196 +- + drivers/staging/android/logger.h | 40 +- + drivers/staging/android/lowmemorykiller.c | 5 +- + drivers/staging/android/sw_sync.c | 263 ++ + drivers/staging/android/sw_sync.h | 58 + + drivers/staging/android/sync.c | 1016 +++++++ + drivers/staging/android/sync.h | 426 +++ + drivers/staging/android/trace/sync.h | 82 + + drivers/staging/bcm/Bcmchar.c | 2 +- + drivers/staging/bcm/InterfaceDld.c | 32 +- + drivers/staging/bcm/PHSModule.c | 1906 ++++++------ + drivers/staging/bcm/nvm.c | 14 +- + drivers/staging/ccg/Kconfig | 25 - + drivers/staging/ccg/Makefile | 2 - + drivers/staging/ccg/TODO | 6 - + drivers/staging/ccg/ccg.c | 1292 -------- + drivers/staging/ccg/composite.c | 1688 ----------- + drivers/staging/ccg/composite.h | 395 --- + drivers/staging/ccg/config.c | 158 - + drivers/staging/ccg/epautoconf.c | 393 --- + drivers/staging/ccg/f_acm.c | 814 ----- + drivers/staging/ccg/f_fs.c | 2456 --------------- + drivers/staging/ccg/f_mass_storage.c | 3135 -------------------- + drivers/staging/ccg/f_rndis.c | 918 ------ + drivers/staging/ccg/gadget_chips.h | 150 - + drivers/staging/ccg/ndis.h | 47 - + drivers/staging/ccg/rndis.c | 1175 -------- + drivers/staging/ccg/rndis.h | 222 -- + drivers/staging/ccg/storage_common.c | 893 ------ + drivers/staging/ccg/sysfs-class-ccg_usb | 158 - + drivers/staging/ccg/u_ether.c | 986 ------ + drivers/staging/ccg/u_ether.h | 154 - + drivers/staging/ccg/u_serial.c | 1339 --------- + drivers/staging/ccg/u_serial.h | 65 - + drivers/staging/ccg/usbstring.c | 71 - + drivers/staging/comedi/Kconfig | 12 +- + drivers/staging/comedi/comedi_fops.c | 12 +- + drivers/staging/comedi/comedi_pci.c | 36 +- + drivers/staging/comedi/comedidev.h | 16 +- + drivers/staging/comedi/drivers.c | 5 +- + drivers/staging/comedi/drivers/8255_pci.c | 172 +- + drivers/staging/comedi/drivers/Makefile | 1 + + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 31 +- + .../staging/comedi/drivers/addi-data/addi_common.h | 2 - + drivers/staging/comedi/drivers/addi_apci_035.c | 19 +- + drivers/staging/comedi/drivers/addi_apci_1032.c | 13 +- + drivers/staging/comedi/drivers/addi_apci_1500.c | 19 +- + drivers/staging/comedi/drivers/addi_apci_1516.c | 63 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 19 +- + drivers/staging/comedi/drivers/addi_apci_16xx.c | 69 +- + drivers/staging/comedi/drivers/addi_apci_1710.c | 62 +- + drivers/staging/comedi/drivers/addi_apci_2032.c | 13 +- + drivers/staging/comedi/drivers/addi_apci_2200.c | 13 +- + drivers/staging/comedi/drivers/addi_apci_3120.c | 52 +- + drivers/staging/comedi/drivers/addi_apci_3200.c | 49 +- + drivers/staging/comedi/drivers/addi_apci_3501.c | 13 +- + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 225 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 63 +- + drivers/staging/comedi/drivers/adl_pci7x3x.c | 95 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 344 +-- + drivers/staging/comedi/drivers/adl_pci9111.c | 14 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 19 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 142 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 18 +- + drivers/staging/comedi/drivers/adv_pci1724.c | 411 +++ + drivers/staging/comedi/drivers/adv_pci_dio.c | 166 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 26 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 19 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 20 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 21 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 22 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 95 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 928 +++--- + drivers/staging/comedi/drivers/cb_pcidda.c | 90 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 14 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 14 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 19 +- + drivers/staging/comedi/drivers/daqboard2000.c | 17 +- + drivers/staging/comedi/drivers/das08.h | 1 - + drivers/staging/comedi/drivers/das08_cs.c | 1 - + drivers/staging/comedi/drivers/das08_pci.c | 13 +- + drivers/staging/comedi/drivers/das16.c | 2 +- + drivers/staging/comedi/drivers/das16m1.c | 2 +- + drivers/staging/comedi/drivers/das1800.c | 2 +- + drivers/staging/comedi/drivers/dt3000.c | 97 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 13 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 16 +- + drivers/staging/comedi/drivers/icp_multi.c | 14 +- + drivers/staging/comedi/drivers/jr3_pci.c | 13 +- + drivers/staging/comedi/drivers/ke_counter.c | 19 +- + drivers/staging/comedi/drivers/me4000.c | 148 +- + drivers/staging/comedi/drivers/me_daq.c | 62 +- + drivers/staging/comedi/drivers/mite.c | 9 +- + drivers/staging/comedi/drivers/ni_6527.c | 82 +- + drivers/staging/comedi/drivers/ni_65xx.c | 383 +-- + drivers/staging/comedi/drivers/ni_660x.c | 144 +- + drivers/staging/comedi/drivers/ni_670x.c | 62 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 2 +- + drivers/staging/comedi/drivers/ni_atmio.c | 12 +- + drivers/staging/comedi/drivers/ni_labpc.c | 12 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 345 ++- + drivers/staging/comedi/drivers/ni_pcidio.c | 68 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 2055 ++++++------- + drivers/staging/comedi/drivers/ni_stc.h | 4 - + drivers/staging/comedi/drivers/pcl816.c | 2 +- + drivers/staging/comedi/drivers/rtd520.c | 51 +- + drivers/staging/comedi/drivers/s626.c | 15 +- + drivers/staging/comedi/drivers/skel.c | 117 +- + drivers/staging/comedi/drivers/usbdux.c | 406 +-- + drivers/staging/comedi/drivers/usbduxsigma.c | 2 +- + drivers/staging/csr/csr_time.c | 8 +- + drivers/staging/csr/drv.c | 4 +- + drivers/staging/csr/netdev.c | 2 +- + drivers/staging/csr/sdio_mmc.c | 3 +- + drivers/staging/csr/sme_native.c | 2 +- + drivers/staging/csr/sme_wext.c | 3 - + drivers/staging/csr/unifi_pdu_processing.c | 4 +- + drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +- + drivers/staging/dgrp/dgrp_mon_ops.c | 2 +- + drivers/staging/dgrp/dgrp_net_ops.c | 4 +- + drivers/staging/dgrp/dgrp_ports_ops.c | 2 +- + drivers/staging/dgrp/dgrp_specproc.c | 6 +- + drivers/staging/dwc2/Kconfig | 42 + + drivers/staging/dwc2/Makefile | 23 + + drivers/staging/dwc2/core.c | 2678 +++++++++++++++++ + drivers/staging/dwc2/core.h | 658 ++++ + drivers/staging/dwc2/core_intr.c | 505 ++++ + drivers/staging/dwc2/hcd.c | 2951 ++++++++++++++++++ + drivers/staging/dwc2/hcd.h | 737 +++++ + drivers/staging/dwc2/hcd_ddma.c | 1196 ++++++++ + drivers/staging/dwc2/hcd_intr.c | 2079 +++++++++++++ + drivers/staging/dwc2/hcd_queue.c | 675 +++++ + drivers/staging/dwc2/hw.h | 811 +++++ + drivers/staging/dwc2/pci.c | 198 ++ + drivers/staging/et131x/et131x.c | 4 +- + drivers/staging/gdm72xx/gdm_qos.c | 47 +- + drivers/staging/gdm72xx/netlink_k.c | 1 + + drivers/staging/gdm72xx/sdio_boot.c | 1 + + drivers/staging/line6/pod.c | 3 +- + drivers/staging/netlogic/Kconfig | 7 + + drivers/staging/netlogic/Makefile | 1 + + drivers/staging/netlogic/TODO | 12 + + drivers/staging/netlogic/platform_net.c | 223 ++ + drivers/staging/netlogic/platform_net.h | 46 + + drivers/staging/netlogic/xlr_net.c | 1114 +++++++ + drivers/staging/netlogic/xlr_net.h | 1099 +++++++ + drivers/staging/omap-thermal/Kconfig | 2 +- + drivers/staging/omap-thermal/Makefile | 4 +- + drivers/staging/omap-thermal/TODO | 4 - + drivers/staging/omap-thermal/omap-bandgap.c | 854 +++--- + drivers/staging/omap-thermal/omap-bandgap.h | 442 ++- + drivers/staging/omap-thermal/omap-thermal-common.c | 4 +- + .../{omap4-thermal.c => omap4-thermal-data.c} | 14 +- + drivers/staging/omap-thermal/omap4xxx-bandgap.h | 175 ++ + drivers/staging/omap-thermal/omap5-thermal-data.c | 354 +++ + drivers/staging/omap-thermal/omap5-thermal.c | 297 -- + drivers/staging/omap-thermal/omap5xxx-bandgap.h | 199 ++ + drivers/staging/omap-thermal/omap_bandgap.txt | 36 +- + drivers/staging/rtl8712/rtl8712_led.c | 8 +- + drivers/staging/rtl8712/rtl871x_recv.h | 108 - + drivers/staging/sep/sep_main.c | 9 +- + drivers/staging/sep/sep_trace_events.h | 11 +- + drivers/staging/silicom/bp_mod.c | 10 +- + drivers/staging/silicom/bypasslib/bypass.c | 94 +- + drivers/staging/slicoss/slicoss.c | 132 +- + drivers/staging/sm7xxfb/sm7xxfb.c | 10 +- + drivers/staging/usbip/stub_dev.c | 6 +- + drivers/staging/usbip/userspace/libsrc/names.c | 532 ++-- + drivers/staging/usbip/userspace/libsrc/names.h | 3 +- + .../staging/usbip/userspace/libsrc/usbip_common.c | 28 +- + .../staging/usbip/userspace/libsrc/usbip_common.h | 11 +- + .../staging/usbip/userspace/libsrc/vhci_driver.c | 40 +- + drivers/staging/usbip/userspace/src/usbip_detach.c | 2 +- + .../staging/usbip/userspace/src/usbip_network.c | 2 +- + .../staging/usbip/userspace/src/usbip_network.h | 4 +- + drivers/staging/usbip/userspace/src/usbipd.c | 4 +- + drivers/staging/usbip/vhci_hcd.c | 5 +- + drivers/staging/vt6656/80211hdr.h | 122 +- + drivers/staging/vt6656/80211mgr.c | 108 +- + drivers/staging/vt6656/80211mgr.h | 309 +- + drivers/staging/vt6656/TODO | 2 +- + drivers/staging/vt6656/aes_ccmp.c | 104 +- + drivers/staging/vt6656/aes_ccmp.h | 4 +- + drivers/staging/vt6656/baseband.c | 48 +- + drivers/staging/vt6656/baseband.h | 7 +- + drivers/staging/vt6656/bssdb.c | 25 +- + drivers/staging/vt6656/bssdb.h | 108 +- + drivers/staging/vt6656/card.c | 64 +- + drivers/staging/vt6656/card.h | 9 +- + drivers/staging/vt6656/channel.c | 14 +- + drivers/staging/vt6656/channel.h | 7 +- + drivers/staging/vt6656/control.h | 1 - + drivers/staging/vt6656/datarate.c | 37 +- + drivers/staging/vt6656/datarate.h | 10 +- + drivers/staging/vt6656/desc.h | 230 +- + drivers/staging/vt6656/device.h | 23 +- + drivers/staging/vt6656/device_cfg.h | 2 - + drivers/staging/vt6656/dpc.c | 122 +- + drivers/staging/vt6656/dpc.h | 1 - + drivers/staging/vt6656/firmware.c | 2 +- + drivers/staging/vt6656/firmware.h | 1 - + drivers/staging/vt6656/hostap.c | 12 +- + drivers/staging/vt6656/int.c | 16 +- + drivers/staging/vt6656/int.h | 39 +- + drivers/staging/vt6656/iocmd.h | 2 - + drivers/staging/vt6656/iwctl.c | 24 +- + drivers/staging/vt6656/key.c | 14 +- + drivers/staging/vt6656/key.h | 23 +- + drivers/staging/vt6656/mac.c | 52 +- + drivers/staging/vt6656/mac.h | 1 - + drivers/staging/vt6656/main_usb.c | 18 +- + drivers/staging/vt6656/mib.c | 36 +- + drivers/staging/vt6656/mib.h | 269 +- + drivers/staging/vt6656/michael.c | 40 +- + drivers/staging/vt6656/michael.h | 8 +- + drivers/staging/vt6656/power.c | 3 +- + drivers/staging/vt6656/rc4.c | 22 +- + drivers/staging/vt6656/rc4.h | 8 +- + drivers/staging/vt6656/rf.c | 8 +- + drivers/staging/vt6656/rf.h | 1 - + drivers/staging/vt6656/rndis.h | 78 +- + drivers/staging/vt6656/rxtx.c | 386 +-- + drivers/staging/vt6656/rxtx.h | 655 ++-- + drivers/staging/vt6656/srom.h | 58 +- + drivers/staging/vt6656/tcrc.c | 12 +- + drivers/staging/vt6656/tcrc.h | 8 +- + drivers/staging/vt6656/tether.c | 14 +- + drivers/staging/vt6656/tether.h | 33 +- + drivers/staging/vt6656/tkip.c | 14 +- + drivers/staging/vt6656/tkip.h | 11 +- + drivers/staging/vt6656/tmacro.h | 14 +- + drivers/staging/vt6656/ttype.h | 55 - + drivers/staging/vt6656/usbpipe.h | 1 - + drivers/staging/vt6656/wcmd.c | 7 +- + drivers/staging/vt6656/wcmd.h | 6 +- + drivers/staging/vt6656/wctl.c | 6 +- + drivers/staging/vt6656/wctl.h | 1 - + drivers/staging/vt6656/wmgr.c | 118 +- + drivers/staging/vt6656/wmgr.h | 1 - + drivers/staging/vt6656/wpa.c | 29 +- + drivers/staging/vt6656/wpa.h | 5 +- + drivers/staging/vt6656/wpa2.c | 40 +- + drivers/staging/vt6656/wpa2.h | 5 +- + drivers/staging/vt6656/wpactl.c | 20 +- + drivers/staging/wlan-ng/prism2sta.c | 51 +- + drivers/staging/zcache/Kconfig | 8 + + drivers/staging/zcache/Makefile | 1 + + drivers/staging/zcache/debug.c | 71 + + drivers/staging/zcache/debug.h | 231 ++ + drivers/staging/zcache/zcache-main.c | 405 +-- + 258 files changed, 25949 insertions(+), 25263 deletions(-) + create mode 100644 drivers/staging/android/sw_sync.c + create mode 100644 drivers/staging/android/sw_sync.h + create mode 100644 drivers/staging/android/sync.c + create mode 100644 drivers/staging/android/sync.h + create mode 100644 drivers/staging/android/trace/sync.h + delete mode 100644 drivers/staging/ccg/Kconfig + delete mode 100644 drivers/staging/ccg/Makefile + delete mode 100644 drivers/staging/ccg/TODO + delete mode 100644 drivers/staging/ccg/ccg.c + delete mode 100644 drivers/staging/ccg/composite.c + delete mode 100644 drivers/staging/ccg/composite.h + delete mode 100644 drivers/staging/ccg/config.c + delete mode 100644 drivers/staging/ccg/epautoconf.c + delete mode 100644 drivers/staging/ccg/f_acm.c + delete mode 100644 drivers/staging/ccg/f_fs.c + delete mode 100644 drivers/staging/ccg/f_mass_storage.c + delete mode 100644 drivers/staging/ccg/f_rndis.c + delete mode 100644 drivers/staging/ccg/gadget_chips.h + delete mode 100644 drivers/staging/ccg/ndis.h + delete mode 100644 drivers/staging/ccg/rndis.c + delete mode 100644 drivers/staging/ccg/rndis.h + delete mode 100644 drivers/staging/ccg/storage_common.c + delete mode 100644 drivers/staging/ccg/sysfs-class-ccg_usb + delete mode 100644 drivers/staging/ccg/u_ether.c + delete mode 100644 drivers/staging/ccg/u_ether.h + delete mode 100644 drivers/staging/ccg/u_serial.c + delete mode 100644 drivers/staging/ccg/u_serial.h + delete mode 100644 drivers/staging/ccg/usbstring.c + create mode 100644 drivers/staging/comedi/drivers/adv_pci1724.c + create mode 100644 drivers/staging/dwc2/Kconfig + create mode 100644 drivers/staging/dwc2/Makefile + create mode 100644 drivers/staging/dwc2/core.c + create mode 100644 drivers/staging/dwc2/core.h + create mode 100644 drivers/staging/dwc2/core_intr.c + create mode 100644 drivers/staging/dwc2/hcd.c + create mode 100644 drivers/staging/dwc2/hcd.h + create mode 100644 drivers/staging/dwc2/hcd_ddma.c + create mode 100644 drivers/staging/dwc2/hcd_intr.c + create mode 100644 drivers/staging/dwc2/hcd_queue.c + create mode 100644 drivers/staging/dwc2/hw.h + create mode 100644 drivers/staging/dwc2/pci.c + create mode 100644 drivers/staging/netlogic/Kconfig + create mode 100644 drivers/staging/netlogic/Makefile + create mode 100644 drivers/staging/netlogic/TODO + create mode 100644 drivers/staging/netlogic/platform_net.c + create mode 100644 drivers/staging/netlogic/platform_net.h + create mode 100644 drivers/staging/netlogic/xlr_net.c + create mode 100644 drivers/staging/netlogic/xlr_net.h + rename drivers/staging/omap-thermal/{omap4-thermal.c => omap4-thermal-data.c} (97%) + create mode 100644 drivers/staging/omap-thermal/omap4xxx-bandgap.h + create mode 100644 drivers/staging/omap-thermal/omap5-thermal-data.c + delete mode 100644 drivers/staging/omap-thermal/omap5-thermal.c + create mode 100644 drivers/staging/omap-thermal/omap5xxx-bandgap.h + delete mode 100644 drivers/staging/vt6656/ttype.h + create mode 100644 drivers/staging/zcache/debug.c + create mode 100644 drivers/staging/zcache/debug.h +Merging char-misc/char-misc-next (a750fa4 softingcs: use module_pcmcia_driver) +$ git merge char-misc/char-misc-next +Auto-merging drivers/net/ethernet/xircom/xirc2ps_cs.c +Auto-merging drivers/net/ethernet/fujitsu/fmvj18x_cs.c +Auto-merging drivers/misc/mei/mei_dev.h +Auto-merging drivers/misc/mei/init.c +Auto-merging drivers/misc/mei/hw-me.c +Merge made by the 'recursive' strategy. + drivers/ata/pata_pcmcia.c | 14 +- + drivers/bluetooth/bluecard_cs.c | 15 +- + drivers/bluetooth/bt3c_cs.c | 15 +- + drivers/bluetooth/btuart_cs.c | 15 +- + drivers/bluetooth/dtl1_cs.c | 15 +- + drivers/char/applicom.c | 4 +- + drivers/char/hw_random/mxc-rnga.c | 13 +- + drivers/char/hw_random/tx4939-rng.c | 13 +- + drivers/hv/Makefile | 2 +- + drivers/hv/channel_mgmt.c | 11 + + drivers/hv/hv_balloon.c | 482 +++++++++++++++++++++++++---- + drivers/hv/hv_snapshot.c | 287 +++++++++++++++++ + drivers/hv/hv_util.c | 10 + + drivers/ipack/carriers/tpci200.c | 14 +- + drivers/ipack/ipack.c | 36 ++- + drivers/isdn/hardware/avm/avm_cs.c | 14 +- + drivers/isdn/hisax/avma1_cs.c | 14 +- + drivers/isdn/hisax/elsa_cs.c | 14 +- + drivers/isdn/hisax/sedlbauer_cs.c | 14 +- + drivers/isdn/hisax/teles_cs.c | 14 +- + drivers/memory/emif.c | 12 +- + drivers/memory/tegra30-mc.c | 2 + + drivers/misc/Makefile | 1 - + drivers/misc/apds990x.c | 3 - + drivers/misc/arm-charlcd.c | 13 +- + drivers/misc/atmel_pwm.c | 12 +- + drivers/misc/ep93xx_pwm.c | 13 +- + drivers/misc/mei/amthif.c | 11 +- + drivers/misc/mei/hw-me.c | 48 ++- + drivers/misc/mei/hw-me.h | 6 - + drivers/misc/mei/init.c | 16 + + drivers/misc/mei/interrupt.c | 50 +-- + drivers/misc/mei/mei_dev.h | 27 +- + drivers/misc/vmw_vmci/Kconfig | 2 +- + drivers/mmc/host/sdricoh_cs.c | 20 +- + drivers/net/arcnet/com20020_cs.c | 14 +- + drivers/net/can/sja1000/ems_pcmcia.c | 13 +- + drivers/net/can/sja1000/peak_pcmcia.c | 13 +- + drivers/net/can/softing/softing_cs.c | 16 +- + drivers/net/ethernet/3com/3c574_cs.c | 14 +- + drivers/net/ethernet/3com/3c589_cs.c | 14 +- + drivers/net/ethernet/8390/axnet_cs.c | 14 +- + drivers/net/ethernet/8390/pcnet_cs.c | 14 +- + drivers/net/ethernet/amd/nmclan_cs.c | 14 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 14 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 14 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 16 +- + drivers/net/wireless/airo_cs.c | 14 +- + drivers/net/wireless/atmel_cs.c | 14 +- + drivers/net/wireless/b43/pcmcia.c | 4 + + drivers/net/wireless/hostap/hostap_cs.c | 15 +- + drivers/net/wireless/libertas/if_cs.c | 25 +- + drivers/net/wireless/orinoco/orinoco_cs.c | 16 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 16 +- + drivers/net/wireless/wl3501_cs.c | 14 +- + drivers/parport/parport_cs.c | 14 +- + drivers/scsi/pcmcia/aha152x_stub.c | 14 +- + drivers/scsi/pcmcia/fdomain_stub.c | 14 +- + drivers/scsi/pcmcia/nsp_cs.c | 17 +- + drivers/scsi/pcmcia/qlogic_stub.c | 13 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 16 +- + drivers/tty/serial/8250/serial_cs.c | 14 +- + drivers/usb/host/sl811_cs.c | 15 +- + drivers/w1/masters/mxc_w1.c | 6 +- + drivers/w1/slaves/Kconfig | 10 + + drivers/w1/slaves/w1_ds2408.c | 25 +- + include/linux/hyperv.h | 69 +++++ + include/linux/ipack.h | 42 ++- + include/pcmcia/ds.h | 12 + + include/uapi/linux/connector.h | 5 +- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 15 +- + sound/pcmcia/vx/vxpocket.c | 14 +- + tools/hv/hv_kvp_daemon.c | 16 +- + tools/hv/hv_vss_daemon.c | 220 +++++++++++++ + 74 files changed, 1319 insertions(+), 772 deletions(-) + create mode 100644 drivers/hv/hv_snapshot.c + create mode 100644 tools/hv/hv_vss_daemon.c +$ git reset --hard HEAD^ +HEAD is now at 877e6b3 Merge remote-tracking branch 'staging/staging-next' +Merging 20130315 version of char-misc +$ git merge -m 20130315/char-misc 388f7bd24d2ffc945ad08be3a592672c1e32156e +Merge made by the 'recursive' strategy. + drivers/w1/masters/mxc_w1.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging bcon/master (06c6942 blockconsole: Mark a local work struct static) +$ git merge bcon/master +Resolved 'drivers/block/Kconfig' using previous resolution. +Auto-merging kernel/printk.c +Auto-merging init/do_mounts.c +Auto-merging include/linux/console.h +Auto-merging drivers/net/netconsole.c +Auto-merging drivers/block/Makefile +Auto-merging drivers/block/Kconfig +CONFLICT (content): Merge conflict in drivers/block/Kconfig +Auto-merging block/partitions/check.h +Auto-merging block/partitions/check.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 08fe8b1] Merge remote-tracking branch 'bcon/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/blockconsole.txt | 94 ++++ + Documentation/block/blockconsole/bcon_tail | 82 ++++ + Documentation/block/blockconsole/mkblockconsole | 29 ++ + block/partitions/Makefile | 1 + + block/partitions/blockconsole.c | 22 + + block/partitions/check.c | 3 + + block/partitions/check.h | 3 + + drivers/block/Kconfig | 6 + + drivers/block/Makefile | 1 + + drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++ + drivers/net/netconsole.c | 2 +- + include/linux/blockconsole.h | 7 + + include/linux/console.h | 1 + + include/linux/mount.h | 2 +- + init/do_mounts.c | 2 +- + kernel/printk.c | 5 +- + 16 files changed, 873 insertions(+), 5 deletions(-) + create mode 100644 Documentation/block/blockconsole.txt + create mode 100755 Documentation/block/blockconsole/bcon_tail + create mode 100755 Documentation/block/blockconsole/mkblockconsole + create mode 100644 block/partitions/blockconsole.c + create mode 100644 drivers/block/blockconsole.c + create mode 100644 include/linux/blockconsole.h +Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) +$ git merge tmem/linux-next +Already up-to-date. +Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio()) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) +$ git merge arm-dt/devicetree/arm-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (f440836 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/pinctrl-at91.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/gpio/gpio.txt | 6 +- + .../devicetree/bindings/pinctrl/pinctrl-single.txt | 107 ++- + arch/arm/boot/dts/spear1310.dtsi | 4 +- + arch/arm/boot/dts/spear1340.dtsi | 4 +- + arch/arm/boot/dts/spear310.dtsi | 4 +- + arch/arm/boot/dts/spear320.dtsi | 4 +- + drivers/gpio/gpio-pl061.c | 117 ++- + drivers/gpio/gpiolib-of.c | 20 +- + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/core.c | 39 +- + drivers/pinctrl/devicetree.c | 4 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 6 +- + drivers/pinctrl/pinconf-generic.c | 14 + + drivers/pinctrl/pinconf.c | 4 +- + drivers/pinctrl/pinconf.h | 10 +- + drivers/pinctrl/pinctrl-abx500.c | 9 +- + drivers/pinctrl/pinctrl-at91.c | 6 +- + drivers/pinctrl/pinctrl-bcm2835.c | 6 +- + drivers/pinctrl/pinctrl-exynos5440.c | 6 +- + drivers/pinctrl/pinctrl-falcon.c | 2 +- + drivers/pinctrl/pinctrl-imx.c | 6 +- + drivers/pinctrl/pinctrl-lantiq.c | 4 +- + drivers/pinctrl/pinctrl-mxs.c | 6 +- + drivers/pinctrl/pinctrl-nomadik-stn8815.c | 2 +- + drivers/pinctrl/pinctrl-nomadik.c | 6 +- + drivers/pinctrl/pinctrl-pxa3xx.c | 4 +- + drivers/pinctrl/pinctrl-samsung.c | 6 +- + drivers/pinctrl/pinctrl-single.c | 515 ++++++++++- + drivers/pinctrl/pinctrl-sirf.c | 4 +- + drivers/pinctrl/pinctrl-sunxi.c | 978 ++++++++++++++++----- + drivers/pinctrl/pinctrl-tegra.c | 6 +- + drivers/pinctrl/pinctrl-u300.c | 6 +- + drivers/pinctrl/pinctrl-xway.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear.c | 4 +- + include/linux/pinctrl/pinctrl.h | 6 +- + 35 files changed, 1554 insertions(+), 374 deletions(-) +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 (7ff2db4 gpio/em: Add Device Tree support) +$ git merge gpio/gpio/next +Auto-merging include/linux/mfd/palmas.h +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-em.c | 45 ++++++++++++++++++++++++++-- + drivers/gpio/gpio-omap.c | 75 +++++++++++++++++++++------------------------- + drivers/gpio/gpio-palmas.c | 75 ++++++++++++++++++++++++++++++++++++++-------- + drivers/gpio/gpio-tegra.c | 11 ++++--- + include/linux/mfd/palmas.h | 12 +++++++- + 5 files changed, 154 insertions(+), 64 deletions(-) +$ git revert 82d4d6637fdf +[master ea65291] Revert "gpio/palmas: add in GPIO support for palmas charger" + 2 files changed, 14 insertions(+), 73 deletions(-) +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 (5ad6b87 Merge branch 'next/soc' into for-next) +$ git merge arm-soc/for-next +Auto-merging drivers/pinctrl/pinctrl-samsung.c +Removing arch/arm/plat-spear/Makefile +Removing arch/arm/plat-spear/Kconfig +Removing arch/arm/plat-samsung/time.c +Auto-merging arch/arm/plat-samsung/samsung-time.c +Removing arch/arm/plat-samsung/include/plat/s5p-time.h +Removing arch/arm/plat-samsung/include/plat/s3c244x.h +Removing arch/arm/plat-samsung/include/plat/s3c2443.h +Removing arch/arm/plat-samsung/include/plat/s3c2416.h +Removing arch/arm/plat-samsung/include/plat/s3c2412.h +Removing arch/arm/plat-samsung/include/plat/s3c2410.h +Removing arch/arm/plat-samsung/include/plat/irq.h +Removing arch/arm/mach-spear6xx/include/mach/uncompress.h +Removing arch/arm/mach-spear6xx/include/mach/timex.h +Removing arch/arm/mach-spear6xx/include/mach/spear.h +Removing arch/arm/mach-spear6xx/include/mach/misc_regs.h +Removing arch/arm/mach-spear6xx/include/mach/hardware.h +Removing arch/arm/mach-spear6xx/include/mach/generic.h +Removing arch/arm/mach-spear6xx/include/mach/debug-macro.S +Removing arch/arm/mach-spear6xx/Makefile.boot +Removing arch/arm/mach-spear6xx/Makefile +Removing arch/arm/mach-spear6xx/Kconfig +Removing arch/arm/mach-spear3xx/include/mach/uncompress.h +Removing arch/arm/mach-spear3xx/include/mach/timex.h +Removing arch/arm/mach-spear3xx/include/mach/spear.h +Removing arch/arm/mach-spear3xx/include/mach/irqs.h +Removing arch/arm/mach-spear3xx/include/mach/hardware.h +Removing arch/arm/mach-spear3xx/include/mach/generic.h +Removing arch/arm/mach-spear3xx/include/mach/debug-macro.S +Removing arch/arm/mach-spear3xx/Makefile.boot +Removing arch/arm/mach-spear3xx/Makefile +Removing arch/arm/mach-spear3xx/Kconfig +Removing arch/arm/mach-spear13xx/include/mach/uncompress.h +Removing arch/arm/mach-spear13xx/include/mach/timex.h +Removing arch/arm/mach-spear13xx/include/mach/spear.h +Removing arch/arm/mach-spear13xx/include/mach/irqs.h +Removing arch/arm/mach-spear13xx/include/mach/hardware.h +Removing arch/arm/mach-spear13xx/include/mach/debug-macro.S +Removing arch/arm/mach-spear13xx/Makefile +Removing arch/arm/mach-spear13xx/Kconfig +Auto-merging arch/arm/mach-spear/time.c +Auto-merging arch/arm/mach-spear/spear6xx.c +Auto-merging arch/arm/mach-spear/spear3xx.c +Auto-merging arch/arm/mach-spear/spear320.c +Auto-merging arch/arm/mach-spear/spear310.c +Auto-merging arch/arm/mach-spear/spear300.c +Auto-merging arch/arm/mach-spear/spear13xx.c +Auto-merging arch/arm/mach-spear/spear1340.c +Auto-merging arch/arm/mach-spear/spear1310.c +Auto-merging arch/arm/mach-spear/restart.c +Auto-merging arch/arm/mach-spear/platsmp.c +Auto-merging arch/arm/mach-spear/include/mach/misc_regs.h +Auto-merging arch/arm/mach-spear/include/mach/irqs.h +Auto-merging arch/arm/mach-spear/generic.h +Removing arch/arm/mach-s3c24xx/irq-s3c244x.c +Removing arch/arm/mach-s3c24xx/irq-s3c2440.c +Removing arch/arm/mach-s3c24xx/irq-s3c2412.c +Removing arch/arm/mach-s3c24xx/include/mach/regs-sdi.h +Auto-merging arch/arm/mach-s3c24xx/common-smdk.h +Removing arch/arm/mach-nomadik/include/mach/uncompress.h +Removing arch/arm/mach-nomadik/include/mach/timex.h +Removing arch/arm/mach-nomadik/include/mach/irqs.h +Removing arch/arm/mach-nomadik/Makefile.boot +Removing arch/arm/mach-l7200/include/mach/debug-macro.S +Removing arch/arm/mach-h720x/include/mach/uncompress.h +Removing arch/arm/mach-h720x/include/mach/timex.h +Removing arch/arm/mach-h720x/include/mach/isa-dma.h +Removing arch/arm/mach-h720x/include/mach/irqs.h +Removing arch/arm/mach-h720x/include/mach/hardware.h +Removing arch/arm/mach-h720x/include/mach/h7202-regs.h +Removing arch/arm/mach-h720x/include/mach/h7201-regs.h +Removing arch/arm/mach-h720x/include/mach/entry-macro.S +Removing arch/arm/mach-h720x/include/mach/debug-macro.S +Removing arch/arm/mach-h720x/include/mach/boards.h +Removing arch/arm/mach-h720x/h7202-eval.c +Removing arch/arm/mach-h720x/h7201-eval.c +Removing arch/arm/mach-h720x/cpu-h7202.c +Removing arch/arm/mach-h720x/cpu-h7201.c +Removing arch/arm/mach-h720x/common.h +Removing arch/arm/mach-h720x/common.c +Removing arch/arm/mach-h720x/Makefile.boot +Removing arch/arm/mach-h720x/Makefile +Removing arch/arm/mach-h720x/Kconfig +Removing arch/arm/mach-gemini/timResolved 'arch/arm/boot/dts/snowball.dts' using previous resolution. +e.c +Removing arch/arm/mach-gemini/mm.c +Removing arch/arm/mach-gemini/irq.c +Removing arch/arm/mach-gemini/include/mach/uncompress.h +Removing arch/arm/mach-gemini/include/mach/timex.h +Removing arch/arm/mach-gemini/include/mach/system.h +Removing arch/arm/mach-gemini/include/mach/irqs.h +Removing arch/arm/mach-gemini/include/mach/hardware.h +Removing arch/arm/mach-gemini/include/mach/gpio.h +Removing arch/arm/mach-gemini/include/mach/global_reg.h +Removing arch/arm/mach-gemini/include/mach/entry-macro.S +Removing arch/arm/mach-gemini/include/mach/debug-macro.S +Removing arch/arm/mach-gemini/idle.c +Removing arch/arm/mach-gemini/gpio.c +Removing arch/arm/mach-gemini/devices.c +Removing arch/arm/mach-gemini/common.h +Removing arch/arm/mach-gemini/board-wbd222.c +Removing arch/arm/mach-gemini/board-wbd111.c +Removing arch/arm/mach-gemini/board-rut1xx.c +Removing arch/arm/mach-gemini/board-nas4220b.c +Removing arch/arm/mach-gemini/Makefile.boot +Removing arch/arm/mach-gemini/Makefile +Removing arch/arm/mach-gemini/Kconfig +Removing arch/arm/mach-cns3xxx/include/mach/uncompress.h +Removing arch/arm/mach-cns3xxx/include/mach/timex.h +Removing arch/arm/mach-cns3xxx/include/mach/irqs.h +Auto-merging arch/arm/mach-cns3xxx/cns3xxx.h +Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c +Removing arch/arm/configs/h7202_defconfig +Removing arch/arm/configs/h7201_defconfig +Auto-merging arch/arm/boot/dts/snowball.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/snowball.dts +Auto-merging arch/arm/boot/dts/href.dtsi +Auto-merging arch/arm/boot/dts/dbx5x0.dtsi +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ab9b63f] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 7 - + arch/arm/Kconfig | 74 +-- + arch/arm/Kconfig.debug | 16 + + arch/arm/Makefile | 7 +- + arch/arm/arm-soc-for-next-contents.txt | 49 ++ + arch/arm/boot/dts/armada-370-mirabox.dts | 11 + + arch/arm/boot/dts/atlas6-evb.dts | 78 +++ + arch/arm/boot/dts/atlas6.dtsi | 668 +++++++++++++++++++++ + arch/arm/boot/dts/dbx5x0.dtsi | 7 +- + arch/arm/boot/dts/dove.dtsi | 5 + + arch/arm/boot/dts/href.dtsi | 1 + + arch/arm/boot/dts/hrefprev60.dts | 10 +- + arch/arm/boot/dts/kirkwood-6282.dtsi | 6 + + arch/arm/boot/dts/snowball.dts | 4 + + arch/arm/boot/dts/stuib.dtsi | 2 +- + arch/arm/configs/at91_dt_defconfig | 2 +- + arch/arm/configs/at91sam9260_defconfig | 2 +- + arch/arm/configs/at91sam9g20_defconfig | 2 +- + arch/arm/configs/at91sam9g45_defconfig | 2 +- + arch/arm/configs/cns3420vb_defconfig | 3 + + arch/arm/configs/dove_defconfig | 2 + + arch/arm/configs/h7201_defconfig | 27 - + arch/arm/configs/h7202_defconfig | 47 -- + arch/arm/configs/kirkwood_defconfig | 2 + + arch/arm/configs/multi_v7_defconfig | 9 + + arch/arm/configs/nhk8815_defconfig | 42 +- + arch/arm/configs/spear3xx_defconfig | 2 + + arch/arm/configs/spear6xx_defconfig | 1 + + arch/arm/include/asm/smp_twd.h | 8 - + .../mach/debug-macro.S => include/debug/cns3xxx.S} | 0 + .../mach/debug-macro.S => include/debug/nomadik.S} | 0 + arch/arm/kernel/smp_twd.c | 17 +- + arch/arm/mach-at91/Kconfig | 398 +----------- + arch/arm/mach-at91/Kconfig.non_dt | 399 ++++++++++++ + arch/arm/mach-at91/Makefile | 4 +- + arch/arm/mach-at91/at91sam9261.c | 2 + + arch/arm/mach-at91/at91sam9261_devices.c | 6 +- + arch/arm/mach-at91/at91sam9263.c | 1 + + arch/arm/mach-at91/at91sam9263_devices.c | 2 +- + arch/arm/mach-at91/at91sam9g45.c | 2 + + arch/arm/mach-at91/at91sam9g45_devices.c | 6 +- + arch/arm/mach-at91/at91sam9rl.c | 1 + + arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- + .../{board-rm9200-dt.c => board-dt-rm9200.c} | 0 + arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} | 0 + arch/arm/mach-cns3xxx/Kconfig | 12 + + arch/arm/mach-cns3xxx/Makefile | 8 +- + arch/arm/mach-cns3xxx/cns3420vb.c | 6 +- + arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h | 7 +- + arch/arm/mach-cns3xxx/core.c | 121 +++- + arch/arm/mach-cns3xxx/devices.c | 5 +- + arch/arm/mach-cns3xxx/include/mach/irqs.h | 24 - + arch/arm/mach-cns3xxx/include/mach/timex.h | 12 - + arch/arm/mach-cns3xxx/include/mach/uncompress.h | 53 -- + arch/arm/mach-cns3xxx/pcie.c | 2 +- + arch/arm/mach-cns3xxx/pm.c | 4 +- + arch/arm/mach-cns3xxx/{include/mach => }/pm.h | 0 + arch/arm/mach-exynos/Kconfig | 2 +- + arch/arm/mach-exynos/common.c | 1 + + arch/arm/mach-exynos/mach-universal_c210.c | 6 +- + arch/arm/mach-gemini/Kconfig | 40 -- + arch/arm/mach-gemini/Makefile | 13 - + arch/arm/mach-gemini/Makefile.boot | 9 - + arch/arm/mach-gemini/board-nas4220b.c | 106 ---- + arch/arm/mach-gemini/board-rut1xx.c | 90 --- + arch/arm/mach-gemini/board-wbd111.c | 133 ---- + arch/arm/mach-gemini/board-wbd222.c | 133 ---- + arch/arm/mach-gemini/common.h | 29 - + arch/arm/mach-gemini/devices.c | 118 ---- + arch/arm/mach-gemini/gpio.c | 230 ------- + arch/arm/mach-gemini/idle.c | 29 - + arch/arm/mach-gemini/include/mach/debug-macro.S | 21 - + arch/arm/mach-gemini/include/mach/entry-macro.S | 33 - + arch/arm/mach-gemini/include/mach/global_reg.h | 278 --------- + arch/arm/mach-gemini/include/mach/gpio.h | 20 - + arch/arm/mach-gemini/include/mach/hardware.h | 74 --- + arch/arm/mach-gemini/include/mach/irqs.h | 53 -- + arch/arm/mach-gemini/include/mach/system.h | 23 - + arch/arm/mach-gemini/include/mach/timex.h | 13 - + arch/arm/mach-gemini/include/mach/uncompress.h | 42 -- + arch/arm/mach-gemini/irq.c | 103 ---- + arch/arm/mach-gemini/mm.c | 82 --- + arch/arm/mach-gemini/time.c | 89 --- + arch/arm/mach-h720x/Kconfig | 40 -- + arch/arm/mach-h720x/Makefile | 16 - + arch/arm/mach-h720x/Makefile.boot | 2 - + arch/arm/mach-h720x/common.c | 268 --------- + arch/arm/mach-h720x/common.h | 30 - + arch/arm/mach-h720x/cpu-h7201.c | 57 -- + arch/arm/mach-h720x/cpu-h7202.c | 225 ------- + arch/arm/mach-h720x/h7201-eval.c | 38 -- + arch/arm/mach-h720x/h7202-eval.c | 81 --- + arch/arm/mach-h720x/include/mach/boards.h | 53 -- + arch/arm/mach-h720x/include/mach/debug-macro.S | 40 -- + arch/arm/mach-h720x/include/mach/entry-macro.S | 57 -- + arch/arm/mach-h720x/include/mach/h7201-regs.h | 67 --- + arch/arm/mach-h720x/include/mach/h7202-regs.h | 155 ----- + arch/arm/mach-h720x/include/mach/hardware.h | 190 ------ + arch/arm/mach-h720x/include/mach/irqs.h | 116 ---- + arch/arm/mach-h720x/include/mach/isa-dma.h | 19 - + arch/arm/mach-h720x/include/mach/timex.h | 15 - + arch/arm/mach-h720x/include/mach/uncompress.h | 36 -- + arch/arm/mach-highbank/highbank.c | 5 +- + arch/arm/mach-imx/mach-imx6q.c | 5 +- + arch/arm/mach-l7200/include/mach/debug-macro.S | 38 -- + arch/arm/mach-nomadik/Kconfig | 22 +- + arch/arm/mach-nomadik/Makefile.boot | 4 - + arch/arm/mach-nomadik/cpu-8815.c | 1 - + arch/arm/mach-nomadik/include/mach/irqs.h | 79 --- + arch/arm/mach-nomadik/include/mach/timex.h | 6 - + arch/arm/mach-nomadik/include/mach/uncompress.h | 60 -- + arch/arm/mach-omap2/timer.c | 2 +- + arch/arm/mach-orion5x/pci.c | 7 +- + arch/arm/mach-prima2/Kconfig | 10 +- + arch/arm/mach-prima2/common.c | 21 + + arch/arm/mach-s3c24xx/Kconfig | 7 + + arch/arm/mach-s3c24xx/Makefile | 6 +- + arch/arm/mach-s3c24xx/bast-irq.c | 2 - + arch/arm/mach-s3c24xx/clock-s3c2410.c | 1 - + arch/arm/mach-s3c24xx/clock-s3c2412.c | 1 - + arch/arm/mach-s3c24xx/clock-s3c2416.c | 1 - + arch/arm/mach-s3c24xx/clock-s3c2443.c | 1 - + arch/arm/mach-s3c24xx/common-smdk.c | 3 +- + .../include/plat => mach-s3c24xx}/common-smdk.h | 3 +- + arch/arm/mach-s3c24xx/common.c | 7 +- + arch/arm/mach-s3c24xx/common.h | 93 ++- + arch/arm/mach-s3c24xx/dma-s3c2410.c | 1 - + arch/arm/mach-s3c24xx/dma-s3c2412.c | 1 - + arch/arm/mach-s3c24xx/dma-s3c2440.c | 1 - + arch/arm/mach-s3c24xx/dma-s3c2443.c | 1 - + arch/arm/mach-s3c24xx/include/mach/irqs.h | 58 +- + arch/arm/mach-s3c24xx/include/mach/regs-sdi.h | 127 ---- + arch/arm/mach-s3c24xx/irq-pm.c | 7 +- + arch/arm/mach-s3c24xx/irq-s3c2412.c | 215 ------- + arch/arm/mach-s3c24xx/irq-s3c2440.c | 128 ---- + arch/arm/mach-s3c24xx/irq-s3c244x.c | 142 ----- + arch/arm/mach-s3c24xx/irq.c | 272 ++++++++- + arch/arm/mach-s3c24xx/mach-amlm5900.c | 5 +- + arch/arm/mach-s3c24xx/mach-anubis.c | 6 +- + arch/arm/mach-s3c24xx/mach-at2440evb.c | 6 +- + arch/arm/mach-s3c24xx/mach-bast.c | 4 +- + arch/arm/mach-s3c24xx/mach-gta02.c | 6 +- + arch/arm/mach-s3c24xx/mach-h1940.c | 5 +- + arch/arm/mach-s3c24xx/mach-jive.c | 8 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 6 +- + arch/arm/mach-s3c24xx/mach-n30.c | 7 +- + arch/arm/mach-s3c24xx/mach-nexcoder.c | 8 +- + arch/arm/mach-s3c24xx/mach-osiris.c | 6 +- + arch/arm/mach-s3c24xx/mach-otom.c | 5 +- + arch/arm/mach-s3c24xx/mach-qt2410.c | 6 +- + arch/arm/mach-s3c24xx/mach-rx1950.c | 6 +- + arch/arm/mach-s3c24xx/mach-rx3715.c | 11 +- + arch/arm/mach-s3c24xx/mach-smdk2410.c | 7 +- + arch/arm/mach-s3c24xx/mach-smdk2413.c | 19 +- + arch/arm/mach-s3c24xx/mach-smdk2416.c | 8 +- + arch/arm/mach-s3c24xx/mach-smdk2440.c | 11 +- + arch/arm/mach-s3c24xx/mach-smdk2443.c | 9 +- + arch/arm/mach-s3c24xx/mach-tct_hammer.c | 4 +- + arch/arm/mach-s3c24xx/mach-vr1000.c | 4 +- + arch/arm/mach-s3c24xx/mach-vstms.c | 9 +- + arch/arm/mach-s3c24xx/pm-s3c2412.c | 9 +- + arch/arm/mach-s3c24xx/s3c2410.c | 1 - + arch/arm/mach-s3c24xx/s3c2412.c | 1 - + arch/arm/mach-s3c24xx/s3c2416.c | 1 - + arch/arm/mach-s3c24xx/s3c2440.c | 1 - + arch/arm/mach-s3c24xx/s3c2442.c | 1 - + arch/arm/mach-s3c24xx/s3c2443.c | 1 - + arch/arm/mach-s3c24xx/s3c244x.c | 2 - + arch/arm/mach-s3c64xx/Kconfig | 2 + + arch/arm/mach-s3c64xx/mach-anw6410.c | 4 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 4 +- + arch/arm/mach-s3c64xx/mach-hmt.c | 4 +- + arch/arm/mach-s3c64xx/mach-mini6410.c | 4 +- + arch/arm/mach-s3c64xx/mach-ncp.c | 4 +- + arch/arm/mach-s3c64xx/mach-real6410.c | 4 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 2 + + arch/arm/mach-s3c64xx/mach-smartq5.c | 3 +- + arch/arm/mach-s3c64xx/mach-smartq7.c | 3 +- + arch/arm/mach-s3c64xx/mach-smdk6400.c | 4 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 4 +- + arch/arm/mach-s5p64x0/Kconfig | 4 +- + arch/arm/mach-s5p64x0/mach-smdk6440.c | 6 +- + arch/arm/mach-s5p64x0/mach-smdk6450.c | 6 +- + arch/arm/mach-s5pc100/Kconfig | 1 + + arch/arm/mach-s5pc100/common.h | 9 - + arch/arm/mach-s5pc100/mach-smdkc100.c | 4 +- + arch/arm/mach-s5pv210/Kconfig | 2 +- + arch/arm/mach-s5pv210/common.h | 9 - + arch/arm/mach-s5pv210/mach-aquila.c | 6 +- + arch/arm/mach-s5pv210/mach-goni.c | 6 +- + arch/arm/mach-s5pv210/mach-smdkc110.c | 6 +- + arch/arm/mach-s5pv210/mach-smdkv210.c | 6 +- + arch/arm/mach-s5pv210/mach-torbreck.c | 6 +- + arch/arm/mach-spear/Kconfig | 103 ++++ + arch/arm/mach-spear/Makefile | 24 + + .../{mach-spear13xx => mach-spear}/Makefile.boot | 0 + .../include/mach => mach-spear}/generic.h | 30 +- + arch/arm/{mach-spear13xx => mach-spear}/headsmp.S | 0 + arch/arm/{mach-spear13xx => mach-spear}/hotplug.c | 0 + .../plat => mach-spear/include/mach}/debug-macro.S | 0 + .../include/mach/irqs.h | 22 +- + .../include/mach/misc_regs.h | 2 +- + arch/arm/mach-spear/include/mach/spear.h | 95 +++ + .../plat => mach-spear/include/mach}/timex.h | 0 + .../plat => mach-spear/include/mach}/uncompress.h | 0 + arch/arm/{plat-spear => mach-spear}/pl080.c | 0 + .../include/plat => mach-spear}/pl080.h | 0 + arch/arm/{mach-spear13xx => mach-spear}/platsmp.c | 2 +- + arch/arm/{plat-spear => mach-spear}/restart.c | 5 +- + .../arm/{mach-spear13xx => mach-spear}/spear1310.c | 4 +- + .../arm/{mach-spear13xx => mach-spear}/spear1340.c | 5 +- + .../mach/dma.h => mach-spear/spear13xx-dma.h} | 0 + .../arm/{mach-spear13xx => mach-spear}/spear13xx.c | 13 +- + arch/arm/{mach-spear3xx => mach-spear}/spear300.c | 4 +- + arch/arm/{mach-spear3xx => mach-spear}/spear310.c | 4 +- + arch/arm/{mach-spear3xx => mach-spear}/spear320.c | 7 +- + arch/arm/{mach-spear3xx => mach-spear}/spear3xx.c | 17 +- + arch/arm/{mach-spear6xx => mach-spear}/spear6xx.c | 25 +- + arch/arm/{plat-spear => mach-spear}/time.c | 2 +- + arch/arm/mach-spear13xx/Kconfig | 20 - + arch/arm/mach-spear13xx/Makefile | 10 - + arch/arm/mach-spear13xx/include/mach/debug-macro.S | 14 - + arch/arm/mach-spear13xx/include/mach/hardware.h | 1 - + arch/arm/mach-spear13xx/include/mach/irqs.h | 20 - + arch/arm/mach-spear13xx/include/mach/spear.h | 54 -- + arch/arm/mach-spear13xx/include/mach/timex.h | 19 - + arch/arm/mach-spear13xx/include/mach/uncompress.h | 19 - + arch/arm/mach-spear3xx/Kconfig | 26 - + arch/arm/mach-spear3xx/Makefile | 15 - + arch/arm/mach-spear3xx/Makefile.boot | 3 - + arch/arm/mach-spear3xx/include/mach/debug-macro.S | 14 - + arch/arm/mach-spear3xx/include/mach/generic.h | 36 -- + arch/arm/mach-spear3xx/include/mach/hardware.h | 1 - + arch/arm/mach-spear3xx/include/mach/irqs.h | 19 - + arch/arm/mach-spear3xx/include/mach/spear.h | 60 -- + arch/arm/mach-spear3xx/include/mach/timex.h | 19 - + arch/arm/mach-spear3xx/include/mach/uncompress.h | 19 - + arch/arm/mach-spear6xx/Kconfig | 10 - + arch/arm/mach-spear6xx/Makefile | 6 - + arch/arm/mach-spear6xx/Makefile.boot | 3 - + arch/arm/mach-spear6xx/include/mach/debug-macro.S | 14 - + arch/arm/mach-spear6xx/include/mach/generic.h | 23 - + arch/arm/mach-spear6xx/include/mach/hardware.h | 1 - + arch/arm/mach-spear6xx/include/mach/misc_regs.h | 22 - + arch/arm/mach-spear6xx/include/mach/spear.h | 46 -- + arch/arm/mach-spear6xx/include/mach/timex.h | 19 - + arch/arm/mach-spear6xx/include/mach/uncompress.h | 19 - + arch/arm/mach-ux500/board-mop500-regulators.c | 14 + + arch/arm/mach-ux500/board-mop500-regulators.h | 1 + + arch/arm/mach-ux500/board-mop500-sdi.c | 52 -- + arch/arm/mach-ux500/board-mop500.c | 45 ++ + arch/arm/mach-ux500/cpu-db8500.c | 1 + + arch/arm/mach-ux500/timer.c | 3 +- + arch/arm/mach-vexpress/v2m.c | 6 +- + arch/arm/plat-orion/Makefile | 6 +- + arch/arm/plat-orion/pcie.c | 10 +- + arch/arm/plat-samsung/Kconfig | 2 +- + arch/arm/plat-samsung/Makefile | 3 +- + arch/arm/plat-samsung/include/plat/cpu.h | 14 +- + arch/arm/plat-samsung/include/plat/irq.h | 116 ---- + arch/arm/plat-samsung/include/plat/s3c2410.h | 31 - + arch/arm/plat-samsung/include/plat/s3c2412.h | 32 - + arch/arm/plat-samsung/include/plat/s3c2416.h | 37 -- + arch/arm/plat-samsung/include/plat/s3c2443.h | 36 -- + arch/arm/plat-samsung/include/plat/s3c244x.h | 42 -- + arch/arm/plat-samsung/include/plat/s5p-time.h | 40 -- + arch/arm/plat-samsung/include/plat/samsung-time.h | 53 ++ + .../plat-samsung/{s5p-time.c => samsung-time.c} | 138 ++--- + arch/arm/plat-samsung/time.c | 287 --------- + arch/arm/plat-spear/Kconfig | 47 -- + arch/arm/plat-spear/Makefile | 9 - + arch/avr32/mach-at32ap/at32ap700x.c | 6 +- + drivers/clk/spear/spear1310_clock.c | 64 +- + drivers/clk/spear/spear1340_clock.c | 63 +- + drivers/clk/spear/spear3xx_clock.c | 60 +- + drivers/clk/spear/spear6xx_clock.c | 31 +- + drivers/clk/ux500/u8500_clk.c | 3 +- + drivers/clocksource/bcm2835_timer.c | 12 +- + drivers/clocksource/clksrc-of.c | 4 +- + drivers/clocksource/tegra20_timer.c | 73 +-- + drivers/clocksource/vt8500_timer.c | 14 +- + drivers/gpio/gpio-samsung.c | 9 +- + drivers/mmc/host/mmci.c | 9 + + drivers/mmc/host/s3cmci.c | 83 ++- + drivers/mmc/host/sdhci-cns3xxx.c | 1 - + drivers/net/ethernet/smsc/smsc911x.c | 29 +- + drivers/pinctrl/pinctrl-exynos.c | 108 ++++ + drivers/pinctrl/pinctrl-samsung.c | 2 + + drivers/pinctrl/pinctrl-samsung.h | 1 + + drivers/video/atmel_lcdfb.c | 120 +++- + include/linux/clocksource.h | 1 + + include/video/atmel_lcdc.h | 4 +- + 292 files changed, 3106 insertions(+), 6611 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/atlas6-evb.dts + create mode 100644 arch/arm/boot/dts/atlas6.dtsi + delete mode 100644 arch/arm/configs/h7201_defconfig + delete mode 100644 arch/arm/configs/h7202_defconfig + rename arch/arm/{mach-cns3xxx/include/mach/debug-macro.S => include/debug/cns3xxx.S} (100%) + rename arch/arm/{mach-nomadik/include/mach/debug-macro.S => include/debug/nomadik.S} (100%) + create mode 100644 arch/arm/mach-at91/Kconfig.non_dt + rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%) + rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%) + rename arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h (99%) + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h + delete mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h + rename arch/arm/mach-cns3xxx/{include/mach => }/pm.h (100%) + delete mode 100644 arch/arm/mach-gemini/Kconfig + delete mode 100644 arch/arm/mach-gemini/Makefile + delete mode 100644 arch/arm/mach-gemini/Makefile.boot + delete mode 100644 arch/arm/mach-gemini/board-nas4220b.c + delete mode 100644 arch/arm/mach-gemini/board-rut1xx.c + delete mode 100644 arch/arm/mach-gemini/board-wbd111.c + delete mode 100644 arch/arm/mach-gemini/board-wbd222.c + delete mode 100644 arch/arm/mach-gemini/common.h + delete mode 100644 arch/arm/mach-gemini/devices.c + delete mode 100644 arch/arm/mach-gemini/gpio.c + delete mode 100644 arch/arm/mach-gemini/idle.c + delete mode 100644 arch/arm/mach-gemini/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-gemini/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-gemini/include/mach/global_reg.h + delete mode 100644 arch/arm/mach-gemini/include/mach/gpio.h + delete mode 100644 arch/arm/mach-gemini/include/mach/hardware.h + delete mode 100644 arch/arm/mach-gemini/include/mach/irqs.h + delete mode 100644 arch/arm/mach-gemini/include/mach/system.h + delete mode 100644 arch/arm/mach-gemini/include/mach/timex.h + delete mode 100644 arch/arm/mach-gemini/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-gemini/irq.c + delete mode 100644 arch/arm/mach-gemini/mm.c + delete mode 100644 arch/arm/mach-gemini/time.c + delete mode 100644 arch/arm/mach-h720x/Kconfig + delete mode 100644 arch/arm/mach-h720x/Makefile + delete mode 100644 arch/arm/mach-h720x/Makefile.boot + delete mode 100644 arch/arm/mach-h720x/common.c + delete mode 100644 arch/arm/mach-h720x/common.h + delete mode 100644 arch/arm/mach-h720x/cpu-h7201.c + delete mode 100644 arch/arm/mach-h720x/cpu-h7202.c + delete mode 100644 arch/arm/mach-h720x/h7201-eval.c + delete mode 100644 arch/arm/mach-h720x/h7202-eval.c + delete mode 100644 arch/arm/mach-h720x/include/mach/boards.h + delete mode 100644 arch/arm/mach-h720x/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-h720x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-h720x/include/mach/h7201-regs.h + delete mode 100644 arch/arm/mach-h720x/include/mach/h7202-regs.h + delete mode 100644 arch/arm/mach-h720x/include/mach/hardware.h + delete mode 100644 arch/arm/mach-h720x/include/mach/irqs.h + delete mode 100644 arch/arm/mach-h720x/include/mach/isa-dma.h + delete mode 100644 arch/arm/mach-h720x/include/mach/timex.h + delete mode 100644 arch/arm/mach-h720x/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-l7200/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-nomadik/Makefile.boot + delete mode 100644 arch/arm/mach-nomadik/include/mach/irqs.h + delete mode 100644 arch/arm/mach-nomadik/include/mach/timex.h + delete mode 100644 arch/arm/mach-nomadik/include/mach/uncompress.h + rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/common-smdk.h (86%) + delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-sdi.h + delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2412.c + delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2440.c + delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c244x.c + create mode 100644 arch/arm/mach-spear/Kconfig + create mode 100644 arch/arm/mach-spear/Makefile + rename arch/arm/{mach-spear13xx => mach-spear}/Makefile.boot (100%) + rename arch/arm/{mach-spear13xx/include/mach => mach-spear}/generic.h (57%) + rename arch/arm/{mach-spear13xx => mach-spear}/headsmp.S (100%) + rename arch/arm/{mach-spear13xx => mach-spear}/hotplug.c (100%) + rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/debug-macro.S (100%) + rename arch/arm/{mach-spear6xx => mach-spear}/include/mach/irqs.h (51%) + rename arch/arm/{mach-spear3xx => mach-spear}/include/mach/misc_regs.h (90%) + create mode 100644 arch/arm/mach-spear/include/mach/spear.h + rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/timex.h (100%) + rename arch/arm/{plat-spear/include/plat => mach-spear/include/mach}/uncompress.h (100%) + rename arch/arm/{plat-spear => mach-spear}/pl080.c (100%) + rename arch/arm/{plat-spear/include/plat => mach-spear}/pl080.h (100%) + rename arch/arm/{mach-spear13xx => mach-spear}/platsmp.c (99%) + rename arch/arm/{plat-spear => mach-spear}/restart.c (90%) + rename arch/arm/{mach-spear13xx => mach-spear}/spear1310.c (95%) + rename arch/arm/{mach-spear13xx => mach-spear}/spear1340.c (99%) + rename arch/arm/{mach-spear13xx/include/mach/dma.h => mach-spear/spear13xx-dma.h} (100%) + rename arch/arm/{mach-spear13xx => mach-spear}/spear13xx.c (95%) + rename arch/arm/{mach-spear3xx => mach-spear}/spear300.c (98%) + rename arch/arm/{mach-spear3xx => mach-spear}/spear310.c (98%) + rename arch/arm/{mach-spear3xx => mach-spear}/spear320.c (97%) + rename arch/arm/{mach-spear3xx => mach-spear}/spear3xx.c (88%) + rename arch/arm/{mach-spear6xx => mach-spear}/spear6xx.c (93%) + rename arch/arm/{plat-spear => mach-spear}/time.c (99%) + delete mode 100644 arch/arm/mach-spear13xx/Kconfig + delete mode 100644 arch/arm/mach-spear13xx/Makefile + delete mode 100644 arch/arm/mach-spear13xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-spear13xx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-spear13xx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-spear13xx/include/mach/spear.h + delete mode 100644 arch/arm/mach-spear13xx/include/mach/timex.h + delete mode 100644 arch/arm/mach-spear13xx/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-spear3xx/Kconfig + delete mode 100644 arch/arm/mach-spear3xx/Makefile + delete mode 100644 arch/arm/mach-spear3xx/Makefile.boot + delete mode 100644 arch/arm/mach-spear3xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-spear3xx/include/mach/generic.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/spear.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/timex.h + delete mode 100644 arch/arm/mach-spear3xx/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-spear6xx/Kconfig + delete mode 100644 arch/arm/mach-spear6xx/Makefile + delete mode 100644 arch/arm/mach-spear6xx/Makefile.boot + delete mode 100644 arch/arm/mach-spear6xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-spear6xx/include/mach/generic.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/misc_regs.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/spear.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/timex.h + delete mode 100644 arch/arm/mach-spear6xx/include/mach/uncompress.h + delete mode 100644 arch/arm/plat-samsung/include/plat/irq.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2410.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2412.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2416.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2443.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s3c244x.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s5p-time.h + create mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h + rename arch/arm/plat-samsung/{s5p-time.c => samsung-time.c} (68%) + delete mode 100644 arch/arm/plat-samsung/time.c + delete mode 100644 arch/arm/plat-spear/Kconfig + delete mode 100644 arch/arm/plat-spear/Makefile +Merging bcm2835/for-next (4c4d449 Merge branch 'for-3.10/defconfig' into for-next) +$ git merge bcm2835/for-next +Resolved 'arch/arm/Kconfig' using previous resolution. +Resolved 'arch/arm/Kconfig.debug' using previous resolution. +Removing arch/arm/mach-bcm2835/include/mach/uncompress.h +Removing arch/arm/mach-bcm2835/include/mach/timex.h +Removing arch/arm/mach-bcm2835/include/mach/gpio.h +Removing arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h +Removing arch/arm/mach-bcm2835/Makefile.boot +Auto-merging arch/arm/include/debug/bcm2835.S +Auto-merging arch/arm/boot/dts/bcm2835.dtsi +Auto-merging arch/arm/Kconfig.debug +CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da08119] Merge remote-tracking branch 'bcm2835/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 22 +---------- + arch/arm/Kconfig.debug | 5 +++ + arch/arm/boot/dts/bcm2835.dtsi | 17 +++++++++ + arch/arm/configs/bcm2835_defconfig | 8 ++-- + .../mach/debug-macro.S => include/debug/bcm2835.S} | 3 +- + arch/arm/mach-bcm2835/Kconfig | 15 ++++++++ + arch/arm/mach-bcm2835/Makefile.boot | 1 - + arch/arm/mach-bcm2835/bcm2835.c | 6 ++- + arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h | 29 -------------- + arch/arm/mach-bcm2835/include/mach/gpio.h | 1 - + arch/arm/mach-bcm2835/include/mach/timex.h | 26 ------------- + arch/arm/mach-bcm2835/include/mach/uncompress.h | 44 ---------------------- + 12 files changed, 49 insertions(+), 128 deletions(-) + rename arch/arm/{mach-bcm2835/include/mach/debug-macro.S => include/debug/bcm2835.S} (86%) + create mode 100644 arch/arm/mach-bcm2835/Kconfig + delete mode 100644 arch/arm/mach-bcm2835/Makefile.boot + delete mode 100644 arch/arm/mach-bcm2835/include/mach/bcm2835_soc.h + delete mode 100644 arch/arm/mach-bcm2835/include/mach/gpio.h + delete mode 100644 arch/arm/mach-bcm2835/include/mach/timex.h + delete mode 100644 arch/arm/mach-bcm2835/include/mach/uncompress.h +Merging cortex/for-next (6ebd4d0 ARM: stub out read_cpuid and read_cpuid_ext for CPU_CP15=n) +$ git merge cortex/for-next +Already up-to-date. +Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-ep93xx/include/mach/uncompress.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) +Merging ixp4xx/next (19f949f Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging msm/for-next (5bc31f8 Merge branch 'msm-defconfig' into for-next) +$ git merge msm/for-next +Removing arch/arm/mach-msm/include/mach/cpu.h +Merge made by the 'recursive' strategy. + arch/arm/configs/msm_defconfig | 154 +++++++++++++++++------- + arch/arm/mach-msm/board-halibut.c | 1 + + arch/arm/mach-msm/board-msm7x30.c | 1 + + arch/arm/mach-msm/board-qsd8x50.c | 1 + + arch/arm/mach-msm/board-trout.c | 1 + + arch/arm/mach-msm/devices-msm7x00.c | 31 +++++ + arch/arm/mach-msm/devices-msm7x30.c | 31 +++++ + arch/arm/mach-msm/devices-qsd8x50.c | 31 +++++ + arch/arm/mach-msm/devices.h | 4 + + arch/arm/mach-msm/dma.c | 26 +++++ + arch/arm/mach-msm/include/mach/cpu.h | 54 --------- + arch/arm/mach-msm/include/mach/dma.h | 26 ----- + drivers/gpio/gpio-msm-v1.c | 220 ++++++++++++++++++++++++----------- + drivers/mmc/host/msm_sdcc.c | 1 - + 14 files changed, 385 insertions(+), 197 deletions(-) + delete mode 100644 arch/arm/mach-msm/include/mach/cpu.h +Merging renesas/next (811689a Merge branches 'heads/defconfig', 'heads/boards', 'heads/clocksource' and 'heads/intc-external-irq' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/hotplug.c +Auto-merging arch/arm/mach-shmobile/headsmp-scu.S +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/r8a7779-marzen-reference.dts | 47 + + arch/arm/boot/dts/r8a7779.dtsi | 98 + + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 77 + + arch/arm/configs/armadillo800eva_defconfig | 8 +- + arch/arm/configs/kzm9g_defconfig | 2 - + arch/arm/configs/mackerel_defconfig | 4 + + arch/arm/configs/marzen_defconfig | 4 + + arch/arm/mach-shmobile/Kconfig | 29 + + arch/arm/mach-shmobile/Makefile | 9 +- + arch/arm/mach-shmobile/board-ag5evm.c | 172 +- + arch/arm/mach-shmobile/board-ap4evb.c | 91 +- + arch/arm/mach-shmobile/board-armadillo800eva.c | 265 +- + arch/arm/mach-shmobile/board-bonito.c | 52 +- + arch/arm/mach-shmobile/board-kota2.c | 208 +- + arch/arm/mach-shmobile/board-kzm9g-reference.c | 108 + + arch/arm/mach-shmobile/board-kzm9g.c | 170 +- + arch/arm/mach-shmobile/board-mackerel.c | 167 +- + arch/arm/mach-shmobile/board-marzen-reference.c | 75 + + arch/arm/mach-shmobile/board-marzen.c | 87 +- + arch/arm/mach-shmobile/clock-r8a7740.c | 13 + + arch/arm/mach-shmobile/clock-r8a7779.c | 8 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 7 +- + .../{headsmp-sh73a0.S => headsmp-scu.S} | 15 +- + arch/arm/mach-shmobile/hotplug.c | 68 - + arch/arm/mach-shmobile/include/mach/common.h | 22 +- + arch/arm/mach-shmobile/include/mach/irqs.h | 5 + + arch/arm/mach-shmobile/include/mach/r8a7740.h | 74 - + arch/arm/mach-shmobile/include/mach/r8a7779.h | 324 ++- + arch/arm/mach-shmobile/include/mach/sh7372.h | 29 - + arch/arm/mach-shmobile/include/mach/sh73a0.h | 363 +-- + arch/arm/mach-shmobile/intc-r8a7779.c | 78 +- + arch/arm/mach-shmobile/intc-sh73a0.c | 125 - + arch/arm/mach-shmobile/setup-emev2.c | 4 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 104 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 162 +- + arch/arm/mach-shmobile/smp-emev2.c | 86 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 129 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 36 +- + arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c | 13 +- + arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 13 +- + arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 11 +- + arch/sh/kernel/cpu/sh3/pinmux-sh7720.c | 14 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c | 14 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c | 14 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 13 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 13 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c | 14 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 14 +- + arch/sh/kernel/cpu/sh4a/pinmux-shx3.c | 17 +- + drivers/clocksource/em_sti.c | 13 +- + drivers/clocksource/sh_cmt.c | 189 +- + drivers/clocksource/sh_mtu2.c | 2 +- + drivers/clocksource/sh_tmu.c | 2 +- + drivers/irqchip/Kconfig | 8 + + drivers/irqchip/Makefile | 2 + + drivers/irqchip/irq-renesas-intc-irqpin.c | 471 ++++ + drivers/irqchip/irq-renesas-irqc.c | 307 +++ + drivers/pinctrl/sh-pfc/Kconfig | 1 + + drivers/pinctrl/sh-pfc/core.c | 261 +- + drivers/pinctrl/sh-pfc/core.h | 54 +- + drivers/pinctrl/sh-pfc/gpio.c | 363 ++- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 694 ++++- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 1648 ++++++++++-- + drivers/pinctrl/sh-pfc/pfc-sh7203.c | 488 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7264.c | 460 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7269.c | 624 ++--- + drivers/pinctrl/sh-pfc/pfc-sh7372.c | 323 ++- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 2664 ++++++++++++++------ + drivers/pinctrl/sh-pfc/pfc-sh7720.c | 333 +-- + drivers/pinctrl/sh-pfc/pfc-sh7722.c | 480 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7723.c | 642 ++--- + drivers/pinctrl/sh-pfc/pfc-sh7724.c | 638 ++--- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 55 +- + drivers/pinctrl/sh-pfc/pfc-sh7757.c | 620 ++--- + drivers/pinctrl/sh-pfc/pfc-sh7785.c | 354 +-- + drivers/pinctrl/sh-pfc/pfc-sh7786.c | 296 +-- + drivers/pinctrl/sh-pfc/pfc-shx3.c | 148 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 484 ++-- + drivers/pinctrl/sh-pfc/sh_pfc.h | 135 +- + .../linux/platform_data/irq-renesas-intc-irqpin.h | 29 + + include/linux/platform_data/irq-renesas-irqc.h | 27 + + 82 files changed, 10377 insertions(+), 5915 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 + create mode 100644 drivers/irqchip/irq-renesas-intc-irqpin.c + create mode 100644 drivers/irqchip/irq-renesas-irqc.c + create mode 100644 include/linux/platform_data/irq-renesas-intc-irqpin.h + create mode 100644 include/linux/platform_data/irq-renesas-irqc.h +Merging samsung/for-next (9daee5a Merge branch 'next/clk-exynos' into for-next) +$ git merge samsung/for-next +Auto-merging drivers/usb/host/ohci-exynos.c +Auto-merging drivers/clocksource/exynos_mct.c +Removing arch/arm/mach-s3c24xx/include/mach/entry-macro.S +Removing arch/arm/mach-exynos/include/mach/regs-mct.h +Removing arch/arm/mach-exynos/clock-exynos5.c +Removing arch/arm/mach-exynos/clock-exynos4212.c +Removing arch/arm/mach-exynos/clock-exynos4210.c +Removing arch/arm/mach-exynos/clock-exynos4.h +Removing arch/arm/mach-exynos/clock-exynos4.c +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/arm/firmware.txt | 88 ++ + .../devicetree/bindings/arm/samsung-boards.txt | 10 + + .../devicetree/bindings/clock/exynos4-clock.txt | 215 +++ + .../devicetree/bindings/clock/exynos5250-clock.txt | 171 ++ + .../devicetree/bindings/clock/exynos5440-clock.txt | 61 + + .../devicetree/bindings/media/s5p-mfc.txt | 21 + + .../bindings/timer/samsung,exynos4210-mct.txt | 68 + + .../devicetree/bindings/usb/exynos-usb.txt | 40 + + arch/arm/Kconfig | 4 +- + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/cros5250-common.dtsi | 138 ++ + arch/arm/boot/dts/exynos4.dtsi | 58 + + arch/arm/boot/dts/exynos4210-origen.dts | 18 + + arch/arm/boot/dts/exynos4210-smdkv310.dts | 18 + + arch/arm/boot/dts/exynos4210-trats.dts | 12 + + arch/arm/boot/dts/exynos4210.dtsi | 36 + + arch/arm/boot/dts/exynos4212.dtsi | 22 + + arch/arm/boot/dts/exynos4412-odroidx.dts | 109 ++ + arch/arm/boot/dts/exynos4412-origen.dts | 430 +++++ + arch/arm/boot/dts/exynos4412-smdk4412.dts | 25 + + arch/arm/boot/dts/exynos4412.dtsi | 26 + + arch/arm/boot/dts/exynos4x12.dtsi | 6 + + arch/arm/boot/dts/exynos5250-arndale.dts | 129 ++ + arch/arm/boot/dts/exynos5250-smdk5250.dts | 20 + + arch/arm/boot/dts/exynos5250-snow.dts | 11 + + arch/arm/boot/dts/exynos5250.dtsi | 148 ++ + arch/arm/boot/dts/exynos5440-ssdk5440.dts | 19 +- + arch/arm/boot/dts/exynos5440.dtsi | 66 +- + arch/arm/common/Makefile | 2 + + arch/arm/common/firmware.c | 18 + + arch/arm/include/asm/firmware.h | 66 + + arch/arm/mach-exynos/Kconfig | 10 +- + arch/arm/mach-exynos/Makefile | 12 +- + arch/arm/mach-exynos/clock-exynos4.c | 1601 ------------------- + arch/arm/mach-exynos/clock-exynos4.h | 35 - + arch/arm/mach-exynos/clock-exynos4210.c | 187 --- + arch/arm/mach-exynos/clock-exynos4212.c | 201 --- + arch/arm/mach-exynos/clock-exynos5.c | 1645 -------------------- + arch/arm/mach-exynos/common.c | 120 +- + arch/arm/mach-exynos/common.h | 12 +- + arch/arm/mach-exynos/cpuidle.c | 58 +- + arch/arm/mach-exynos/dev-ohci.c | 2 +- + arch/arm/mach-exynos/exynos-smc.S | 22 + + arch/arm/mach-exynos/firmware.c | 70 + + arch/arm/mach-exynos/include/mach/irqs.h | 19 +- + arch/arm/mach-exynos/include/mach/map.h | 4 +- + arch/arm/mach-exynos/include/mach/regs-clock.h | 107 -- + arch/arm/mach-exynos/include/mach/regs-mct.h | 53 - + arch/arm/mach-exynos/mach-armlex4210.c | 3 +- + arch/arm/mach-exynos/mach-exynos4-dt.c | 123 +- + arch/arm/mach-exynos/mach-exynos5-dt.c | 141 +- + arch/arm/mach-exynos/mach-nuri.c | 5 +- + arch/arm/mach-exynos/mach-origen.c | 7 +- + arch/arm/mach-exynos/mach-smdk4x12.c | 5 +- + arch/arm/mach-exynos/mach-smdkv310.c | 9 +- + arch/arm/mach-exynos/mach-universal_c210.c | 3 +- + arch/arm/mach-exynos/platsmp.c | 32 +- + arch/arm/mach-exynos/smc.h | 31 + + arch/arm/mach-s3c24xx/common.h | 1 + + arch/arm/mach-s3c24xx/include/mach/entry-macro.S | 70 - + arch/arm/mach-s3c24xx/irq.c | 167 +- + arch/arm/mach-s3c24xx/mach-amlm5900.c | 2 +- + arch/arm/mach-s3c24xx/mach-bast.c | 2 +- + arch/arm/mach-s3c24xx/mach-h1940.c | 7 +- + arch/arm/mach-s3c24xx/mach-n30.c | 4 +- + arch/arm/mach-s3c24xx/mach-otom.c | 2 +- + arch/arm/mach-s3c24xx/mach-qt2410.c | 2 +- + arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 +- + arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 +- + arch/arm/mach-s3c24xx/mach-vr1000.c | 2 +- + arch/arm/plat-samsung/Kconfig | 4 +- + arch/arm/plat-samsung/devs.c | 2 +- + arch/arm/plat-samsung/include/plat/cpu.h | 1 - + arch/arm/plat-samsung/include/plat/map-s5p.h | 1 + + arch/arm/plat-samsung/setup-mipiphy.c | 3 + + drivers/clk/Makefile | 1 + + drivers/clk/samsung/Makefile | 8 + + drivers/clk/samsung/clk-exynos4.c | 843 ++++++++++ + drivers/clk/samsung/clk-exynos5250.c | 514 ++++++ + drivers/clk/samsung/clk-exynos5440.c | 139 ++ + drivers/clk/samsung/clk-pll.c | 499 ++++++ + drivers/clk/samsung/clk-pll.h | 41 + + drivers/clk/samsung/clk.c | 273 ++++ + drivers/clk/samsung/clk.h | 262 ++++ + drivers/clocksource/Kconfig | 5 + + drivers/clocksource/Makefile | 1 + + .../mct.c => drivers/clocksource/exynos_mct.c | 209 ++- + drivers/irqchip/exynos-combiner.c | 80 +- + drivers/usb/host/ohci-exynos.c | 3 +- + .../{usb-exynos.h => usb-ohci-exynos.h} | 0 + 90 files changed, 5261 insertions(+), 4466 deletions(-) + create mode 100644 Documentation/arm/firmware.txt + create mode 100644 Documentation/devicetree/bindings/clock/exynos4-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/exynos5250-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/exynos5440-clock.txt + create mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt + create mode 100644 Documentation/devicetree/bindings/usb/exynos-usb.txt + create mode 100644 arch/arm/boot/dts/exynos4412-odroidx.dts + create mode 100644 arch/arm/boot/dts/exynos4412-origen.dts + create mode 100644 arch/arm/boot/dts/exynos5250-arndale.dts + create mode 100644 arch/arm/common/firmware.c + create mode 100644 arch/arm/include/asm/firmware.h + delete mode 100644 arch/arm/mach-exynos/clock-exynos4.c + delete mode 100644 arch/arm/mach-exynos/clock-exynos4.h + delete mode 100644 arch/arm/mach-exynos/clock-exynos4210.c + delete mode 100644 arch/arm/mach-exynos/clock-exynos4212.c + delete mode 100644 arch/arm/mach-exynos/clock-exynos5.c + create mode 100644 arch/arm/mach-exynos/exynos-smc.S + create mode 100644 arch/arm/mach-exynos/firmware.c + delete mode 100644 arch/arm/mach-exynos/include/mach/regs-mct.h + create mode 100644 arch/arm/mach-exynos/smc.h + delete mode 100644 arch/arm/mach-s3c24xx/include/mach/entry-macro.S + create mode 100644 drivers/clk/samsung/Makefile + create mode 100644 drivers/clk/samsung/clk-exynos4.c + create mode 100644 drivers/clk/samsung/clk-exynos5250.c + create mode 100644 drivers/clk/samsung/clk-exynos5440.c + create mode 100644 drivers/clk/samsung/clk-pll.c + create mode 100644 drivers/clk/samsung/clk-pll.h + create mode 100644 drivers/clk/samsung/clk.c + create mode 100644 drivers/clk/samsung/clk.h + rename arch/arm/mach-exynos/mct.c => drivers/clocksource/exynos_mct.c (65%) + rename include/linux/platform_data/{usb-exynos.h => usb-ohci-exynos.h} (100%) +Merging tegra/for-next (b063ec6 Merge branch 'for-3.10/dt' into for-next) +$ git merge tegra/for-next +Resolved 'drivers/clocksource/tegra20_timer.c' using previous resolution. +Auto-merging drivers/clocksource/tegra20_timer.c +CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c +Auto-merging drivers/clk/tegra/clk-tegra20.c +Auto-merging arch/arm/mach-tegra/tegra.c +Auto-merging arch/arm/mach-tegra/board-harmony-pcie.c +Removing arch/arm/mach-tegra/board-dt-tegra30.c +Removing arch/arm/mach-tegra/board-dt-tegra114.c +Auto-merging arch/arm/boot/dts/tegra30.dtsi +Auto-merging arch/arm/boot/dts/tegra20.dtsi +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master db79fd5] Merge remote-tracking branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 1 + + arch/arm/boot/dts/tegra114-dalmore.dts | 714 +++++++++++++++++++++ + arch/arm/boot/dts/tegra114.dtsi | 242 ++++++- + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +- + arch/arm/boot/dts/tegra20-harmony.dts | 4 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 4 + + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 2 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + arch/arm/boot/dts/tegra20-whistler.dts | 1 + + arch/arm/boot/dts/tegra20.dtsi | 55 +- + arch/arm/boot/dts/tegra30-beaver.dts | 2 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30.dtsi | 5 +- + arch/arm/mach-tegra/Makefile | 4 +- + arch/arm/mach-tegra/board-dt-tegra114.c | 46 -- + arch/arm/mach-tegra/board-dt-tegra30.c | 60 -- + arch/arm/mach-tegra/board-harmony-pcie.c | 7 +- + arch/arm/mach-tegra/board.h | 4 +- + arch/arm/mach-tegra/common.c | 26 +- + arch/arm/mach-tegra/cpuidle-tegra30.c | 4 - + arch/arm/mach-tegra/headsmp.S | 3 - + arch/arm/mach-tegra/hotplug.c | 23 +- + arch/arm/mach-tegra/platsmp.c | 119 ++-- + arch/arm/mach-tegra/pm.c | 19 - + arch/arm/mach-tegra/pmc.c | 152 ++++- + arch/arm/mach-tegra/pmc.h | 4 + + arch/arm/mach-tegra/reset-handler.S | 48 +- + arch/arm/mach-tegra/sleep.h | 10 +- + .../arm/mach-tegra/{board-dt-tegra20.c => tegra.c} | 45 +- + drivers/clk/tegra/clk-tegra20.c | 36 +- + drivers/clocksource/tegra20_timer.c | 4 +- + drivers/memory/tegra30-mc.c | 2 + + 35 files changed, 1287 insertions(+), 371 deletions(-) + delete mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c + delete mode 100644 arch/arm/mach-tegra/board-dt-tegra30.c + rename arch/arm/mach-tegra/{board-dt-tegra20.c => tegra.c} (75%) +Merging dma-mapping/dma-mapping-next (a937536 Linux 3.9-rc3) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (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 (6dbe51c Linux 3.9-rc1) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (92f28d9 scm: Require CAP_SYS_ADMIN over the current pidns to spoof pids.) +$ git merge userns/for-next +Merge made by the 'recursive' strategy. + net/core/scm.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging ktest/for-next (7328735 ktest: Remove indexes from warnings check) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (99e621f syscalls.h: slightly reduce the jungles of macros) +$ git merge signal/for-next +Resolved 'arch/mips/kernel/linux32.c' using previous resolution. +Resolved 'arch/tile/Kconfig' using previous resolution. +Resolved 'arch/tile/kernel/compat.c' using previous resolution. +Resolved 'include/asm-generic/unistd.h' using previous resolution. +Auto-merging kernel/fork.c +Auto-merging include/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/asm-generic/unistd.h +Auto-merging fs/compat.c +Removing arch/x86/ia32/ipc32.c +Auto-merging arch/tile/kernel/compat.c +CONFLICT (content): Merge conflict in arch/tile/kernel/compat.c +Auto-merging arch/tile/Kconfig +CONFLICT (content): Merge conflict in arch/tile/Kconfig +Auto-merging arch/s390/Kconfig +Removing arch/powerpc/include/uapi/asm/linkage.h +Auto-merging arch/powerpc/include/asm/unistd.h +Auto-merging arch/powerpc/include/asm/systbl.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/kernel/linux32.c +CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/alpha/Kconfig +Auto-merging arch/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2ae667e] Merge remote-tracking branch 'signal/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 3 - + arch/alpha/Kconfig | 1 - + arch/alpha/include/asm/linkage.h | 4 +- + arch/alpha/include/asm/unistd.h | 12 --- + arch/arm/include/asm/unistd.h | 8 -- + arch/arm64/kernel/sys32.S | 7 -- + arch/avr32/include/asm/unistd.h | 8 -- + arch/blackfin/include/asm/unistd.h | 8 -- + arch/cris/include/asm/unistd.h | 8 -- + arch/frv/include/asm/unistd.h | 10 -- + arch/h8300/include/asm/linkage.h | 2 - + arch/h8300/include/asm/unistd.h | 7 -- + arch/ia64/include/asm/linkage.h | 4 + + arch/ia64/include/asm/unistd.h | 10 -- + arch/m32r/include/asm/unistd.h | 10 -- + arch/m68k/include/asm/unistd.h | 8 -- + arch/microblaze/include/asm/unistd.h | 8 -- + arch/mips/Kconfig | 1 - + arch/mips/include/asm/linkage.h | 3 + + arch/mips/include/asm/unistd.h | 8 -- + arch/mips/kernel/linux32.c | 119 ---------------------- + arch/mips/kernel/scall64-n32.S | 8 +- + arch/mips/kernel/scall64-o32.S | 6 +- + arch/mn10300/include/asm/unistd.h | 10 -- + arch/parisc/include/asm/unistd.h | 8 -- + arch/parisc/kernel/sys_parisc32.c | 41 -------- + arch/parisc/kernel/syscall_table.S | 8 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/linkage.h | 13 +++ + arch/powerpc/include/asm/systbl.h | 10 +- + arch/powerpc/include/asm/unistd.h | 6 -- + arch/powerpc/include/uapi/asm/linkage.h | 6 -- + arch/powerpc/kernel/sys_ppc32.c | 109 -------------------- + arch/s390/Kconfig | 1 - + arch/s390/include/asm/unistd.h | 8 -- + arch/s390/kernel/compat_linux.c | 86 +--------------- + arch/s390/kernel/compat_linux.h | 5 - + arch/s390/kernel/compat_wrapper.S | 64 ------------ + arch/s390/kernel/sys_s390.c | 14 +-- + arch/s390/kernel/syscalls.S | 18 ++-- + arch/sh/include/asm/unistd.h | 8 -- + arch/sparc/Kconfig | 1 - + arch/sparc/include/asm/unistd.h | 8 -- + arch/sparc/kernel/sys32.S | 4 - + arch/sparc/kernel/sys_sparc32.c | 75 +------------- + arch/sparc/kernel/sys_sparc_64.c | 6 +- + arch/sparc/kernel/systbls_64.S | 8 +- + arch/tile/Kconfig | 1 - + arch/tile/kernel/compat.c | 6 -- + arch/x86/ia32/Makefile | 3 - + arch/x86/ia32/ipc32.c | 54 ---------- + arch/x86/ia32/sys_ia32.c | 37 ------- + arch/x86/include/asm/sys_ia32.h | 12 --- + arch/x86/include/asm/syscalls.h | 4 +- + arch/x86/include/asm/unistd.h | 8 -- + arch/x86/kernel/tls.c | 14 +-- + arch/x86/syscalls/syscall_32.tbl | 10 +- + arch/x86/um/tls_32.c | 5 +- + arch/xtensa/include/asm/unistd.h | 8 -- + fs/aio.c | 2 - + fs/compat.c | 121 ---------------------- + fs/dcookies.c | 15 ++- + fs/eventpoll.c | 47 +++++++++ + fs/notify/fanotify/fanotify_user.c | 17 +--- + fs/open.c | 52 ++-------- + fs/read_write.c | 68 +++++++++---- + fs/read_write.h | 2 - + fs/signalfd.c | 31 ++++++ + fs/splice.c | 22 ++++ + fs/sync.c | 26 +---- + include/asm-generic/unistd.h | 12 --- + include/linux/compat.h | 51 +++------- + include/linux/linkage.h | 21 ++++ + include/linux/mm.h | 3 - + include/linux/syscalls.h | 156 +++++++++------------------- + ipc/compat.c | 174 ++++++++++++++++++-------------- + ipc/sem.c | 123 +++++++++++++--------- + ipc/syscall.c | 6 +- + kernel/compat.c | 19 ---- + kernel/exit.c | 5 - + kernel/fork.c | 5 +- + kernel/sys.c | 14 +++ + kernel/sys_ni.c | 3 +- + kernel/uid16.c | 55 ++-------- + mm/fadvise.c | 18 +--- + mm/nommu.c | 3 +- + mm/readahead.c | 9 +- + 87 files changed, 539 insertions(+), 1484 deletions(-) + create mode 100644 arch/powerpc/include/asm/linkage.h + delete mode 100644 arch/powerpc/include/uapi/asm/linkage.h + delete mode 100644 arch/x86/ia32/ipc32.c +$ git am -3 ../patches/0001-cond_syscall-and-SYSCALL_ALIAS-merge-fixup.patch +Applying: cond_syscall and SYSCALL_ALIAS merge fixup +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/linkage.h +$ git add -A . +$ git commit -v -a --amend +[master a5ab3cd] Merge remote-tracking branch 'signal/for-next' +Merging clk/clk-next (fde8bc5 clk: sunxi: remove stale Makefile entry) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) +Merging akpm-current/current (9f22578 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge akpm-current/current +Already up-to-date. +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg +Applying: thinkpad-acpi: kill hotkey_thread_mutex +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: matroxfb: convert struct i2c_msg initialization to C99 format +Applying: drivers/video/exynos/exynos_mipi_dsi.c: convert to devm_ioremap_resource() +Applying: cyber2000fb: avoid palette corruption at higher clocks +Applying: timer_list: split timer_list_show_tickdevices() +Applying: timer_list-split-timer_list_show_tickdevices-v4 +Applying: timer_list: convert timer list to be a proper seq_file +Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v3 +Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v3-fix +Applying: mkcapflags.pl: convert to mkcapflags.sh +Applying: headers_install.pl: convert to headers_install.sh +Applying: scripts/decodecode: make faulting insn ptr more robust +Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max +Applying: debug_locks.h: make warning more verbose +Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros +Applying: lglock: update lockdep annotations to report recursive local locks +Applying: block: restore /proc/partitions to not display non-partitionable removable devices +Applying: 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: HWPOISON: check dirty flag to match against clean page +Applying: mm: trace filemap add and del +Applying: mm-trace-filemap-add-and-del-v2 +Applying: mm, show_mem: suppress page counts in non-blockable contexts +Applying: mm/shmem.c: remove an ifdef +Applying: vm: adjust ifdef for TINY_RCU +Applying: mm: frontswap: lazy initialization to allow tmem backends to build/run as modules +Applying: frontswap: make frontswap_init use a pointer for the ops +Applying: mm: frontswap: cleanup code +Applying: frontswap: get rid of swap_lock dependency +Applying: mm: cleancache: lazy initialization to allow tmem backends to build/run as modules +Applying: cleancache: Make cleancache_init use a pointer for the ops +Applying: mm: cleancache: clean up cleancache_enabled +Applying: xen: tmem: enable Xen tmem shim to be built/loaded as a module +Applying: zcache/tmem: Better error checking on frontswap_register_ops return value. +Applying: staging: zcache: enable ramster to be built/loaded as a module +Applying: staging: zcache: enable zcache to be built/loaded as a module +Applying: rmap: recompute pgoff for unmapping huge page +Applying: memblock: add assertion for zero allocation alignment +Applying: mm: remove free_area_cache +Applying: include/linux/mmzone.h: cleanups +Applying: include-linux-mmzoneh-cleanups-fix +Applying: mm: memmap_init_zone() performance improvement +Applying: drop_caches: add some documentation and info message +Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev +Using index info to reconstruct a base tree... +M drivers/usb/gadget/amd5536udc.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/usb/gadget/amd5536udc.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/amd5536udc.c +Failed to merge in the changes. +Patch failed at 0052 drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev +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: mm/dmapool.c: fix null dev in dma_pool_create() +Applying: memcg: debugging facility to access dangling memcgs +Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix +Applying: mm: add vm event counters for balloon pages compaction +Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq +Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock +Applying: kernel/smp.c: cleanups +Applying: printk/tracing: rework console tracing +Applying: drivers/video/backlight/ams369fg06.c: convert ams369fg06 to dev_pm_ops +Applying: drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix +Applying: drivers/video/backlight/platform_lcd.c: remove unnecessary ifdefs +Applying: drivers/video/backlight/ep93xx_bl.c: remove incorrect __init annotation +Applying: drivers/video/backlight/atmel-pwm-bl.c: use module_platform_driver_probe() +Applying: drivers/video/backlight/atmel-pwm-bl.c: add __init annotation +Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask +Applying: lib/int_sqrt.c: optimize square root algorithm +Applying: epoll: trim epitem by one cache line +Applying: epoll-trim-epitem-by-one-cache-line-on-x86_64-fix +Applying: epoll: support for disabling items, and a self-test app +Applying: epoll: stop comparing pointers with 0 in self-test app +Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting +Applying: dmi_scan: refactor dmi_scan_machine(), {smbios,dmi}_present() +Applying: i2o: check copy_from_user() size parameter +Applying: rtc: rtc-mv: add __init annotation +Applying: rtc: rtc-davinci: add __exit annotation +Applying: rtc: rtc-ds1302: add __exit annotation +Applying: rtc: rtc-imxdi: add __init/__exit annotation +Applying: rtc: rtc-nuc900: add __init/__exit annotation +Applying: rtc: rtc-pcap: add __init/__exit annotation +Applying: rtc: rtc-tegra: add __init/__exit annotation +Applying: rtc: add devm_rtc_device_{register,unregister}() +Applying: drivers/rtc/rtc-max77686.c: use module_platform_driver() +Applying: drivers/rtc/rtc-max77686.c: add missing module author name +Applying: drivers/rtc/rtc-max77686.c: use devm_kzalloc() +Applying: drivers/rtc/rtc-max77686.c: fix indentation of bit definitions +Applying: drivers/rtc/rtc-max77686.c: use dev_info()/dev_emerg() instead of pr_info()/pr_emerg() +Applying: drivers/rtc/rtc-v3020.c: use gpio_request_array() +Applying: drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_register() +Applying: rtc: rtc-ab3100: use module_platform_driver_probe() +Applying: rtc: rtc-at32ap700x: use module_platform_driver_probe() +Applying: rtc: rtc-at91rm9200: use module_platform_driver_probe() +Applying: rtc: rtc-au1xxx: use module_platform_driver_probe() +Applying: rtc: rtc-coh901331: use module_platform_driver_probe() +Applying: rtc: rtc-davinci: use module_platform_driver_probe() +Applying: rtc: rtc-ds1302: use module_platform_driver_probe() +Applying: rtc: rtc-efi: use module_platform_driver_probe() +Applying: rtc: rtc-generic: use module_platform_driver_probe() +Applying: rtc: rtc-imxdi: use module_platform_driver_probe() +Applying: rtc: rtc-mc13xxx: use module_platform_driver_probe() +Applying: rtc: rtc-msm6242: use module_platform_driver_probe() +Applying: rtc: rtc-mv: use module_platform_driver_probe() +Applying: rtc: rtc-nuc900: use module_platform_driver_probe() +Applying: rtc: rtc-omap: use module_platform_driver_probe() +Applying: rtc: rtc-pcap: use module_platform_driver_probe() +Applying: rtc: rtc-ps3: use module_platform_driver_probe() +Applying: rtc: rtc-pxa: use module_platform_driver_probe() +Applying: rtc: rtc-rp5c01: use module_platform_driver_probe() +Applying: rtc: rtc-sh: use module_platform_driver_probe() +Applying: rtc: rtc-starfire: use module_platform_driver_probe() +Applying: rtc: rtc-sun4v: use module_platform_driver_probe() +Applying: rtc: rtc-tegra: use module_platform_driver_probe() +Applying: rtc: rtc-tx4939: use module_platform_driver_probe() +Applying: rtc: rtc-88pm80x: use devm_rtc_device_register() +Applying: rtc: rtc-coh90133: use devm_rtc_device_register() +Applying: rtc: rtc-da9052: use devm_rtc_device_register() +Applying: rtc: rtc-da9055: use devm_rtc_device_register() +Applying: rtc: rtc-davinci: use devm_rtc_device_register() +Applying: rtc: rtc-ds1511: use devm_rtc_device_register() +Applying: rtc: rtc-ds1553: use devm_rtc_device_register() +Applying: rtc: rtc-ds1742: use devm_rtc_device_register() +Applying: rtc: rtc-ep93xx: use devm_rtc_device_register() +Applying: rtc: rtc-imxdi: use devm_rtc_device_register() +Applying: rtc: rtc-lp8788: use devm_rtc_device_register() +Applying: rtc: rtc-lpc32xx: use devm_rtc_device_register() +Applying: rtc: rtc-max77686: use devm_rtc_device_register() +Applying: rtc: rtc-max8907: use devm_rtc_device_register() +Applying: rtc: rtc-max8997: use devm_rtc_device_register() +Applying: rtc: rtc-mv: use devm_rtc_device_register() +Applying: rtc: rtc-mxc: use devm_rtc_device_register() +Applying: rtc: rtc-palmas: use devm_rtc_device_register() +Applying: rtc: rtc-pcf8523: use devm_rtc_device_register() +Applying: rtc: rtc-s3c: use devm_rtc_device_register() +Applying: rtc: rtc-snvs: use devm_rtc_device_register() +Applying: rtc: rtc-spear: use devm_rtc_device_register() +Applying: rtc: rtc-stk17ta8: use devm_rtc_device_register() +Applying: rtc: rtc-tegra: use devm_rtc_device_register() +Applying: rtc: rtc-tps6586x: use devm_rtc_device_register() +Applying: rtc: rtc-tps65910: use devm_rtc_device_register() +Applying: rtc: rtc-tps80031: use devm_rtc_device_register() +Applying: rtc: rtc-tx4939: use devm_rtc_device_register() +Applying: rtc: rtc-vt8500: use devm_rtc_device_register() +Applying: rtc: rtc-wm831x: use devm_rtc_device_register() +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: rtc-palmas: use devm_request_threaded_irq() +Applying: hfsplus: fix warnings in fs/hfsplus/bfind.c +Applying: hfsplus-fix-warnings-in-fs-hfsplus-bfindc-in-function-hfs_find_1st_rec_by_cnid-fix +Applying: ptrace: add ability to retrieve signals without removing from a queue (v4) +Applying: selftest: add a test case for PTRACE_PEEKSIGINFO +Applying: coredump: only SIGKILL should interrupt the coredumping task +Applying: coredump: ensure that SIGKILL always kills the dumping thread +Applying: coredump: sanitize the setting of signal->group_exit_code +Applying: coredump: factor out the setting of PF_DUMPCORE +Applying: freezer: do not send a fake signal to a PF_DUMPCORE thread +Applying: coredump: make wait_for_dump_helpers() freezable +Applying: procfs: improve scaling in proc +Applying: procfs-improve-scaling-in-proc-v5 +Applying: kexec: fix wrong types of some local variables +Applying: kexec: Use min() and min_t() to simplify logic +Applying: kexec-use-min_t-to-simplify-logic-fix +Applying: ipc: clamp with min() +Applying: ipc: separate msg allocation from userspace copy +Applying: ipc: tighten msg copy loops +Applying: ipc: set EFAULT as default error in load_msg() +Applying: ipc: remove msg handling from queue scan +Applying: ipc: implement MSG_COPY as a new receive mode +Applying: ipc: simplify msg list search +Applying: ipc: refactor msg list search into separate function +Applying: ipc/msgutil.c: use linux/uaccess.h +Applying: ipc/sem.c: alternatives to preempt_disable() +Applying: pid_namespace.c/.h: simplify defines +Applying: pid_namespacec-h-simplify-defines-fix +Applying: raid6test: use prandom_bytes() +Applying: uuid: use prandom_bytes() +Applying: x86: pageattr-test: remove srandom32 call +Applying: x86: rename random32() to prandom_u32() +Applying: lib/: rename random32() to prandom_u32() +Applying: mm/: rename random32() to prandom_u32() +Applying: kernel/: rename random32() to prandom_u32() +Applying: drbd: rename random32() to prandom_u32() +Applying: infiniband: rename random32() to prandom_u32() +Applying: mmc: rename random32() to prandom_u32() +Applying: video/uvesafb: rename random32() to prandom_u32() +Applying: uwb: rename random32() to prandom_u32() +Applying: lguest: rename random32() to prandom_u32() +Applying: scsi: rename random32() to prandom_u32() +Applying: drivers/net: rename random32() to prandom_u32() +Applying: drivers-net-rename-random32-to-prandom_u32-fix +Applying: net/sunrpc: rename random32() to prandom_u32() +Applying: net/sched: rename random32() to prandom_u32() +Applying: net/netfilter: rename random32() to prandom_u32() +Applying: net/core: rename random32() to prandom_u32() +Applying: net/core: remove duplicate statements by do-while loop +Applying: net: rename random32 to prandom +Applying: remove unused random32() and srandom32() +Applying: semaphore: use unlikely() for down's timeout +Applying: semaphore: use `bool' type for semaphore_waiter's up +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 +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 +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: conversion to bio 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 +Applying: Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS +Applying: kernel/sys.c: make prctl(PR_SET_MM) generally available +Applying: decompressor: add LZ4 decompressor module +Applying: lib: add support for LZ4-compressed kernel +Applying: arm: add support for LZ4-compressed kernel +Applying: x86: add support for LZ4-compressed kernel +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + bb83a00...c487d7f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (c487d7f x86: add support for LZ4-compressed kernel) +$ git merge --no-ff akpm/master +Removing scripts/headers_install.pl +Auto-merging lib/usercopy.c +Removing arch/x86/kernel/cpu/mkcapflags.pl +Removing arch/sparc/lib/usercopy.c +Merge made by the 'recursive' strategy. + Documentation/cgroups/memory.txt | 16 + + Documentation/sysctl/vm.txt | 33 +- + arch/arm/Kconfig | 1 + + arch/arm/boot/compressed/.gitignore | 1 + + arch/arm/boot/compressed/Makefile | 6 +- + arch/arm/boot/compressed/decompress.c | 4 + + arch/arm/boot/compressed/piggy.lz4.S | 6 + + arch/arm/mm/init.c | 3 + + arch/arm/mm/mmap.c | 2 - + arch/arm64/mm/mmap.c | 2 - + arch/ia64/mm/contig.c | 2 + + arch/ia64/mm/discontig.c | 2 + + arch/mips/mm/mmap.c | 2 - + arch/parisc/Kconfig | 1 + + arch/parisc/Kconfig.debug | 14 - + arch/parisc/mm/init.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/Kconfig | 1 + + arch/s390/Kconfig.debug | 14 - + arch/s390/hypfs/inode.c | 1 + + arch/s390/lib/Makefile | 1 - + arch/s390/mm/mmap.c | 4 - + arch/sparc/kernel/sys_sparc_64.c | 2 - + arch/sparc/lib/Makefile | 1 - + arch/sparc/lib/usercopy.c | 9 - + arch/tile/Kconfig | 8 +- + arch/tile/include/asm/uaccess.h | 7 +- + arch/tile/lib/uaccess.c | 8 - + arch/tile/mm/mmap.c | 2 - + arch/unicore32/mm/init.c | 3 + + arch/x86/Kconfig | 2 + + arch/x86/Kconfig.debug | 14 - + arch/x86/boot/compressed/Makefile | 5 +- + arch/x86/boot/compressed/misc.c | 4 + + arch/x86/ia32/ia32_aout.c | 3 - + arch/x86/include/asm/e820.h | 2 + + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/mkcapflags.pl | 48 - + arch/x86/kernel/cpu/mkcapflags.sh | 41 + + arch/x86/kernel/e820.c | 72 +- + arch/x86/lib/usercopy_32.c | 6 - + arch/x86/mm/mmap.c | 2 - + arch/x86/mm/pageattr-test.c | 5 +- + 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 + + crypto/async_tx/raid6test.c | 9 +- + drivers/block/drbd/drbd_receiver.c | 5 +- + drivers/block/mtip32xx/mtip32xx.c | 86 +- + drivers/block/mtip32xx/mtip32xx.h | 8 +- + drivers/block/swim3.c | 2 +- + drivers/block/virtio_blk.c | 31 +- + drivers/char/mem.c | 36 + + drivers/firmware/dmi_scan.c | 80 +- + drivers/gpu/drm/drm_fb_helper.c | 8 + + drivers/infiniband/hw/cxgb3/cxio_resource.c | 4 +- + drivers/infiniband/hw/cxgb4/id_table.c | 4 +- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 + + drivers/infiniband/hw/mlx4/mad.c | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- + drivers/leds/leds-ot200.c | 14 +- + drivers/lguest/page_tables.c | 2 +- + drivers/md/dm.c | 2 +- + drivers/message/i2o/i2o_config.c | 10 + + drivers/mmc/core/core.c | 4 +- + drivers/net/ethernet/broadcom/cnic.c | 4 +- + drivers/net/hamradio/baycom_epp.c | 2 +- + drivers/net/hamradio/hdlcdrv.c | 2 +- + drivers/net/hamradio/yam.c | 2 +- + drivers/net/team/team_mode_random.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +- + drivers/net/wireless/mwifiex/cfg80211.c | 4 +- + drivers/platform/x86/thinkpad_acpi.c | 10 - + drivers/rtc/class.c | 70 + + drivers/rtc/rtc-88pm80x.c | 3 +- + drivers/rtc/rtc-ab3100.c | 14 +- + drivers/rtc/rtc-at32ap700x.c | 12 +- + drivers/rtc/rtc-at91rm9200.c | 13 +- + drivers/rtc/rtc-au1xxx.c | 13 +- + drivers/rtc/rtc-coh901331.c | 18 +- + drivers/rtc/rtc-da9052.c | 5 +- + drivers/rtc/rtc-da9055.c | 5 +- + drivers/rtc/rtc-davinci.c | 24 +- + drivers/rtc/rtc-ds1302.c | 17 +- + drivers/rtc/rtc-ds1307.c | 60 +- + drivers/rtc/rtc-ds1511.c | 8 +- + drivers/rtc/rtc-ds1553.c | 6 +- + drivers/rtc/rtc-ds1742.c | 8 +- + drivers/rtc/rtc-efi.c | 13 +- + drivers/rtc/rtc-ep93xx.c | 11 +- + drivers/rtc/rtc-generic.c | 13 +- + drivers/rtc/rtc-imxdi.c | 23 +- + drivers/rtc/rtc-lp8788.c | 5 +- + drivers/rtc/rtc-lpc32xx.c | 5 +- + drivers/rtc/rtc-max77686.c | 63 +- + drivers/rtc/rtc-max8907.c | 7 +- + drivers/rtc/rtc-max8997.c | 10 +- + drivers/rtc/rtc-mc13xxx.c | 12 +- + drivers/rtc/rtc-msm6242.c | 13 +- + drivers/rtc/rtc-mv.c | 23 +- + drivers/rtc/rtc-mxc.c | 4 +- + drivers/rtc/rtc-nuc900.c | 19 +- + drivers/rtc/rtc-omap.c | 12 +- + drivers/rtc/rtc-palmas.c | 9 +- + drivers/rtc/rtc-pcap.c | 19 +- + drivers/rtc/rtc-pcf8523.c | 6 +- + drivers/rtc/rtc-ps3.c | 13 +- + drivers/rtc/rtc-pxa.c | 77 +- + drivers/rtc/rtc-rp5c01.c | 13 +- + drivers/rtc/rtc-s3c.c | 6 +- + drivers/rtc/rtc-sh.c | 13 +- + drivers/rtc/rtc-snvs.c | 6 +- + drivers/rtc/rtc-spear.c | 5 +- + drivers/rtc/rtc-starfire.c | 13 +- + drivers/rtc/rtc-stk17ta8.c | 6 +- + drivers/rtc/rtc-sun4v.c | 13 +- + drivers/rtc/rtc-tegra.c | 28 +- + drivers/rtc/rtc-tps6586x.c | 4 +- + drivers/rtc/rtc-tps65910.c | 6 +- + drivers/rtc/rtc-tps80031.c | 6 +- + drivers/rtc/rtc-tx4939.c | 19 +- + drivers/rtc/rtc-v3020.c | 37 +- + drivers/rtc/rtc-vt8500.c | 8 +- + drivers/rtc/rtc-wm831x.c | 6 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +- + drivers/scsi/qla2xxx/qla_attr.c | 7 +- + drivers/scsi/sg.c | 1 + + drivers/staging/android/logger.c | 1 + + drivers/staging/zcache/Kconfig | 6 +- + drivers/staging/zcache/ramster.h | 6 +- + drivers/staging/zcache/ramster/nodemanager.c | 9 +- + drivers/staging/zcache/ramster/ramster.c | 29 +- + drivers/staging/zcache/ramster/ramster.h | 2 +- + .../staging/zcache/ramster/ramster_nodemanager.h | 2 + + drivers/staging/zcache/tmem.c | 6 +- + drivers/staging/zcache/tmem.h | 8 +- + drivers/staging/zcache/zcache-main.c | 64 +- + drivers/staging/zcache/zcache.h | 2 +- + drivers/usb/gadget/amd5536udc.c | 12 +- + drivers/usb/gadget/inode.c | 42 +- + drivers/uwb/rsv.c | 4 +- + drivers/video/backlight/ams369fg06.c | 21 +- + drivers/video/backlight/atmel-pwm-bl.c | 14 +- + drivers/video/backlight/ep93xx_bl.c | 2 +- + drivers/video/backlight/platform_lcd.c | 6 +- + drivers/video/cyber2000fb.c | 3 + + drivers/video/exynos/exynos_mipi_dsi.c | 8 +- + drivers/video/matrox/matroxfb_maven.c | 16 +- + drivers/video/uvesafb.c | 2 +- + drivers/xen/Kconfig | 4 +- + drivers/xen/tmem.c | 53 +- + drivers/xen/xen-selfballoon.c | 13 +- + fs/9p/vfs_addr.c | 1 + + fs/afs/write.c | 1 + + fs/aio.c | 1785 ++++++++------------ + fs/binfmt_aout.c | 3 - + fs/binfmt_elf.c | 26 +- + fs/binfmt_elf_fdpic.c | 2 - + 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 | 46 +- + fs/direct-io.c | 21 +- + fs/drop_caches.c | 2 + + fs/ecryptfs/file.c | 1 + + fs/eventpoll.c | 42 +- + 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/bfind.c | 8 +- + fs/hfsplus/inode.c | 1 + + fs/jfs/inode.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/proc/generic.c | 62 +- + fs/proc/inode.c | 176 +- + 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/cleancache.h | 4 +- + include/linux/debug_locks.h | 2 +- + include/linux/decompress/unlz4.h | 10 + + include/linux/errno.h | 1 - + include/linux/frontswap.h | 36 +- + include/linux/fs.h | 12 + + include/linux/hardirq.h | 5 + + include/linux/lockdep.h | 92 +- + include/linux/lz4.h | 51 + + include/linux/mm.h | 3 +- + include/linux/mm_types.h | 3 - + include/linux/mmzone.h | 20 +- + include/linux/net.h | 4 +- + include/linux/pagemap.h | 2 +- + include/linux/percpu-refcount.h | 114 ++ + include/linux/pid_namespace.h | 5 +- + include/linux/proc_fs.h | 6 +- + include/linux/ramfs.h | 8 +- + include/linux/random.h | 7 - + include/linux/rtc-pxa.h | 18 + + include/linux/rtc.h | 6 + + include/linux/sched.h | 5 +- + include/linux/vm_event_item.h | 7 +- + include/linux/wait.h | 86 + + include/linux/writeback.h | 1 + + include/net/ip_vs.h | 8 +- + include/trace/events/filemap.h | 58 + + include/trace/events/printk.h | 25 +- + include/uapi/linux/eventpoll.h | 1 + + include/uapi/linux/ptrace.h | 12 + + include/xen/tmem.h | 8 + + init/Kconfig | 34 +- + ipc/msg.c | 82 +- + ipc/msgutil.c | 110 +- + ipc/sem.c | 250 ++- + kernel/acct.c | 3 +- + kernel/fork.c | 5 +- + kernel/freezer.c | 19 +- + kernel/kexec.c | 30 +- + kernel/lglock.c | 12 +- + kernel/pid.c | 3 - + kernel/pid_namespace.c | 2 - + kernel/printk.c | 6 +- + kernel/ptrace.c | 81 + + kernel/rcutree.c | 2 +- + kernel/semaphore.c | 8 +- + kernel/signal.c | 6 +- + kernel/smp.c | 102 +- + kernel/sys.c | 10 +- + kernel/test_kprobes.c | 2 +- + kernel/time/timer_list.c | 112 +- + kernel/watchdog.c | 10 +- + lib/Kconfig | 7 + + lib/Kconfig.debug | 18 + + lib/Makefile | 5 +- + lib/decompress.c | 5 + + lib/decompress_unlz4.c | 187 ++ + lib/fault-inject.c | 2 +- + lib/int_sqrt.c | 32 +- + lib/list_sort.c | 2 +- + lib/lz4/Makefile | 1 + + lib/lz4/lz4_decompress.c | 326 ++++ + lib/lz4/lz4defs.h | 94 ++ + lib/percpu-refcount.c | 243 +++ + lib/show_mem.c | 3 + + {arch/s390/lib => lib}/usercopy.c | 3 +- + lib/uuid.c | 8 +- + mm/balloon_compaction.c | 2 + + mm/cleancache.c | 265 ++- + mm/dmapool.c | 5 +- + mm/filemap.c | 8 +- + mm/frontswap.c | 156 +- + mm/memblock.c | 3 + + mm/memcontrol.c | 192 ++- + mm/memory-failure.c | 4 +- + mm/migrate.c | 1 + + mm/mmap.c | 28 - + mm/mmu_context.c | 3 - + mm/nommu.c | 4 - + mm/page_alloc.c | 12 +- + mm/page_io.c | 1 + + mm/rmap.c | 3 + + mm/shmem.c | 6 +- + mm/swap.c | 1 + + mm/swapfile.c | 19 +- + mm/util.c | 1 - + mm/vmstat.c | 9 +- + net/core/pktgen.c | 42 +- + net/netfilter/ipvs/ip_vs_ctl.c | 4 +- + net/netfilter/nf_conntrack_core.c | 4 +- + net/sched/sch_choke.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- + scripts/Makefile.headersinst | 4 +- + scripts/Makefile.lib | 5 + + scripts/decodecode | 8 +- + scripts/headers_install.pl | 63 - + scripts/headers_install.sh | 43 + + security/keys/internal.h | 2 + + security/keys/keyctl.c | 1 + + sound/core/pcm_native.c | 2 +- + tools/testing/selftests/Makefile | 2 + + tools/testing/selftests/epoll/Makefile | 11 + + tools/testing/selftests/epoll/test_epoll.c | 364 ++++ + tools/testing/selftests/ptrace/Makefile | 10 + + tools/testing/selftests/ptrace/peeksiginfo.c | 214 +++ + usr/Kconfig | 9 + + 326 files changed, 5496 insertions(+), 3258 deletions(-) + create mode 100644 arch/arm/boot/compressed/piggy.lz4.S + delete mode 100644 arch/sparc/lib/usercopy.c + delete mode 100644 arch/x86/kernel/cpu/mkcapflags.pl + create mode 100644 arch/x86/kernel/cpu/mkcapflags.sh + create mode 100644 include/linux/batch_complete.h + create mode 100644 include/linux/decompress/unlz4.h + create mode 100644 include/linux/lz4.h + create mode 100644 include/linux/percpu-refcount.h + create mode 100644 include/linux/rtc-pxa.h + create mode 100644 include/trace/events/filemap.h + create mode 100644 lib/decompress_unlz4.c + create mode 100644 lib/lz4/Makefile + create mode 100644 lib/lz4/lz4_decompress.c + create mode 100644 lib/lz4/lz4defs.h + create mode 100644 lib/percpu-refcount.c + rename {arch/s390/lib => lib}/usercopy.c (73%) + delete mode 100644 scripts/headers_install.pl + create mode 100644 scripts/headers_install.sh + create mode 100644 tools/testing/selftests/epoll/Makefile + create mode 100644 tools/testing/selftests/epoll/test_epoll.c + create mode 100644 tools/testing/selftests/ptrace/Makefile + create mode 100644 tools/testing/selftests/ptrace/peeksiginfo.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..78205deddbae --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,53 @@ +Importing jdelvare-hwmon based on 3.9-rc3 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard a937536b868b8369b98967929045f1df54234323 +HEAD is now at a937536 Linux 3.9-rc3 +$ git am ../quilt/jdelvare-hwmon/MAINTAINERS-Mark-Hoffman.patch +Applying: MAINTAINERS: Remove Mark M. Hoffman +$ git am ../quilt/jdelvare-hwmon/hwmon-lm75-01-update-header-inclusion.patch +Applying: hwmon: (lm75.h) Update header inclusion +$ git am ../quilt/jdelvare-hwmon/hwmon-lm75-02-fix-tcn75-prefix.patch +Applying: hwmon: (lm75) Fix tcn75 prefix +$ git am ../quilt/jdelvare-hwmon/hwmon-lm75-03-per-chip-initialization.patch +Applying: hwmon: (lm75) Per-chip configuration register initialization +$ git am ../quilt/jdelvare-hwmon/hwmon-lm75-04-tweak-per-chip-part-1.patch +Applying: hwmon: (lm75) Prepare to support per-chip resolution and sample time +$ git am ../quilt/jdelvare-hwmon/hwmon-lm75-05-tweak-per-chip-part-2.patch +Applying: hwmon: (lm75) Tune resolution and sample time per chip +$ git am ../quilt/jdelvare-hwmon/hwmon-lm75-06-add-DS7505.patch +Applying: hwmon: (lm75) Add support for the Dallas/Maxim DS7505 +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master +From ../quilt-tmp + + badd072...4aafa4f master -> jdelvare-hwmon/master (forced update) +Importing device-mapper based on v3.9-rc3 +$ cd ../quilt-tmp +$ git reset --hard a937536b868b8369b98967929045f1df54234323 +HEAD is now at a937536 Linux 3.9-rc3 +$ git am ../quilt/device-mapper/dm-thin-fix-discard-corruption.patch +Applying: Fix a bug in dm_btree_remove that could leave leaf values with incorrect +$ git am ../quilt/device-mapper/dm-thin-fix-non-power-of-two-discard-granularity-calc.patch +Applying: Fix a discard granularity calculation to work for non power of 2 block sizes. +$ git am ../quilt/device-mapper/dm-verity-avoid-deadlock.patch +Applying: A deadlock was found in the prefetch code in the dm verity map +$ git am ../quilt/device-mapper/dm-cache-avoid-64-bit-division-on-32-bit.patch +Applying: Squash various 32bit link errors. +$ git am ../quilt/device-mapper/dm-cache-detect-cache_create-failure.patch +Applying: Return error if cache_create() fails. +$ git am ../quilt/device-mapper/dm-cache-avoid-calling-policy-destructor-twice-on-error.patch +Applying: If the cache policy's config values are not able to be set we must +$ git am ../quilt/device-mapper/dm-cache-metadata-clear-dirty-bits-on-clean-shutdown.patch +Applying: When writing the dirty bitset to the metadata device on a clean +$ git am ../quilt/device-mapper/dm-cache-fix-race-in-writethrough-implementation.patch +Applying: We have found a race in the optimisation used in the dm cache +$ git am ../quilt/device-mapper/dm-cache-policy-change-version-from-string-to-integer-set.patch +Applying: Separate dm cache policy version string into 3 unsigned numbers +$ git am ../quilt/device-mapper/dm-cache-policy-ignore-hints-if-generated-by-different-version.patch +Applying: When reading the dm cache metadata from disk, ignore the policy hints +$ git am ../quilt/device-mapper/dm-cache-policy-fix-description-of-lookup-fn.patch +Applying: Correct the documented requirement on the return code from dm cache policy +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:device-mapper/master +From ../quilt-tmp + + aa5e785...fc2f1ae master -> device-mapper/master (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..4a3778ccb948 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20130319 |