diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-23 14:06:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-23 14:06:59 +1000 |
| commit | b46cfb32acb71e611e736ab3059cfe5e0509842a (patch) | |
| tree | e5ea4d79e9bebc4e4b74132be64d05a804d8954c | |
| parent | 7b69dabd5f76fdfc33622c9bd4e434bad7e21759 (diff) | |
Add linux-next specific files for 20130723next-20130723
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 232 | ||||
| -rw-r--r-- | Next/Trees | 234 | ||||
| -rw-r--r-- | Next/merge.log | 2412 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2883 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..8255a60a1c76 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,232 @@ +Name SHA1 +---- ---- +origin 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +fixes 8177a9d79c0e942dcac3312f15585d0344d505a5 +kbuild-current 42a0940d9d582214a8d0f8ba41f2b4fe987e21b0 +arc-current ad81f0545ef01ea651886dddac4bef6cec930092 +arm-current ab8d46c0609843a83aef3f486365ca5e7c21d537 +m68k-current ad81f0545ef01ea651886dddac4bef6cec930092 +metag-fixes dfe248b18fe29ce5a59c60364a4c27e88cb65b0e +powerpc-merge ea461abf61753b4b79e625a7c20650105b990f21 +sparc 6d128e1e72bf082542e85f72e6b7ddd704193588 +net f0e61604d747bf541808a1ebde6eeaef57e904e4 +ipsec 01cb71d2d47b78354358e4bb938bb06323e17498 +sound-current be2f93a4c4981b3646b6f98f477154411b8516cb +pci-current ad81f0545ef01ea651886dddac4bef6cec930092 +wireless 23d412a2e94f55b84dbf9d5e64f381677bc90575 +driver-core.current 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +tty.current 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +usb.current 47a64a13d54f6c669b00542848d5550be3d3310e +staging.current 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +char-misc.current ed4bb9744b41d39ba35080c2390e201575121dc7 +input-current 88ce3c3ca3df754e8a2a63b01c38bd1667fcae70 +md-current ff9db744adce4f515798f1ae2804d66e6a4992d4 +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current 9c23b7d3d6bda41e2a27375df705485523a96dc8 +ide 6d128e1e72bf082542e85f72e6b7ddd704193588 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +irqdomain-current d94ea3f6d21e8b4398285516cc307c81d7374ec9 +devicetree-current cf9e2368655d86cd800e4d9fe65a407b39d29373 +spi-current 0d2d0cc5216db678070efc911ef47f4cb53b4aad +gpio-current 397eada946712b90e0620c378b366bcc6c98c9f6 +rr-fixes 6407d75afd08545f2252bb39806ffd3f10c7faac +mfd-fixes 5649d8f9e335f2b093751fcc2bdd5953f79f66ef +vfio-fixes 7d132055814ef17a6c7b69f342244c410a5e000f +drm-intel-fixes 363202bb22467ea1de6dd284b78eff5cf517db66 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc ad81f0545ef01ea651886dddac4bef6cec930092 +arm 6a62de39b51c31084c1e8bd5375946d32b36e7d0 +arm-perf ad81f0545ef01ea651886dddac4bef6cec930092 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +xilinx b028161fbba178ccd35aa69051c04d7673fe9d80 +arm64 ff701306cd49aaff80fb852323b387812bc76491 +blackfin eb043d36ace4b4720020fdef9e94854c549adda7 +c6x f934af05cb1bf20558542185299394a69060b829 +cris 32ade6a282a36aae1803b190bae452f1e46f6b6c +hexagon de44443a45e36b7467af2518d3bf7ec6ec909549 +ia64 9c510f75fd453b101cb165c95ccfb45c4cac7d56 +m68k ad81f0545ef01ea651886dddac4bef6cec930092 +m68knommu 1a2ac3e4a77108cca64f64c61902bba6d0a5ee1f +metag 8a697827540d54443f343b058b8dac695c847f9f +microblaze 9903883f1dd6e86f286b7bfa6e4b423f98c1cd9e +mips 1cae73352a690ae43c97e6e4a62b3fa6ba973edd +openrisc 6af609515d788bd4c94116344f00601b058f75a6 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 3b02818c77e9ceef37450ec17942bda011c88dfd +powerpc 1d8b368ab4aacfc3f864655baad4d31a3028ec1a +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx dd0120dea601de654a5a6d959da3a632a02200f0 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 2954ca41b5b944824d5a73b7ef0b6df5ff670b8f +sh 37284bd93103ae36b5ea274a985d688fb16f7a38 +sparc-next f8ce1faf55955de62e0a12e330c6d9a526071f65 +tile 8e42e211e4fef2b2026c7f99092542f00dd817f3 +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa 0eb5afb3bae69a18bb4a8dbcbd361c4403fb54cd +btrfs cbacd76bb3d2295478aa13015fdd302757297e88 +ceph 8b8cf8917f9b5d74e04f281272d8719ce335a497 +cifs c4a74088fed94b72a6bb0cb478b559ad14f37a65 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs cc18ec3c8f5dd735c1bff5da30fd33860c08a293 +ext3 e628753bf925b058b6811527492f7529f4d27691 +ext4 dda5690defe4af62ee120f055e98e40d97e4c760 +f2fs 9b096047abff04a815923b3d695ebea79957614c +fscache bcd7351e83728859833e3c5b8aae9a2816914e4b +fuse c7263bcdc4d150e3c718b711a5f6fad496d9f662 +gfs2 1067f2a5b96d11c2c3dd5ba83e3969cc5ed51b50 +jfs eb8630d7d2fd13589e6a7a3ae2fe1f75f867fbed +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 76c34f3beadd8c7893ac7070319af2b6ce0a2660 +nfsd 1c327d962fc420aea046c16215a552710bde8231 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs ad81f0545ef01ea651886dddac4bef6cec930092 +ubifs beadadfa5467e09e36891f39cae1f5d8d3bbf17e +xfs d892d5864f020c44cfa4e23e9165112d8df91093 +vfs d405be48a4c3f37f7a8e5648a5db204738272c61 +pci ad81f0545ef01ea651886dddac4bef6cec930092 +hid a9612c82b04c5dcbe4255436e59494e4ff2bfe2b +i2c 97191d734f6ac028e5e6dcd574378c1544a16c0b +jdelvare-hwmon 6f7e0b6faf221b03c410d13a6f81c054530b3bd3 +hwmon-staging 7de362d0eb2fba88ade771927775757cff270d0a +v4l-dvb 22174384373f2f9377b3596c55a6148018c15cc0 +kbuild cca867d42c46ebca7c93ad399242865f77f63d53 +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata 50653e33aa0d60b9220104889ff1bb11b4377672 +pstore bd08ec33b5c23833581e5a36b2a69ccae6b39a28 +pm 5d733b3ac7a012578ff6c1ebdef5d73204c8df42 +idle 5c99726b5faaf1ba4ca80c39d319f419c227f803 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal ace120dcf23b3bbba00d797a898481997381052f +ieee1394 bcabcfd2e09ceb8599a33001e812e7cbad00fc4d +ubi 83ff59a066637a6c28844bbf43009459408240f4 +dlm cfa805f6f19639b37ee877085770a396b70f2da1 +swiotlb af51a9f1848ff50079a10def56a2c064f326af22 +slave-dma 4eb38835ae37e43aece3f144e2ac679effe11f14 +dmaengine 41ef2d5678d83af030125550329b6ae8b74618fa +net-next eda297729171fe16bf34fe5b0419dfb69060f623 +ipsec-next 02890946481bef50f60782c79efb4451c26c1d50 +wireless-next ad81f0545ef01ea651886dddac4bef6cec930092 +bluetooth f0868e120564922c5a9295d4bd03a5e9763eff81 +infiniband e04abfa2436e3ab016b23eb1afb2c5578b8dc2cf +mtd a637b0d45947df686979b85361ad5bfa9d19fdd3 +l2-mtd fb1585bc13b3d89a8fcf2a2edfa4c0c821276dea +crypto aa2faec1a05f1ebc2856be911f83e696f8dc2122 +drm e13af9a8340685cfe25d0c9f708da7121e0f51dd +drm-intel 86281e1ca60a5f0ce14d586d8b31d42bd038d33a +drm-tegra ebae30b1fbcc2cc991ce705cc82e16d1e5ddbf51 +sound b785a492c6eef578520594d5c4d6e9f2cb47cbeb +sound-asoc 151d45e2615e5da282541a11a34a67d2ea255bed +modules 9eb76d7797b892a1dad4f2efb6f786681306dd13 +virtio c893c8d763d8a8a757028a48ace7d1bb2dd8373f +input 46146e7d4b383d5b34014d072553498c7cd52821 +input-mt ad81f0545ef01ea651886dddac4bef6cec930092 +cgroup ed55cff85a9693a96e86a799828354dec35c43d2 +block 3fe9649223d270a8eb2f649fa119b1995fe6b53d +device-mapper ad81f0545ef01ea651886dddac4bef6cec930092 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc bfffbea1aaeeb1eb6500c83ff9653416daa5b490 +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 0450b0ceeaffa02e4436cdd5c890f52560f97023 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md ca372188acd0cc88abe3eb373451d55f20118c24 +mfd 25f311fa58c18c19ae1348336265ccb8368638f0 +battery 5a6c2208455f25b3e6f939adc2da59aa00d4806e +fbdev 5e8be022fb5b8badb033940cb807dff0112042b6 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 e72b7536e4e1e44e56dba50205d5a5092bf1d3c0 +regulator 72f5372ba790dae43ee1cd17ec7e465b5c8953fc +security be0306bcc3a0b0725b0f99b06d56a29a6d906b7c +selinux c2d7b247f0c028d325a5da5b9611b60ba160f237 +lblnet d4b6739bf567ffe7763014af7e477135b4574711 +watchdog 47188d39b5deeebf41f87a02af1b3935866364cf +dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351 +iommu 01ce784acfa69a171afe6ec3f85a959546f2d18a +vfio 47188d39b5deeebf41f87a02af1b3935866364cf +osd 861d66601acda6d7a2038fb3c95f68009128003a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 8ecada16512c90ae782b00f15ebff0c32e4cd92a +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +edac de4772c621487fd4cadb4138f2481297c8e0cb0d +edac-amd aad19e51769d761ffc0608b381313e18f0bd82b3 +devicetree 6dd18e4684f3d188277bbbc27545248487472108 +dt-rh d683b96b072dc4680fc74964eca77e6a23d1fa6e +spi 00ab5392cbc3f87ddfeada311e22f55dfb0bc5c6 +spi-mb c1ad66bbe96f33197227d6765ac56c7bc265040b +tip 54396a651817c510d8d5405cf2ddfce9d3a7108d +ftrace e70e78e3c83b536730e31231dd9b979768d8df3c +rcu 0f791c956aa26d6d8142f7b3e7a9fbd8bdeffcd0 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 103af0a98788592b76ee69a13948b6b3036d7e18 +kvm-arm 8bd4ffd6b3a98f00267051dc095076ea2ff06ea8 +kvm-ppc 20f7462aac0b220c56231a15abec9ab99e897136 +oprofile f722406faae2d073cc1d01063d1123c35425939e +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495 +xen-two 21f3c042131b67e159ae441522c8f9f1ff8546f2 +xen-arm 176455e9a9e2a37a0b3eec6f6d7883de720c02c7 +percpu a4244454df1296e90cc961c1b636b1176ef0d9a0 +workqueues bbe2a23b3b6f559b7b3d6803bc2b8f4675f6f2f8 +drivers-x86 de91b53dcc25f5f3255f3ea124bec293344fd402 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 78fd81741ee42c7dd311767d8c5e4d80d3d4ad41 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 93946903c8e9ea4950ed1cfc27cdea4e915dc0fb +driver-core 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +tty 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +usb 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +usb-gadget b1fd6cb5ee2f97a553d1c4b8a88914bd970daf37 +staging 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +char-misc 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +scsi d26911a2fd813c3bf5a105473498c56287c4c1f8 +target-updates ca40d24eb8fc3c194b4439493ecf6b2d703812b8 +target-merge 317ddd256b9c24b0d78fa8018f80f1e495481a10 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +bcon e284f3493206d4268267db4557c7ee6f89ed2314 +tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 +writeback 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl f2577e7003f23ae0d3d3a6cc850391a7ff28a2b1 +vhost 22fa90c7fb479694d6affebc049d21f06b714be6 +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc b9777859ec015a78dae1476e317d04f851bfdd0d +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +irqdomain 798f0fd188be3656991c8745104b5ee045769a5f +gpio 644c8df2fb276e6cdfab18d60e9e0bf7a5b65b9a +gpio-lw cd2f7f072f60c43bd54954aa2096f991fb5edfbc +arm-soc f681e48aab23d1ff884f2011dcd7a1ecfe85db32 +bcm2835 7d132055814ef17a6c7b69f342244c410a5e000f +cortex 3ad87ac5ac98d951bc51d1c815c533b65e072f45 +ep93xx 9c59be78d1ee4a717ca2f85b54356f8fed7f439c +imx-mxs 395e8534e824c163095043db7bb19c3cf1021b90 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm d701eda5ef391ffa071617de1f7f3558c6841250 +mvebu ad81f0545ef01ea651886dddac4bef6cec930092 +renesas 833574a9e7efcb7d3e26f0de4866967575550449 +samsung ad81f0545ef01ea651886dddac4bef6cec930092 +tegra e4f00cf004b8e8ca4d1e719431f06ee90d6d88be +dma-mapping f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e +pwm b388f15fd14c3ae62deb9a059464aa99b524ea4a +dma-buf 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 +userns 78008c404acd8e731d1e06618cc5995961e847a6 +ktest df5f7c66013c46cec9aa8156af257bc5eb29b5c5 +signal 20b4fb485227404329e41ad15588afad3df23050 +clk 45e3ec3784aec0d194740b75b547bfabca448ff3 +random b980955236922ae6106774511c5c05003d3ad225 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages af07484863e0c20796081e57093886c22dc16705 +ptr-ret 6b4f2b56a48c8ea9775bd2b29681725d4474367a +aio 0c45355fc7c48c82db151bf0e7ca305d513e639e +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm-current 1f02e5b30607cbef3c8b4d1376cba3689c399288 +akpm 0c2f52fa9a7cb139617078568c48026c49927617 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..01fdc50a3755 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,234 @@ +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 +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +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 +drm-intel-fixes git git://people.freedesktop.org/~danvet/drm-intel#drm-intel-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next +xilinx git git://git.xilinx.com/linux-xlnx.git#arm-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git#upstream +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.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 +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://github.com/pmundt/linux-sh.git#sh-latest +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs.git#for-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pstore git git://git.infradead.org/users/cbou/linux-pstore.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-intel git git://people.freedesktop.org/~danvet/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://github.com/rydberg/linux.git#for-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper quilt http://people.redhat.com/agk/patches/linux/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git#master +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://sources.calxeda.com/kernel/linux.git#for-next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +spi-mb git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +cputime git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#cputime +uprobes git git://github.com/srikard/linux.git#for-next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://github.com/columbia/linux-kvm-arm.git#kvm-arm-next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/next +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-arm git git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://cavan.codon.org.uk/platform-drivers-x86.git#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git#linux-next +isci git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git#all +bcon git git://git.kernel.org/pub/scm/linux/kernel/git/joern/bcon2.git#master +tmem git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +irqdomain git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next +gpio-lw git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next +cortex git git://git.pengutronix.de/git/ukl/linux-2.6.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.linaro.org/people/shawnguo/linux-2.6.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/users/jcooper/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://gitorious.org/linux-pwm/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update +arm64-hugepages git git://git.linaro.org/people/stevecapper/linux.git#for-next/hugepages +ptr-ret git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#PTR_RET +aio git git://git.kvack.org/~bcrl/aio-next.git#master +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..20ad4efeeafd --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2412 @@ +$ date +Tuesday 23 July 10:14:57 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 3b2f64d Linux 3.11-rc2 +Merging origin/master (3b2f64d Linux 3.11-rc2) +$ git merge --no-ff origin/master +Already up-to-date. +Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n) +$ git merge --no-ff fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) +$ git merge --no-ff kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (ab8d46c0 ARM: 7788/1: elf: fix lpae hwcap feature reporting in proc/cpuinfo) +$ git merge --no-ff arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/Kconfig.debug | 14 ++++++++++++-- + arch/arm/kernel/hyp-stub.S | 4 ++-- + arch/arm/kernel/setup.c | 1 + + arch/arm/mm/mmu.c | 43 ++++++++++++++++++++++++++++++++++++++----- + arch/arm/mm/proc-v7-2level.S | 2 +- + arch/arm/mm/proc-v7-3level.S | 2 +- + arch/arm/mm/proc-v7.S | 11 ++++++----- + 7 files changed, 61 insertions(+), 16 deletions(-) +Merging m68k-current/for-linus (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (dfe248b MAINTAINERS: add linux-metag mailing list) +$ git merge --no-ff metag-fixes/fixes +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging powerpc-merge/merge (ea461ab powerpc/eeh: Fix fetching bus for single-dev-PE) +$ git merge --no-ff powerpc-merge/merge +Already up-to-date. +Merging sparc/master (6d128e1 Revert "Makefile: Fix install error with make -j option") +$ git merge --no-ff sparc/master +Already up-to-date. +Merging net/master (f0e6160 net: pch_gbe depends on x86) +$ git merge --no-ff net/master +Merge made by the 'recursive' strategy. + drivers/net/arcnet/arcnet.c | 2 +- + drivers/net/can/usb/esd_usb2.c | 10 +++ + drivers/net/can/usb/usb_8dev.c | 1 + + drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 3 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 22 +++---- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 16 ++++- + drivers/net/veth.c | 1 + + drivers/net/vxlan.c | 57 ++++++++++++----- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 10 ++- + drivers/net/wireless/ath/ath9k/hif_usb.c | 9 ++- + drivers/net/wireless/ath/ath9k/xmit.c | 44 ++++++++----- + drivers/net/wireless/rt2x00/Kconfig | 2 +- + drivers/net/wireless/rtlwifi/Kconfig | 72 ++++++++++++++-------- + drivers/net/wireless/rtlwifi/Makefile | 10 ++- + drivers/net/wireless/rtlwifi/base.c | 19 +++++- + drivers/net/wireless/rtlwifi/base.h | 2 +- + drivers/net/wireless/rtlwifi/core.c | 1 + + drivers/net/wireless/rtlwifi/debug.c | 1 + + drivers/net/wireless/rtlwifi/efuse.c | 1 + + drivers/net/wireless/rtlwifi/pci.c | 22 +++---- + drivers/net/wireless/rtlwifi/ps.c | 16 +++++ + drivers/net/wireless/rtlwifi/ps.h | 1 + + drivers/net/wireless/rtlwifi/usb.c | 9 +++ + include/linux/mod_devicetable.h | 5 +- + net/bridge/br_multicast.c | 5 +- + net/ipv4/sysctl_net_ipv4.c | 6 +- + net/netfilter/nf_conntrack_expect.c | 5 ++ + net/netfilter/xt_socket.c | 10 ++- + 35 files changed, 260 insertions(+), 118 deletions(-) +Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling) +$ git merge --no-ff ipsec/master +Already up-to-date. +Merging sound-current/for-linus (be2f93a ALSA: usb-audio: 6fire: return correct XRUN indication) +$ git merge --no-ff sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_sigmatel.c | 13 +++++++------ + sound/usb/6fire/pcm.c | 2 +- + 2 files changed, 8 insertions(+), 7 deletions(-) +Merging pci-current/for-linus (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff pci-current/for-linus +Already up-to-date. +Merging wireless/master (23d412a brcmfmac: bail out of brcmf_txflowblock_if() for non-netdev interface) +$ git merge --no-ff wireless/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/hif_usb.c | 4 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + + drivers/net/wireless/ath/wil6210/debugfs.c | 4 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 8 +- + drivers/net/wireless/cw1200/txrx.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/main.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 6 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 23 +++++- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 + + drivers/net/wireless/iwlwifi/mvm/scan.c | 10 ++- + drivers/net/wireless/iwlwifi/mvm/sta.c | 23 +++++- + drivers/net/wireless/mwifiex/init.c | 10 +-- + drivers/net/wireless/mwifiex/main.c | 13 +++- + drivers/net/wireless/mwifiex/main.h | 1 + + drivers/net/wireless/mwifiex/sdio.c | 91 ++++++++++------------ + drivers/net/wireless/mwifiex/sdio.h | 3 - + net/mac80211/cfg.c | 2 + + net/mac80211/rc80211_minstrel.c | 3 +- + net/mac80211/rc80211_minstrel_ht.c | 10 ++- + net/mac80211/rx.c | 10 ++- + net/wireless/nl80211.c | 11 ++- + net/wireless/reg.c | 2 + + net/wireless/sme.c | 29 ++++++- + 24 files changed, 184 insertions(+), 87 deletions(-) +Merging driver-core.current/driver-core-linus (3b2f64d Linux 3.11-rc2) +$ git merge --no-ff driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (3b2f64d Linux 3.11-rc2) +$ git merge --no-ff tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (47a64a1 USB: EHCI: Fix resume signalling on remote wakeup) +$ git merge --no-ff usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/hub.c | 39 +++++++++++++++++++++++++++------- + drivers/usb/core/hub.h | 3 +++ + drivers/usb/dwc3/Kconfig | 2 +- + drivers/usb/dwc3/core.c | 2 +- + drivers/usb/dwc3/core.h | 4 ++-- + drivers/usb/dwc3/gadget.c | 1 + + drivers/usb/gadget/Kconfig | 5 ++++- + drivers/usb/gadget/at91_udc.c | 16 ++++++++------ + drivers/usb/gadget/fotg210-udc.c | 4 ++-- + drivers/usb/gadget/mv_u3d_core.c | 4 ++-- + drivers/usb/gadget/udc-core.c | 6 ++++++ + drivers/usb/host/ehci-hub.c | 1 + + drivers/usb/misc/sisusbvga/sisusb.c | 1 + + drivers/usb/phy/phy-omap-usb3.c | 2 +- + drivers/usb/phy/phy-samsung-usb2.c | 2 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 4 ---- + drivers/usb/serial/cp210x.c | 4 ++++ + drivers/usb/serial/option.c | 6 ++++-- + drivers/usb/storage/unusual_devs.h | 7 ++++++ + include/linux/usb.h | 11 ---------- + include/uapi/linux/usb/ch11.h | 11 ++++++++++ + 21 files changed, 92 insertions(+), 43 deletions(-) +Merging staging.current/staging-linus (3b2f64d Linux 3.11-rc2) +$ git merge --no-ff staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (ed4bb97 Tools: hv: KVP: Fix a bug in IPV6 subnet enumeration) +$ git merge --no-ff char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/hv/hv_balloon.c | 21 +++++++++++++-------- + drivers/hv/vmbus_drv.c | 8 ++++---- + tools/hv/hv_kvp_daemon.c | 5 +++-- + 3 files changed, 20 insertions(+), 14 deletions(-) +Merging input-current/for-linus (88ce3c3 Merge branch 'next' into for-linus) +$ git merge --no-ff input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (ff9db74 md/raid1: fix bio handling problems in process_checks()) +$ git merge --no-ff md-current/for-linus +Merge made by the 'recursive' strategy. +Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) +$ git merge --no-ff audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (9c23b7d crypto: caam - Fixed the memory out of bound overwrite issue) +$ git merge --no-ff crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/caam/caamhash.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ide/master (6d128e1 Revert "Makefile: Fix install error with make -j option") +$ git merge --no-ff ide/master +Already up-to-date. +Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) +$ git merge --no-ff dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) +$ git merge --no-ff sh-current/sh-fixes-for-linus +Already up-to-date. +Merging irqdomain-current/irqdomain/merge (d94ea3f irqchip: Return -EPERM for reserved IRQs) +$ git merge --no-ff irqdomain-current/irqdomain/merge +Already up-to-date. +Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct resource to 0 in of_irq_to_resource()) +$ git merge --no-ff devicetree-current/devicetree/merge +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 2 ++ + MAINTAINERS | 30 +++++++++++++--------- + drivers/of/irq.c | 6 +++-- + 3 files changed, 24 insertions(+), 14 deletions(-) +Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) +$ git merge --no-ff spi-current/spi/merge +Already up-to-date. +Merging gpio-current/gpio/merge (397eada gpio/omap: don't use linear domain mapping for OMAP1) +$ git merge --no-ff gpio-current/gpio/merge +Already up-to-date. +Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header) +$ git merge --no-ff rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) +$ git merge --no-ff mfd-fixes/master +Already up-to-date. +Merging vfio-fixes/for-linus (7d13205 Linux 3.10-rc6) +$ git merge --no-ff vfio-fixes/for-linus +Already up-to-date. +Merging drm-intel-fixes/drm-intel-fixes (363202b drm/i915: fix hdmi portclock limits) +$ git merge --no-ff drm-intel-fixes/drm-intel-fixes +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/i915_dma.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_dma.c | 18 +++++----- + drivers/gpu/drm/i915/i915_drv.c | 13 ++++--- + drivers/gpu/drm/i915/i915_drv.h | 3 +- + drivers/gpu/drm/i915/i915_gem.c | 18 ++++++++-- + drivers/gpu/drm/i915/intel_ddi.c | 10 +++--- + drivers/gpu/drm/i915/intel_display.c | 69 ++++++++++++++++++++++++++---------- + drivers/gpu/drm/i915/intel_drv.h | 2 +- + drivers/gpu/drm/i915/intel_hdmi.c | 19 ++++++++-- + drivers/gpu/drm/i915/intel_lvds.c | 12 ++++--- + drivers/gpu/drm/i915/intel_panel.c | 6 +++- + drivers/gpu/drm/i915/intel_pm.c | 8 +++-- + 11 files changed, 126 insertions(+), 52 deletions(-) +Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) +$ git merge --no-ff asm-generic/master +Already up-to-date. +Merging arc/for-next (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff arc/for-next +Already up-to-date. +Merging arm/for-next (6a62de3 Merge branch 'devel-stable' into for-next) +$ git merge --no-ff arm/for-next +Removing arch/arm/mach-versatile/include/mach/debug-macro.S +Removing arch/arm/mach-spear/include/mach/debug-macro.S +Removing arch/arm/mach-rpc/include/mach/debug-macro.S +Removing arch/arm/mach-realview/include/mach/debug-macro.S +Removing arch/arm/mach-orion5x/include/mach/debug-macro.S +Removing arch/arm/mach-mv78xx0/include/mach/debug-macro.S +Removing arch/arm/mach-lpc32xx/include/mach/debug-macro.S +Removing arch/arm/mach-kirkwood/include/mach/debug-macro.S +Removing arch/arm/mach-ixp4xx/include/mach/debug-macro.S +Removing arch/arm/mach-iop33x/include/mach/debug-macro.S +Removing arch/arm/mach-iop32x/include/mach/debug-macro.S +Removing arch/arm/mach-iop13xx/include/mach/debug-macro.S +Removing arch/arm/mach-integrator/include/mach/debug-macro.S +Removing arch/arm/mach-gemini/include/mach/debug-macro.S +Removing arch/arm/mach-ep93xx/include/mach/debug-macro.S +Removing arch/arm/mach-ebsa110/include/mach/debug-macro.S +Removing arch/arm/mach-dove/include/mach/debug-macro.S +Removing arch/arm/mach-davinci/include/mach/debug-macro.S +Removing arch/arm/include/debug/u300.S +Removing arch/arm/include/debug/sunxi.S +Removing arch/arm/include/debug/socfpga.S +Removing arch/arm/include/debug/rockchip.S +Removing arch/arm/include/debug/pxa.S +Auto-merging arch/arm/include/debug/pl01x.S +Removing arch/arm/include/debug/picoxcell.S +Removing arch/arm/include/debug/nspire.S +Removing arch/arm/include/debug/nomadik.S +Removing arch/arm/include/debug/mxs.S +Removing arch/arm/include/debug/mvebu.S +Removing arch/arm/include/debug/keystone.S +Removing arch/arm/include/debug/highbank.S +Removing arch/arm/include/debug/cns3xxx.S +Removing arch/arm/include/debug/bcm2835.S +Removing arch/arm/include/debug/8250_32.S +Removing arch/arm/include/asm/hardware/debug-8250.S +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 7 + + arch/arm/Kconfig.debug | 553 +++++++++++++++------ + arch/arm/include/asm/hardware/debug-8250.S | 29 -- + arch/arm/include/asm/neon.h | 36 ++ + arch/arm/include/asm/xor.h | 73 +++ + arch/arm/include/debug/8250.S | 54 ++ + arch/arm/include/debug/8250_32.S | 27 - + arch/arm/include/debug/bcm2835.S | 22 - + arch/arm/include/debug/cns3xxx.S | 19 - + arch/arm/include/debug/highbank.S | 17 - + arch/arm/include/debug/keystone.S | 43 -- + arch/arm/include/debug/mvebu.S | 30 -- + arch/arm/include/debug/mxs.S | 27 - + arch/arm/include/debug/nomadik.S | 20 - + arch/arm/include/debug/nspire.S | 28 -- + arch/arm/include/debug/picoxcell.S | 19 - + .../{asm/hardware/debug-pl01x.S => debug/pl01x.S} | 9 +- + arch/arm/include/debug/pxa.S | 33 -- + arch/arm/include/debug/rockchip.S | 42 -- + arch/arm/include/debug/socfpga.S | 21 - + arch/arm/include/debug/sunxi.S | 27 - + arch/arm/include/debug/u300.S | 18 - + arch/arm/include/debug/ux500.S | 2 +- + arch/arm/include/debug/vexpress.S | 48 +- + arch/arm/lib/Makefile | 6 + + arch/arm/lib/xor-neon.c | 42 ++ + arch/arm/mach-davinci/include/mach/debug-macro.S | 65 --- + arch/arm/mach-dove/include/mach/debug-macro.S | 19 - + arch/arm/mach-ebsa110/include/mach/debug-macro.S | 22 - + arch/arm/mach-ep93xx/include/mach/debug-macro.S | 21 - + .../arm/mach-footbridge/include/mach/debug-macro.S | 15 - + arch/arm/mach-gemini/include/mach/debug-macro.S | 21 - + .../arm/mach-integrator/include/mach/debug-macro.S | 20 - + arch/arm/mach-iop13xx/include/mach/debug-macro.S | 24 - + arch/arm/mach-iop32x/include/mach/debug-macro.S | 21 - + arch/arm/mach-iop33x/include/mach/debug-macro.S | 22 - + arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 26 - + arch/arm/mach-kirkwood/include/mach/debug-macro.S | 19 - + arch/arm/mach-lpc32xx/include/mach/debug-macro.S | 29 -- + arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 19 - + arch/arm/mach-orion5x/include/mach/debug-macro.S | 21 - + arch/arm/mach-realview/include/mach/debug-macro.S | 29 -- + arch/arm/mach-rpc/include/mach/debug-macro.S | 23 - + arch/arm/mach-spear/include/mach/debug-macro.S | 36 -- + arch/arm/mach-spear/include/mach/spear.h | 2 - + arch/arm/mach-versatile/include/mach/debug-macro.S | 21 - + arch/arm/vfp/vfphw.S | 5 + + arch/arm/vfp/vfpmodule.c | 69 ++- + include/linux/raid/pq.h | 5 + + lib/raid6/.gitignore | 1 + + lib/raid6/Makefile | 40 ++ + lib/raid6/algos.c | 6 + + lib/raid6/neon.c | 58 +++ + lib/raid6/neon.uc | 80 +++ + lib/raid6/test/Makefile | 26 +- + 55 files changed, 909 insertions(+), 1108 deletions(-) + delete mode 100644 arch/arm/include/asm/hardware/debug-8250.S + create mode 100644 arch/arm/include/asm/neon.h + create mode 100644 arch/arm/include/debug/8250.S + delete mode 100644 arch/arm/include/debug/8250_32.S + delete mode 100644 arch/arm/include/debug/bcm2835.S + delete mode 100644 arch/arm/include/debug/cns3xxx.S + delete mode 100644 arch/arm/include/debug/highbank.S + delete mode 100644 arch/arm/include/debug/keystone.S + delete mode 100644 arch/arm/include/debug/mvebu.S + delete mode 100644 arch/arm/include/debug/mxs.S + delete mode 100644 arch/arm/include/debug/nomadik.S + delete mode 100644 arch/arm/include/debug/nspire.S + delete mode 100644 arch/arm/include/debug/picoxcell.S + rename arch/arm/include/{asm/hardware/debug-pl01x.S => debug/pl01x.S} (78%) + delete mode 100644 arch/arm/include/debug/pxa.S + delete mode 100644 arch/arm/include/debug/rockchip.S + delete mode 100644 arch/arm/include/debug/socfpga.S + delete mode 100644 arch/arm/include/debug/sunxi.S + delete mode 100644 arch/arm/include/debug/u300.S + create mode 100644 arch/arm/lib/xor-neon.c + delete mode 100644 arch/arm/mach-davinci/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-dove/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-ebsa110/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-ep93xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-gemini/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-integrator/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-iop13xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-iop32x/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-iop33x/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-kirkwood/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-lpc32xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-orion5x/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-realview/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-rpc/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-spear/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-versatile/include/mach/debug-macro.S + create mode 100644 lib/raid6/neon.c + create mode 100644 lib/raid6/neon.uc +Merging arm-perf/for-next/perf (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff arm-perf/for-next/perf +Already up-to-date. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge --no-ff davinci/davinci-next +Already up-to-date. +Merging xilinx/arm-next (b028161 Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge --no-ff xilinx/arm-next +Already up-to-date. +Merging arm64/upstream (ff70130 arm64: use common reboot infrastructure) +$ git merge --no-ff arm64/upstream +Already up-to-date. +Merging blackfin/for-linus (eb043d3 smp: blackfin: fix check error, using atomic_ops to handle atomic_t type) +$ git merge --no-ff blackfin/for-linus +Merge made by the 'recursive' strategy. +Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore) +$ git merge --no-ff c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file) +$ git merge --no-ff cris/for-next +Resolved 'arch/cris/arch-v32/drivers/Kconfig' using previous resolution. +Auto-merging arch/cris/include/asm/processor.h +Auto-merging arch/cris/arch-v32/drivers/Kconfig +CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig +Auto-merging arch/cris/arch-v10/drivers/Kconfig +Auto-merging arch/cris/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6686d47] Merge remote-tracking branch 'cris/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/cris/Kconfig | 81 ------- + arch/cris/arch-v10/drivers/Kconfig | 70 ------ + arch/cris/arch-v10/drivers/Makefile | 2 - + arch/cris/arch-v32/drivers/Kconfig | 394 ---------------------------------- + arch/cris/arch-v32/mach-a3/Kconfig | 4 - + arch/cris/include/asm/processor.h | 1 - + arch/cris/include/uapi/asm/kvm_para.h | 1 + + 7 files changed, 1 insertion(+), 552 deletions(-) + create mode 100644 arch/cris/include/uapi/asm/kvm_para.h +Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) +$ git merge --no-ff hexagon/linux-next +Already up-to-date. +Merging ia64/next (9c510f7 [IA64] dmi.h: Make dmi_alloc use kzalloc) +$ git merge --no-ff ia64/next +Merge made by the 'recursive' strategy. + arch/ia64/configs/generic_defconfig | 2 +- + arch/ia64/configs/gensparse_defconfig | 2 +- + arch/ia64/configs/tiger_defconfig | 2 +- + arch/ia64/configs/xen_domu_defconfig | 2 +- + arch/ia64/include/asm/dmi.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) +Merging m68k/for-next (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (1a2ac3e m68knommu: Mark functions only called from setup_arch() __init) +$ git merge --no-ff m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/kernel/setup_no.c | 2 +- + arch/m68k/platform/68000/m68328.c | 3 ++- + arch/m68k/platform/68000/m68EZ328.c | 3 ++- + arch/m68k/platform/68000/m68VZ328.c | 9 +++++---- + arch/m68k/platform/68360/commproc.c | 3 ++- + arch/m68k/platform/68360/config.c | 3 ++- + 6 files changed, 14 insertions(+), 9 deletions(-) +Merging metag/for-next (8a69782 metag: tz1090: instantiate gpio-tz1090-pdc) +$ git merge --no-ff metag/for-next +Merge made by the 'recursive' strategy. + arch/metag/Kconfig.soc | 2 ++ + arch/metag/boot/dts/tz1090.dtsi | 67 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 69 insertions(+) +Merging microblaze/next (9903883 Merge tag 'dm-3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm) +$ git merge --no-ff microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (1cae733 Merge branch '3.11-fixes' into mips-for-linux-next) +$ git merge --no-ff mips/mips-for-linux-next +Removing arch/mips/include/uapi/asm/ipcbuf.h +Removing arch/mips/include/uapi/asm/auxvec.h +Removing arch/mips/include/asm/xor.h +Removing arch/mips/include/asm/ucontext.h +Removing arch/mips/include/asm/serial.h +Removing arch/mips/include/asm/segment.h +Removing arch/mips/include/asm/sections.h +Removing arch/mips/include/asm/scatterlist.h +Removing arch/mips/include/asm/percpu.h +Removing arch/mips/include/asm/parport.h +Removing arch/mips/include/asm/mutex.h +Removing arch/mips/include/asm/local64.h +Removing arch/mips/include/asm/emergency-restart.h +Removing arch/mips/include/asm/current.h +Removing arch/mips/include/asm/cputime.h +Merge made by the 'recursive' strategy. + arch/mips/include/asm/Kbuild | 13 +++++++++++++ + arch/mips/include/asm/cputime.h | 6 ------ + arch/mips/include/asm/current.h | 1 - + arch/mips/include/asm/emergency-restart.h | 6 ------ + arch/mips/include/asm/local64.h | 1 - + arch/mips/include/asm/mutex.h | 9 --------- + arch/mips/include/asm/parport.h | 1 - + arch/mips/include/asm/percpu.h | 6 ------ + arch/mips/include/asm/scatterlist.h | 6 ------ + arch/mips/include/asm/sections.h | 6 ------ + arch/mips/include/asm/segment.h | 6 ------ + arch/mips/include/asm/serial.h | 1 - + arch/mips/include/asm/ucontext.h | 1 - + arch/mips/include/asm/xor.h | 1 - + arch/mips/include/uapi/asm/Kbuild | 5 +++-- + arch/mips/include/uapi/asm/auxvec.h | 4 ---- + arch/mips/include/uapi/asm/ipcbuf.h | 1 - + arch/mips/mm/tlb-funcs.S | 2 ++ + 18 files changed, 18 insertions(+), 58 deletions(-) + delete mode 100644 arch/mips/include/asm/cputime.h + delete mode 100644 arch/mips/include/asm/current.h + delete mode 100644 arch/mips/include/asm/emergency-restart.h + delete mode 100644 arch/mips/include/asm/local64.h + delete mode 100644 arch/mips/include/asm/mutex.h + delete mode 100644 arch/mips/include/asm/parport.h + delete mode 100644 arch/mips/include/asm/percpu.h + delete mode 100644 arch/mips/include/asm/scatterlist.h + delete mode 100644 arch/mips/include/asm/sections.h + delete mode 100644 arch/mips/include/asm/segment.h + delete mode 100644 arch/mips/include/asm/serial.h + delete mode 100644 arch/mips/include/asm/ucontext.h + delete mode 100644 arch/mips/include/asm/xor.h + delete mode 100644 arch/mips/include/uapi/asm/auxvec.h + delete mode 100644 arch/mips/include/uapi/asm/ipcbuf.h +Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) +$ git merge --no-ff openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge --no-ff parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (3b02818 parisc: agp/parisc-agp: allow binding of user memory to the AGP GART) +$ git merge --no-ff parisc-hd/for-next +Merge made by the 'recursive' strategy. + drivers/char/agp/parisc-agp.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging powerpc/next (1d8b368 pstore: Add hsize argument in write_buf call of pstore_ftrace_call) +$ git merge --no-ff powerpc/next +Already up-to-date. +Merging 4xx/next (2074b1d powerpc: Fix irq distribution) +$ git merge --no-ff 4xx/next +Already up-to-date. +Merging mpc5xxx/next (dd0120d powerpc/mpc512x: enable USB support in defconfig) +$ git merge --no-ff mpc5xxx/next +Already up-to-date. +Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) +$ git merge --no-ff galak/next +Already up-to-date. +Merging s390/features (2954ca4 s390: replace remaining strict_strtoul() with kstrtoul()) +$ git merge --no-ff s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/boot/compressed/Makefile | 9 ++++++--- + arch/s390/boot/compressed/misc.c | 4 ++++ + arch/s390/kernel/ptrace.c | 2 +- + arch/s390/kernel/vdso.c | 2 +- + drivers/s390/block/dasd_devmap.c | 8 ++++---- + drivers/s390/cio/ccwgroup.c | 2 +- + drivers/s390/cio/cmf.c | 2 +- + drivers/s390/cio/css.c | 2 +- + drivers/s390/cio/device.c | 2 +- + drivers/s390/net/qeth_l3_sys.c | 2 +- + 11 files changed, 22 insertions(+), 14 deletions(-) +Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) +$ git merge --no-ff sh/sh-latest +Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution. +Resolved 'include/linux/serial_sci.h' using previous resolution. +Auto-merging include/linux/serial_sci.h +CONFLICT (content): Merge conflict in include/linux/serial_sci.h +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging arch/sh/kernel/cpu/sh2a/Makefile +CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d64b34dd] Merge remote-tracking branch 'sh/sh-latest' +$ git diff -M --stat --summary HEAD^.. + .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++ + arch/sh/include/asm/hw_breakpoint.h | 12 +- + arch/sh/include/cpu-common/cpu/ubc.h | 17 +++ + arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++ + arch/sh/kernel/cpu/sh2a/Makefile | 1 + + arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++ + arch/sh/kernel/hw_breakpoint.c | 8 ++ + drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++- + include/linux/serial_sci.h | 4 + + 9 files changed, 375 insertions(+), 15 deletions(-) + create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt + create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h + create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h + create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c +Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) +$ git merge --no-ff sparc-next/master +Already up-to-date. +Merging tile/master (8e42e21 edac: Remove redundant platform_set_drvdata()) +$ git merge --no-ff tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/asm/cmpxchg.h | 6 ++++++ + drivers/edac/tile_edac.c | 1 - + 2 files changed, 6 insertions(+), 1 deletion(-) +Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge --no-ff unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (0eb5afb xtensa: remove the second argument of __bio_kmap_atomic()) +$ git merge --no-ff xtensa/for_next +Already up-to-date. +Merging btrfs/next (cbacd76 Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into next) +$ git merge --no-ff btrfs/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ceph/master (8b8cf89 libceph: fix invalid unsigned->signed conversion for timespec encoding) +$ git merge --no-ff ceph/master +Already up-to-date. +Merging cifs/for-next (c4a7408 Do not attempt to do cifs operations reading symlinks with SMB2) +$ git merge --no-ff cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsencrypt.c | 2 +- + fs/cifs/cifsglob.h | 4 +++ + fs/cifs/cifsproto.h | 4 ++- + fs/cifs/connect.c | 7 +++-- + fs/cifs/link.c | 84 ++++++++++++++++++++++++++++++++------------------- + fs/cifs/sess.c | 6 ++-- + fs/cifs/smb1ops.c | 1 + + 7 files changed, 69 insertions(+), 39 deletions(-) +Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge --no-ff configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (cc18ec3 Use ecryptfs_dentry_to_lower_path in a couple of places) +$ git merge --no-ff ecryptfs/next +Already up-to-date. +Merging ext3/for_next (e628753 quota: Convert use of typedef ctl_table to struct ctl_table) +$ git merge --no-ff ext3/for_next +Already up-to-date. +Merging ext4/dev (dda5690 ext3: fix a BUG when opening a file with O_TMPFILE flag) +$ git merge --no-ff ext4/dev +Already up-to-date. +Merging f2fs/dev (9b09604 f2fs: update file name in the inode block during f2fs_rename) +$ git merge --no-ff f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 43 +++++++++++++++++++++++++++++++---- + fs/f2fs/data.c | 2 +- + fs/f2fs/debug.c | 16 ++++++------- + fs/f2fs/dir.c | 17 +++++++++++++- + fs/f2fs/f2fs.h | 22 +++++++++++++----- + fs/f2fs/file.c | 9 ++++---- + fs/f2fs/inode.c | 4 ++-- + fs/f2fs/namei.c | 5 +++++ + fs/f2fs/node.c | 10 ++++----- + fs/f2fs/node.h | 40 +++++++++++++-------------------- + fs/f2fs/recovery.c | 6 ++--- + fs/f2fs/super.c | 46 ++++++++++++++++++++++++++++++++++++++ + 12 files changed, 162 insertions(+), 58 deletions(-) +Merging fscache/fscache (bcd7351 Merge tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs) +$ git merge --no-ff fscache/fscache +Already up-to-date. +Merging fuse/for-next (c7263bc fuse: readdirplus: cleanup) +$ git merge --no-ff fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 51 ++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 36 insertions(+), 15 deletions(-) +Merging gfs2/master (1067f2a GFS2: Fix typo in gfs2_create_inode()) +$ git merge --no-ff gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/inode.c | 2 +- + fs/gfs2/lops.c | 18 ++++++++++++++++++ + fs/gfs2/meta_io.c | 18 ------------------ + fs/gfs2/meta_io.h | 26 +++++++++++--------------- + 4 files changed, 30 insertions(+), 34 deletions(-) +Merging jfs/jfs-next (eb8630d jfs: Update jfs_error) +$ git merge --no-ff jfs/jfs-next +Already up-to-date. +Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) +$ git merge --no-ff logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (76c34f3 NFSv4.1 Use the mount point rpc_clnt for layoutreturn) +$ git merge --no-ff nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4proc.c | 6 +-- + fs/nfs/nfs4state.c | 2 +- + fs/nfs/nfs4xdr.c | 125 +++++++++++++++++++++----------------------------- + net/sunrpc/rpc_pipe.c | 19 +------- + 4 files changed, 58 insertions(+), 94 deletions(-) +Merging nfsd/nfsd-next (1c327d9 lockd: protect nlm_blocked access in nlmsvc_retry_blocked) +$ git merge --no-ff nfsd/nfsd-next +Already up-to-date. +Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) +$ git merge --no-ff ocfs2/linux-next +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/ocfs2/cluster/heartbeat.c +Merge made by the 'recursive' strategy. + fs/ocfs2/cluster/heartbeat.c | 40 +++++++++------------------------------- + fs/ocfs2/cluster/masklog.h | 3 ++- + fs/ocfs2/dlm/dlmmaster.c | 8 +++++++- + fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ + 4 files changed, 25 insertions(+), 33 deletions(-) +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge --no-ff omfs/for-next +Already up-to-date. +Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) +$ git merge --no-ff squashfs/master +Already up-to-date. +Merging v9fs/for-next (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (beadadf UBIFS: correct mount message) +$ git merge --no-ff ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (d892d58 xfs: Start using pquotaino from the superblock.) +$ git merge --no-ff xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/xfs_aops.c | 15 ++++++++- + fs/xfs/xfs_log.c | 2 +- + fs/xfs/xfs_mount.c | 80 +++++++++++++++++++++++++++++++++++++++++++----- + fs/xfs/xfs_qm.c | 72 ++++++++++++++++++++++++++++++++----------- + fs/xfs/xfs_qm_syscalls.c | 35 ++++++++++++++++++--- + fs/xfs/xfs_sb.h | 13 ++++++-- + fs/xfs/xfs_super.c | 19 ++++++------ + 7 files changed, 191 insertions(+), 45 deletions(-) +Merging vfs/for-next (d405be4 ext4: ->tmpfile() support) +$ git merge --no-ff vfs/for-next +Resolved 'fs/ext4/namei.c' using previous resolution. +Auto-merging fs/ext4/namei.c +CONFLICT (content): Merge conflict in fs/ext4/namei.c +Auto-merging fs/coredump.c +Auto-merging fs/binfmt_elf.c +Auto-merging fs/binfmt_aout.c +Auto-merging arch/x86/ia32/ia32_aout.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a86e85d] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/kernel/elfcore.c | 13 ++--- + arch/powerpc/include/asm/spu.h | 3 +- + arch/powerpc/platforms/cell/spu_syscalls.c | 4 +- + arch/powerpc/platforms/cell/spufs/coredump.c | 64 ++++---------------- + arch/powerpc/platforms/cell/spufs/spufs.h | 2 +- + arch/x86/ia32/ia32_aout.c | 20 +++---- + arch/x86/um/elfcore.c | 16 ++--- + fs/binfmt_aout.c | 9 ++- + fs/binfmt_elf.c | 84 +++++++++++---------------- + fs/binfmt_elf_fdpic.c | 87 ++++++++++------------------ + fs/coredump.c | 62 ++++++++++++-------- + include/linux/binfmts.h | 1 + + include/linux/coredump.h | 5 +- + include/linux/elf.h | 7 ++- + include/linux/elfcore.h | 5 +- + kernel/elfcore.c | 6 +- + 16 files changed, 152 insertions(+), 236 deletions(-) +Merging pci/next (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff pci/next +Already up-to-date. +Merging hid/for-next (a9612c8 Merge branch 'for-3.12/upstream' into for-next) +$ git merge --no-ff hid/for-next +Auto-merging net/bluetooth/hidp/core.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Merge made by the 'recursive' strategy. + drivers/hid/hid-core.c | 22 +++++++++++++++++-- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-kye.c | 45 ++++++++++++++++++++++++--------------- + drivers/hid/hid-logitech-dj.c | 22 +++++++++++++------ + drivers/hid/hid-picolcd_debugfs.c | 23 ++++++++++---------- + drivers/hid/usbhid/hid-core.c | 5 ++--- + include/linux/hid.h | 1 + + net/bluetooth/hidp/core.c | 15 ++++++++----- + 8 files changed, 89 insertions(+), 45 deletions(-) +Merging i2c/i2c/for-next (97191d7 i2c-designware: use div_u64 to fix link) +$ git merge --no-ff i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (6f7e0b6 hwmon: (w83792d) Update module author) +$ git merge --no-ff jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + Documentation/hwmon/w83791d | 2 +- + Documentation/hwmon/w83792d | 3 +-- + drivers/hwmon/w83792d.c | 4 ++-- + 3 files changed, 4 insertions(+), 5 deletions(-) +Merging hwmon-staging/hwmon-next (7de362d hwmon: (nct6775) Avoid using device platform data outside probe function) +$ git merge --no-ff hwmon-staging/hwmon-next +Resolved 'drivers/hwmon/coretemp.c' using previous resolution. +Auto-merging drivers/hwmon/coretemp.c +CONFLICT (content): Merge conflict in drivers/hwmon/coretemp.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1532499] Merge remote-tracking branch 'hwmon-staging/hwmon-next' +$ git diff -M --stat --summary HEAD^.. + drivers/hwmon/coretemp.c | 14 +- + drivers/hwmon/nct6775.c | 2523 +++++++++++++++++++++++----------------------- + 2 files changed, 1260 insertions(+), 1277 deletions(-) +Merging v4l-dvb/master (2217438 Merge /home/v4l/v4l/for_upstream) +$ git merge --no-ff v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (cca867d Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge --no-ff 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 --no-ff kconfig/for-next +Already up-to-date. +Merging libata/for-next (50653e3 Merge branch 'for-3.11-fixes' into for-next) +$ git merge --no-ff libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/Kconfig | 2 +- + drivers/ata/ata_piix.c | 2 +- + drivers/ata/libata-scsi.c | 6 ++- + drivers/ata/sata_inic162x.c | 14 ++++++ + include/linux/ata.h | 102 -------------------------------------------- + include/linux/libata.h | 102 ++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 122 insertions(+), 106 deletions(-) +Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) +$ git merge --no-ff pstore/master +Already up-to-date. +Merging pm/linux-next (5d733b3 Merge branch 'acpi-assorted-next' into linux-next) +$ git merge --no-ff pm/linux-next +Removing drivers/cpufreq/mperf.h +Removing drivers/cpufreq/mperf.c +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/acpi/processor_driver.c +Auto-merging arch/x86/include/asm/processor.h +Merge made by the 'recursive' strategy. + Documentation/laptops/asus-laptop.txt | 8 +- + Documentation/laptops/sony-laptop.txt | 8 +- + Documentation/laptops/thinkpad-acpi.txt | 73 +----- + arch/x86/include/asm/processor.h | 29 --- + drivers/acpi/Kconfig | 18 -- + drivers/acpi/ac.c | 1 - + drivers/acpi/acpi_pad.c | 1 - + drivers/acpi/battery.c | 21 +- + drivers/acpi/bus.c | 120 +--------- + drivers/acpi/button.c | 2 - + drivers/acpi/dock.c | 396 ++++++++++---------------------- + drivers/acpi/ec.c | 4 +- + drivers/acpi/event.c | 106 --------- + drivers/acpi/power.c | 4 +- + drivers/acpi/processor_driver.c | 4 - + drivers/acpi/processor_perflib.c | 22 +- + drivers/acpi/resource.c | 4 +- + drivers/acpi/sbs.c | 15 +- + drivers/acpi/scan.c | 189 +++++---------- + drivers/acpi/sleep.c | 7 +- + drivers/acpi/thermal.c | 21 +- + drivers/acpi/utils.c | 70 ++++++ + drivers/acpi/video.c | 66 ++---- + drivers/acpi/video_detect.c | 19 +- + drivers/char/sonypi.c | 5 - + drivers/cpufreq/Makefile | 2 +- + drivers/cpufreq/acpi-cpufreq.c | 5 - + drivers/cpufreq/cpufreq.c | 12 - + drivers/cpufreq/cpufreq_governor.c | 10 +- + drivers/cpufreq/cpufreq_governor.h | 1 - + drivers/cpufreq/cpufreq_ondemand.c | 39 +--- + drivers/cpufreq/mperf.c | 51 ---- + drivers/cpufreq/mperf.h | 9 - + drivers/cpuidle/cpuidle.c | 94 ++++---- + drivers/cpuidle/governors/ladder.c | 12 +- + drivers/cpuidle/governors/menu.c | 12 +- + drivers/cpuidle/sysfs.c | 101 +++++--- + drivers/pci/hotplug/acpiphp.h | 1 - + drivers/pci/hotplug/acpiphp_glue.c | 48 +--- + drivers/pci/hotplug/acpiphp_ibm.c | 1 - + drivers/platform/x86/asus-laptop.c | 1 - + drivers/platform/x86/eeepc-laptop.c | 1 - + drivers/platform/x86/fujitsu-laptop.c | 4 - + drivers/platform/x86/panasonic-laptop.c | 3 - + drivers/platform/x86/sony-laptop.c | 4 - + drivers/platform/x86/thinkpad_acpi.c | 40 ---- + include/acpi/acpi_bus.h | 21 +- + include/acpi/acpi_drivers.h | 14 +- + include/linux/cpufreq.h | 6 - + include/linux/cpuidle.h | 9 +- + 50 files changed, 483 insertions(+), 1231 deletions(-) + delete mode 100644 drivers/cpufreq/mperf.c + delete mode 100644 drivers/cpufreq/mperf.h +Merging idle/next (5c99726b Merge branch 'fspin' into next) +$ git merge --no-ff idle/next +Merge made by the 'recursive' strategy. + tools/power/fspin/Makefile | 21 +++ + tools/power/fspin/fspin.1 | 68 +++++++ + tools/power/fspin/fspin.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 532 insertions(+) + create mode 100644 tools/power/fspin/Makefile + create mode 100644 tools/power/fspin/fspin.1 + create mode 100644 tools/power/fspin/fspin.c +Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) +$ git merge --no-ff apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) +$ git merge --no-ff cpupowerutils/master +Already up-to-date. +Merging thermal/next (ace120d Thermal: Fix lockup of cpu_down()) +$ git merge --no-ff thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/x86_pkg_temp_thermal.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) +Merging ieee1394/for-next (bcabcfd firewire: remove support of fw_driver.driver.probe and .remove methods) +$ git merge --no-ff ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (83ff59a UBI: support ubi_num on mtd.ubi command line) +$ git merge --no-ff ubi/linux-next +Already up-to-date. +Merging dlm/next (cfa805f dlm: Avoid LVB truncation) +$ git merge --no-ff 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 --no-ff swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (4eb3883 Merge branch 'topic/api_caps' into next) +$ git merge --no-ff slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/edma.c | 2 -- + drivers/dma/ep93xx_dma.c | 10 +--------- + drivers/dma/fsldma.c | 10 +--------- + drivers/dma/imx-sdma.c | 9 +++------ + drivers/dma/ipu/ipu_idmac.c | 5 +---- + drivers/dma/mmp_pdma.c | 10 +--------- + drivers/dma/mmp_tdma.c | 3 ++- + drivers/dma/mpc512x_dma.c | 10 +--------- + drivers/dma/mxs-dma.c | 4 +--- + drivers/dma/pch_dma.c | 9 +-------- + drivers/dma/pl330.c | 27 ++++++++++++++++++++++++++ + drivers/dma/tegra20-apb-dma.c | 8 +++----- + drivers/dma/txx9dmac.c | 13 ++++++------- + include/linux/dmaengine.h | 44 +++++++++++++++++++++++++++++++++++++++++++ + 14 files changed, 92 insertions(+), 72 deletions(-) +Merging dmaengine/next (41ef2d5 Linux 3.9-rc7) +$ git merge --no-ff dmaengine/next +Already up-to-date. +Merging net-next/master (eda2977 tun: Support software transmit time stamping.) +$ git merge --no-ff net-next/master +Merge made by the 'recursive' strategy. + drivers/isdn/hardware/mISDN/hfcpci.c | 12 ++++---- + drivers/net/ethernet/via/via-velocity.c | 20 +++++++++++++ + drivers/net/tun.c | 14 +++++++-- + include/net/sock.h | 2 ++ + include/uapi/linux/if_tun.h | 3 ++ + net/core/sock.c | 47 +++++++++++++++++++++++++++++++ + net/irda/irttp.c | 50 +++++++++++++++------------------ + net/packet/af_packet.c | 48 ++----------------------------- + 8 files changed, 115 insertions(+), 81 deletions(-) +Merging ipsec-next/master (0289094 af_key: constify lookup tables) +$ git merge --no-ff ipsec-next/master +Auto-merging net/key/af_key.c +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 2 +- + net/key/af_key.c | 6 +++--- + net/xfrm/xfrm_state.c | 12 +++++++----- + 3 files changed, 11 insertions(+), 9 deletions(-) +Merging wireless-next/master (c6c7788 wil6210: drop -Werror compiler flag) +$ git merge --no-ff wireless-next/master +Auto-merging drivers/net/wireless/rt2x00/Kconfig +Auto-merging drivers/net/wireless/ath/wil6210/debugfs.c +Auto-merging drivers/net/wireless/ath/ath9k/xmit.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 +- + drivers/bcma/Kconfig | 10 +- + drivers/bcma/main.c | 2 +- + drivers/bcma/scan.c | 28 +- + drivers/net/wireless/ath/ath9k/Kconfig | 10 + + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 51 +- + drivers/net/wireless/ath/ath9k/hw.c | 70 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 36 +- + drivers/net/wireless/ath/wil6210/Makefile | 3 - + drivers/net/wireless/ath/wil6210/debugfs.c | 4 +- + drivers/net/wireless/ath/wil6210/netdev.c | 2 + + drivers/net/wireless/ath/wil6210/trace.h | 22 +- + drivers/net/wireless/ath/wil6210/txrx.c | 160 ++- + drivers/net/wireless/ath/wil6210/txrx.h | 20 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 27 +- + drivers/net/wireless/ath/wil6210/wmi.c | 20 +- + drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 +- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 4 +- + drivers/net/wireless/cw1200/wsm.h | 2 +- + drivers/net/wireless/mwifiex/pcie.c | 26 +- + drivers/net/wireless/rt2x00/Kconfig | 6 + + drivers/net/wireless/rt2x00/rt2800.h | 274 +++- + drivers/net/wireless/rt2x00/rt2800lib.c | 1524 +++++++++++++++++++++-- + drivers/net/wireless/rt2x00/rt2800usb.c | 9 +- + drivers/net/wireless/rt2x00/rt2x00.h | 1 + + include/linux/bcma/bcma.h | 17 + + 27 files changed, 2053 insertions(+), 292 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 4f20501 Merge remote-tracking branch 'ipsec-next/master' +Merging next-20130722 version of wireless-next +$ git merge -m next-20130722/wireless-next ad81f0545ef01ea651886dddac4bef6cec930092 +Already up-to-date. +Merging bluetooth/master (f0868e1 Bluetooth: hidp: remove wrong send_report at init) +$ git merge --no-ff bluetooth/master +Resolved 'drivers/net/wireless/rtlwifi/ps.c' using previous resolution. +Auto-merging net/bluetooth/hidp/core.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging drivers/net/wireless/rtlwifi/ps.c +CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/ps.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b0bf703] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/ath3k.c | 2 ++ + drivers/bluetooth/btusb.c | 1 + + include/net/bluetooth/hci.h | 6 ++++++ + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/hci_event.c | 22 +++++++++++++--------- + net/bluetooth/hidp/core.c | 40 ++++++++++++++++++++++++++-------------- + net/bluetooth/l2cap_core.c | 3 ++- + 7 files changed, 51 insertions(+), 25 deletions(-) +Merging infiniband/for-next (e04abfa Merge branches 'mlx5', 'qib' and 'srp' into for-next) +$ git merge --no-ff infiniband/for-next +Already up-to-date. +Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd) +$ git merge --no-ff mtd/master +Already up-to-date. +Merging l2-mtd/master (fb1585b mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe) +$ git merge --no-ff l2-mtd/master +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging arch/mips/bcm63xx/nvram.c +Auto-merging arch/avr32/mach-at32ap/at32ap700x.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/atmel-nand.txt | 1 + + .../devicetree/bindings/mtd/fsmc-nand.txt | 25 +- + arch/avr32/mach-at32ap/at32ap700x.c | 3 + + arch/mips/bcm63xx/nvram.c | 11 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 + + drivers/mtd/bcm63xxpart.c | 9 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 4 +- + drivers/mtd/devices/bcm47xxsflash.c | 68 +++ + drivers/mtd/devices/bcm47xxsflash.h | 2 + + drivers/mtd/devices/block2mtd.c | 58 +-- + drivers/mtd/devices/elm.c | 124 ++++- + drivers/mtd/devices/m25p80.c | 44 +- + drivers/mtd/devices/mtd_dataflash.c | 8 +- + drivers/mtd/devices/spear_smi.c | 11 +- + drivers/mtd/devices/sst25l.c | 6 +- + drivers/mtd/maps/ixp4xx.c | 2 - + drivers/mtd/maps/latch-addr-flash.c | 1 - + drivers/mtd/maps/physmap.c | 1 - + drivers/mtd/maps/plat-ram.c | 2 - + drivers/mtd/maps/pxa2xx-flash.c | 2 - + drivers/mtd/maps/rbtx4939-flash.c | 1 - + drivers/mtd/maps/sa1100-flash.c | 1 - + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/ams-delta.c | 1 - + drivers/mtd/nand/atmel_nand.c | 25 +- + drivers/mtd/nand/bf5xx_nand.c | 3 - + drivers/mtd/nand/davinci_nand.c | 13 +- + drivers/mtd/nand/docg4.c | 2 - + drivers/mtd/nand/fsl_ifc_nand.c | 3 +- + drivers/mtd/nand/fsmc_nand.c | 26 +- + drivers/mtd/nand/gpio.c | 227 +++------ + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 +- + drivers/mtd/nand/jz4740_nand.c | 2 - + drivers/mtd/nand/lpc32xx_mlc.c | 2 - + drivers/mtd/nand/lpc32xx_slc.c | 2 - + drivers/mtd/nand/mxc_nand.c | 2 - + drivers/mtd/nand/nand_base.c | 27 +- + drivers/mtd/nand/nuc900_nand.c | 2 - + drivers/mtd/nand/omap2.c | 505 ++++++++++----------- + drivers/mtd/nand/orion_nand.c | 1 - + drivers/mtd/nand/plat_nand.c | 1 - + drivers/mtd/nand/pxa3xx_nand.c | 110 ++--- + drivers/mtd/nand/r852.c | 5 +- + drivers/mtd/nand/s3c2410.c | 2 - + drivers/mtd/nand/sharpsl.c | 3 - + drivers/mtd/nand/txx9ndfmc.c | 1 - + drivers/mtd/onenand/generic.c | 2 - + drivers/mtd/onenand/omap2.c | 1 - + drivers/mtd/onenand/samsung.c | 1 - + drivers/mtd/tests/mtd_oobtest.c | 12 +- + drivers/mtd/tests/mtd_pagetest.c | 20 +- + drivers/mtd/tests/mtd_readtest.c | 12 +- + drivers/mtd/tests/mtd_speedtest.c | 8 +- + drivers/mtd/tests/mtd_stresstest.c | 8 +- + drivers/mtd/tests/mtd_subpagetest.c | 12 +- + include/linux/mtd/fsmc.h | 1 + + include/linux/mtd/nand.h | 9 +- + include/linux/platform_data/atmel.h | 4 + + include/linux/platform_data/elm.h | 4 + + 59 files changed, 759 insertions(+), 702 deletions(-) +Merging crypto/master (aa2faec crypto: caam - Moved macro DESC_JOB_IO_LEN to desc_constr.h) +$ git merge --no-ff crypto/master +Auto-merging drivers/crypto/caam/caamhash.c +Merge made by the 'recursive' strategy. + drivers/crypto/caam/caamalg.c | 2 -- + drivers/crypto/caam/caamhash.c | 2 -- + drivers/crypto/caam/desc_constr.h | 1 + + 3 files changed, 1 insertion(+), 4 deletions(-) +Merging drm/drm-next (e13af9a Merge tag 'drm-intel-next-2013-07-12' of git://people.freedesktop.org/~danvet/drm-intel into drm-next) +$ git merge --no-ff drm/drm-next +Resolved 'drivers/gpu/drm/i915/i915_dma.c' using previous resolution. +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_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_dma.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1dea660] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_mm.c | 31 +- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 658 ++++--------------- + drivers/gpu/drm/i915/i915_dma.c | 22 +- + drivers/gpu/drm/i915/i915_drv.c | 33 +- + drivers/gpu/drm/i915/i915_drv.h | 184 ++++-- + drivers/gpu/drm/i915/i915_gem.c | 162 +++-- + drivers/gpu/drm/i915/i915_gem_context.c | 2 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 6 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 21 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 106 ++-- + drivers/gpu/drm/i915/i915_gem_stolen.c | 76 ++- + drivers/gpu/drm/i915/i915_gem_tiling.c | 14 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 971 +++++++++++++++++++++++++++++ + drivers/gpu/drm/i915/i915_irq.c | 742 ++++------------------ + drivers/gpu/drm/i915/i915_reg.h | 6 +- + drivers/gpu/drm/i915/i915_sysfs.c | 71 +++ + drivers/gpu/drm/i915/i915_trace.h | 8 +- + drivers/gpu/drm/i915/intel_display.c | 621 +++++++++++------- + drivers/gpu/drm/i915/intel_dp.c | 7 + + drivers/gpu/drm/i915/intel_drv.h | 24 +- + drivers/gpu/drm/i915/intel_dvo.c | 3 - + drivers/gpu/drm/i915/intel_fb.c | 8 +- + drivers/gpu/drm/i915/intel_lvds.c | 21 +- + drivers/gpu/drm/i915/intel_overlay.c | 18 +- + drivers/gpu/drm/i915/intel_pm.c | 110 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.c | 43 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 5 +- + drivers/gpu/drm/i915/intel_sdvo.c | 27 +- + drivers/gpu/drm/i915/intel_sprite.c | 8 +- + include/drm/drm_mm.h | 6 +- + 31 files changed, 2182 insertions(+), 1833 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_gpu_error.c +Merging drm-intel/for-linux-next (86281e1 drm/i915: fix up error cleanup in i915_gem_object_bind_to_gtt) +$ git merge --no-ff drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution. +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 +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_gem_stolen.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_dma.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 43055f7] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/i915_debugfs.c | 173 ++++++++- + drivers/gpu/drm/i915/i915_dma.c | 24 +- + drivers/gpu/drm/i915/i915_drv.c | 9 + + drivers/gpu/drm/i915/i915_drv.h | 182 ++++++---- + drivers/gpu/drm/i915/i915_gem.c | 156 +++++---- + drivers/gpu/drm/i915/i915_gem_context.c | 23 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 2 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 34 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 12 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 213 +++++++----- + drivers/gpu/drm/i915/i915_gem_stolen.c | 25 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 8 +- + drivers/gpu/drm/i915/i915_irq.c | 539 ++++++++++++----------------- + drivers/gpu/drm/i915/i915_reg.h | 80 +++++ + drivers/gpu/drm/i915/intel_crt.c | 4 + + drivers/gpu/drm/i915/intel_ddi.c | 2 + + drivers/gpu/drm/i915/intel_display.c | 185 +++++----- + drivers/gpu/drm/i915/intel_dp.c | 328 ++++++++++++++++-- + drivers/gpu/drm/i915/intel_drv.h | 6 + + drivers/gpu/drm/i915/intel_dvo.c | 2 + + drivers/gpu/drm/i915/intel_hdmi.c | 3 + + drivers/gpu/drm/i915/intel_lvds.c | 3 + + drivers/gpu/drm/i915/intel_pm.c | 75 ++-- + drivers/gpu/drm/i915/intel_sdvo.c | 3 + + drivers/gpu/drm/i915/intel_tv.c | 4 + + include/drm/drm_dp_helper.h | 31 +- + include/uapi/drm/i915_drm.h | 24 ++ + 27 files changed, 1386 insertions(+), 764 deletions(-) +Merging drm-tegra/drm/for-next (ebae30b gpu: host1x: Rework CPU syncpoint increment) +$ git merge --no-ff drm-tegra/drm/for-next +Already up-to-date. +Merging sound/for-next (b785a49 ALSA: replace strict_strto*() with kstrto*()) +$ git merge --no-ff sound/for-next +Auto-merging sound/soc/omap/mcbsp.c +Merge made by the 'recursive' strategy. + sound/drivers/dummy.c | 2 +- + sound/firewire/speakers.c | 4 +- + sound/pci/hda/hda_generic.c | 8 +- + sound/pci/hda/hda_hwdep.c | 6 +- + sound/pci/hda/hda_jack.c | 18 +- + sound/pci/hda/hda_jack.h | 13 +- + sound/pci/hda/patch_analog.c | 4662 +++------------------------------------- + sound/pci/hda/patch_conexant.c | 79 +- + sound/pci/rme9652/hdspm.c | 767 +++++-- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/omap/mcbsp.c | 2 +- + sound/soc/soc-core.c | 8 +- + 12 files changed, 902 insertions(+), 4669 deletions(-) +Merging sound-asoc/for-next (151d45e Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next) +$ git merge --no-ff sound-asoc/for-next +Auto-merging sound/soc/soc-core.c +Auto-merging sound/soc/codecs/wm8962.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4554.c | 11 + + .../devicetree/bindings/sound/atmel-wm8904.txt | 55 +++++ + .../{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} | 0 + .../devicetree/bindings/sound/tlv320aic3x.txt | 9 +- + drivers/misc/atmel-ssc.c | 11 +- + include/linux/atmel-ssc.h | 2 +- + include/linux/mfd/arizona/gpio.h | 96 ++++++++ + sound/soc/atmel/Kconfig | 11 + + sound/soc/atmel/Makefile | 2 + + sound/soc/atmel/atmel-pcm-dma.c | 118 ++-------- + sound/soc/atmel/atmel_ssc_dai.c | 36 +-- + sound/soc/atmel/atmel_wm8904.c | 254 +++++++++++++++++++++ + sound/soc/au1x/db1200.c | 4 + + sound/soc/cirrus/ep93xx-ac97.c | 4 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/adav80x.c | 13 +- + sound/soc/codecs/ak4554.c | 86 +++++++ + sound/soc/codecs/arizona.c | 36 +++ + sound/soc/codecs/arizona.h | 1 + + sound/soc/codecs/hdmi.c | 11 + + sound/soc/codecs/max98088.c | 2 +- + sound/soc/codecs/max98090.c | 10 +- + sound/soc/codecs/pcm3008.c | 108 +++------ + sound/soc/codecs/sgtl5000.c | 4 + + sound/soc/codecs/sta32x.c | 10 +- + sound/soc/codecs/tlv320aic3x.c | 4 + + sound/soc/codecs/twl6040.c | 3 +- + sound/soc/codecs/wm5102.c | 6 + + sound/soc/codecs/wm5110.c | 9 + + sound/soc/codecs/wm8350.c | 6 +- + sound/soc/codecs/wm8753.c | 5 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8962.c | 7 +- + sound/soc/codecs/wm8994.c | 33 +-- + sound/soc/fsl/Kconfig | 4 +- + sound/soc/fsl/fsl_ssi.c | 60 ++--- + sound/soc/fsl/imx-audmux.c | 16 +- + sound/soc/fsl/imx-mc13783.c | 1 + + sound/soc/fsl/imx-pcm-dma.c | 1 - + sound/soc/fsl/imx-pcm-fiq.c | 18 +- + sound/soc/fsl/imx-pcm.h | 15 +- + sound/soc/fsl/imx-sgtl5000.c | 4 +- + sound/soc/fsl/imx-ssi.c | 7 +- + sound/soc/fsl/imx-ssi.h | 1 + + sound/soc/fsl/imx-wm8962.c | 3 +- + sound/soc/kirkwood/Kconfig | 6 +- + sound/soc/kirkwood/kirkwood-i2s.c | 35 +-- + sound/soc/kirkwood/kirkwood-openrd.c | 2 - + sound/soc/kirkwood/kirkwood-t5325.c | 2 - + sound/soc/mxs/Kconfig | 2 +- + sound/soc/mxs/mxs-saif.c | 1 - + sound/soc/mxs/mxs-sgtl5000.c | 1 - + sound/soc/omap/Kconfig | 6 +- + sound/soc/omap/omap-mcbsp.c | 5 + + sound/soc/pxa/brownstone.c | 1 + + sound/soc/pxa/ttc-dkb.c | 1 + + sound/soc/samsung/spdif.c | 8 +- + sound/soc/soc-core.c | 4 +- + sound/soc/soc-dapm.c | 8 +- + sound/soc/soc-jack.c | 2 +- + sound/soc/soc-pcm.c | 5 +- + sound/soc/tegra/Kconfig | 14 +- + sound/soc/tegra/tegra20_ac97.c | 8 +- + sound/soc/tegra/tegra20_spdif.c | 4 +- + sound/soc/tegra/tegra_alc5632.c | 2 - + sound/soc/tegra/tegra_wm8753.c | 2 - + sound/soc/tegra/trimslice.c | 2 - + sound/soc/ux500/mop500.c | 1 + + 69 files changed, 864 insertions(+), 363 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/ak4554.c + create mode 100644 Documentation/devicetree/bindings/sound/atmel-wm8904.txt + rename Documentation/devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} (100%) + create mode 100644 include/linux/mfd/arizona/gpio.h + create mode 100644 sound/soc/atmel/atmel_wm8904.c + create mode 100644 sound/soc/codecs/ak4554.c +Merging modules/modules-next (9eb76d7 module: cleanup call chain.) +$ git merge --no-ff modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (c893c8d MAINTAINERS: add tools/virtio/ under virtio) +$ git merge --no-ff virtio/virtio-next +Already up-to-date. +Merging input/next (46146e7 Input: nspire-keypad - replace magic offset with define) +$ git merge --no-ff input/next +Already up-to-date. +Merging input-mt/for-next (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (ed55cff Merge branch 'for-3.12' into for-next) +$ git merge --no-ff cgroup/for-next +Auto-merging kernel/cgroup.c +Merge made by the 'recursive' strategy. + include/linux/cgroup.h | 3 +- + include/linux/cgroup_subsys.h | 45 +----- + kernel/cgroup.c | 336 +++++++++++++++++++++--------------------- + 3 files changed, 174 insertions(+), 210 deletions(-) +Merging block/for-next (3fe9649 Merge branch 'for-3.11/drivers' into for-next) +$ git merge --no-ff block/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-xen-blkback | 17 + + .../ABI/testing/sysfs-driver-xen-blkfront | 10 + + Documentation/bcache.txt | 37 +- + MAINTAINERS | 4 +- + drivers/block/Kconfig | 4 +- + drivers/block/drbd/drbd_actlog.c | 21 + + drivers/block/drbd/drbd_int.h | 15 +- + drivers/block/drbd/drbd_main.c | 61 +- + drivers/block/drbd/drbd_nl.c | 185 ++++- + drivers/block/drbd/drbd_receiver.c | 12 +- + drivers/block/drbd/drbd_state.c | 4 +- + drivers/block/rsxx/core.c | 359 ++++++++- + drivers/block/rsxx/cregs.c | 14 + + drivers/block/rsxx/dev.c | 33 +- + drivers/block/rsxx/dma.c | 185 ++--- + drivers/block/rsxx/rsxx_priv.h | 10 +- + drivers/block/xen-blkback/blkback.c | 872 +++++++++++++-------- + drivers/block/xen-blkback/common.h | 147 +++- + drivers/block/xen-blkback/xenbus.c | 85 ++ + drivers/block/xen-blkfront.c | 532 ++++++++++--- + drivers/md/bcache/alloc.c | 46 +- + drivers/md/bcache/bcache.h | 61 +- + drivers/md/bcache/bset.c | 56 +- + drivers/md/bcache/bset.h | 4 + + drivers/md/bcache/btree.c | 451 +++++------ + drivers/md/bcache/btree.h | 35 +- + drivers/md/bcache/closure.c | 6 +- + drivers/md/bcache/debug.c | 178 +---- + drivers/md/bcache/debug.h | 11 +- + drivers/md/bcache/io.c | 68 +- + drivers/md/bcache/journal.c | 25 +- + drivers/md/bcache/movinggc.c | 24 +- + drivers/md/bcache/request.c | 197 ++--- + drivers/md/bcache/request.h | 2 +- + drivers/md/bcache/super.c | 171 +++- + drivers/md/bcache/sysfs.c | 68 +- + drivers/md/bcache/trace.c | 47 +- + drivers/md/bcache/util.c | 17 - + drivers/md/bcache/util.h | 6 - + drivers/md/bcache/writeback.c | 133 +++- + drivers/md/bcache/writeback.h | 64 ++ + include/linux/drbd.h | 6 +- + include/linux/drbd_genl.h | 2 + + include/linux/drbd_limits.h | 9 + + include/trace/events/bcache.h | 381 ++++++--- + include/xen/interface/io/blkif.h | 53 ++ + include/xen/interface/io/ring.h | 5 + + 47 files changed, 3183 insertions(+), 1550 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkback + create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkfront + create mode 100644 drivers/md/bcache/writeback.h +Merging device-mapper/master (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff device-mapper/master +Already up-to-date. +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge --no-ff embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge --no-ff firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge --no-ff pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (bfffbea Merge tag 'mmc-updates-for-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc) +$ git merge --no-ff mmc/mmc-next +Already up-to-date. +Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) +$ git merge --no-ff kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (0450b0c Merge branch 'slab/next' into for-next) +$ git merge --no-ff slab/for-next +Auto-merging mm/slub.c +Merge made by the 'recursive' strategy. + mm/slub.c | 98 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 57 insertions(+), 41 deletions(-) +Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) +$ git merge --no-ff uclinux/for-next +Already up-to-date. +Merging md/for-next (ca37218 md/raid5: make release_stripe lockless) +$ git merge --no-ff md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 13 +- + drivers/md/md.h | 8 + + drivers/md/raid1.c | 27 +--- + drivers/md/raid5.c | 459 +++++++++++++++++++++++++++++++++++++++++++++++++--- + drivers/md/raid5.h | 22 +++ + fs/bio.c | 27 ++++ + include/linux/bio.h | 1 + + 7 files changed, 502 insertions(+), 55 deletions(-) +Merging mfd/master (25f311f mfd: sec: Provide max_register to regmap) +$ git merge --no-ff mfd/master +Already up-to-date. +Merging battery/master (5a6c220 charger-manager: Fix regulator_get() return check) +$ git merge --no-ff battery/master +Already up-to-date. +Merging fbdev/for-next (5e8be02 video: atmel_lcdfb: add device tree suport) +$ git merge --no-ff fbdev/for-next +Auto-merging arch/avr32/mach-at32ap/at32ap700x.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/video/atmel,lcdc.txt | 75 +++++ + arch/arm/mach-at91/at91sam9261_devices.c | 6 +- + arch/arm/mach-at91/at91sam9263_devices.c | 6 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 6 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 6 +- + arch/arm/mach-at91/board-sam9261ek.c | 10 +- + arch/arm/mach-at91/board-sam9263ek.c | 6 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 4 +- + arch/arm/mach-at91/board-sam9rlek.c | 6 +- + arch/arm/mach-at91/board.h | 4 +- + arch/avr32/boards/atngw100/evklcd10x.c | 8 +- + arch/avr32/boards/atngw100/mrmt.c | 4 +- + arch/avr32/boards/atstk1000/atstk1000.h | 2 +- + arch/avr32/boards/atstk1000/setup.c | 2 +- + arch/avr32/boards/favr-32/setup.c | 2 +- + arch/avr32/boards/hammerhead/setup.c | 2 +- + arch/avr32/boards/merisc/display.c | 2 +- + arch/avr32/boards/mimc200/setup.c | 4 +- + arch/avr32/mach-at32ap/at32ap700x.c | 8 +- + arch/avr32/mach-at32ap/include/mach/board.h | 4 +- + drivers/video/Kconfig | 2 + + drivers/video/atmel_lcdfb.c | 343 +++++++++++++++++---- + include/video/atmel_lcdc.h | 25 +- + 23 files changed, 402 insertions(+), 135 deletions(-) + create mode 100644 Documentation/devicetree/bindings/video/atmel,lcdc.txt +Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) +$ git merge --no-ff viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning) +$ git merge --no-ff omap_dss2/for-next +Merge made by the 'recursive' strategy. +Merging regulator/for-next (72f5372 Merge remote-tracking branch 'regulator/topic/sec' into regulator-next) +$ git merge --no-ff regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/88pm800.txt | 38 +++ + .../devicetree/bindings/regulator/palmas-pmic.txt | 4 +- + .../devicetree/bindings/regulator/regulator.txt | 2 + + drivers/regulator/88pm800.c | 380 +++++++++++++++++++++ + drivers/regulator/Kconfig | 254 +++++++------- + drivers/regulator/Makefile | 3 +- + drivers/regulator/core.c | 112 +++++- + drivers/regulator/lp872x.c | 9 +- + drivers/regulator/lp8755.c | 1 + + drivers/regulator/of_regulator.c | 12 +- + drivers/regulator/s2mps11.c | 241 ++++++++++--- + drivers/regulator/wm831x-ldo.c | 104 ++---- + drivers/regulator/wm8350-regulator.c | 55 +-- + drivers/regulator/wm8400-regulator.c | 50 +-- + include/linux/mfd/samsung/s2mps11.h | 11 + + include/linux/regulator/consumer.h | 7 +- + include/linux/regulator/driver.h | 25 ++ + include/linux/regulator/machine.h | 1 + + 18 files changed, 971 insertions(+), 338 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/88pm800.txt + create mode 100644 drivers/regulator/88pm800.c +Merging security/next (be0306b Merge branch 'linus-master'; commit 'v3.11-rc2' into ra-next) +$ git merge --no-ff security/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) +$ git merge --no-ff selinux/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lblnet/master (d4b6739 SELinux: fix selinuxfs policy file on big endian systems) +$ git merge --no-ff lblnet/master +Auto-merging security/capability.c +Merge made by the 'recursive' strategy. + include/linux/security.h | 26 ++- + security/capability.c | 15 +- + security/security.c | 13 +- + security/selinux/hooks.c | 18 +- + security/selinux/include/xfrm.h | 45 ++-- + security/selinux/netnode.c | 2 + + security/selinux/ss/ebitmap.c | 20 +- + security/selinux/ss/ebitmap.h | 10 +- + security/selinux/ss/mls.c | 22 +- + security/selinux/ss/mls_types.h | 2 +- + security/selinux/ss/policydb.c | 3 +- + security/selinux/xfrm.c | 453 ++++++++++++++++++---------------------- + 12 files changed, 306 insertions(+), 323 deletions(-) +Merging watchdog/master (47188d3 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge --no-ff watchdog/master +Already up-to-date. +Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) +$ git merge --no-ff dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (01ce784 Merge branches 'x86/vt-d', 'arm/omap', 'core', 'x86/amd' and 'arm/smmu' into next) +$ git merge --no-ff iommu/next +Already up-to-date. +Merging vfio/next (47188d3 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge --no-ff vfio/next +Already up-to-date. +Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) +$ git merge --no-ff osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge --no-ff jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (8ecada1 doc: printk-formats: fix format specifier to %p[Ii]4[hnbl]) +$ git merge --no-ff trivial/for-next +Auto-merging Documentation/printk-formats.txt +Merge made by the 'recursive' strategy. + Documentation/printk-formats.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge --no-ff audit/for-next +Already up-to-date. +Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) +$ git merge --no-ff fsnotify/for-next +Already up-to-date. +Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device) +$ git merge --no-ff edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (aad19e5 EDAC, MCE, AMD: Add an MCE signature for new Fam15h models) +$ git merge --no-ff edac-amd/for-next +Already up-to-date. +Merging devicetree/devicetree/next (6dd18e4 of: Fix address decoding on Bimini and js2x machines) +$ git merge --no-ff devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (d683b96 Linux 3.10-rc4) +$ git merge --no-ff dt-rh/for-next +Already up-to-date. +Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration) +$ git merge --no-ff spi/spi/next +Already up-to-date. +Merging spi-mb/for-next (c1ad66b Merge remote-tracking branch 'spi/topic/xilinx' into spi-next) +$ git merge --no-ff spi-mb/for-next +Merge made by the 'recursive' strategy. + drivers/spi/Kconfig | 11 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-atmel.c | 12 +- + drivers/spi/spi-bfin-v3.c | 973 ++++++++++++++++++++++++++++++++++++++++ + drivers/spi/spi-bitbang.c | 261 +++++------ + drivers/spi/spi-clps711x.c | 6 - + drivers/spi/spi-ep93xx.c | 351 ++++----------- + drivers/spi/spi-imx.c | 75 ++-- + drivers/spi/spi-mxs.c | 23 +- + drivers/spi/spi-omap-100k.c | 276 ++++-------- + drivers/spi/spi-pxa2xx.c | 9 +- + drivers/spi/spi-s3c64xx.c | 41 +- + drivers/spi/spi-sirf.c | 1 + + drivers/spi/spi-tegra114.c | 1 - + drivers/spi/spi-tle62x0.c | 3 +- + drivers/spi/spi-xilinx.c | 172 +++---- + drivers/spi/spi.c | 13 + + include/linux/spi/spi.h | 7 + + include/linux/spi/spi_bitbang.h | 5 - + 19 files changed, 1407 insertions(+), 834 deletions(-) + create mode 100644 drivers/spi/spi-bfin-v3.c +Merging tip/auto-latest (54396a6 Merge branch 'x86/urgent') +$ git merge --no-ff tip/auto-latest +Auto-merging kernel/sched/core.c +Auto-merging kernel/events/core.c +Auto-merging arch/x86/kernel/head_32.S +Merge made by the 'recursive' strategy. + arch/x86/include/asm/alternative.h | 1 + + arch/x86/include/asm/bitops.h | 46 +++++++++------- + arch/x86/include/asm/cpufeature.h | 17 +++--- + arch/x86/include/asm/mutex_64.h | 30 +++++++++++ + arch/x86/include/asm/sync_bitops.h | 24 ++++----- + arch/x86/kernel/alternative.c | 106 +++++++++++++++++++++++++++++++++++++ + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/jump_label.c | 16 +++++- + include/linux/lockdep.h | 92 ++++++++------------------------ + kernel/events/core.c | 79 ++++++++++++++------------- + kernel/kprobes.c | 2 +- + kernel/lglock.c | 12 ++--- + kernel/sched/core.c | 2 +- + 13 files changed, 272 insertions(+), 157 deletions(-) +Merging ftrace/for-next (e70e78e tracing: Kill the unbalanced tr->ref++ in tracing_buffers_open()) +$ git merge --no-ff ftrace/for-next +Merge made by the 'recursive' strategy. + include/trace/ftrace.h | 4 -- + kernel/trace/ring_buffer.c | 26 +++++----- + kernel/trace/trace.c | 34 +++++++++---- + kernel/trace/trace.h | 10 +++- + kernel/trace/trace_event_perf.c | 10 +++- + kernel/trace/trace_events.c | 98 +++++++++++++++++------------------- + kernel/trace/trace_events_filter.c | 4 +- + kernel/trace/trace_functions.c | 2 +- + kernel/trace/trace_functions_graph.c | 54 ++++++++++---------- + kernel/trace/trace_kprobe.c | 29 ++++++----- + kernel/trace/trace_mmiotrace.c | 8 +-- + kernel/trace/trace_output.c | 14 +++--- + kernel/trace/trace_syscalls.c | 26 ++++------ + kernel/trace/trace_uprobe.c | 2 - + 14 files changed, 166 insertions(+), 155 deletions(-) +Merging rcu/rcu/next (0f791c9 nohz_full: Force RCU's grace-period kthreads onto timekeeping CPU) +$ git merge --no-ff rcu/rcu/next +Auto-merging kernel/rcutree_plugin.h +Auto-merging kernel/rcutree.h +Auto-merging kernel/rcutree.c +Auto-merging kernel/rcutorture.c +Merge made by the 'recursive' strategy. + Documentation/RCU/RTFP.txt | 855 ++++++++++++++++++++++++-------------- + Documentation/RCU/rcubarrier.txt | 12 +- + Documentation/RCU/torture.txt | 10 + + Documentation/memory-barriers.txt | 10 +- + Documentation/timers/NO_HZ.txt | 44 +- + include/linux/debugobjects.h | 6 +- + include/linux/rcupdate.h | 22 +- + kernel/rcu.h | 10 +- + kernel/rcupdate.c | 100 ----- + kernel/rcutorture.c | 334 ++++++--------- + kernel/rcutree.c | 133 +++--- + kernel/rcutree.h | 17 + + kernel/rcutree_plugin.h | 413 +++++++++++++++++- + kernel/time/Kconfig | 23 + + lib/debugobjects.c | 20 +- + 15 files changed, 1316 insertions(+), 693 deletions(-) +Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) +$ git merge --no-ff cputime/cputime +Already up-to-date. +Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge --no-ff uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (103af0a perf, kvm: Support the in_tx/in_tx_cp modifiers in KVM arch perfmon emulation v5) +$ git merge --no-ff kvm/linux-next +Auto-merging kernel/sched/core.c +Merge made by the 'recursive' strategy. + arch/arm/kvm/arm.c | 4 + + arch/ia64/kvm/kvm-ia64.c | 4 + + arch/mips/kvm/kvm_mips.c | 4 + + arch/powerpc/kvm/powerpc.c | 4 + + arch/s390/kvm/diag.c | 17 +++- + arch/s390/kvm/kvm-s390.c | 4 + + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/include/asm/pvclock.h | 1 - + arch/x86/kernel/pvclock.c | 44 --------- + arch/x86/kvm/mmu.c | 5 +- + arch/x86/kvm/pmu.c | 25 ++++-- + arch/x86/kvm/vmx.c | 193 ++++++++++++++++++++++++++-------------- + arch/x86/kvm/x86.c | 19 ++-- + arch/x86/vdso/vclock_gettime.c | 16 ++-- + include/linux/kvm_host.h | 5 ++ + include/linux/sched.h | 8 -- + kernel/sched/core.c | 15 ---- + virt/kvm/kvm_main.c | 113 +++++++++++++++++++---- + 18 files changed, 302 insertions(+), 180 deletions(-) +Merging kvm-arm/kvm-arm-next (8bd4ffd ARM: kvm: don't include drivers/virtio/Kconfig) +$ git merge --no-ff kvm-arm/kvm-arm-next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (20f7462 Merge remote-tracking branch 'cmadma/for-v3.12-cma-dma' into kvm-ppc-next) +$ git merge --no-ff kvm-ppc/kvm-ppc-next +Resolved 'mm/Kconfig' using previous resolution. +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging drivers/base/Makefile +Auto-merging arch/arm/mm/dma-mapping.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d2421b9] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/include/asm/dma-contiguous.h | 2 +- + arch/arm/mm/dma-mapping.c | 6 +++--- + drivers/base/Kconfig | 20 ++++---------------- + drivers/base/Makefile | 2 +- + include/linux/dma-contiguous.h | 2 +- + mm/Kconfig | 24 ++++++++++++++++++++++++ + 6 files changed, 34 insertions(+), 22 deletions(-) +Merging oprofile/for-next (f722406 Linux 3.10-rc1) +$ git merge --no-ff oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) +$ git merge --no-ff fw-nohz/nohz/next +Already up-to-date. +Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes) +$ git merge --no-ff xen/upstream/xen +Already up-to-date. +Merging xen-two/linux-next (21f3c04 Merge branch 'stable/for-linus-3.11' into linux-next) +$ git merge --no-ff xen-two/linux-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging xen-arm/linux-next (176455e xen/arm and xen/arm64: implement HYPERVISOR_tmem_op) +$ git merge --no-ff xen-arm/linux-next +Already up-to-date. +Merging percpu/for-next (a424445 percpu-refcount: use RCU-sched insted of normal RCU) +$ git merge --no-ff percpu/for-next +Already up-to-date. +Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for-next) +$ git merge --no-ff workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/linux-next (de91b53 x86 platform drivers: fix gpio leak) +$ git merge --no-ff drivers-x86/linux-next +Merge made by the 'recursive' strategy. +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge --no-ff hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) +$ git merge --no-ff sysctl/master +Already up-to-date. +Merging regmap/for-next (78fd817 Merge remote-tracking branch 'regmap/topic/patch' into regmap-next) +$ git merge --no-ff regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap.c | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) +Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) +$ git merge --no-ff hsi/for-next +Already up-to-date. +Merging leds/for-next (9394690 leds: support new LP8501 device - another LP55xx common) +$ git merge --no-ff leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-lp55xx.txt | 72 +++- + Documentation/devicetree/bindings/leds/pca9633.txt | 45 +++ + Documentation/leds/leds-lp55xx.txt | 30 +- + drivers/leds/Kconfig | 18 +- + drivers/leds/Makefile | 1 + + drivers/leds/leds-lp55xx-common.c | 3 + + drivers/leds/leds-lp8501.c | 410 +++++++++++++++++++++ + drivers/leds/leds-pca9633.c | 71 ++++ + include/linux/platform_data/leds-lp55xx.h | 10 + + 9 files changed, 653 insertions(+), 7 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/pca9633.txt + create mode 100644 drivers/leds/leds-lp8501.c +Merging driver-core/driver-core-next (3b2f64d Linux 3.11-rc2) +$ git merge --no-ff driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (3b2f64d Linux 3.11-rc2) +$ git merge --no-ff tty/tty-next +Already up-to-date. +Merging usb/usb-next (3b2f64d Linux 3.11-rc2) +$ git merge --no-ff usb/usb-next +Already up-to-date. +Merging usb-gadget/next (b1fd6cb usb: dwc3: omap: Adds dwc3_omap_readl/writel wrappers) +$ git merge --no-ff usb-gadget/next +Already up-to-date. +Merging staging/staging-next (3b2f64d Linux 3.11-rc2) +$ git merge --no-ff staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (3b2f64d Linux 3.11-rc2) +$ git merge --no-ff char-misc/char-misc-next +Already up-to-date. +Merging scsi/for-next (d26911a Merge branch 'misc' into for-next) +$ git merge --no-ff scsi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging target-updates/for-next (ca40d24 iser-target: Ignore non TEXT + LOGOUT opcodes for discovery) +$ git merge --no-ff target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (317ddd2 Linux 3.10-rc5) +$ git merge --no-ff target-merge/for-next-merge +Already up-to-date. +Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) +$ git merge --no-ff ibft/linux-next +Already up-to-date. +Merging isci/all (6734092 isci: add a couple __iomem annotations) +$ git merge --no-ff isci/all +Already up-to-date. +Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation) +$ git merge --no-ff bcon/master +Resolved 'drivers/block/Kconfig' using previous resolution. +Auto-merging kernel/printk.c +Auto-merging init/do_mounts.c +Auto-merging include/linux/mount.h +Auto-merging include/linux/console.h +Auto-merging drivers/net/netconsole.c +Auto-merging drivers/block/Makefile +Auto-merging drivers/block/Kconfig +CONFLICT (content): Merge conflict in drivers/block/Kconfig +Auto-merging block/partitions/check.h +Auto-merging block/partitions/check.c +Auto-merging block/partitions/Makefile +Auto-merging Documentation/networking/netconsole.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5114d82] Merge remote-tracking branch 'bcon/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/blockconsole.txt | 94 ++++ + Documentation/block/blockconsole/bcon_tail | 82 ++++ + Documentation/block/blockconsole/mkblockconsole | 29 ++ + Documentation/networking/netconsole.txt | 16 +- + block/partitions/Makefile | 1 + + block/partitions/blockconsole.c | 22 + + block/partitions/check.c | 3 + + block/partitions/check.h | 3 + + drivers/block/Kconfig | 6 + + drivers/block/Makefile | 1 + + drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++ + drivers/net/netconsole.c | 2 +- + include/linux/blockconsole.h | 7 + + include/linux/console.h | 1 + + include/linux/mount.h | 2 +- + init/do_mounts.c | 2 +- + kernel/printk.c | 5 +- + 17 files changed, 885 insertions(+), 9 deletions(-) + create mode 100644 Documentation/block/blockconsole.txt + create mode 100755 Documentation/block/blockconsole/bcon_tail + create mode 100755 Documentation/block/blockconsole/mkblockconsole + create mode 100644 block/partitions/blockconsole.c + create mode 100644 drivers/block/blockconsole.c + create mode 100644 include/linux/blockconsole.h +Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) +$ git merge --no-ff tmem/linux-next +Already up-to-date. +Merging writeback/writeback-for-next (8bb495e Linux 3.10) +$ git merge --no-ff writeback/writeback-for-next +Already up-to-date. +Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) +$ git merge --no-ff arm-dt/devicetree/arm-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge --no-ff hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (f2577e7 Merge branch 'devel' into for-next) +$ git merge --no-ff pinctrl/for-next +Merge made by the 'recursive' strategy. + Documentation/pinctrl.txt | 91 ++++++++++++++++++++++++++++++++--- + arch/arm/boot/dts/atlas6.dtsi | 22 ++++++--- + arch/arm/boot/dts/prima2.dtsi | 16 +++--- + drivers/pinctrl/Kconfig | 2 +- + drivers/pinctrl/core.c | 56 ++++++++++----------- + drivers/pinctrl/pinctrl-baytrail.c | 41 +++++++++------- + drivers/pinctrl/pinctrl-imx.c | 3 -- + drivers/pinctrl/pinctrl-single.c | 2 + + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 1 + + drivers/pinctrl/sirf/pinctrl-atlas6.c | 24 ++++++++- + drivers/pinctrl/sirf/pinctrl-sirf.c | 8 +-- + include/dt-bindings/pinctrl/am33xx.h | 2 +- + 12 files changed, 190 insertions(+), 78 deletions(-) +Merging vhost/linux-next (22fa90c vhost: Remove custom vhost rcu usage) +$ git merge --no-ff vhost/linux-next +Auto-merging drivers/vhost/scsi.c +Merge made by the 'recursive' strategy. + drivers/vhost/net.c | 37 ++++++++++++++++--------------------- + drivers/vhost/scsi.c | 17 ++++++----------- + drivers/vhost/test.c | 6 ++---- + drivers/vhost/vhost.h | 10 ++-------- + 4 files changed, 26 insertions(+), 44 deletions(-) +Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) +$ git merge --no-ff memblock/memblock-kill-early_node_map +Already up-to-date. +Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO) +$ git merge --no-ff remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge --no-ff rpmsg/for-next +Already up-to-date. +Merging irqdomain/irqdomain/next (798f0fd irq: fix checkpatch error) +$ git merge --no-ff irqdomain/irqdomain/next +Already up-to-date. +Merging gpio/gpio/next (644c8df gpio: sx150x: convert to use devm_* functions) +$ git merge --no-ff gpio/gpio/next +Already up-to-date. +Merging gpio-lw/for-next (cd2f7f0 Merge branch 'devel' into for-next) +$ git merge --no-ff gpio-lw/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-tz1090-pdc.txt | 45 ++ + .../devicetree/bindings/gpio/gpio-tz1090.txt | 88 +++ + .../devicetree/bindings/gpio/mrvl-gpio.txt | 7 +- + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 8 + + drivers/gpio/Kconfig | 27 + + drivers/gpio/Makefile | 3 + + drivers/gpio/gpio-em.c | 25 + + drivers/gpio/gpio-kempld.c | 225 ++++++++ + drivers/gpio/gpio-msm-v2.c | 2 +- + drivers/gpio/gpio-mxc.c | 37 +- + drivers/gpio/gpio-omap.c | 84 ++- + drivers/gpio/gpio-pxa.c | 13 +- + drivers/gpio/gpio-twl6040.c | 6 +- + drivers/gpio/gpio-tz1090-pdc.c | 243 +++++++++ + drivers/gpio/gpio-tz1090.c | 606 +++++++++++++++++++++ + drivers/gpio/gpiolib.c | 8 +- + include/linux/platform_data/gpio-em.h | 1 + + 17 files changed, 1363 insertions(+), 65 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-tz1090-pdc.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-tz1090.txt + create mode 100644 drivers/gpio/gpio-kempld.c + create mode 100644 drivers/gpio/gpio-tz1090-pdc.c + create mode 100644 drivers/gpio/gpio-tz1090.c +Merging arm-soc/for-next (f681e48 Merge branch 'fixes' into for-next) +$ git merge --no-ff arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 345 +++++++++++++++++++++++++++++++++ + 1 file changed, 345 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging bcm2835/for-next (7d13205 Linux 3.10-rc6) +$ git merge --no-ff bcm2835/for-next +Already up-to-date. +Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function) +$ git merge --no-ff cortex/for-next +Merge made by the 'recursive' strategy. + arch/arm/kernel/entry-v7m.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ep93xx/ep93xx-for-next (9c59be7 Merge branch 'ep93xx-devel' into ep93xx-for-next) +$ git merge --no-ff ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-ep93xx/Kconfig | 1 + + arch/arm/mach-ep93xx/core.c | 108 ++++++++++++++++++++++++++- + arch/arm/mach-ep93xx/include/mach/platform.h | 3 +- + 3 files changed, 110 insertions(+), 2 deletions(-) +Merging imx-mxs/for-next (395e853 Merge branch 'mxs/dt' into for-next) +$ git merge --no-ff imx-mxs/for-next +Recorded preimage for 'arch/arm/Kconfig.debug' +Auto-merging arch/arm/Kconfig.debug +CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/Kconfig.debug'. +[master 31f0dde] Merge remote-tracking branch 'imx-mxs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/bus/imx-weim.txt | 17 +- + .../devicetree/bindings/clock/imx27-clock.txt | 1 + + arch/arm/Kconfig.debug | 8 + + arch/arm/boot/dts/Makefile | 5 + + arch/arm/boot/dts/imx23-evk.dts | 15 + + arch/arm/boot/dts/imx23-olinuxino.dts | 4 + + arch/arm/boot/dts/imx23.dtsi | 15 +- + arch/arm/boot/dts/imx25.dtsi | 35 +- + arch/arm/boot/dts/imx27-apf27dev.dts | 5 + + arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 93 + + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 44 + + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 13 + + arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 98 +- + arch/arm/boot/dts/imx27.dtsi | 114 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 7 +- + arch/arm/boot/dts/imx28-cfa10037.dts | 19 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 73 +- + arch/arm/boot/dts/imx28-cfa10055.dts | 38 +- + arch/arm/boot/dts/imx28-cfa10056.dts | 119 ++ + arch/arm/boot/dts/imx28-cfa10057.dts | 23 +- + arch/arm/boot/dts/imx28-cfa10058.dts | 141 ++ + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-m28evk.dts | 15 +- + arch/arm/boot/dts/imx28.dtsi | 47 +- + arch/arm/boot/dts/imx31.dtsi | 17 + + arch/arm/boot/dts/imx51-babbage.dts | 14 +- + arch/arm/boot/dts/imx51.dtsi | 103 +- + arch/arm/boot/dts/imx53-mba53.dts | 2 +- + arch/arm/boot/dts/imx53-qsb.dts | 4 + + arch/arm/boot/dts/imx53.dtsi | 87 +- + arch/arm/boot/dts/imx6dl-pinfunc.h | 2138 ++++++++++---------- + arch/arm/boot/dts/imx6dl-sabreauto.dts | 22 - + arch/arm/boot/dts/imx6dl-sabresd.dts | 19 - + arch/arm/boot/dts/imx6dl-wandboard.dts | 24 +- + arch/arm/boot/dts/imx6dl.dtsi | 248 +-- + arch/arm/boot/dts/imx6q-arm2.dts | 14 +- + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 6 +- + arch/arm/boot/dts/imx6q-pinfunc.h | 2050 +++++++++---------- + arch/arm/boot/dts/imx6q-sabreauto.dts | 22 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 20 +- + arch/arm/boot/dts/imx6q-sabresd.dts | 19 +- + arch/arm/boot/dts/imx6q-wandboard.dts | 26 + + arch/arm/boot/dts/imx6q.dtsi | 387 +--- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 22 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 60 + + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 132 ++ + arch/arm/boot/dts/imx6qdl.dtsi | 776 ++++++- + arch/arm/boot/dts/imx6sl.dtsi | 35 +- + arch/arm/boot/dts/vf610.dtsi | 8 +- + arch/arm/configs/imx_v4_v5_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 9 + + arch/arm/include/debug/vf.S | 26 + + arch/arm/mach-imx/Kconfig | 1 + + arch/arm/mach-imx/Makefile | 3 +- + arch/arm/mach-imx/clk-fixup-div.c | 129 ++ + arch/arm/mach-imx/clk-fixup-mux.c | 107 + + arch/arm/mach-imx/clk-imx6q.c | 29 +- + arch/arm/mach-imx/clk-imx6sl.c | 20 +- + arch/arm/mach-imx/clk-pllv3.c | 15 +- + arch/arm/mach-imx/clk-vf610.c | 2 + + arch/arm/mach-imx/clk.c | 26 + + arch/arm/mach-imx/clk.h | 10 + + arch/arm/mach-imx/common.h | 6 + + arch/arm/mach-imx/mach-imx6q.c | 102 +- + arch/arm/mach-imx/mach-imx6sl.c | 3 +- + arch/arm/mach-imx/mx27.h | 2 +- + arch/arm/mach-imx/system.c | 33 + + arch/arm/mach-mxs/mach-mxs.c | 5 +- + arch/arm/mach-mxs/pm.c | 1 + + drivers/bus/Kconfig | 3 +- + drivers/bus/imx-weim.c | 129 +- + include/dt-bindings/clock/vf610-clock.h | 4 +- + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 16 +- + 74 files changed, 4737 insertions(+), 3153 deletions(-) + create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts + create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts + create mode 100644 arch/arm/boot/dts/imx28-cfa10056.dts + create mode 100644 arch/arm/boot/dts/imx28-cfa10058.dts + create mode 100644 arch/arm/boot/dts/imx6q-wandboard.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-wandboard.dtsi + create mode 100644 arch/arm/include/debug/vf.S + create mode 100644 arch/arm/mach-imx/clk-fixup-div.c + create mode 100644 arch/arm/mach-imx/clk-fixup-mux.c +Merging ixp4xx/next (19f949f Linux 3.8) +$ git merge --no-ff ixp4xx/next +Already up-to-date. +Merging msm/for-next (d701eda ARM: dts: msm: Fix merge resolution) +$ git merge --no-ff msm/for-next +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff mvebu/for-next +Already up-to-date. +Merging renesas/next (833574a Merge tag 'renesas-clocksource-for-v3.12' into next) +$ git merge --no-ff renesas/next +Removing arch/arm/mach-shmobile/include/mach/dma.h +Merge made by the 'recursive' strategy. + arch/arm/mach-shmobile/board-ag5evm.c | 65 ++--- + arch/arm/mach-shmobile/board-ape6evm.c | 2 - + arch/arm/mach-shmobile/board-armadillo800eva.c | 9 - + arch/arm/mach-shmobile/board-kzm9d.c | 2 +- + arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 - + arch/arm/mach-shmobile/board-lager.c | 2 - + arch/arm/mach-shmobile/board-mackerel.c | 34 +-- + arch/arm/mach-shmobile/clock-emev2.c | 2 +- + arch/arm/mach-shmobile/include/mach/dma.h | 1 - + arch/arm/mach-shmobile/include/mach/emev2.h | 2 +- + arch/arm/mach-shmobile/include/mach/r8a7778.h | 1 - + arch/arm/mach-shmobile/setup-emev2.c | 353 +++++-------------------- + arch/arm/mach-shmobile/setup-r8a73a4.c | 2 - + arch/arm/mach-shmobile/setup-r8a7740.c | 16 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 72 ++--- + arch/arm/mach-shmobile/setup-r8a7779.c | 7 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 7 - + arch/arm/mach-shmobile/setup-sh7372.c | 7 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 34 +-- + arch/sh/boards/mach-ecovec24/setup.c | 37 +-- + arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 48 ---- + arch/sh/boards/mach-kfr2r09/setup.c | 19 +- + arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | 2 - + drivers/clocksource/sh_cmt.c | 50 +++- + drivers/video/backlight/Kconfig | 19 ++ + drivers/video/backlight/Makefile | 3 + + drivers/video/backlight/bd6107.c | 213 +++++++++++++++ + drivers/video/backlight/gpio_backlight.c | 133 ++++++++++ + drivers/video/backlight/lv5207lp.c | 171 ++++++++++++ + include/linux/platform_data/bd6107.h | 19 ++ + include/linux/platform_data/gpio_backlight.h | 21 ++ + include/linux/platform_data/lv5207lp.h | 19 ++ + 32 files changed, 807 insertions(+), 567 deletions(-) + delete mode 100644 arch/arm/mach-shmobile/include/mach/dma.h + create mode 100644 drivers/video/backlight/bd6107.c + create mode 100644 drivers/video/backlight/gpio_backlight.c + create mode 100644 drivers/video/backlight/lv5207lp.c + create mode 100644 include/linux/platform_data/bd6107.h + create mode 100644 include/linux/platform_data/gpio_backlight.h + create mode 100644 include/linux/platform_data/lv5207lp.h +Merging samsung/for-next (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff samsung/for-next +Already up-to-date. +Merging tegra/for-next (e4f00cf Merge branch for-3.12/defconfig into for-next) +$ git merge --no-ff tegra/for-next +Auto-merging arch/arm/mach-tegra/pm.c +Auto-merging arch/arm/mach-tegra/platsmp.c +Removing arch/arm/boot/dts/tegra114-pluto.dts +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 222 ++++++++++++++++++++++++++++++++- + arch/arm/boot/dts/tegra114-pluto.dts | 33 ----- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 33 +++-- + arch/arm/configs/tegra_defconfig | 3 + + arch/arm/mach-tegra/Kconfig | 1 + + arch/arm/mach-tegra/common.h | 1 - + arch/arm/mach-tegra/cpuidle-tegra114.c | 51 +++++++- + arch/arm/mach-tegra/flowctrl.c | 2 + + arch/arm/mach-tegra/flowctrl.h | 9 ++ + arch/arm/mach-tegra/headsmp.S | 3 +- + arch/arm/mach-tegra/hotplug.c | 13 +- + arch/arm/mach-tegra/irq.c | 40 ++++++ + arch/arm/mach-tegra/platsmp.c | 1 - + arch/arm/mach-tegra/pm.c | 8 +- + arch/arm/mach-tegra/pmc.c | 16 ++- + arch/arm/mach-tegra/reset-handler.S | 8 +- + arch/arm/mach-tegra/sleep-tegra20.S | 1 + + arch/arm/mach-tegra/sleep-tegra30.S | 9 +- + arch/arm/mach-tegra/sleep.S | 29 ++++- + arch/arm/mach-tegra/sleep.h | 6 +- + drivers/clk/tegra/clk-tegra114.c | 26 ++++ + 22 files changed, 442 insertions(+), 76 deletions(-) + delete mode 100644 arch/arm/boot/dts/tegra114-pluto.dts +Merging dma-mapping/dma-mapping-next (f7d8f1e Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next) +$ git merge --no-ff dma-mapping/dma-mapping-next +Merge made by the 'recursive' strategy. +Merging pwm/for-next (b388f15 pwm: pwm-tiehrpwm: Use clk_enable/disable instead clk_prepare/unprepare.) +$ git merge --no-ff pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (8bb495e Linux 3.10) +$ git merge --no-ff dma-buf/for-next +Already up-to-date. +Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem) +$ git merge --no-ff userns/for-next +Auto-merging fs/proc/root.c +Merge made by the 'recursive' strategy. + fs/proc/root.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines) +$ git merge --no-ff ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge --no-ff signal/for-next +Already up-to-date. +Merging clk/clk-next (45e3ec3 clk: tegra: fix ifdef for tegra_periph_reset_assert inline) +$ git merge --no-ff clk/clk-next +Already up-to-date. +Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) +$ git merge --no-ff random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge --no-ff lzo-update/lzo-update +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging arm64-hugepages/for-next/hugepages (af07484 ARM64: mm: THP support.) +$ git merge --no-ff arm64-hugepages/for-next/hugepages +Already up-to-date. +Merging ptr-ret/PTR_RET (6b4f2b5 mm/oom_kill: remove weird use of ERR_PTR()/PTR_ERR().) +$ git merge --no-ff ptr-ret/PTR_RET +Auto-merging drivers/acpi/acpi_pad.c +Merge made by the 'recursive' strategy. + arch/arm/mach-omap2/i2c.c | 2 +- + arch/m68k/amiga/platform.c | 2 +- + arch/m68k/kernel/time.c | 2 +- + arch/m68k/q40/config.c | 2 +- + arch/powerpc/kernel/iommu.c | 2 +- + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/platforms/ps3/time.c | 2 +- + arch/powerpc/sysdev/rtc_cmos_setup.c | 2 +- + arch/s390/hypfs/hypfs_dbfs.c | 2 +- + arch/s390/kvm/gaccess.h | 12 ++++++++---- + drivers/acpi/acpi_pad.c | 13 ++++++++----- + drivers/char/tile-srom.c | 2 +- + drivers/infiniband/core/cma.c | 2 +- + drivers/net/appletalk/cops.c | 2 +- + drivers/net/appletalk/ltpc.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/amd/mvme147.c | 2 +- + drivers/net/ethernet/amd/ni65.c | 2 +- + drivers/net/ethernet/amd/sun3lance.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 2 +- + drivers/net/wireless/brcm80211/brcmsmac/debug.c | 2 +- + drivers/pinctrl/mvebu/pinctrl-dove.c | 2 +- + drivers/platform/x86/samsung-q10.c | 2 +- + drivers/regulator/fan53555.c | 2 +- + drivers/remoteproc/da8xx_remoteproc.c | 2 +- + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spidev.c | 2 +- + drivers/staging/zcache/zcache-main.c | 2 +- + drivers/video/omap2/dss/core.c | 2 +- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/inode.c | 2 +- + include/linux/err.h | 5 ++++- + mm/oom_kill.c | 6 +++--- + net/bluetooth/hci_sysfs.c | 2 +- + net/bridge/netfilter/ebtable_broute.c | 2 +- + net/bridge/netfilter/ebtable_filter.c | 2 +- + net/bridge/netfilter/ebtable_nat.c | 2 +- + net/ipv4/netfilter/arptable_filter.c | 2 +- + net/ipv4/netfilter/iptable_filter.c | 2 +- + net/ipv4/netfilter/iptable_mangle.c | 2 +- + net/ipv4/netfilter/iptable_nat.c | 2 +- + net/ipv4/netfilter/iptable_raw.c | 2 +- + net/ipv4/netfilter/iptable_security.c | 2 +- + net/ipv6/netfilter/ip6table_filter.c | 2 +- + net/ipv6/netfilter/ip6table_mangle.c | 2 +- + net/ipv6/netfilter/ip6table_nat.c | 2 +- + net/ipv6/netfilter/ip6table_raw.c | 2 +- + net/ipv6/netfilter/ip6table_security.c | 2 +- + scripts/coccinelle/api/ptr_ret.cocci | 10 +++++----- + sound/soc/soc-io.c | 2 +- + 50 files changed, 73 insertions(+), 63 deletions(-) +Merging aio/master (0c45355 aio: fix build when migration is disabled) +$ git merge --no-ff aio/master +Merge made by the 'recursive' strategy. + fs/aio.c | 123 ++++++++++++++++++++++++++++++++++++++++---- + fs/anon_inodes.c | 66 ++++++++++++++++++++++++ + include/linux/anon_inodes.h | 3 ++ + include/linux/migrate.h | 3 ++ + mm/migrate.c | 2 +- + 5 files changed, 185 insertions(+), 12 deletions(-) +Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) +Merging akpm-current/current (1f02e5b staging/lustre: replace num_physpages with totalram_pages) +$ git merge akpm-current/current +Auto-merging kernel/printk/printk.c +Auto-merging include/linux/sched.h +Auto-merging fs/binfmt_elf.c +Auto-merging arch/x86/platform/efi/efi.c +Auto-merging arch/x86/platform/ce4100/ce4100.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .gitignore | 1 + + Documentation/development-process/2.Process | 4 +- + MAINTAINERS | 7 +- + arch/alpha/lib/csum_partial_copy.c | 5 + + arch/sparc/kernel/sys_sparc32.c | 12 +- + arch/x86/include/asm/e820.h | 2 + + arch/x86/kernel/e820.c | 72 +- + arch/x86/mm/tlb.c | 18 +- + arch/x86/platform/ce4100/ce4100.c | 1 + + arch/x86/platform/efi/efi.c | 15 +- + block/compat_ioctl.c | 2 +- + block/genhd.c | 2 +- + drivers/accessibility/braille/braille_console.c | 9 +- + drivers/atm/he.c | 13 +- + drivers/base/node.c | 6 - + drivers/firmware/dmi_scan.c | 87 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 8 + + drivers/gpu/drm/nouveau/nouveau_acpi.c | 5 + + drivers/infiniband/core/cm.c | 5 +- + drivers/isdn/hisax/amd7930_fn.c | 4 +- + drivers/isdn/hisax/avm_pci.c | 4 +- + drivers/isdn/hisax/config.c | 2 +- + drivers/isdn/hisax/diva.c | 4 +- + drivers/isdn/hisax/elsa.c | 2 +- + drivers/isdn/hisax/elsa_ser.c | 2 +- + drivers/isdn/hisax/hfc_pci.c | 2 +- + drivers/isdn/hisax/hfc_sx.c | 2 +- + drivers/isdn/hisax/hscx_irq.c | 4 +- + drivers/isdn/hisax/icc.c | 4 +- + drivers/isdn/hisax/ipacx.c | 8 +- + drivers/isdn/hisax/isac.c | 4 +- + drivers/isdn/hisax/isar.c | 6 +- + drivers/isdn/hisax/jade.c | 18 +- + drivers/isdn/hisax/jade_irq.c | 4 +- + drivers/isdn/hisax/l3_1tr6.c | 50 +- + drivers/isdn/hisax/netjet.c | 2 +- + drivers/isdn/hisax/q931.c | 6 +- + drivers/isdn/hisax/w6692.c | 8 +- + drivers/isdn/mISDN/core.c | 6 + + drivers/isdn/mISDN/core.h | 1 + + drivers/isdn/mISDN/socket.c | 9 + + drivers/memstick/core/Kconfig | 12 + + drivers/memstick/core/Makefile | 2 +- + drivers/memstick/core/ms_block.c | 2385 ++++++++++++++++++++ + drivers/memstick/core/ms_block.h | 290 +++ + drivers/mtd/chips/gen_probe.c | 4 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 14 +- + drivers/net/irda/donauboe.c | 15 +- + drivers/pcmcia/pd6729.c | 13 +- + drivers/pcmcia/yenta_socket.c | 16 +- + drivers/rapidio/rio.c | 4 +- + drivers/rtc/rtc-hid-sensor-time.c | 16 +- + drivers/scsi/a100u2w.c | 12 +- + drivers/scsi/dc395x.c | 24 +- + drivers/scsi/dmx3191d.c | 13 +- + drivers/scsi/initio.c | 13 +- + drivers/scsi/mvumi.c | 20 +- + .../lustre/include/linux/libcfs/linux/linux-mem.h | 42 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 10 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 139 +- + .../lustre/lustre/libcfs/linux/linux-tracefile.c | 2 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 8 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 6 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 100 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 80 +- + drivers/video/acornfb.c | 266 +-- + drivers/video/acornfb.h | 29 - + drivers/video/cyber2000fb.c | 3 + + fs/autofs4/autofs_i.h | 4 +- + fs/autofs4/dev-ioctl.c | 16 +- + fs/autofs4/inode.c | 33 +- + fs/autofs4/waitq.c | 16 +- + fs/binfmt_elf.c | 21 +- + fs/eventpoll.c | 34 +- + fs/fat/file.c | 108 +- + fs/fat/inode.c | 54 + + fs/file_table.c | 3 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/file.c | 60 +- + fs/ocfs2/namei.c | 12 +- + fs/ocfs2/refcounttree.c | 5 + + fs/proc/meminfo.c | 6 - + include/linux/hardirq.h | 5 + + include/linux/huge_mm.h | 3 - + include/linux/interrupt.h | 23 +- + include/linux/ipc_namespace.h | 2 +- + include/linux/mempolicy.h | 9 +- + include/linux/mm.h | 3 +- + include/linux/page-flags.h | 4 +- + include/linux/sched.h | 8 +- + include/linux/smp.h | 20 +- + include/linux/vm_event_item.h | 5 + + ipc/msg.c | 25 +- + ipc/namespace.c | 4 +- + ipc/sem.c | 24 +- + ipc/shm.c | 239 +- + ipc/util.c | 60 +- + ipc/util.h | 7 +- + kernel/Makefile | 3 +- + kernel/fork.c | 9 +- + kernel/hrtimer.c | 2 + + kernel/printk/Makefile | 2 + + kernel/printk/braille.c | 48 + + kernel/printk/braille.h | 48 + + kernel/printk/console_cmdline.h | 14 + + kernel/{ => printk}/printk.c | 183 +- + kernel/relay.c | 14 +- + kernel/sched/fair.c | 4 +- + kernel/signal.c | 4 +- + kernel/smp.c | 16 +- + kernel/watchdog.c | 10 +- + mm/filemap.c | 60 +- + mm/huge_memory.c | 125 +- + mm/madvise.c | 14 +- + mm/memory.c | 9 +- + mm/mempolicy.c | 16 +- + mm/mmap.c | 47 +- + mm/rmap.c | 18 +- + mm/shmem.c | 11 +- + mm/swap.c | 29 +- + mm/swap_state.c | 63 +- + mm/swapfile.c | 38 +- + mm/vmstat.c | 5 + + mm/zbud.c | 2 +- + mm/zswap.c | 2 +- + net/socket.c | 50 +- + 130 files changed, 4218 insertions(+), 1421 deletions(-) + create mode 100644 drivers/memstick/core/ms_block.c + create mode 100644 drivers/memstick/core/ms_block.h + create mode 100644 kernel/printk/Makefile + create mode 100644 kernel/printk/braille.c + create mode 100644 kernel/printk/braille.h + create mode 100644 kernel/printk/console_cmdline.h + rename kernel/{ => printk}/printk.c (95%) +$ 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: fs: bump inode and dentry counters to long +Applying: super: fix calculation of shrinkable objects for small numbers +Applying: dcache: convert dentry_stat.nr_unused to per-cpu counters +Applying: dentry: move to per-sb LRU locks +Applying: dcache: remove dentries from LRU before putting on dispose list +Applying: mm: new shrinker API +Applying: shrinker: convert superblock shrinkers to new API +Applying: shrinker-convert-superblock-shrinkers-to-new-api-fix +Applying: list: add a new LRU list type +Applying: inode: convert inode lru list to generic lru list code. +Applying: inode: move inode to a different list inside lock +Applying: dcache: convert to use new lru list infrastructure +Applying: list_lru: per-node list infrastructure +Applying: list_lru: per-node list infrastructure fix +Applying: list_lru: fix broken LRU_RETRY behaviour +Applying: list_lru: per-node API +Applying: list_lru: remove special case function list_lru_dispose_all. +Applying: shrinker: add node awareness +Applying: vmscan: per-node deferred work +Applying: fs: convert inode and dentry shrinking to be node aware +Applying: xfs: convert buftarg LRU to generic code +Applying: xfs-convert-buftarg-lru-to-generic-code-fix +Applying: xfs: rework buffer dispose list tracking +Applying: xfs: convert dquot cache lru to list_lru +Applying: xfs-convert-dquot-cache-lru-to-list_lru-fix +Applying: xfs: fix dquot isolation hang +Applying: fs: convert fs shrinkers to new scan/count API +Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix +Applying: UBIFS: signedness bug in ubifs_shrink_count() +Applying: drivers: convert shrinkers to new count/scan API +Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix +Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix-2 +Applying: i915: bail out earlier when shrinker cannot acquire mutex +Applying: shrinker: convert remaining shrinkers to count/scan API +Applying: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix +Applying: hugepage: convert huge zero page shrinker to new shrinker API +Applying: hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix +Applying: shrinker: Kill old ->shrink API. +Applying: shrinker-kill-old-shrink-api-fix +Applying: list_lru: dynamically adjust node arrays +Applying: super: fix for destroy lrus +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + c260ed9...0c2f52f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (0c2f52f super: fix for destroy lrus) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/x86/kvm/mmu.c | 25 ++- + drivers/gpu/drm/i915/i915_dma.c | 4 +- + drivers/gpu/drm/i915/i915_gem.c | 82 ++++++--- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 44 +++-- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 51 ++++-- + drivers/md/bcache/btree.c | 43 +++-- + drivers/md/bcache/sysfs.c | 2 +- + drivers/md/dm-bufio.c | 64 ++++--- + drivers/staging/android/ashmem.c | 44 +++-- + drivers/staging/android/lowmemorykiller.c | 43 +++-- + drivers/staging/zcache/zcache-main.c | 29 +-- + fs/dcache.c | 279 ++++++++++++++++++----------- + fs/drop_caches.c | 1 + + fs/ext4/extents_status.c | 27 ++- + fs/gfs2/glock.c | 30 ++-- + fs/gfs2/main.c | 3 +- + fs/gfs2/quota.c | 18 +- + fs/gfs2/quota.h | 6 +- + fs/inode.c | 193 +++++++++----------- + fs/internal.h | 6 +- + fs/mbcache.c | 49 ++--- + fs/nfs/dir.c | 16 +- + fs/nfs/internal.h | 6 +- + fs/nfs/super.c | 3 +- + fs/nfsd/nfscache.c | 32 +++- + fs/quota/dquot.c | 34 ++-- + fs/super.c | 111 +++++++----- + fs/ubifs/shrinker.c | 29 +-- + fs/ubifs/super.c | 3 +- + fs/ubifs/ubifs.h | 5 +- + fs/xfs/xfs_buf.c | 253 +++++++++++++------------- + fs/xfs/xfs_buf.h | 17 +- + fs/xfs/xfs_dquot.c | 7 +- + fs/xfs/xfs_icache.c | 4 +- + fs/xfs/xfs_icache.h | 2 +- + fs/xfs/xfs_qm.c | 287 ++++++++++++++++-------------- + fs/xfs/xfs_qm.h | 4 +- + fs/xfs/xfs_super.c | 12 +- + include/linux/dcache.h | 14 +- + include/linux/fs.h | 25 ++- + include/linux/list_lru.h | 131 ++++++++++++++ + include/linux/shrinker.h | 54 ++++-- + include/trace/events/vmscan.h | 4 +- + include/uapi/linux/fs.h | 6 +- + kernel/sysctl.c | 6 +- + mm/Makefile | 2 +- + mm/huge_memory.c | 17 +- + mm/list_lru.c | 139 +++++++++++++++ + mm/memory-failure.c | 2 + + mm/vmscan.c | 241 ++++++++++++++----------- + net/sunrpc/auth.c | 41 +++-- + 51 files changed, 1597 insertions(+), 953 deletions(-) + create mode 100644 include/linux/list_lru.h + create mode 100644 mm/list_lru.c +$ git revert 8ccbc3ebe9a7 +[master 7b69dab] Revert "ASoC: mxs: Enable COMPILE_TEST builds" + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..227af12f2961 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 496322bc91e35007ed754184dcd447a02b6dd685 +Unchanged quilt series jdelvare-hwmon +Importing device-mapper based on v3.11-rc1 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..8992fcc05277 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20130723 |