diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-31 17:10:00 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-31 17:10:00 +1000 |
| commit | c1462f7e87b880662db029615ea5bd8d9337261d (patch) | |
| tree | e186260f35cff878b5f53239e36ec43696572667 | |
| parent | 764fe7055ffaa36e5a475cf63c3ae9114735cb5f (diff) | |
Add linux-next specific files for 20130731next-20130731
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 224 | ||||
| -rw-r--r-- | Next/Trees | 226 | ||||
| -rw-r--r-- | Next/merge.log | 4222 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4677 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..30bb9f20348e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,224 @@ +Name SHA1 +---- ---- +origin 36f571e9ed0419e73d127e18aa8992ced867268c +fixes b3a3a9c441e2c8f6b6760de9331023a7906a4ac6 +kbuild-current ad81f0545ef01ea651886dddac4bef6cec930092 +arc-current 4ffd9e2c4deda2ad90ce261174b2bc90e0660703 +arm-current ab8d46c0609843a83aef3f486365ca5e7c21d537 +m68k-current ad81f0545ef01ea651886dddac4bef6cec930092 +metag-fixes dfe248b18fe29ce5a59c60364a4c27e88cb65b0e +powerpc-merge ff3d79dc12c2ed38483f6c1e0f26fde430f27c9d +sparc 6d128e1e72bf082542e85f72e6b7ddd704193588 +net e1ee3673a83cc02b6b5e43c9e647d8dd5e1c4e26 +ipsec 01cb71d2d47b78354358e4bb938bb06323e17498 +sound-current a8d30608eaed6cc759b8e2e8a8bbbb42591f797f +pci-current aa914f5ec25e4371ba18b312971314be1b9b1076 +wireless 161915a07d501404710f5c89f9c98e6b58c085f0 +driver-core.current 5ae90d8e467e625e447000cb4335c4db973b1095 +tty.current d5a12ea7a9e58d9e5c19d25cb668aadb396423ec +usb.current fed1f1ed90bce42ea010e2904cbc04e7b8304940 +staging.current 02073798a6b081bf74e6c10d6f7e7a693c067ecd +char-misc.current 5ae90d8e467e625e447000cb4335c4db973b1095 +input-current 88ce3c3ca3df754e8a2a63b01c38bd1667fcae70 +md-current f94c0b6658c7edea8bc19d13be321e3860a3fa54 +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current e70308ec0e4bff344fcfdf160de40e1150552c5f +ide 6d128e1e72bf082542e85f72e6b7ddd704193588 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +devicetree-current cf9e2368655d86cd800e4d9fe65a407b39d29373 +rr-fixes 96f97a83910cdb9d89d127c5ee523f8fc040a804 +mfd-fixes 5649d8f9e335f2b093751fcc2bdd5953f79f66ef +vfio-fixes d24cdbfd28b7e0ffecb1e281d73e73c03a57f734 +drm-intel-fixes 61c2542b3b8e70fc1b82880c3ef7e2f930875b97 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 524a105dead4d424faaa6a78a72bf3343a747ecf +arm c579c69ff124a1e4c6317f4b9d1362e1a9a9cfdf +arm-perf ad81f0545ef01ea651886dddac4bef6cec930092 +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +xilinx b028161fbba178ccd35aa69051c04d7673fe9d80 +arm64 845ad05ec31e0f3872a321e10dbeaf872022632c +blackfin eb043d36ace4b4720020fdef9e94854c549adda7 +c6x f934af05cb1bf20558542185299394a69060b829 +cris 32ade6a282a36aae1803b190bae452f1e46f6b6c +hexagon de44443a45e36b7467af2518d3bf7ec6ec909549 +ia64 9c510f75fd453b101cb165c95ccfb45c4cac7d56 +m68k ad81f0545ef01ea651886dddac4bef6cec930092 +m68knommu 703b943f7a1d4b75000946c3036fd720dc93795b +metag 8a697827540d54443f343b058b8dac695c847f9f +microblaze 9903883f1dd6e86f286b7bfa6e4b423f98c1cd9e +mips d0e491296a41f0f18f37862b61fa0ec4a5888927 +openrisc 6af609515d788bd4c94116344f00601b058f75a6 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 9bb401a62afaac689ae252c27c1ae279b953b721 +powerpc 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx dd0120dea601de654a5a6d959da3a632a02200f0 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 83b6bcd2af26862ee20a5e92aad40813a1f83339 +sh 37284bd93103ae36b5ea274a985d688fb16f7a38 +sparc-next f8ce1faf55955de62e0a12e330c6d9a526071f65 +tile 9ae8480f9f1425652ba5c0137bad8d4ab55250df +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +btrfs cbacd76bb3d2295478aa13015fdd302757297e88 +ceph 71b43258fca50da88f9d800c7f05ccc742dc7937 +cifs c4a74088fed94b72a6bb0cb478b559ad14f37a65 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 07bc9dc1b01bad7084fed3d2659e5d83317869bc +ext3 e628753bf925b058b6811527492f7529f4d27691 +ext4 dda5690defe4af62ee120f055e98e40d97e4c760 +f2fs cbd56e7d20d7188d62a85aa6986a7b2c8e755ab5 +fscache bcd7351e83728859833e3c5b8aae9a2816914e4b +fuse c7263bcdc4d150e3c718b711a5f6fad496d9f662 +gfs2 6daf3e6c5dd7cedf0a2210ef4ffa345970d05bdb +jfs eb8630d7d2fd13589e6a7a3ae2fe1f75f867fbed +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 55b592933b7d0091d515ef1663334470a343ec98 +nfsd df66e75395c839c3a373bae897dbb1248f741b45 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs b3f8ab4b7953b4719aaa00c22c1de5d9161f57f5 +ubifs beadadfa5467e09e36891f39cae1f5d8d3bbf17e +xfs 7a378c9aeab3782a5f998c17313bc7027cee3454 +vfs d405be48a4c3f37f7a8e5648a5db204738272c61 +pci b7c75de4885d958316f26fb140d00febfab89c19 +hid ea25d0dfffb685ed31c76071d341d7fbec46989b +i2c 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +jdelvare-hwmon 6f7e0b6faf221b03c410d13a6f81c054530b3bd3 +hwmon-staging d8df13e305d0a303e266b17599032fef62e66693 +v4l-dvb 22174384373f2f9377b3596c55a6148018c15cc0 +kbuild 8de6aeb7b3c83a870078fcbf561923c268690168 +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata 3ea47c0bdde8f74b864456802eda89d15f4b3e7e +pstore bd08ec33b5c23833581e5a36b2a69ccae6b39a28 +pm 2280c2cb9d9e0e86e4b250b5791040c9abe9a4e3 +idle 5c99726b5faaf1ba4ca80c39d319f419c227f803 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal ace120dcf23b3bbba00d797a898481997381052f +ieee1394 0a41981803fcd4107fff4e943afb72940ba653d2 +ubi 83ff59a066637a6c28844bbf43009459408240f4 +dlm ededf305a8d843c12038ae48eb68529016b3e91f +swiotlb af51a9f1848ff50079a10def56a2c064f326af22 +slave-dma 8f48475794087d74dd653ba3630a80324a182925 +dmaengine 41ef2d5678d83af030125550329b6ae8b74618fa +net-next 9ad8fef6c61a9dfcaa8444e526020de88c540fa9 +ipsec-next 02890946481bef50f60782c79efb4451c26c1d50 +wireless-next 2cdf359a521bb72286b6714478dfdbcd2691f3fe +bluetooth 473c13179c5828f7123a4d9fe449d8bd79fae254 +infiniband e04abfa2436e3ab016b23eb1afb2c5578b8dc2cf +mtd a637b0d45947df686979b85361ad5bfa9d19fdd3 +l2-mtd fb1585bc13b3d89a8fcf2a2edfa4c0c821276dea +crypto aa2faec1a05f1ebc2856be911f83e696f8dc2122 +drm aed2c03c8d96ea471b86761129c213e05ab6fbef +drm-intel fae5cbff3e3e4097de2e76178d462b90626c2bdb +drm-tegra ebae30b1fbcc2cc991ce705cc82e16d1e5ddbf51 +sound 7d4f606c50ffaaa3ac60b7faf770dc6e84af3207 +sound-asoc 4211dde8ef1b6371122f3ed7d53c1c63ab1e04aa +modules ad81f0545ef01ea651886dddac4bef6cec930092 +virtio 314081f1025e9ea77b69261f21183e9be18a6f91 +input 46146e7d4b383d5b34014d072553498c7cd52821 +input-mt ad81f0545ef01ea651886dddac4bef6cec930092 +cgroup cace1c980a38dfdb3aadb94a39907267f7486e1c +block 3fe9649223d270a8eb2f649fa119b1995fe6b53d +device-mapper ad81f0545ef01ea651886dddac4bef6cec930092 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 6d1d6b4759112acf4c079eb3a0dd296bdbf61cf5 +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 0450b0ceeaffa02e4436cdd5c890f52560f97023 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 5ad58b4cd0391ea9a6905c8d986a31cf809d5320 +mfd 25f311fa58c18c19ae1348336265ccb8368638f0 +battery 5a6c2208455f25b3e6f939adc2da59aa00d4806e +fbdev 5e8be022fb5b8badb033940cb807dff0112042b6 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 e72b7536e4e1e44e56dba50205d5a5092bf1d3c0 +regulator 4f5c9434b485c08c295acbe7c81ebf1d8e4e14ad +security 9548906b2bb7ff09e12c013a55d669bef2c8e121 +selinux 2be4d74f2fd45460d70d4fe65cc1972ef45bf849 +lblnet 07bc9dc1b01bad7084fed3d2659e5d83317869bc +watchdog b3a3a9c441e2c8f6b6760de9331023a7906a4ac6 +dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351 +iommu 01ce784acfa69a171afe6ec3f85a959546f2d18a +vfio 47188d39b5deeebf41f87a02af1b3935866364cf +osd 861d66601acda6d7a2038fb3c95f68009128003a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial a24a4b9f3f7a4cfba3af0e8079e25972b88a5afa +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +edac de4772c621487fd4cadb4138f2481297c8e0cb0d +edac-amd f0a56c480196a98479760862468cc95879df3de0 +devicetree 245d9641909aee2e73fc773cea708eb7bc51a524 +dt-rh d683b96b072dc4680fc74964eca77e6a23d1fa6e +spi 6dd4918ef56bcef3f4bd3c6052cc09e751ecde3b +tip 396c4fb53db782245668595c0f4e58938ed86bc0 +ftrace 6fd52fce057b55cc1bba463e6f05536a76c058b4 +rcu 0f791c956aa26d6d8142f7b3e7a9fbd8bdeffcd0 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm bf640876e21fe603f7f52b0c27d66b7716da0384 +kvm-arm 8bd4ffd6b3a98f00267051dc095076ea2ff06ea8 +kvm-ppc 20f7462aac0b220c56231a15abec9ab99e897136 +oprofile f722406faae2d073cc1d01063d1123c35425939e +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip eea3e0b2587c5d4c37070a4f9f7ac936a92a56b8 +xen-arm 2451ade070ef9b0a0f118ac41896da856e72b5a1 +percpu a4244454df1296e90cc961c1b636b1176ef0d9a0 +workqueues 1315b5cf71bab8aa440bba536b82adcdaf04a132 +drivers-x86 de91b53dcc25f5f3255f3ea124bec293344fd402 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap f021e63aa315ddf375baa8e115237998cb8983a7 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 077e91f6e979471dc300f1f486890ee95d8f344e +driver-core e70b0915124942204dec8064bb25756e8723b81a +tty e26439ce03f0808f5d797ca33f180fdb8258335a +usb 7d50195f6c5005d6ae7a789d9a7f0a94d104ee96 +usb-gadget b1fd6cb5ee2f97a553d1c4b8a88914bd970daf37 +staging b9b9b35176316c3fc50ac50da9cf8796fbb7abd5 +char-misc 9c5891bd4342349a200676d33f742dd1b864822c +scsi 2cb6e5f3865298e5b853192351d0e35f0459d8db +target-updates ca40d24eb8fc3c194b4439493ecf6b2d703812b8 +target-merge 317ddd256b9c24b0d78fa8018f80f1e495481a10 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +bcon e284f3493206d4268267db4557c7ee6f89ed2314 +tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 +writeback 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl fa8ec8fef4e27743be6aa5ba531d33957b5fa3f7 +vhost 22fa90c7fb479694d6affebc049d21f06b714be6 +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc b9777859ec015a78dae1476e317d04f851bfdd0d +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio b0305e947608c04031fec24f50e0d9cec56ba650 +arm-soc c53414f054de7bfb9db30167a4b380eed355c067 +bcm2835 7d132055814ef17a6c7b69f342244c410a5e000f +cortex 3ad87ac5ac98d951bc51d1c815c533b65e072f45 +ep93xx 9c59be78d1ee4a717ca2f85b54356f8fed7f439c +imx-mxs 184b94c7b0fbeaac1d203bbe9bee6379e8d6a1e5 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm 28fd577b65e8314289dfedce45eea070b620c1d7 +mvebu 5c0f737afdae01a91aba44d74837b8bddae37e22 +renesas 833574a9e7efcb7d3e26f0de4866967575550449 +samsung b53705148cb7c01a584b8eaedf7aed463c07ddce +tegra c8cd3e7b9e59c9c8300481b5ac5cc211d7c0b655 +dma-mapping f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e +pwm 6d0cf4d38fd3e234e333a7343132b4c1d441eeb0 +dma-buf 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 +userns 78008c404acd8e731d1e06618cc5995961e847a6 +ktest df5f7c66013c46cec9aa8156af257bc5eb29b5c5 +signal 20b4fb485227404329e41ad15588afad3df23050 +clk 406c5989276967db8721d057ed4b4f51bf9c71c6 +random b980955236922ae6106774511c5c05003d3ad225 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages af07484863e0c20796081e57093886c22dc16705 +ptr-ret ad151d544475df40ee0d18be7d5c945e29c1b545 +aio 0c45355fc7c48c82db151bf0e7ca305d513e639e +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm-current 1f02e5b30607cbef3c8b4d1376cba3689c399288 +akpm 651e600ff3ecc4ac06747313a1c49d89a9ce988e diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..01e5a4416c57 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,226 @@ +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 +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/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.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-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.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 +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 +gpio 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/linux-mvebu.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..170cc7b0dc22 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4222 @@ +$ date +Wednesday 31 July 10:14:22 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 5ae90d8 Linux 3.11-rc3 +Merging origin/master (36f571e Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394) +$ git merge --no-ff origin/master +Merge made by the 'recursive' strategy. + arch/arc/include/asm/entry.h | 1 + + drivers/firewire/core-cdev.c | 3 +++ + drivers/firewire/ohci.c | 10 ++++++++-- + include/linux/firewire.h | 1 + + include/uapi/linux/firewire-cdev.h | 4 ++-- + 5 files changed, 15 insertions(+), 4 deletions(-) +Merging fixes/master (b3a3a9c Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge --no-ff fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (4ffd9e2 ARC: SMP build breakage) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging powerpc-merge/merge (ff3d79d powerpc/perf: BHRB filter configuration should follow the task) +$ 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 (e1ee367 genetlink: fix usage of NLM_F_EXCL or NLM_F_REPLACE) +$ 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/allwinner/Kconfig | 26 ++++--- + drivers/net/ethernet/broadcom/tg3.c | 6 +- + drivers/net/ethernet/freescale/fec.h | 1 + + drivers/net/ethernet/freescale/fec_main.c | 38 +++++++-- + drivers/net/ethernet/intel/igb/igb_main.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 ++- + 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_83xx_init.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 | 4 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 2 +- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 + + .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 46 +++++++++-- + drivers/net/ethernet/realtek/r8169.c | 4 +- + drivers/net/ethernet/sfc/filter.c | 4 +- + drivers/net/phy/mdio-sun4i.c | 14 ++-- + drivers/net/usb/ax88179_178a.c | 9 +-- + drivers/net/usb/smsc75xx.c | 12 +-- + 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 | 13 +++- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 44 +++++++---- + 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 - + 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 +- + kernel/sysctl.c | 6 +- + net/bridge/br_multicast.c | 5 +- + net/core/neighbour.c | 29 +++++-- + net/core/skbuff.c | 3 +- + net/ipv4/fib_trie.c | 2 +- + net/ipv4/sysctl_net_ipv4.c | 6 +- + net/ipv6/ip6mr.c | 5 ++ + net/key/af_key.c | 4 + + net/mac80211/cfg.c | 2 + + net/mac80211/rc80211_minstrel.c | 3 +- + net/mac80211/rc80211_minstrel_ht.c | 10 ++- + net/mac80211/rx.c | 10 ++- + net/netfilter/nf_conntrack_expect.c | 5 ++ + net/netfilter/xt_socket.c | 10 ++- + net/netlink/genetlink.c | 4 +- + net/sched/sch_cbq.c | 1 + + net/wireless/nl80211.c | 11 ++- + net/wireless/reg.c | 2 + + net/wireless/sme.c | 29 ++++++- + 80 files changed, 596 insertions(+), 276 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 (a8d3060 ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION) +$ git merge --no-ff sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/compress_offload.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pci-current/for-linus (aa914f5 PCI: Retry allocation of only the resource type that failed) +$ git merge --no-ff pci-current/for-linus +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/powerpc/configs/ppc64_defconfig | 2 +- + arch/powerpc/configs/ppc64e_defconfig | 2 +- + arch/powerpc/configs/pseries_defconfig | 2 +- + arch/sh/configs/sh03_defconfig | 2 +- + drivers/pci/hotplug/Kconfig | 5 +-- + drivers/pci/hotplug/pciehp_pci.c | 9 ++++- + drivers/pci/pcie/Kconfig | 5 +-- + drivers/pci/setup-bus.c | 69 +++++++++++++++++++++++++++++++++- + 12 files changed, 86 insertions(+), 18 deletions(-) +Merging wireless/master (161915a Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) +$ git merge --no-ff wireless/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 +++++- + drivers/net/wireless/ath/ath10k/Kconfig | 2 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 5 ++- + drivers/net/wireless/iwlwifi/iwl-prph.h | 2 ++ + drivers/net/wireless/iwlwifi/mvm/d3.c | 15 +++++--- + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 1 - + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 42 +++++++++++----------- + drivers/net/wireless/iwlwifi/mvm/scan.c | 11 ++---- + drivers/net/wireless/iwlwifi/mvm/sta.c | 11 ++++-- + drivers/net/wireless/iwlwifi/pcie/drv.c | 1 + + drivers/net/wireless/iwlwifi/pcie/rx.c | 8 +++++ + drivers/net/wireless/iwlwifi/pcie/trans.c | 5 +++ + drivers/net/wireless/mwifiex/sdio.c | 4 +-- + drivers/net/wireless/rt2x00/rt2x00queue.c | 18 ++++++---- + net/mac80211/mesh_ps.c | 4 +++ + net/mac80211/pm.c | 7 ++-- + net/wireless/reg.c | 5 ++- + 17 files changed, 97 insertions(+), 54 deletions(-) +Merging driver-core.current/driver-core-linus (5ae90d8 Linux 3.11-rc3) +$ git merge --no-ff driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (d5a12ea serial: arc_uart: Fix module alias) +$ git merge --no-ff tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/arc_uart.c | 2 +- + drivers/tty/serial/mxs-auart.c | 38 ++++++++++++++++++++++---------------- + drivers/tty/tty_port.c | 5 ++--- + 3 files changed, 25 insertions(+), 20 deletions(-) +Merging usb.current/usb-linus (fed1f1e USB: serial: ftdi_sio: add more RT Systems ftdi devices) +$ git merge --no-ff usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/Kconfig | 4 +- + drivers/usb/chipidea/bits.h | 4 +- + drivers/usb/gadget/ether.c | 14 +++- + drivers/usb/gadget/f_phonet.c | 2 - + drivers/usb/gadget/multi.c | 10 +-- + drivers/usb/gadget/udc-core.c | 2 +- + drivers/usb/musb/omap2430.c | 7 +- + drivers/usb/musb/tusb6010.c | 7 +- + drivers/usb/serial/Kconfig | 7 ++ + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/ftdi_sio.c | 31 +++++++- + drivers/usb/serial/ftdi_sio_ids.h | 34 +++++++-- + drivers/usb/serial/mos7840.c | 150 ++++++++++++++++++++++---------------- + drivers/usb/serial/suunto.c | 41 +++++++++++ + 14 files changed, 223 insertions(+), 91 deletions(-) + create mode 100644 drivers/usb/serial/suunto.c +Merging staging.current/staging-linus (0207379 staging: zcache: fix "zcache=" kernel parameter) +$ git merge --no-ff staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/zcache/zcache-main.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging char-misc.current/char-misc-linus (5ae90d8 Linux 3.11-rc3) +$ git merge --no-ff char-misc.current/char-misc-linus +Already up-to-date. +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 (f94c0b6 md/raid5: fix interaction of 'replace' and 'recovery'.) +$ git merge --no-ff md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) +$ git merge --no-ff audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (e70308e Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework") +$ git merge --no-ff crypto-current/master +Already up-to-date. +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 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 +Already up-to-date. +Merging rr-fixes/fixes (96f97a8 virtio: console: return -ENODEV on all read operations after unplug) +$ git merge --no-ff rr-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/char/virtio_console.c | 70 +++++++++++++++++++++++++++++-------------- + 1 file changed, 48 insertions(+), 22 deletions(-) +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 (d24cdbf vfio-pci: Avoid deadlock on remove) +$ git merge --no-ff vfio-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 23 +++++++++++++++++++++-- + drivers/vfio/vfio.c | 37 ++++++++++--------------------------- + 2 files changed, 31 insertions(+), 29 deletions(-) +Merging drm-intel-fixes/drm-intel-fixes (61c2542 drm/i915: fix gen4 digital port hotplug definitions) +$ git merge --no-ff drm-intel-fixes/drm-intel-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_reg.h | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 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 (524a105 ARC: [ASID] Optimize the threads-of-process switching case) +$ git merge --no-ff arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/boot/.gitignore | 1 + + arch/arc/include/asm/entry.h | 24 ++++- + arch/arc/include/asm/irqflags.h | 7 -- + arch/arc/include/asm/mmu.h | 7 +- + arch/arc/include/asm/mmu_context.h | 193 +++++++++++++++---------------------- + arch/arc/include/asm/pgtable.h | 61 +++++------- + arch/arc/include/asm/ptrace.h | 36 ++----- + arch/arc/include/asm/tlbflush.h | 11 ++- + arch/arc/kernel/.gitignore | 1 + + arch/arc/kernel/entry.S | 66 ++++--------- + arch/arc/kernel/smp.c | 1 + + arch/arc/mm/Makefile | 1 + + arch/arc/mm/tlb.c | 150 ++++++++++++++-------------- + arch/arc/mm/tlbex.S | 186 +++++++++++++++++------------------ + arch/arc/mm/tlbflush.c | 85 ++++++++++++++++ + 15 files changed, 415 insertions(+), 415 deletions(-) + create mode 100644 arch/arc/boot/.gitignore + create mode 100644 arch/arc/kernel/.gitignore + create mode 100644 arch/arc/mm/tlbflush.c +Merging arm/for-next (c579c69 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 +Auto-merging arch/arm/Kconfig +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 (845ad05 arm64: Change kernel stack size to 16K) +$ 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 a8911a8] 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 +Resolved 'arch/ia64/configs/generic_defconfig' using previous resolution. +Resolved 'arch/ia64/configs/gensparse_defconfig' using previous resolution. +Resolved 'arch/ia64/configs/tiger_defconfig' using previous resolution. +Resolved 'arch/ia64/configs/xen_domu_defconfig' using previous resolution. +Auto-merging arch/ia64/configs/xen_domu_defconfig +CONFLICT (content): Merge conflict in arch/ia64/configs/xen_domu_defconfig +Auto-merging arch/ia64/configs/tiger_defconfig +CONFLICT (content): Merge conflict in arch/ia64/configs/tiger_defconfig +Auto-merging arch/ia64/configs/gensparse_defconfig +CONFLICT (content): Merge conflict in arch/ia64/configs/gensparse_defconfig +Auto-merging arch/ia64/configs/generic_defconfig +CONFLICT (content): Merge conflict in arch/ia64/configs/generic_defconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7dda0ad] Merge remote-tracking branch 'ia64/next' +$ git diff -M --stat --summary HEAD^.. + 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 (703b943 m68k/coldfire: flush cache when creating the signal stack frame) +$ git merge --no-ff m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/kernel/setup_no.c | 2 +- + arch/m68k/kernel/signal.c | 8 ++++++++ + 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 ++- + 7 files changed, 22 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 (d0e4912 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/Kconfig | 1 + + arch/mips/bcm47xx/Kconfig | 1 - + arch/mips/cavium-octeon/setup.c | 28 ++++++++++++++++++++++++++++ + arch/mips/include/asm/Kbuild | 13 +++++++++++++ + arch/mips/include/asm/cpu.h | 5 ++++- + 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/mach-generic/spaces.h | 4 ++++ + 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/include/uapi/asm/siginfo.h | 7 ++++--- + arch/mips/kernel/bmips_vec.S | 6 +++++- + arch/mips/kernel/cpu-probe.c | 7 +++++++ + arch/mips/kernel/idle.c | 1 + + arch/mips/kernel/smp-bmips.c | 18 +++++++++--------- + arch/mips/mm/c-octeon.c | 14 ++++++++++++++ + arch/mips/mm/tlb-funcs.S | 2 ++ + arch/mips/mm/tlbex.c | 2 ++ + arch/mips/netlogic/xlp/usb-init.c | 3 +-- + arch/mips/pci/pci-octeon.c | 9 +++++---- + arch/mips/powertv/asic/asic_devices.c | 3 +-- + 33 files changed, 104 insertions(+), 81 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 (9bb401a parisc: Fix interrupt routing for C8000 serial ports) +$ git merge --no-ff parisc-hd/for-next +Removing arch/parisc/kernel/sys32.h +Merge made by the 'recursive' strategy. + arch/parisc/configs/c8000_defconfig | 279 ++++++++++++++++++++++ + arch/parisc/configs/generic-32bit_defconfig | 340 +++++++++++++++++++++++++++ + arch/parisc/configs/generic-64bit_defconfig | 350 ++++++++++++++++++++++++++++ + arch/parisc/include/asm/parisc-device.h | 3 + + arch/parisc/kernel/cache.c | 135 ++++++----- + arch/parisc/kernel/inventory.c | 1 + + arch/parisc/kernel/signal.c | 7 - + arch/parisc/kernel/signal32.c | 1 - + arch/parisc/kernel/sys32.h | 36 --- + arch/parisc/kernel/sys_parisc32.c | 2 - + drivers/char/agp/parisc-agp.c | 6 +- + drivers/parisc/iosapic.c | 38 ++- + drivers/tty/serial/8250/8250_gsc.c | 3 +- + 13 files changed, 1076 insertions(+), 125 deletions(-) + create mode 100644 arch/parisc/configs/c8000_defconfig + create mode 100644 arch/parisc/configs/generic-32bit_defconfig + create mode 100644 arch/parisc/configs/generic-64bit_defconfig + delete mode 100644 arch/parisc/kernel/sys32.h +Merging powerpc/next (3b2f64d Linux 3.11-rc2) +$ 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 (83b6bcd s390/sclp: reword cpu capability change message) +$ git merge --no-ff s390/features +Removing arch/s390/pci/pci_msi.c +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 20 +- + arch/s390/boot/compressed/Makefile | 9 +- + arch/s390/boot/compressed/misc.c | 4 + + arch/s390/include/asm/airq.h | 37 +++ + arch/s390/include/asm/bitops.h | 2 +- + arch/s390/include/asm/hardirq.h | 5 + + arch/s390/include/asm/hugetlb.h | 135 +++-------- + arch/s390/include/asm/hw_irq.h | 17 +- + arch/s390/include/asm/irq.h | 35 +-- + arch/s390/include/asm/page.h | 10 - + arch/s390/include/asm/pci.h | 22 +- + arch/s390/include/asm/pci_insn.h | 12 +- + arch/s390/include/asm/pci_io.h | 10 +- + arch/s390/include/asm/pgtable.h | 304 +++++++++++++------------ + arch/s390/include/asm/serial.h | 6 + + arch/s390/kernel/entry.S | 12 +- + arch/s390/kernel/entry64.S | 9 +- + arch/s390/kernel/irq.c | 160 +++++-------- + arch/s390/kernel/perf_event.c | 9 +- + arch/s390/kernel/ptrace.c | 2 +- + arch/s390/kernel/setup.c | 1 + + arch/s390/kernel/vdso.c | 6 +- + arch/s390/lib/uaccess_pt.c | 16 +- + arch/s390/mm/dump_pagetables.c | 18 +- + arch/s390/mm/gup.c | 6 +- + arch/s390/mm/hugetlbpage.c | 104 ++++++++- + arch/s390/mm/init.c | 1 + + arch/s390/mm/pageattr.c | 2 +- + arch/s390/mm/pgtable.c | 59 ++--- + arch/s390/mm/vmem.c | 14 +- + arch/s390/oprofile/init.c | 2 +- + arch/s390/pci/Makefile | 2 +- + arch/s390/pci/pci.c | 454 ++++++++++++++----------------------- + arch/s390/pci/pci_dma.c | 4 +- + arch/s390/pci/pci_insn.c | 18 +- + arch/s390/pci/pci_msi.c | 142 ------------ + drivers/s390/block/dasd.c | 6 + + drivers/s390/block/dasd_devmap.c | 8 +- + drivers/s390/block/dasd_erp.c | 6 +- + drivers/s390/char/sclp_config.c | 2 +- + drivers/s390/cio/airq.c | 161 ++++++++++++- + drivers/s390/cio/ccwgroup.c | 2 +- + drivers/s390/cio/cio.c | 46 ++-- + drivers/s390/cio/cio.h | 3 - + 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 +- + 48 files changed, 921 insertions(+), 990 deletions(-) + create mode 100644 arch/s390/include/asm/serial.h + delete mode 100644 arch/s390/pci/pci_msi.c +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 7353b8b] 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 (9ae8480 tile: convert uses of "inv" to "finv") +$ git merge --no-ff tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/asm/cacheflush.h | 44 ++++++++++++++++------------------- + arch/tile/include/asm/cmpxchg.h | 6 +++++ + arch/tile/include/asm/uaccess.h | 31 ------------------------ + arch/tile/include/uapi/asm/cachectl.h | 4 ++-- + arch/tile/kernel/hardwall.c | 2 +- + arch/tile/kernel/head_32.S | 2 +- + arch/tile/kernel/head_64.S | 2 +- + arch/tile/kernel/process.c | 23 +++++++----------- + arch/tile/lib/cacheflush.c | 13 +++++++---- + arch/tile/lib/exports.c | 1 - + arch/tile/lib/usercopy_32.S | 19 --------------- + arch/tile/lib/usercopy_64.S | 19 --------------- + drivers/edac/tile_edac.c | 1 - + 13 files changed, 48 insertions(+), 119 deletions(-) +Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge --no-ff unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (3b2f64d Linux 3.11-rc2) +$ 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 (71b4325 ceph: wake up writer if vmtruncate work get blocked) +$ git merge --no-ff ceph/master +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/dir.c +Merge made by the 'recursive' strategy. + fs/ceph/dir.c | 2 ++ + fs/ceph/inode.c | 9 ++++++++- + fs/ceph/ioctl.c | 4 +++- + net/ceph/osd_client.c | 3 ++- + 4 files changed, 15 insertions(+), 3 deletions(-) +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 (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ 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 (4a8603e ext4: avoid reusing recently deleted inodes in no journal mode) +$ git merge --no-ff ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/ext4.h | 19 +++- + fs/ext4/extents.c | 259 +++++++++++++++++++++++++++++--------------- + fs/ext4/extents_status.c | 56 +++++++++- + fs/ext4/extents_status.h | 50 +++++---- + fs/ext4/ialloc.c | 61 ++++++++++- + fs/ext4/inode.c | 6 +- + fs/ext4/ioctl.c | 3 + + fs/ext4/migrate.c | 2 +- + fs/ext4/move_extent.c | 2 +- + fs/ext4/namei.c | 35 +++--- + fs/ext4/super.c | 1 + + include/trace/events/ext4.h | 28 +++-- + 12 files changed, 376 insertions(+), 146 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at b235914 Merge remote-tracking branch 'cifs/for-next' +Merging next-20130726 version of ext4 +$ git merge -m next-20130726/ext4 dda5690defe4af62ee120f055e98e40d97e4c760 +Already up-to-date. +Merging f2fs/dev (cbd56e7 f2fs: fix handling orphan inodes) +$ git merge --no-ff f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 43 +++++++++++++++++++++++++++++++---- + fs/f2fs/checkpoint.c | 18 ++++++++++----- + fs/f2fs/data.c | 3 +-- + fs/f2fs/debug.c | 34 ++++++++++++++-------------- + fs/f2fs/dir.c | 19 +++++++++++++++- + fs/f2fs/f2fs.h | 25 ++++++++++++++++----- + fs/f2fs/file.c | 19 +++++++++------- + fs/f2fs/inode.c | 4 ++-- + fs/f2fs/namei.c | 20 ++++++++++++++--- + fs/f2fs/node.c | 10 ++++----- + fs/f2fs/node.h | 40 +++++++++++++-------------------- + fs/f2fs/recovery.c | 6 ++--- + fs/f2fs/segment.c | 19 +++++++++------- + fs/f2fs/super.c | 46 ++++++++++++++++++++++++++++++++++++++ + 14 files changed, 216 insertions(+), 90 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 +Already up-to-date. +Merging gfs2/master (6daf3e6 GFS2: WQ_NON_REENTRANT is meaningless and going away) +$ git merge --no-ff gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/inode.c | 2 +- + fs/gfs2/lops.c | 18 ++++++++++++++++++ + fs/gfs2/main.c | 2 +- + fs/gfs2/meta_io.c | 18 ------------------ + fs/gfs2/meta_io.h | 26 +++++++++++--------------- + 5 files changed, 31 insertions(+), 35 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 (55b5929 NFSv4: Fix nfs4_init_uniform_client_string for net namespaces) +$ git merge --no-ff nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/nfs4proc.c | 14 ++++-- + fs/nfs/nfs4state.c | 2 +- + fs/nfs/nfs4xdr.c | 125 +++++++++++++++++++++----------------------------- + net/sunrpc/rpc_pipe.c | 19 +------- + 4 files changed, 64 insertions(+), 96 deletions(-) +Merging nfsd/nfsd-next (df66e75 nfsd: nfs4_file_get_access: need to be more careful with O_RDWR) +$ git merge --no-ff nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4state.c | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) +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 (b3f8ab4 fs: 9p: use strlcpy instead of strncpy) +$ git merge --no-ff v9fs/for-next +Merge made by the 'recursive' strategy. + fs/9p/vfs_inode.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging ubifs/linux-next (beadadf UBIFS: correct mount message) +$ git merge --no-ff ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (7a378c9 xfs: WQ_NON_REENTRANT is meaningless and going away) +$ 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 | 25 +++++++-------- + 7 files changed, 194 insertions(+), 48 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 0da5339] 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 (b7c75de PCI: Claim ACS support for AMD southbridge devices) +$ git merge --no-ff pci/next +Merge made by the 'recursive' strategy. + drivers/pci/pci.c | 93 +++++++++++++++++++++++++++++++++++++++++++--------- + drivers/pci/quirks.c | 50 ++++++++++++++++++++++++++++ + 2 files changed, 127 insertions(+), 16 deletions(-) +Merging hid/for-next (ea25d0d 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/Kconfig | 8 +++++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 23 +++++++++++-- + drivers/hid/hid-ids.h | 4 +++ + drivers/hid/hid-kye.c | 45 +++++++++++++++--------- + drivers/hid/hid-logitech-dj.c | 22 ++++++++---- + drivers/hid/hid-magicmouse.c | 2 +- + drivers/hid/hid-ntrig.c | 12 +++---- + drivers/hid/hid-picolcd_debugfs.c | 23 +++++++------ + drivers/hid/hid-roccat-arvo.c | 6 ++-- + drivers/hid/hid-roccat-isku.c | 2 +- + drivers/hid/hid-roccat-kone.c | 4 +-- + drivers/hid/hid-roccat-koneplus.c | 2 +- + drivers/hid/hid-roccat-kovaplus.c | 2 +- + drivers/hid/hid-xinmo.c | 72 +++++++++++++++++++++++++++++++++++++++ + drivers/hid/usbhid/hid-core.c | 5 ++- + include/linux/hid.h | 1 + + net/bluetooth/hidp/core.c | 15 +++++--- + 18 files changed, 189 insertions(+), 60 deletions(-) + create mode 100644 drivers/hid/hid-xinmo.c +Merging i2c/i2c/for-next (3b2f64d Linux 3.11-rc2) +$ 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 (d8df13e hwmon: (nct6775) Fix size of data->temp array) +$ git merge --no-ff hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/coretemp.c | 14 +- + drivers/hwmon/nct6775.c | 2527 +++++++++++++++++++++++----------------------- + 2 files changed, 1262 insertions(+), 1279 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 (8de6aeb Merge branches 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next) +$ git merge --no-ff kbuild/for-next +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig.txt | 8 ++-- + scripts/kconfig/mconf.c | 4 +- + scripts/kconfig/nconf.c | 4 +- + scripts/kconfig/symbol.c | 49 +++++++++------------ + scripts/package/builddeb | 92 +++++++++++++++++++++++++++++++++------- + scripts/package/mkspec | 46 +++++++++++++++++--- + 6 files changed, 144 insertions(+), 59 deletions(-) +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 (3ea47c0 Merge branch 'for-3.12' into for-next) +$ git merge --no-ff libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/libata.h | 4 -- + drivers/ata/pata_at32.c | 2 +- + drivers/ata/pata_at91.c | 2 +- + drivers/ata/pata_imx.c | 1 + + drivers/ata/pata_ixp4xx_cf.c | 4 +- + drivers/ata/pata_octeon_cf.c | 2 +- + drivers/ata/pata_platform.c | 2 +- + drivers/ata/pata_pxa.c | 2 +- + drivers/ata/pata_samsung_cf.c | 4 +- + drivers/ata/sata_mv.c | 26 ++++------- + include/linux/ata.h | 102 ------------------------------------------ + include/linux/libata.h | 102 ++++++++++++++++++++++++++++++++++++++++++ + 12 files changed, 120 insertions(+), 133 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 (2280c2c Merge branch 'fixes-next' into linux-next) +$ git merge --no-ff pm/linux-next +Auto-merging drivers/cpuidle/cpuidle-ux500.c +Removing drivers/cpufreq/mperf.h +Removing drivers/cpufreq/mperf.c +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 55 +- + Documentation/laptops/asus-laptop.txt | 8 +- + Documentation/laptops/sony-laptop.txt | 8 +- + Documentation/laptops/thinkpad-acpi.txt | 73 +- + arch/arm/mach-davinci/cpuidle.c | 2 +- + arch/arm/mach-ux500/Makefile | 1 - + arch/x86/include/asm/processor.h | 29 - + arch/x86/pci/i386.c | 4 + + drivers/acpi/Kconfig | 18 - + drivers/acpi/ac.c | 1 - + drivers/acpi/acpi_pad.c | 1 - + drivers/acpi/acpi_platform.c | 8 +- + drivers/acpi/acpica/aclocal.h | 3 + + drivers/acpi/acpica/actables.h | 5 + + drivers/acpi/acpica/acutils.h | 4 +- + drivers/acpi/acpica/evgpeinit.c | 11 - + drivers/acpi/acpica/exdump.c | 6 +- + drivers/acpi/acpica/nsxfname.c | 11 +- + drivers/acpi/acpica/tbxfroot.c | 4 +- + drivers/acpi/acpica/uteval.c | 8 +- + drivers/acpi/acpica/utosi.c | 77 +- + drivers/acpi/acpica/utstring.c | 5 +- + drivers/acpi/acpica/utxface.c | 29 + + drivers/acpi/battery.c | 21 +- + drivers/acpi/bus.c | 121 +-- + drivers/acpi/button.c | 2 - + drivers/acpi/dock.c | 398 +++----- + drivers/acpi/ec.c | 4 +- + drivers/acpi/event.c | 106 -- + drivers/acpi/internal.h | 1 + + drivers/acpi/osl.c | 22 +- + drivers/acpi/pci_irq.c | 1 + + drivers/acpi/pci_slot.c | 14 +- + 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/base/power/main.c | 77 +- + drivers/char/sonypi.c | 5 - + drivers/cpufreq/Makefile | 2 +- + drivers/cpufreq/acpi-cpufreq.c | 5 - + drivers/cpufreq/cpufreq.c | 31 +- + 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/Kconfig | 20 +- + drivers/cpuidle/Kconfig.arm | 29 + + drivers/cpuidle/Makefile | 9 +- + .../cpuidle.c => drivers/cpuidle/cpuidle-ux500.c | 19 +- + drivers/cpuidle/cpuidle.c | 94 +- + drivers/cpuidle/governors/ladder.c | 12 +- + drivers/cpuidle/governors/menu.c | 118 +-- + drivers/cpuidle/sysfs.c | 101 +- + drivers/mfd/db8500-prcmu.c | 4 + + drivers/pci/hotplug/acpiphp.h | 55 +- + drivers/pci/hotplug/acpiphp_core.c | 18 +- + drivers/pci/hotplug/acpiphp_glue.c | 1031 ++++++++------------ + drivers/pci/hotplug/acpiphp_ibm.c | 3 +- + drivers/pci/pci-acpi.c | 16 +- + 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 - + drivers/pnp/driver.c | 21 +- + include/acpi/acpi_bus.h | 21 +- + include/acpi/acpi_drivers.h | 14 +- + include/acpi/acpixf.h | 4 +- + include/acpi/actypes.h | 21 +- + include/linux/cpufreq.h | 6 - + include/linux/cpuidle.h | 9 +- + include/linux/pci-acpi.h | 10 +- + include/linux/tick.h | 6 - + include/trace/events/power.h | 37 + + kernel/power/suspend.c | 4 +- + kernel/time/tick-sched.c | 9 +- + 86 files changed, 1328 insertions(+), 2128 deletions(-) + delete mode 100644 drivers/cpufreq/mperf.c + delete mode 100644 drivers/cpufreq/mperf.h + create mode 100644 drivers/cpuidle/Kconfig.arm + rename arch/arm/mach-ux500/cpuidle.c => drivers/cpuidle/cpuidle-ux500.c (90%) +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 +Already up-to-date. +Merging ieee1394/for-next (0a41981 firewire: core: typecast from gfp_t to bool more safely) +$ git merge --no-ff ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/core-cdev.c | 2 +- + drivers/firewire/core-transaction.c | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) +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 (ededf30 dlm: WQ_NON_REENTRANT is meaningless and going away) +$ git merge --no-ff dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/ast.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +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 (8f48475 Merge branch 'for-linus' into next) +$ git merge --no-ff slave-dma/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/dma/acpi-dma.c | 2 +- + drivers/dma/dw/core.c | 39 ++++++++------ + drivers/dma/dw/platform.c | 1 + + 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 | 10 +--- + drivers/dma/pl330.c | 120 +++++++++++++++++++++++++++++++++--------- + drivers/dma/tegra20-apb-dma.c | 8 ++- + drivers/dma/txx9dmac.c | 13 +++-- + include/linux/dmaengine.h | 44 ++++++++++++++++ + 18 files changed, 187 insertions(+), 114 deletions(-) +Merging dmaengine/next (41ef2d5 Linux 3.9-rc7) +$ git merge --no-ff dmaengine/next +Already up-to-date. +Merging net-next/master (9ad8fef net: mvneta: support big endian) +$ git merge --no-ff net-next/master +Auto-merging net/ipv6/ip6mr.c +Auto-merging net/ipv4/sysctl_net_ipv4.c +Auto-merging drivers/net/vxlan.c +Auto-merging drivers/net/usb/ax88179_178a.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 17 + + Documentation/networking/sctp.txt | 5 +- + MAINTAINERS | 1 + + drivers/isdn/hardware/mISDN/hfcpci.c | 12 +- + drivers/net/bonding/bond_main.c | 72 +-- + drivers/net/bonding/bond_sysfs.c | 21 +- + drivers/net/ethernet/broadcom/cnic.c | 84 ++-- + drivers/net/ethernet/broadcom/cnic.h | 2 +- + drivers/net/ethernet/broadcom/cnic_defs.h | 6 +- + drivers/net/ethernet/broadcom/cnic_if.h | 6 +- + drivers/net/ethernet/broadcom/tg3.c | 103 +++- + drivers/net/ethernet/broadcom/tg3.h | 12 +- + drivers/net/ethernet/cisco/enic/Makefile | 3 +- + drivers/net/ethernet/cisco/enic/enic.h | 48 ++ + drivers/net/ethernet/cisco/enic/enic_dev.h | 1 + + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 257 ++++++++++ + drivers/net/ethernet/cisco/enic/enic_main.c | 270 +---------- + drivers/net/ethernet/emulex/benet/be_cmds.c | 116 ++++- + drivers/net/ethernet/emulex/benet/be_cmds.h | 13 + + drivers/net/ethernet/emulex/benet/be_main.c | 211 ++++---- + drivers/net/ethernet/freescale/fec_main.c | 110 +++-- + drivers/net/ethernet/intel/e100.c | 15 +- + drivers/net/ethernet/intel/e1000e/82571.c | 1 + + drivers/net/ethernet/intel/e1000e/e1000.h | 3 - + drivers/net/ethernet/intel/e1000e/ethtool.c | 105 ++-- + drivers/net/ethernet/intel/e1000e/hw.h | 10 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 140 ++++-- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 6 + + drivers/net/ethernet/intel/e1000e/netdev.c | 38 +- + drivers/net/ethernet/marvell/mvneta.c | 61 ++- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 18 + + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 61 ++- + drivers/net/ethernet/mellanox/mlx4/eq.c | 9 + + drivers/net/ethernet/mellanox/mlx4/fw.c | 104 ++++ + drivers/net/ethernet/mellanox/mlx4/fw.h | 1 + + drivers/net/ethernet/mellanox/mlx4/main.c | 35 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 11 - + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 13 + + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 15 + + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 51 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 98 ++++ + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h | 1 + + drivers/net/ethernet/renesas/Kconfig | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 25 + + drivers/net/ethernet/renesas/sh_eth.h | 2 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 - + drivers/net/ethernet/ti/cpsw.c | 230 ++++++++- + drivers/net/ethernet/tile/tilepro.c | 77 ++- + drivers/net/ethernet/via/via-velocity.c | 20 + + drivers/net/macvlan.c | 3 + + drivers/net/team/team.c | 201 +++++++- + drivers/net/tun.c | 54 ++- + drivers/net/usb/asix_devices.c | 3 + + drivers/net/usb/ax88179_178a.c | 3 + + drivers/net/usb/usbnet.c | 54 ++- + drivers/net/virtio_net.c | 42 +- + drivers/net/vxlan.c | 38 ++ + drivers/scsi/bnx2i/57xx_iscsi_hsi.h | 12 +- + include/linux/if_team.h | 14 +- + include/linux/igmp.h | 1 - + include/linux/mlx4/cmd.h | 1 + + include/linux/mlx4/device.h | 1 + + include/linux/netdevice.h | 4 +- + include/linux/tcp.h | 1 + + include/linux/usb/usbnet.h | 3 + + include/net/9p/transport.h | 3 - + {net/vmw_vsock => include/net}/af_vsock.h | 0 + include/net/sctp/auth.h | 2 +- + include/net/sctp/checksum.h | 17 +- + include/net/sctp/constants.h | 2 +- + include/net/sctp/sctp.h | 2 +- + include/net/sctp/sm.h | 2 +- + include/net/sctp/structs.h | 2 +- + include/net/sctp/tsnmap.h | 2 +- + include/net/sctp/ulpevent.h | 2 +- + include/net/sctp/ulpqueue.h | 2 +- + include/net/sock.h | 23 +- + include/net/tcp.h | 24 +- + include/net/udp.h | 1 + + {net/vmw_vsock => include/net}/vsock_addr.h | 0 + include/uapi/linux/if_tun.h | 3 + + include/uapi/linux/sctp.h | 2 +- + include/uapi/linux/tcp.h | 1 + + include/uapi/linux/virtio_net.h | 4 +- + net/8021q/vlan.c | 1 + + net/9p/client.c | 9 +- + net/9p/trans_rdma.c | 11 - + net/Kconfig | 2 +- + net/bridge/br_device.c | 12 +- + net/bridge/br_if.c | 3 +- + net/bridge/br_notify.c | 5 + + net/bridge/br_private.h | 10 - + net/ceph/messenger.c | 2 +- + net/core/dev.c | 2 +- + net/core/pktgen.c | 61 ++- + net/core/sock.c | 47 ++ + net/core/stream.c | 2 +- + net/dccp/proto.c | 4 +- + net/ipv4/igmp.c | 49 +- + net/ipv4/ip_vti.c | 528 ++------------------- + net/ipv4/ipmr.c | 15 +- + net/ipv4/sysctl_net_ipv4.c | 7 + + net/ipv4/tcp.c | 11 +- + net/ipv4/tcp_input.c | 115 +++-- + net/ipv4/tcp_ipv4.c | 8 +- + net/ipv4/tcp_minisocks.c | 8 +- + net/ipv4/tcp_output.c | 3 + + net/ipv4/udp.c | 3 +- + net/ipv6/ip6_fib.c | 16 +- + net/ipv6/ip6mr.c | 11 +- + net/ipv6/mcast.c | 4 +- + net/ipv6/route.c | 1 - + net/ipv6/tcp_ipv6.c | 6 +- + net/irda/irttp.c | 50 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 23 +- + net/netfilter/nf_nat_proto_sctp.c | 8 +- + net/packet/af_packet.c | 48 +- + net/sctp/associola.c | 2 +- + net/sctp/auth.c | 2 +- + net/sctp/bind_addr.c | 2 +- + net/sctp/chunk.c | 2 +- + net/sctp/command.c | 2 +- + net/sctp/debug.c | 2 +- + net/sctp/endpointola.c | 2 +- + net/sctp/input.c | 12 +- + net/sctp/inqueue.c | 2 +- + net/sctp/ipv6.c | 2 +- + net/sctp/objcnt.c | 2 +- + net/sctp/output.c | 2 +- + net/sctp/outqueue.c | 2 +- + net/sctp/primitive.c | 2 +- + net/sctp/proc.c | 2 +- + net/sctp/protocol.c | 4 +- + net/sctp/sm_make_chunk.c | 2 +- + net/sctp/sm_sideeffect.c | 2 +- + net/sctp/sm_statefuns.c | 2 +- + net/sctp/sm_statetable.c | 2 +- + net/sctp/socket.c | 2 +- + net/sctp/ssnmap.c | 2 +- + net/sctp/sysctl.c | 2 +- + net/sctp/transport.c | 2 +- + net/sctp/tsnmap.c | 2 +- + net/sctp/ulpevent.c | 2 +- + net/sctp/ulpqueue.c | 2 +- + net/sunrpc/svcsock.c | 2 +- + net/sunrpc/xprtsock.c | 2 +- + net/vmw_vsock/af_vsock.c | 3 +- + net/vmw_vsock/vmci_transport.c | 2 +- + net/vmw_vsock/vmci_transport.h | 4 +- + net/vmw_vsock/vsock_addr.c | 3 +- + 150 files changed, 2600 insertions(+), 1621 deletions(-) + create mode 100644 drivers/net/ethernet/cisco/enic/enic_ethtool.c + rename {net/vmw_vsock => include/net}/af_vsock.h (100%) + rename {net/vmw_vsock => include/net}/vsock_addr.h (100%) +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 (2cdf359 mwifiex: code rearrangement in sdio.c) +$ git merge --no-ff wireless-next/master +Resolved 'drivers/net/ethernet/broadcom/Kconfig' using previous resolution. +Auto-merging drivers/net/wireless/mwifiex/sdio.c +Auto-merging drivers/net/ethernet/broadcom/Kconfig +CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bbd1758] Merge remote-tracking branch 'wireless-next/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bcma/Kconfig | 10 +- + drivers/bcma/main.c | 2 +- + drivers/bcma/scan.c | 28 +- + drivers/net/ethernet/broadcom/Kconfig | 2 +- + drivers/net/wireless/ath/ath9k/Kconfig | 10 + + drivers/net/wireless/ath/ath9k/ar9002_phy.h | 4 - + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 55 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 5 - + drivers/net/wireless/ath/ath9k/ath9k.h | 7 - + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 19 + + drivers/net/wireless/ath/ath9k/hw.c | 70 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/phy.h | 7 + + 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/iwlegacy/3945.c | 31 +- + drivers/net/wireless/mwifiex/11n_aggr.c | 4 +- + drivers/net/wireless/mwifiex/cfg80211.c | 25 +- + drivers/net/wireless/mwifiex/decl.h | 3 +- + drivers/net/wireless/mwifiex/fw.h | 44 +- + drivers/net/wireless/mwifiex/ie.c | 2 +- + drivers/net/wireless/mwifiex/init.c | 14 +- + drivers/net/wireless/mwifiex/join.c | 1 + + drivers/net/wireless/mwifiex/main.c | 87 +- + drivers/net/wireless/mwifiex/main.h | 6 +- + drivers/net/wireless/mwifiex/pcie.c | 39 +- + drivers/net/wireless/mwifiex/sdio.c | 213 ++-- + drivers/net/wireless/mwifiex/sta_cmd.c | 5 +- + drivers/net/wireless/mwifiex/sta_event.c | 10 + + drivers/net/wireless/mwifiex/sta_ioctl.c | 11 +- + drivers/net/wireless/mwifiex/uap_cmd.c | 130 +- + drivers/net/wireless/mwifiex/uap_txrx.c | 70 +- + drivers/net/wireless/mwifiex/usb.c | 8 + + drivers/net/wireless/mwifiex/wmm.c | 16 +- + 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 | 39 +- + drivers/net/wireless/rt2x00/rt2x00.h | 1 + + include/linux/bcma/bcma.h | 17 + + 51 files changed, 2514 insertions(+), 596 deletions(-) +Merging bluetooth/master (473c131 Bluetooth: replace strict_strtol() with kstrtol()) +$ git merge --no-ff bluetooth/master +Auto-merging net/bluetooth/hidp/core.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_debugfs.c | 6 +++--- + 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 ++- + 6 files changed, 51 insertions(+), 28 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 (aed2c03 drm/gem: fix mmap vma size calculations) +$ git merge --no-ff drm/drm-next +Resolved 'drivers/gpu/drm/qxl/qxl_release.c' using previous resolution. +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/qxl/qxl_release.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/qxl/qxl_release.c +Auto-merging drivers/gpu/drm/qxl/qxl_object.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_display.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +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 +Recorded resolution for 'drivers/gpu/drm/i915/i915_dma.c'. +[master b83f999] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 6 + + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/ast/ast_main.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 2 +- + drivers/gpu/drm/drm_bufs.c | 41 +- + drivers/gpu/drm/drm_context.c | 8 - + drivers/gpu/drm/drm_drv.c | 19 +- + drivers/gpu/drm/drm_fops.c | 10 - + drivers/gpu/drm/drm_gem.c | 109 +--- + drivers/gpu/drm/drm_gem_cma_helper.c | 16 +- + drivers/gpu/drm/drm_mm.c | 31 +- + drivers/gpu/drm/drm_pci.c | 4 - + drivers/gpu/drm/drm_scatter.c | 13 +- + drivers/gpu/drm/drm_vma_manager.c | 281 +++++++++ + drivers/gpu/drm/exynos/exynos_drm_gem.c | 14 +- + drivers/gpu/drm/gma500/framebuffer.c | 6 +- + drivers/gpu/drm/gma500/gem.c | 22 +- + 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 | 176 +++--- + drivers/gpu/drm/i915/i915_gem_context.c | 2 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 7 +- + 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 | 80 ++- + 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 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 31 +- + drivers/gpu/drm/omapdrm/omap_gem_helpers.c | 49 +- + drivers/gpu/drm/qxl/qxl_object.h | 2 +- + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/r128/r128_cce.c | 2 +- + drivers/gpu/drm/radeon/cik.c | 14 +- + drivers/gpu/drm/radeon/evergreen.c | 4 +- + drivers/gpu/drm/radeon/ni.c | 6 +- + drivers/gpu/drm/radeon/r100.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 14 +- + drivers/gpu/drm/radeon/r600_cp.c | 6 +- + drivers/gpu/drm/radeon/radeon_cp.c | 6 +- + drivers/gpu/drm/radeon/radeon_drv.c | 7 +- + drivers/gpu/drm/radeon/radeon_kms.c | 10 - + drivers/gpu/drm/radeon/radeon_object.h | 5 +- + drivers/gpu/drm/radeon/si.c | 14 +- + drivers/gpu/drm/ttm/ttm_bo.c | 84 +-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 3 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 81 +-- + drivers/gpu/drm/udl/udl_gem.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- + drivers/gpu/host1x/drm/gem.c | 5 +- + include/drm/drmP.h | 44 +- + include/drm/drm_mm.h | 6 +- + include/drm/drm_vma_manager.h | 224 +++++++ + include/drm/ttm/ttm_bo_api.h | 15 +- + include/drm/ttm/ttm_bo_driver.h | 10 +- + include/uapi/drm/drm.h | 2 +- + 79 files changed, 2894 insertions(+), 2368 deletions(-) + create mode 100644 drivers/gpu/drm/drm_vma_manager.c + create mode 100644 drivers/gpu/drm/i915/i915_gpu_error.c + create mode 100644 include/drm/drm_vma_manager.h +Merging drm-intel/for-linux-next (fae5cbf drm/i915: clean up crtc timings computation) +$ git merge --no-ff drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/i915_dma.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_gem_stolen.c +Auto-merging drivers/gpu/drm/i915/i915_gem.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 9fe35c0] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 178 ++++++++- + drivers/gpu/drm/i915/i915_dma.c | 50 +-- + drivers/gpu/drm/i915/i915_drv.c | 280 +------------- + drivers/gpu/drm/i915/i915_drv.h | 260 ++++++++----- + drivers/gpu/drm/i915/i915_gem.c | 155 +++++--- + 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 | 16 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 213 +++++++---- + drivers/gpu/drm/i915/i915_gem_stolen.c | 67 ++-- + drivers/gpu/drm/i915/i915_gpu_error.c | 8 +- + drivers/gpu/drm/i915/i915_irq.c | 552 +++++++++++--------------- + drivers/gpu/drm/i915/i915_reg.h | 104 ++++- + drivers/gpu/drm/i915/i915_trace.h | 8 +- + drivers/gpu/drm/i915/intel_crt.c | 38 +- + drivers/gpu/drm/i915/intel_ddi.c | 41 +- + drivers/gpu/drm/i915/intel_display.c | 440 ++++++++++++++------- + drivers/gpu/drm/i915/intel_dp.c | 421 ++++++++++++++++---- + drivers/gpu/drm/i915/intel_drv.h | 14 +- + drivers/gpu/drm/i915/intel_dvo.c | 58 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 32 +- + drivers/gpu/drm/i915/intel_lvds.c | 19 +- + drivers/gpu/drm/i915/intel_overlay.c | 4 +- + drivers/gpu/drm/i915/intel_panel.c | 3 - + drivers/gpu/drm/i915/intel_pm.c | 333 +++------------- + drivers/gpu/drm/i915/intel_sdvo.c | 26 +- + drivers/gpu/drm/i915/intel_tv.c | 31 +- + drivers/gpu/drm/i915/intel_uncore.c | 595 +++++++++++++++++++++++++++++ + include/drm/drm_dp_helper.h | 31 +- + include/uapi/drm/i915_drm.h | 24 ++ + 33 files changed, 2469 insertions(+), 1594 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_uncore.c +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 (7d4f606 ALSA: hda - WAKEEN feature enabling for runtime pm) +$ git merge --no-ff sound/for-next +Auto-merging sound/soc/soc-core.c +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_codec.c | 6 +- + sound/pci/hda/hda_generic.c | 8 +- + sound/pci/hda/hda_hwdep.c | 6 +- + sound/pci/hda/hda_intel.c | 32 +- + 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/hda/patch_realtek.c | 45 +- + sound/pci/hda/patch_via.c | 2 +- + sound/pci/rme9652/hdspm.c | 767 +++++-- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/omap/mcbsp.c | 2 +- + sound/soc/soc-core.c | 8 +- + sound/usb/usx2y/usbusx2y.c | 8 +- + 17 files changed, 978 insertions(+), 4686 deletions(-) +Merging sound-asoc/for-next (4211dde 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 +- + Documentation/devicetree/bindings/sound/wm8994.txt | 4 + + include/linux/atmel-ssc.h | 2 +- + include/linux/mfd/arizona/gpio.h | 96 +++ + include/sound/rcar_snd.h | 75 +++ + include/sound/soc-dapm.h | 182 +++--- + include/sound/soc-dpcm.h | 2 +- + include/sound/soc.h | 3 + + 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/au1x/psc-ac97.c | 3 - + sound/soc/blackfin/bf5xx-ac97.c | 5 +- + sound/soc/blackfin/bf5xx-ac97.h | 2 - + sound/soc/cirrus/ep93xx-ac97.c | 3 - + sound/soc/cirrus/ep93xx-i2s.c | 3 - + sound/soc/codecs/Kconfig | 5 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/adau1701.c | 5 +- + 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/lm4857.c | 107 +--- + sound/soc/codecs/max98090.c | 10 +- + sound/soc/codecs/pcm3008.c | 108 ++-- + sound/soc/codecs/sgtl5000.c | 1 + + sound/soc/codecs/sta32x.c | 10 +- + sound/soc/codecs/tlv320aic3x.c | 56 +- + sound/soc/codecs/twl6040.c | 7 +- + sound/soc/codecs/uda134x.c | 88 ++- + sound/soc/codecs/wm5102.c | 6 + + sound/soc/codecs/wm5110.c | 9 + + sound/soc/codecs/wm8350.c | 6 +- + sound/soc/codecs/wm8731.c | 60 +- + sound/soc/codecs/wm8753.c | 5 +- + sound/soc/codecs/wm8903.c | 4 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8962.c | 7 +- + sound/soc/codecs/wm8994.c | 37 +- + sound/soc/codecs/wm8995.c | 5 +- + sound/soc/codecs/wm_adsp.c | 103 +-- + sound/soc/codecs/wm_adsp.h | 2 +- + sound/soc/codecs/wm_hubs.c | 8 +- + sound/soc/fsl/Kconfig | 4 +- + sound/soc/fsl/fsl_ssi.c | 64 +- + 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 | 22 +- + sound/soc/fsl/imx-sgtl5000.c | 4 +- + sound/soc/fsl/imx-ssi.c | 11 +- + 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 | 3 +- + sound/soc/mxs/mxs-saif.c | 1 - + sound/soc/mxs/mxs-sgtl5000.c | 1 - + sound/soc/nuc900/nuc900-ac97.c | 3 - + sound/soc/omap/Kconfig | 6 +- + sound/soc/omap/omap-mcbsp.c | 5 + + sound/soc/pxa/brownstone.c | 1 + + sound/soc/pxa/mmp-sspa.c | 3 - + sound/soc/pxa/ttc-dkb.c | 1 + + sound/soc/samsung/i2s-regs.h | 36 +- + sound/soc/samsung/i2s.c | 58 +- + sound/soc/samsung/smdk_wm8994.c | 58 +- + sound/soc/samsung/spdif.c | 8 +- + sound/soc/sh/Kconfig | 7 + + sound/soc/sh/Makefile | 3 + + sound/soc/sh/rcar/Makefile | 2 + + sound/soc/sh/rcar/adg.c | 234 +++++++ + sound/soc/sh/rcar/core.c | 705 +++++++++++++++++++++ + sound/soc/sh/rcar/gen.c | 285 +++++++++ + sound/soc/sh/rcar/rsnd.h | 258 ++++++++ + sound/soc/sh/rcar/scu.c | 125 ++++ + sound/soc/sh/rcar/ssi.c | 588 +++++++++++++++++ + sound/soc/soc-compress.c | 8 +- + sound/soc/soc-core.c | 16 + + sound/soc/soc-dapm.c | 690 ++++++++++---------- + sound/soc/soc-jack.c | 2 +- + sound/soc/soc-pcm.c | 15 +- + sound/soc/tegra/Kconfig | 14 +- + sound/soc/tegra/tegra20_ac97.c | 2 - + sound/soc/tegra/tegra_alc5632.c | 2 - + sound/soc/tegra/tegra_wm8753.c | 2 - + sound/soc/tegra/trimslice.c | 2 - + sound/soc/txx9/txx9aclc-ac97.c | 3 - + sound/soc/ux500/mop500.c | 1 + + 100 files changed, 3908 insertions(+), 1110 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 include/sound/rcar_snd.h + create mode 100644 sound/soc/atmel/atmel_wm8904.c + create mode 100644 sound/soc/codecs/ak4554.c + create mode 100644 sound/soc/sh/rcar/Makefile + create mode 100644 sound/soc/sh/rcar/adg.c + create mode 100644 sound/soc/sh/rcar/core.c + create mode 100644 sound/soc/sh/rcar/gen.c + create mode 100644 sound/soc/sh/rcar/rsnd.h + create mode 100644 sound/soc/sh/rcar/scu.c + create mode 100644 sound/soc/sh/rcar/ssi.c +Merging modules/modules-next (ad81f05 Linux 3.11-rc1) +$ git merge --no-ff modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (314081f virtio: console: fix locking around send_sigio_to_port()) +$ git merge --no-ff virtio/virtio-next +Auto-merging drivers/char/virtio_console.c +Merge made by the 'recursive' strategy. + arch/x86/lguest/boot.c | 3 +-- + drivers/char/virtio_console.c | 18 +++++++++++++----- + tools/lguest/lguest.c | 6 ++++++ + tools/virtio/.gitignore | 3 +++ + 4 files changed, 23 insertions(+), 7 deletions(-) + create mode 100644 tools/virtio/.gitignore +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 (cace1c9 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. + kernel/cgroup.c | 305 +++++++++++++++++++++++++++----------------------------- + kernel/cpuset.c | 13 ++- + 2 files changed, 153 insertions(+), 165 deletions(-) +Merging block/for-next (3fe9649 Merge branch 'for-3.11/drivers' into for-next) +$ git merge --no-ff block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (6d1d6b4 mmc: tmio: fix compiler warning) +$ git merge --no-ff mmc/mmc-next +Merge made by the 'recursive' strategy. + drivers/mmc/host/tmio_mmc_pio.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +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 (5ad58b4 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/raid5.c | 459 ++++++++++++++++++++++++++++++++++++++++++++++++++--- + drivers/md/raid5.h | 22 +++ + 4 files changed, 471 insertions(+), 31 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 (4f5c943 Merge remote-tracking branch 'regulator/topic/tps65912' 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/pfuze100.txt | 115 ++++++ + .../devicetree/bindings/regulator/regulator.txt | 2 + + drivers/regulator/88pm800.c | 380 +++++++++++++++++ + drivers/regulator/88pm8607.c | 2 +- + drivers/regulator/Kconfig | 262 ++++++------ + drivers/regulator/Makefile | 4 +- + drivers/regulator/aat2870-regulator.c | 2 +- + drivers/regulator/ab3100.c | 2 +- + drivers/regulator/ad5398.c | 2 +- + drivers/regulator/as3711-regulator.c | 163 ++------ + drivers/regulator/core.c | 140 ++++++- + drivers/regulator/da903x.c | 47 +-- + drivers/regulator/da9052-regulator.c | 2 +- + drivers/regulator/da9055-regulator.c | 2 +- + drivers/regulator/fan53555.c | 2 +- + drivers/regulator/fixed.c | 2 +- + drivers/regulator/gpio-regulator.c | 2 +- + drivers/regulator/isl6271a-regulator.c | 2 +- + drivers/regulator/lp3971.c | 2 +- + drivers/regulator/lp3972.c | 2 +- + drivers/regulator/lp872x.c | 11 +- + drivers/regulator/lp8755.c | 3 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max8649.c | 2 +- + drivers/regulator/max8660.c | 2 +- + drivers/regulator/max8925-regulator.c | 2 +- + drivers/regulator/max8952.c | 2 +- + drivers/regulator/max8973-regulator.c | 2 +- + drivers/regulator/of_regulator.c | 12 +- + drivers/regulator/palmas-regulator.c | 2 +- + drivers/regulator/pcap-regulator.c | 2 +- + drivers/regulator/pcf50633-regulator.c | 2 +- + drivers/regulator/pfuze100-regulator.c | 456 +++++++++++++++++++++ + drivers/regulator/s2mps11.c | 241 +++++++++-- + drivers/regulator/tps51632-regulator.c | 2 +- + drivers/regulator/tps62360-regulator.c | 2 +- + drivers/regulator/tps65023-regulator.c | 2 +- + drivers/regulator/tps6524x-regulator.c | 2 +- + drivers/regulator/tps65912-regulator.c | 39 +- + drivers/regulator/twl-regulator.c | 2 +- + drivers/regulator/userspace-consumer.c | 2 +- + drivers/regulator/virtual.c | 2 +- + drivers/regulator/wm831x-dcdc.c | 8 +- + drivers/regulator/wm831x-isink.c | 2 +- + drivers/regulator/wm831x-ldo.c | 110 ++--- + drivers/regulator/wm8350-regulator.c | 57 +-- + drivers/regulator/wm8400-regulator.c | 52 +-- + drivers/regulator/wm8994-regulator.c | 2 +- + 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 + + include/linux/regulator/pfuze100.h | 44 ++ + 55 files changed, 1713 insertions(+), 579 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/88pm800.txt + create mode 100644 Documentation/devicetree/bindings/regulator/pfuze100.txt + create mode 100644 drivers/regulator/88pm800.c + create mode 100644 drivers/regulator/pfuze100-regulator.c + create mode 100644 include/linux/regulator/pfuze100.h +Merging security/next (9548906 xattr: Constify ->name member of "struct xattr".) +$ git merge --no-ff security/next +Merge made by the 'recursive' strategy. + fs/ocfs2/xattr.h | 2 +- + include/linux/security.h | 8 ++++---- + include/linux/xattr.h | 2 +- + include/uapi/linux/reiserfs_xattr.h | 2 +- + security/capability.c | 2 +- + security/integrity/evm/evm_main.c | 2 +- + security/security.c | 8 +++----- + security/selinux/hooks.c | 17 ++++++----------- + security/smack/smack_lsm.c | 9 +++------ + 9 files changed, 21 insertions(+), 31 deletions(-) +Merging selinux/master (2be4d74 Add SELinux policy capability for always checking packet and peer classes.) +$ git merge --no-ff selinux/master +Resolved 'security/selinux/hooks.c' using previous resolution. +Auto-merging security/selinux/ss/policydb.c +Auto-merging security/selinux/include/security.h +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/capability.c +Auto-merging include/linux/security.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master acb333b] Merge remote-tracking branch 'selinux/master' +$ git diff -M --stat --summary HEAD^.. + include/linux/security.h | 26 ++- + security/capability.c | 15 +- + security/security.c | 13 +- + security/selinux/hooks.c | 109 ++++++--- + security/selinux/include/objsec.h | 4 +- + security/selinux/include/security.h | 15 +- + security/selinux/include/xfrm.h | 45 ++-- + security/selinux/netnode.c | 2 + + security/selinux/selinuxfs.c | 4 +- + 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/ss/services.c | 24 +- + security/selinux/xfrm.c | 453 ++++++++++++++++-------------------- + 16 files changed, 389 insertions(+), 378 deletions(-) +Merging lblnet/master (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge --no-ff lblnet/master +Already up-to-date. +Merging watchdog/master (b3a3a9c Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ 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 (a24a4b9 include/linux/coda.h: remove useless '#else') +$ git merge --no-ff trivial/for-next +Merge made by the 'recursive' strategy. + Documentation/arm/OMAP/omap_pm | 2 +- + Documentation/block/cfq-iosched.txt | 2 +- + Documentation/development-process/2.Process | 4 ++-- + Documentation/devicetree/bindings/arm/ste-u300.txt | 2 +- + .../devicetree/bindings/arm/vexpress-sysreg.txt | 4 ++-- + .../devicetree/bindings/clock/clk-exynos-audss.txt | 2 +- + .../devicetree/bindings/dma/atmel-dma.txt | 4 ++-- + .../devicetree/bindings/dma/fsl-imx-dma.txt | 2 +- + .../devicetree/bindings/dma/ste-dma40.txt | 4 ++-- + Documentation/devicetree/bindings/mfd/cros-ec.txt | 2 +- + .../bindings/pinctrl/atmel,at91-pinctrl.txt | 2 +- + Documentation/dma-buf-sharing.txt | 2 +- + Documentation/fb/fbcon.txt | 2 +- + Documentation/fb/viafb.txt | 2 +- + Documentation/filesystems/ext4.txt | 2 +- + Documentation/filesystems/nfs/pnfs.txt | 2 +- + Documentation/filesystems/relay.txt | 2 +- + Documentation/filesystems/sysfs-tagging.txt | 2 +- + Documentation/i2c/upgrading-clients | 4 ++-- + Documentation/printk-formats.txt | 2 +- + Documentation/rapidio/rapidio.txt | 2 +- + Documentation/sound/alsa/compress_offload.txt | 2 +- + Documentation/sysfs-rules.txt | 2 +- + Documentation/virtual/kvm/api.txt | 2 +- + Documentation/x86/boot.txt | 2 +- + include/linux/coda.h | 1 - + include/linux/ktime.h | 28 ++++++++++++---------- + 27 files changed, 45 insertions(+), 44 deletions(-) +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 (f0a56c4 amd64_edac: Fix single-channel setups) +$ git merge --no-ff edac-amd/for-next +Auto-merging drivers/edac/edac_mc_sysfs.c +Merge made by the 'recursive' strategy. + drivers/edac/amd64_edac.c | 9 ++++++++- + drivers/edac/edac_mc_sysfs.c | 6 ++++-- + 2 files changed, 12 insertions(+), 3 deletions(-) +Merging devicetree/devicetree/next (245d964 of/platform: Staticize of_platform_device_create_pdata()) +$ git merge --no-ff devicetree/devicetree/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/can/sja1000.txt | 2 +- + arch/arc/mm/init.c | 5 ++- + arch/arm/mm/init.c | 2 +- + arch/arm64/mm/init.c | 3 +- + arch/c6x/kernel/devicetree.c | 3 +- + arch/metag/mm/init.c | 5 ++- + arch/microblaze/kernel/prom.c | 3 +- + arch/mips/kernel/prom.c | 3 +- + arch/openrisc/kernel/prom.c | 3 +- + arch/powerpc/kernel/prom.c | 3 +- + arch/x86/kernel/devicetree.c | 3 +- + arch/xtensa/kernel/setup.c | 3 +- + drivers/of/fdt.c | 10 +++--- + drivers/of/platform.c | 2 +- + include/linux/of.h | 39 +++++++++++++--------- + include/linux/of_fdt.h | 3 +- + 16 files changed, 46 insertions(+), 46 deletions(-) +Merging dt-rh/for-next (d683b96 Linux 3.10-rc4) +$ git merge --no-ff dt-rh/for-next +Already up-to-date. +Merging spi/for-next (6dd4918 Merge remote-tracking branch 'spi/topic/xilinx' into spi-next) +$ git merge --no-ff spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/Kconfig | 41 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-atmel.c | 16 +- + drivers/spi/spi-bcm2835.c | 6 - + drivers/spi/spi-bcm63xx.c | 21 +- + drivers/spi/spi-bfin-v3.c | 973 +++++++++++++++++++++++++++++++++++++++ + drivers/spi/spi-bitbang.c | 261 +++++------ + drivers/spi/spi-clps711x.c | 6 - + drivers/spi/spi-coldfire-qspi.c | 21 +- + drivers/spi/spi-davinci.c | 2 +- + drivers/spi/spi-ep93xx.c | 351 ++++---------- + drivers/spi/spi-imx.c | 76 ++- + drivers/spi/spi-mxs.c | 23 +- + drivers/spi/spi-omap-100k.c | 276 ++++------- + drivers/spi/spi-omap2-mcspi.c | 20 +- + drivers/spi/spi-orion.c | 23 +- + drivers/spi/spi-pl022.c | 21 +- + drivers/spi/spi-pxa2xx.c | 21 +- + drivers/spi/spi-s3c64xx.c | 45 +- + drivers/spi/spi-sh-hspi.c | 20 +- + drivers/spi/spi-sh-msiof.c | 18 - + drivers/spi/spi-sirf.c | 1 + + drivers/spi/spi-tegra114.c | 11 +- + drivers/spi/spi-tegra20-sflash.c | 8 +- + drivers/spi/spi-tegra20-slink.c | 8 +- + drivers/spi/spi-tle62x0.c | 3 +- + drivers/spi/spi-txx9.c | 2 +- + drivers/spi/spi-xilinx.c | 172 +++---- + drivers/spi/spi.c | 29 ++ + include/linux/spi/spi.h | 12 + + include/linux/spi/spi_bitbang.h | 5 - + 31 files changed, 1464 insertions(+), 1029 deletions(-) + create mode 100644 drivers/spi/spi-bfin-v3.c +Merging tip/auto-latest (396c4fb Merge branch 'x86/urgent') +$ git merge --no-ff tip/auto-latest +Auto-merging kernel/time/tick-sched.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/timer/moxa,moxart-timer.txt | 17 + + Documentation/memory-hotplug.txt | 16 +- + Documentation/x86/x86_64/boot-options.txt | 5 + + MAINTAINERS | 10 +- + arch/powerpc/include/asm/perf_event_server.h | 4 +- + arch/powerpc/perf/power7-events-list.h | 548 +++++++++++++++ + arch/powerpc/perf/power7-pmu.c | 148 +---- + arch/x86/Kconfig | 11 +- + arch/x86/boot/compressed/eboot.c | 2 +- + arch/x86/ia32/ia32entry.S | 2 +- + arch/x86/include/asm/acpi.h | 2 + + arch/x86/include/asm/alternative.h | 14 +- + arch/x86/include/asm/bitops.h | 46 +- + arch/x86/include/asm/cpufeature.h | 17 +- + arch/x86/include/asm/mce.h | 3 + + arch/x86/include/asm/mutex_64.h | 30 + + arch/x86/include/asm/sync_bitops.h | 24 +- + arch/x86/include/asm/tsc.h | 1 + + arch/x86/kernel/acpi/boot.c | 20 +- + arch/x86/kernel/alternative.c | 155 +++-- + arch/x86/kernel/apic/apic.c | 7 +- + arch/x86/kernel/cpu/mcheck/mce-internal.h | 3 + + arch/x86/kernel/cpu/mcheck/mce.c | 28 + + arch/x86/kernel/cpu/mcheck/mce_intel.c | 42 +- + arch/x86/kernel/cpu/perf_event.c | 6 + + arch/x86/kernel/early-quirks.c | 14 +- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/i387.c | 2 +- + arch/x86/kernel/jump_label.c | 16 +- + arch/x86/kernel/kprobes/common.h | 5 - + arch/x86/kernel/kprobes/core.c | 2 +- + arch/x86/kernel/kprobes/opt.c | 110 +--- + arch/x86/kernel/traps.c | 4 + + arch/x86/kernel/tsc.c | 6 + + drivers/acpi/apei/ghes.c | 38 +- + drivers/acpi/apei/hest.c | 38 ++ + drivers/clocksource/Makefile | 1 + + drivers/clocksource/cadence_ttc_timer.c | 13 +- + drivers/clocksource/moxart_timer.c | 164 +++++ + drivers/clocksource/sun4i_timer.c | 110 +++- + drivers/clocksource/time-orion.c | 2 +- + include/linux/lockdep.h | 92 +-- + include/linux/mm.h | 1 + + include/linux/nodemask.h | 11 +- + include/linux/sched.h | 9 + + include/uapi/linux/perf_event.h | 46 +- + kernel/events/core.c | 110 ++-- + kernel/lglock.c | 12 +- + kernel/mutex.c | 43 +- + kernel/sched/core.c | 91 ++- + kernel/sched/cpupri.c | 4 +- + kernel/sched/fair.c | 122 ++-- + kernel/sched/sched.h | 8 +- + kernel/time/tick-sched.c | 5 +- + mm/memory-failure.c | 5 +- + tools/lib/traceevent/Makefile | 18 +- + tools/lib/traceevent/event-parse.c | 7 +- + tools/lib/traceevent/event-parse.h | 15 +- + tools/lib/traceevent/kbuffer-parse.c | 732 +++++++++++++++++++++ + tools/lib/traceevent/kbuffer.h | 67 ++ + tools/lib/traceevent/trace-seq.c | 13 + + tools/perf/Documentation/perf-diff.txt | 79 ++- + tools/perf/Documentation/perf-list.txt | 4 +- + tools/perf/Documentation/perf-report.txt | 13 +- + tools/perf/Documentation/perf-top.txt | 5 + + tools/perf/Makefile | 11 +- + tools/perf/arch/x86/Makefile | 2 + + tools/perf/arch/x86/util/tsc.c | 59 ++ + tools/perf/arch/x86/util/tsc.h | 20 + + tools/perf/bench/mem-memcpy.c | 2 + + tools/perf/builtin-diff.c | 662 +++++++++++++++---- + tools/perf/builtin-inject.c | 45 +- + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-list.c | 3 + + tools/perf/builtin-record.c | 13 - + tools/perf/builtin-report.c | 79 ++- + tools/perf/builtin-sched.c | 53 +- + tools/perf/builtin-script.c | 8 +- + tools/perf/builtin-timechart.c | 176 ++--- + tools/perf/builtin-top.c | 15 +- + tools/perf/builtin-trace.c | 6 +- + tools/perf/config/Makefile | 5 +- + tools/perf/tests/builtin-test.c | 6 + + tools/perf/tests/dso-data.c | 8 - + tools/perf/tests/evsel-tp-sched.c | 4 +- + tools/perf/tests/make | 67 +- + tools/perf/tests/parse-events.c | 22 +- + tools/perf/tests/perf-time-to-tsc.c | 177 +++++ + tools/perf/tests/tests.h | 9 + + tools/perf/tests/vmlinux-kallsyms.c | 15 +- + tools/perf/ui/browsers/hists.c | 18 +- + tools/perf/ui/gtk/hists.c | 126 +++- + tools/perf/ui/hist.c | 258 +------- + tools/perf/ui/setup.c | 1 - + tools/perf/ui/stdio/hist.c | 45 +- + tools/perf/util/callchain.c | 7 +- + tools/perf/util/callchain.h | 6 + + tools/perf/util/cpumap.h | 2 +- + tools/perf/util/event.c | 2 +- + tools/perf/util/event.h | 2 +- + tools/perf/util/evlist.c | 38 +- + tools/perf/util/evsel.c | 10 +- + tools/perf/util/header.c | 150 +---- + tools/perf/util/header.h | 40 +- + tools/perf/util/hist.c | 4 +- + tools/perf/util/hist.h | 26 +- + tools/perf/util/include/linux/string.h | 1 + + tools/perf/util/machine.c | 46 +- + tools/perf/util/machine.h | 8 +- + tools/perf/util/parse-events.c | 112 ++-- + tools/perf/util/parse-events.h | 11 +- + tools/perf/util/parse-events.y | 62 +- + tools/perf/util/pmu.c | 87 ++- + tools/perf/util/pmu.h | 5 +- + .../perf/util/scripting-engines/trace-event-perl.c | 14 +- + .../util/scripting-engines/trace-event-python.c | 9 +- + tools/perf/util/session.c | 45 +- + tools/perf/util/session.h | 1 - + tools/perf/util/sort.c | 12 +- + tools/perf/util/sort.h | 13 +- + tools/perf/util/string.c | 24 + + tools/perf/util/symbol.c | 7 +- + tools/perf/util/thread.c | 10 +- + tools/perf/util/thread.h | 14 +- + tools/perf/util/tool.h | 10 +- + tools/perf/util/trace-event-info.c | 96 +-- + tools/perf/util/trace-event-parse.c | 6 - + tools/perf/util/trace-event-read.c | 52 +- + tools/perf/util/trace-event-scripting.c | 3 +- + tools/perf/util/trace-event.h | 21 +- + tools/perf/util/util.c | 59 ++ + tools/perf/util/util.h | 3 + + 132 files changed, 4344 insertions(+), 1791 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt + create mode 100644 arch/powerpc/perf/power7-events-list.h + create mode 100644 drivers/clocksource/moxart_timer.c + create mode 100644 tools/lib/traceevent/kbuffer-parse.c + create mode 100644 tools/lib/traceevent/kbuffer.h + create mode 100644 tools/perf/arch/x86/util/tsc.c + create mode 100644 tools/perf/arch/x86/util/tsc.h + create mode 100644 tools/perf/tests/perf-time-to-tsc.c +Merging ftrace/for-next (6fd52fc ftrace: Clear module traced functions on unload module) +$ git merge --no-ff ftrace/for-next +Merge made by the 'recursive' strategy. + kernel/trace/ftrace.c | 76 ++++++++++++++++-- + kernel/trace/trace_events.c | 159 ++++++++++++++++++++----------------- + kernel/trace/trace_events_filter.c | 17 ++-- + 3 files changed, 164 insertions(+), 88 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 (bf64087 KVM: s390: Make KVM_HVA_ERR_BAD usable on s390) +$ git merge --no-ff kvm/linux-next +Auto-merging kernel/sched/core.c +Auto-merging include/linux/sched.h +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/include/asm/processor.h +Auto-merging arch/s390/include/asm/pgtable.h +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/include/asm/kvm_host.h | 8 ++ + arch/s390/include/asm/mmu.h | 2 - + arch/s390/include/asm/mmu_context.h | 19 +--- + arch/s390/include/asm/pgtable.h | 11 ++ + arch/s390/include/asm/processor.h | 2 + + arch/s390/kvm/diag.c | 17 +++- + arch/s390/kvm/kvm-s390.c | 27 +++-- + arch/s390/kvm/kvm-s390.h | 10 ++ + arch/s390/kvm/priv.c | 32 +++--- + arch/s390/mm/pgtable.c | 183 +++++++++++++++++++++------------ + arch/x86/include/asm/kvm_host.h | 5 +- + arch/x86/include/asm/pvclock.h | 1 - + arch/x86/kernel/pvclock.c | 44 -------- + arch/x86/kvm/lapic.c | 33 ++---- + arch/x86/kvm/mmu.c | 7 +- + arch/x86/kvm/pmu.c | 25 ++++- + arch/x86/kvm/vmx.c | 195 +++++++++++++++++++++++------------- + arch/x86/kvm/x86.c | 128 +++++++++++++++++++++-- + arch/x86/vdso/vclock_gettime.c | 16 +-- + include/linux/kvm_host.h | 13 +++ + include/linux/sched.h | 8 -- + kernel/sched/core.c | 15 --- + virt/kvm/kvm_main.c | 126 +++++++++++++++++++---- + 27 files changed, 614 insertions(+), 329 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 0658d33] 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-tip/linux-next (eea3e0b Merge tag 'stable/for-linus-3.11-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into linux-next) +$ git merge --no-ff xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/Makefile | 5 ++--- + drivers/xen/evtchn.c | 21 ++------------------- + drivers/xen/xenbus/xenbus_probe_frontend.c | 19 ++++++++++++++++--- + 3 files changed, 20 insertions(+), 25 deletions(-) +Merging xen-arm/linux-next (2451ade xen/arm,arm64: update xen_restart after ff701306cd49 and 7b6d864b48d9) +$ git merge --no-ff xen-arm/linux-next +Merge made by the 'recursive' strategy. + arch/arm/xen/enlighten.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (1315b5c Merge branch 'for-3.12' into for-next) +$ git merge --no-ff workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + Documentation/workqueue.txt | 18 ++++++------------ + include/linux/workqueue.h | 7 ++++++- + kernel/workqueue.c | 32 ++++++++++++++++++++++---------- + 3 files changed, 34 insertions(+), 23 deletions(-) +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 (f021e63 Merge remote-tracking branch 'regmap/topic/sparse' into regmap-next) +$ git merge --no-ff regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 25 +++++++++++++++++++++++++ + drivers/base/regmap/regmap.c | 19 ++++++++++--------- + include/linux/regmap.h | 10 +++++++--- + 3 files changed, 42 insertions(+), 12 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 (077e91f leds: use dev_get_platdata()) +$ 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 | 46 +++ + Documentation/leds/leds-lp55xx.txt | 30 +- + drivers/leds/Kconfig | 18 +- + drivers/leds/Makefile | 1 + + drivers/leds/leds-88pm860x.c | 2 +- + drivers/leds/leds-adp5520.c | 6 +- + drivers/leds/leds-asic3.c | 4 +- + drivers/leds/leds-atmel-pwm.c | 4 +- + drivers/leds/leds-bd2802.c | 2 +- + drivers/leds/leds-da903x.c | 2 +- + drivers/leds/leds-da9052.c | 4 +- + drivers/leds/leds-gpio.c | 2 +- + drivers/leds/leds-lm3530.c | 2 +- + drivers/leds/leds-lm3533.c | 2 +- + drivers/leds/leds-lm355x.c | 2 +- + drivers/leds/leds-lm3642.c | 2 +- + drivers/leds/leds-lp3944.c | 5 +- + drivers/leds/leds-lp5521.c | 4 +- + drivers/leds/leds-lp5523.c | 4 +- + drivers/leds/leds-lp5562.c | 4 +- + drivers/leds/leds-lp55xx-common.c | 3 + + drivers/leds/leds-lp8501.c | 410 +++++++++++++++++++++ + drivers/leds/leds-lt3593.c | 4 +- + drivers/leds/leds-netxbig.c | 6 +- + drivers/leds/leds-ns2.c | 2 +- + drivers/leds/leds-pca9532.c | 3 +- + drivers/leds/leds-pca955x.c | 2 +- + drivers/leds/leds-pca9633.c | 209 ++++++++++- + drivers/leds/leds-pwm.c | 2 +- + drivers/leds/leds-regulator.c | 3 +- + drivers/leds/leds-renesas-tpu.c | 12 +- + drivers/leds/leds-s3c24xx.c | 2 +- + drivers/leds/leds-tca6507.c | 2 +- + drivers/leds/leds-wm831x-status.c | 4 +- + drivers/leds/leds-wm8350.c | 2 +- + include/linux/platform_data/leds-lp55xx.h | 10 + + include/linux/platform_data/leds-pca9633.h | 6 + + 38 files changed, 842 insertions(+), 58 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/pca9633.txt + create mode 100644 drivers/leds/leds-lp8501.c +Merging driver-core/driver-core-next (e70b091 tile / cpu topology: remove stale Macro arch_provides_topology_pointers) +$ git merge --no-ff driver-core/driver-core-next +Merge made by the 'recursive' strategy. + arch/tile/include/asm/topology.h | 3 - + arch/x86/include/asm/topology.h | 3 - + drivers/base/core.c | 28 ++++---- + drivers/base/memory.c | 4 +- + drivers/base/power/sysfs.c | 2 +- + drivers/base/regmap/regmap-debugfs.c | 2 +- + drivers/base/topology.c | 20 ------ + drivers/char/bsr.c | 18 +++-- + drivers/char/tile-srom.c | 28 ++++---- + drivers/dma/dmaengine.c | 26 ++++--- + drivers/extcon/extcon-class.c | 13 ++-- + drivers/isdn/mISDN/core.c | 64 +++++++++-------- + drivers/leds/led-class.c | 38 +++++++--- + drivers/misc/c2port/core.c | 83 +++++++++++---------- + drivers/misc/enclosure.c | 29 +++----- + drivers/ptp/ptp_clock.c | 2 +- + drivers/ptp/ptp_private.h | 2 +- + drivers/ptp/ptp_sysfs.c | 51 +++++++------ + drivers/rtc/rtc-sysfs.c | 48 ++++++------- + drivers/scsi/osd/osd_uld.c | 13 ++-- + drivers/staging/comedi/comedi_fops.c | 39 +++++----- + drivers/uio/uio.c | 22 +++--- + drivers/video/backlight/backlight.c | 44 ++++++------ + drivers/video/backlight/lcd.c | 26 ++++--- + fs/fuse/cuse.c | 13 ++-- + include/linux/kobject.h | 4 ++ + lib/Kconfig.debug | 19 +++++ + lib/kobject.c | 22 +++++- + net/core/net-sysfs.c | 136 +++++++++++++++++++---------------- + net/ieee802154/wpan-class.c | 23 +++--- + net/rfkill/core.c | 90 +++++++++++------------ + net/wireless/sysfs.c | 25 ++++--- + 32 files changed, 517 insertions(+), 423 deletions(-) +Merging tty/tty-next (e26439c serial: pch_uart: Fix signed-ness and casting of uartclk related fields) +$ git merge --no-ff tty/tty-next +Auto-merging drivers/tty/serial/mxs-auart.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/tty/serial/atmel-usart.txt | 18 +- + .../devicetree/bindings/tty/serial/st-asc.txt | 18 + + drivers/net/irda/irtty-sir.c | 8 +- + drivers/staging/comedi/comedidev.h | 1 - + drivers/staging/dgrp/dgrp_tty.c | 2 + + drivers/tty/hvc/hvc_console.c | 11 +- + drivers/tty/hvc/hvc_console.h | 3 + + drivers/tty/hvc/hvc_iucv.c | 64 +- + drivers/tty/n_gsm.c | 29 +- + drivers/tty/n_tty.c | 1401 ++++++++++++-------- + drivers/tty/pty.c | 18 +- + drivers/tty/serial/8250/8250_em.c | 27 +- + drivers/tty/serial/8250/8250_pci.c | 15 +- + drivers/tty/serial/8250/Kconfig | 2 + + drivers/tty/serial/Kconfig | 26 +- + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/ar933x_uart.c | 1 - + drivers/tty/serial/atmel_serial.c | 851 ++++++++++-- + drivers/tty/serial/bcm63xx_uart.c | 1 - + drivers/tty/serial/bfin_uart.c | 4 - + drivers/tty/serial/clps711x.c | 11 +- + drivers/tty/serial/efm32-uart.c | 4 +- + drivers/tty/serial/fsl_lpuart.c | 7 +- + drivers/tty/serial/imx.c | 507 ++++++- + drivers/tty/serial/max310x.c | 991 +++++++------- + drivers/tty/serial/msm_serial.c | 184 +-- + drivers/tty/serial/msm_serial.h | 19 +- + drivers/tty/serial/mxs-auart.c | 8 - + drivers/tty/serial/netx-serial.c | 2 - + drivers/tty/serial/omap-serial.c | 41 +- + drivers/tty/serial/pch_uart.c | 82 +- + drivers/tty/serial/pmac_zilog.c | 1 - + drivers/tty/serial/pnx8xxx_uart.c | 2 - + drivers/tty/serial/pxa.c | 2 - + drivers/tty/serial/sa1100.c | 2 - + drivers/tty/serial/sccnxp.c | 3 - + drivers/tty/serial/serial_core.c | 4 +- + drivers/tty/serial/sirfsoc_uart.c | 3 +- + drivers/tty/serial/st-asc.c | 937 +++++++++++++ + drivers/tty/serial/vt8500_serial.c | 1 - + drivers/tty/synclink.c | 130 +- + drivers/tty/tty_buffer.c | 417 +++--- + drivers/tty/tty_io.c | 28 +- + drivers/tty/tty_ioctl.c | 90 +- + drivers/tty/tty_ldisc.c | 461 +++---- + drivers/tty/vt/keyboard.c | 21 +- + drivers/tty/vt/selection.c | 8 +- + drivers/tty/vt/vt.c | 4 +- + include/linux/atmel_serial.h | 2 + + include/linux/kbd_kern.h | 3 +- + include/linux/llist.h | 23 + + include/linux/pci_ids.h | 4 +- + include/linux/platform_data/max310x.h | 9 +- + include/linux/tty.h | 66 +- + include/linux/tty_flip.h | 8 +- + include/linux/tty_ldisc.h | 16 +- + include/uapi/linux/serial_core.h | 3 + + include/uapi/linux/serial_reg.h | 1 + + 58 files changed, 4412 insertions(+), 2194 deletions(-) + create mode 100644 Documentation/devicetree/bindings/tty/serial/st-asc.txt + create mode 100644 drivers/tty/serial/st-asc.c +Merging usb/usb-next (7d50195 usb: host: Faraday fotg210-hcd driver) +$ git merge --no-ff usb/usb-next +Auto-merging drivers/usb/serial/mos7840.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Merge made by the 'recursive' strategy. + drivers/usb/Makefile | 1 + + drivers/usb/atm/Makefile | 3 - + drivers/usb/atm/speedtch.c | 2 +- + drivers/usb/atm/usbatm.c | 49 +- + drivers/usb/atm/usbatm.h | 35 +- + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/class/usbtmc.c | 46 +- + drivers/usb/core/devio.c | 6 +- + drivers/usb/core/endpoint.c | 1 - + drivers/usb/core/hub.c | 6 +- + drivers/usb/core/urb.c | 8 + + drivers/usb/gadget/storage_common.c | 2 +- + drivers/usb/host/Kconfig | 12 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-grlib.c | 11 +- + drivers/usb/host/ehci-mxc.c | 10 +- + drivers/usb/host/ehci-omap.c | 10 +- + drivers/usb/host/ehci-pci.c | 42 - + drivers/usb/host/ehci-ppc-of.c | 11 +- + drivers/usb/host/ehci-s5p.c | 10 +- + drivers/usb/host/ehci-xilinx-of.c | 17 +- + drivers/usb/host/fotg210-hcd.c | 6049 +++++++++++++++++++++++++++++++++ + drivers/usb/host/fotg210.h | 750 ++++ + drivers/usb/host/isp116x.h | 13 +- + drivers/usb/host/isp1362-hcd.c | 83 +- + drivers/usb/host/isp1362.h | 53 +- + drivers/usb/host/ohci-ep93xx.c | 137 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/ohci-omap3.c | 10 +- + drivers/usb/host/ohci-ppc-of.c | 11 +- + drivers/usb/host/pci-quirks.c | 48 +- + drivers/usb/host/pci-quirks.h | 3 +- + drivers/usb/host/sl811-hcd.c | 107 +- + drivers/usb/host/sl811.h | 21 +- + drivers/usb/host/xhci-hub.c | 221 +- + drivers/usb/host/xhci-pci.c | 14 +- + drivers/usb/host/xhci-plat.c | 26 + + drivers/usb/host/xhci.c | 10 +- + drivers/usb/misc/Kconfig | 13 + + drivers/usb/misc/Makefile | 4 +- + drivers/usb/misc/adutux.c | 200 +- + drivers/usb/misc/ehset.c | 134 + + drivers/usb/misc/ldusb.c | 31 +- + drivers/usb/misc/legousbtower.c | 124 +- + drivers/usb/musb/musb_core.c | 1 - + drivers/usb/phy/Kconfig | 2 + + drivers/usb/phy/Makefile | 3 - + drivers/usb/phy/phy-fsl-usb.c | 6 +- + drivers/usb/phy/phy-fsm-usb.h | 11 +- + drivers/usb/phy/phy-isp1301-omap.c | 6 +- + drivers/usb/serial/console.c | 27 +- + drivers/usb/serial/cp210x.c | 3 - + drivers/usb/serial/cypress_m8.c | 4 +- + drivers/usb/serial/f81232.c | 3 +- + drivers/usb/serial/ftdi_sio.c | 52 +- + drivers/usb/serial/generic.c | 13 +- + drivers/usb/serial/io_edgeport.c | 2 - + drivers/usb/serial/io_ti.c | 71 +- + drivers/usb/serial/mos7840.c | 48 - + drivers/usb/serial/oti6858.c | 10 +- + drivers/usb/serial/pl2303.c | 175 +- + drivers/usb/serial/safe_serial.c | 51 +- + drivers/usb/serial/spcp8x5.c | 4 +- + drivers/usb/serial/ti_usb_3410_5052.c | 103 +- + drivers/usb/serial/usb-serial.c | 14 +- + drivers/usb/usb-skeleton.c | 3 +- + include/linux/usb.h | 14 +- + 67 files changed, 7658 insertions(+), 1317 deletions(-) + create mode 100644 drivers/usb/host/fotg210-hcd.c + create mode 100644 drivers/usb/host/fotg210.h + create mode 100644 drivers/usb/misc/ehset.c +Merging usb-gadget/next (2e11234 usb: dwc3: core: modify IO memory resource after deferred probe completes) +$ git merge --no-ff usb-gadget/next +Resolved 'drivers/usb/gadget/udc-core.c' using previous resolution. +Removing include/linux/platform_data/tegra_usb.h +Auto-merging drivers/usb/phy/Kconfig +Auto-merging drivers/usb/musb/musb_core.c +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/usb/gadget/udc-core.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/udc-core.c +Removing drivers/usb/gadget/imx_udc.h +Removing drivers/usb/gadget/imx_udc.c +Auto-merging drivers/usb/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 12ff423] Merge remote-tracking branch 'usb-gadget/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/usb/dwc3.txt | 4 +- + Documentation/devicetree/bindings/usb/generic.txt | 24 + + .../bindings/usb/nvidia,tegra20-usb-phy.txt | 2 +- + .../devicetree/bindings/usb/samsung-hsotg.txt | 40 + + arch/arm/boot/dts/omap5.dtsi | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 1 - + arch/arm/boot/dts/tegra20-trimslice.dts | 1 - + arch/arm/boot/dts/tegra20-whistler.dts | 2 - + arch/arm/boot/dts/tegra20.dtsi | 28 +- + arch/arm/mach-tegra/tegra.c | 38 +- + drivers/usb/Makefile | 2 +- + drivers/usb/dwc3/Kconfig | 32 + + drivers/usb/dwc3/Makefile | 13 +- + drivers/usb/dwc3/core.c | 189 ++- + drivers/usb/dwc3/core.h | 53 +- + drivers/usb/dwc3/debug.h | 34 +- + drivers/usb/dwc3/debugfs.c | 34 +- + drivers/usb/dwc3/dwc3-exynos.c | 14 +- + drivers/usb/dwc3/dwc3-omap.c | 44 +- + drivers/usb/dwc3/dwc3-pci.c | 36 +- + drivers/usb/dwc3/ep0.c | 49 +- + drivers/usb/dwc3/gadget.c | 257 ++-- + drivers/usb/dwc3/gadget.h | 34 +- + drivers/usb/dwc3/host.c | 34 +- + drivers/usb/dwc3/io.h | 34 +- + drivers/usb/dwc3/platform_data.h | 27 + + drivers/usb/gadget/Kconfig | 17 - + drivers/usb/gadget/Makefile | 1 - + drivers/usb/gadget/atmel_usba_udc.c | 28 +- + drivers/usb/gadget/imx_udc.c | 1544 -------------------- + drivers/usb/gadget/imx_udc.h | 351 ----- + drivers/usb/gadget/s3c-hsotg.c | 10 + + drivers/usb/gadget/udc-core.c | 12 +- + drivers/usb/host/Kconfig | 5 +- + drivers/usb/host/ehci-tegra.c | 71 +- + drivers/usb/musb/cppi_dma.c | 18 +- + drivers/usb/musb/musb_core.c | 28 +- + drivers/usb/musb/musb_core.h | 8 - + drivers/usb/musb/musb_dma.h | 19 +- + drivers/usb/musb/musb_dsps.c | 36 +- + drivers/usb/musb/musb_gadget.c | 5 +- + drivers/usb/musb/musbhsdma.c | 17 +- + drivers/usb/musb/tusb6010_omap.c | 24 - + drivers/usb/musb/ux500_dma.c | 19 +- + drivers/usb/phy/Kconfig | 36 +- + drivers/usb/phy/phy-mxs-usb.c | 13 +- + drivers/usb/phy/phy-omap-usb3.c | 87 +- + drivers/usb/phy/phy-rcar-usb.c | 5 - + drivers/usb/phy/phy-tegra-usb.c | 254 ++-- + drivers/usb/renesas_usbhs/mod_gadget.c | 6 +- + drivers/usb/renesas_usbhs/mod_host.c | 6 +- + drivers/usb/renesas_usbhs/pipe.h | 6 +- + drivers/usb/usb-common.c | 49 +- + include/linux/platform_data/tegra_usb.h | 32 - + include/linux/usb/gadget.h | 4 + + include/linux/usb/of.h | 8 + + include/linux/usb/phy.h | 18 +- + include/linux/usb/tegra_usb_phy.h | 17 +- + 58 files changed, 829 insertions(+), 2953 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/generic.txt + create mode 100644 Documentation/devicetree/bindings/usb/samsung-hsotg.txt + create mode 100644 drivers/usb/dwc3/platform_data.h + delete mode 100644 drivers/usb/gadget/imx_udc.c + delete mode 100644 drivers/usb/gadget/imx_udc.h + delete mode 100644 include/linux/platform_data/tegra_usb.h +$ git reset --hard HEAD^ +HEAD is now at e38f558 Merge remote-tracking branch 'usb/usb-next' +Merging next-20130729 version of usb-gadget +$ git merge -m next-20130729/usb-gadget b1fd6cb5ee2f97a553d1c4b8a88914bd970daf37 +Already up-to-date. +Merging staging/staging-next (b9b9b35 staging: gdm724x: depend on CONFIG_TTY) +$ git merge --no-ff staging/staging-next +Removing drivers/staging/ozwpan/oztrace.h +Removing drivers/staging/ozwpan/oztrace.c +Removing drivers/staging/ozwpan/ozconfig.h +Auto-merging drivers/staging/ozwpan/Makefile +Removing drivers/staging/lustre/lustre/obdclass/lprocfs_jobstats.c +Removing drivers/staging/lustre/lustre/libcfs/watchdog.c +Removing drivers/staging/lustre/lustre/include/lustre_mdt.h +Removing drivers/staging/lustre/lustre/fld/fld_index.c +Removing drivers/staging/lustre/lustre/fld/fld_handler.c +Removing drivers/staging/lustre/lustre/fid/fid_store.c +Removing drivers/staging/lustre/lustre/fid/fid_handler.c +Removing drivers/staging/lustre/lnet/lnet/api-errno.c +Removing drivers/staging/comedi/drivers/addi_apci_1710.c +Removing drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c +Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c +Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c +Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c +Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c +Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c +Removing drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c +Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c +Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c +Removing drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c +Auto-merging drivers/staging/comedi/comedidev.h +Auto-merging drivers/staging/comedi/comedi_fops.c +Removing drivers/staging/asus_oled/zig.txt +Removing drivers/staging/asus_oled/tux_r2.txt +Removing drivers/staging/asus_oled/tux_r.txt +Removing drivers/staging/asus_oled/tux.txt +Removing drivers/staging/asus_oled/linux_fr.txt +Removing drivers/staging/asus_oled/linux_f.txt +Removing drivers/staging/asus_oled/linux.txt +Removing drivers/staging/asus_oled/asus_oled.c +Removing drivers/staging/asus_oled/TODO +Removing drivers/staging/asus_oled/README +Removing drivers/staging/asus_oled/Makefile +Removing drivers/staging/asus_oled/Kconfig +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 6 +- + drivers/staging/Makefile | 3 +- + drivers/staging/android/binder.c | 32 +- + drivers/staging/android/binder.h | 48 +- + drivers/staging/asus_oled/Kconfig | 6 - + drivers/staging/asus_oled/Makefile | 1 - + drivers/staging/asus_oled/README | 156 - + drivers/staging/asus_oled/TODO | 10 - + drivers/staging/asus_oled/asus_oled.c | 847 --- + drivers/staging/asus_oled/linux.txt | 33 - + drivers/staging/asus_oled/linux_f.txt | 18 - + drivers/staging/asus_oled/linux_fr.txt | 33 - + drivers/staging/asus_oled/tux.txt | 33 - + drivers/staging/asus_oled/tux_r.txt | 33 - + drivers/staging/asus_oled/tux_r2.txt | 33 - + drivers/staging/asus_oled/zig.txt | 33 - + drivers/staging/bcm/LeakyBucket.c | 262 +- + drivers/staging/bcm/Qos.c | 538 +- + drivers/staging/comedi/Kconfig | 43 +- + drivers/staging/comedi/comedi_buf.c | 2 + + drivers/staging/comedi/comedi_fops.c | 1 - + drivers/staging/comedi/comedi_internal.h | 1 + + drivers/staging/comedi/comedidev.h | 18 +- + drivers/staging/comedi/drivers.c | 54 +- + drivers/staging/comedi/drivers/8255.c | 3 +- + drivers/staging/comedi/drivers/8255_pci.c | 4 +- + drivers/staging/comedi/drivers/Makefile | 3 +- + .../comedi/drivers/addi-data/APCI1710_82x54.c | 1068 ---- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2050 -------- + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 1037 ---- + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 5461 -------------------- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 866 ---- + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 3582 ------------- + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 845 --- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2065 -------- + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 1044 ---- + .../staging/comedi/drivers/addi-data/addi_common.c | 3 +- + .../staging/comedi/drivers/addi-data/addi_common.h | 169 - + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 2 + + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 1314 ----- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 2 + + drivers/staging/comedi/drivers/addi_apci_035.c | 1 + + drivers/staging/comedi/drivers/addi_apci_1032.c | 4 +- + drivers/staging/comedi/drivers/addi_apci_1500.c | 1 + + drivers/staging/comedi/drivers/addi_apci_1516.c | 4 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 1 + + drivers/staging/comedi/drivers/addi_apci_16xx.c | 1 + + drivers/staging/comedi/drivers/addi_apci_1710.c | 99 - + drivers/staging/comedi/drivers/addi_apci_2032.c | 2 + + drivers/staging/comedi/drivers/addi_apci_2200.c | 1 + + drivers/staging/comedi/drivers/addi_apci_3120.c | 4 +- + drivers/staging/comedi/drivers/addi_apci_3200.c | 1 + + drivers/staging/comedi/drivers/addi_apci_3501.c | 4 +- + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 4 +- + drivers/staging/comedi/drivers/addi_watchdog.c | 1 + + drivers/staging/comedi/drivers/adl_pci6208.c | 4 +- + drivers/staging/comedi/drivers/adl_pci7x3x.c | 1 + + drivers/staging/comedi/drivers/adl_pci8164.c | 1 + + drivers/staging/comedi/drivers/adl_pci9111.c | 4 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 7 +- + drivers/staging/comedi/drivers/adq12b.c | 6 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 4 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 4 +- + drivers/staging/comedi/drivers/adv_pci1724.c | 11 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 4 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 5 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 2 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 6 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 2 +- + drivers/staging/comedi/drivers/amplc_dio200_pci.c | 5 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 7 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 1 + + drivers/staging/comedi/drivers/amplc_pci224.c | 7 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 4 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 1 + + drivers/staging/comedi/drivers/c6xdigio.c | 2 - + drivers/staging/comedi/drivers/cb_das16_cs.c | 5 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 4 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 4 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 4 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 5 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 4 +- + drivers/staging/comedi/drivers/comedi_bond.c | 4 +- + drivers/staging/comedi/drivers/comedi_fc.c | 1 + + drivers/staging/comedi/drivers/comedi_parport.c | 5 +- + drivers/staging/comedi/drivers/comedi_test.c | 4 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 1 + + drivers/staging/comedi/drivers/daqboard2000.c | 4 +- + drivers/staging/comedi/drivers/das08.c | 2 +- + drivers/staging/comedi/drivers/das08_cs.c | 6 +- + drivers/staging/comedi/drivers/das08_isa.c | 4 +- + drivers/staging/comedi/drivers/das08_pci.c | 4 +- + drivers/staging/comedi/drivers/das16.c | 6 +- + drivers/staging/comedi/drivers/das16m1.c | 5 +- + drivers/staging/comedi/drivers/das1800.c | 5 +- + drivers/staging/comedi/drivers/das6402.c | 6 +- + drivers/staging/comedi/drivers/das800.c | 5 +- + drivers/staging/comedi/drivers/dmm32at.c | 6 +- + drivers/staging/comedi/drivers/dt2801.c | 5 +- + drivers/staging/comedi/drivers/dt2811.c | 6 +- + drivers/staging/comedi/drivers/dt2814.c | 5 +- + drivers/staging/comedi/drivers/dt2815.c | 5 +- + drivers/staging/comedi/drivers/dt2817.c | 3 +- + drivers/staging/comedi/drivers/dt282x.c | 8 +- + drivers/staging/comedi/drivers/dt3000.c | 4 +- + drivers/staging/comedi/drivers/dt9812.c | 21 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 5 +- + drivers/staging/comedi/drivers/fl512.c | 5 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 4 +- + drivers/staging/comedi/drivers/icp_multi.c | 4 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 1004 ++-- + drivers/staging/comedi/drivers/jr3_pci.c | 4 +- + drivers/staging/comedi/drivers/ke_counter.c | 1 + + drivers/staging/comedi/drivers/me4000.c | 4 +- + drivers/staging/comedi/drivers/me_daq.c | 4 +- + drivers/staging/comedi/drivers/mite.c | 1 + + drivers/staging/comedi/drivers/mite.h | 1 + + drivers/staging/comedi/drivers/mpc624.c | 5 +- + drivers/staging/comedi/drivers/multiq3.c | 6 +- + drivers/staging/comedi/drivers/ni_6527.c | 4 +- + drivers/staging/comedi/drivers/ni_65xx.c | 5 +- + drivers/staging/comedi/drivers/ni_660x.c | 4 +- + drivers/staging/comedi/drivers/ni_670x.c | 5 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 7 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 6 +- + drivers/staging/comedi/drivers/ni_atmio.c | 2 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 6 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 4 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 1 + + drivers/staging/comedi/drivers/ni_labpc.c | 283 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 5 +- + drivers/staging/comedi/drivers/ni_labpc_isadma.c | 226 + + drivers/staging/comedi/drivers/ni_labpc_isadma.h | 57 + + drivers/staging/comedi/drivers/ni_labpc_pci.c | 5 +- + drivers/staging/comedi/drivers/ni_labpc_regs.h | 75 + + drivers/staging/comedi/drivers/ni_mio_common.c | 4 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 1 + + drivers/staging/comedi/drivers/ni_pcidio.c | 4 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 1 + + drivers/staging/comedi/drivers/ni_tio.c | 3 + + drivers/staging/comedi/drivers/ni_tiocmd.c | 1 + + drivers/staging/comedi/drivers/pcl711.c | 5 +- + drivers/staging/comedi/drivers/pcl724.c | 13 +- + drivers/staging/comedi/drivers/pcl726.c | 6 +- + drivers/staging/comedi/drivers/pcl730.c | 3 +- + drivers/staging/comedi/drivers/pcl812.c | 5 +- + drivers/staging/comedi/drivers/pcl816.c | 5 +- + drivers/staging/comedi/drivers/pcl818.c | 5 +- + drivers/staging/comedi/drivers/pcm3724.c | 7 +- + drivers/staging/comedi/drivers/pcmad.c | 1 + + drivers/staging/comedi/drivers/pcmda12.c | 4 +- + drivers/staging/comedi/drivers/pcmmio.c | 4 +- + drivers/staging/comedi/drivers/pcmuio.c | 4 +- + drivers/staging/comedi/drivers/poc.c | 6 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 4 +- + drivers/staging/comedi/drivers/rtd520.c | 4 +- + drivers/staging/comedi/drivers/rti800.c | 7 +- + drivers/staging/comedi/drivers/rti802.c | 6 +- + drivers/staging/comedi/drivers/s526.c | 5 +- + drivers/staging/comedi/drivers/s626.c | 5 +- + drivers/staging/comedi/drivers/s626.h | 2 - + drivers/staging/comedi/drivers/serial2002.c | 5 +- + drivers/staging/comedi/drivers/skel.c | 7 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 1 + + drivers/staging/comedi/drivers/unioxx5.c | 4 +- + drivers/staging/comedi/drivers/usbdux.c | 2364 +++------ + drivers/staging/comedi/drivers/usbduxfast.c | 3 +- + drivers/staging/comedi/drivers/usbduxsigma.c | 21 +- + drivers/staging/comedi/drivers/vmk80xx.c | 3 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 2 - + drivers/staging/comedi/proc.c | 2 + + drivers/staging/comedi/range.c | 43 +- + drivers/staging/dwc2/Kconfig | 1 - + drivers/staging/dwc2/core.c | 51 +- + drivers/staging/dwc2/core.h | 13 +- + drivers/staging/dwc2/hcd.c | 133 +- + drivers/staging/dwc2/hcd.h | 4 +- + drivers/staging/dwc2/hcd_ddma.c | 23 +- + drivers/staging/dwc2/hcd_intr.c | 86 +- + drivers/staging/dwc2/hcd_queue.c | 20 +- + drivers/staging/dwc2/hw.h | 4 + + drivers/staging/dwc2/pci.c | 2 +- + drivers/staging/gdm724x/Kconfig | 15 + + drivers/staging/gdm724x/Makefile | 7 + + drivers/staging/gdm724x/TODO | 16 + + drivers/staging/gdm724x/gdm_endian.c | 67 + + drivers/staging/gdm724x/gdm_endian.h | 49 + + drivers/staging/gdm724x/gdm_lte.c | 877 ++++ + drivers/staging/gdm724x/gdm_lte.h | 81 + + drivers/staging/gdm724x/gdm_mux.c | 698 +++ + drivers/staging/gdm724x/gdm_mux.h | 87 + + drivers/staging/gdm724x/gdm_tty.c | 366 ++ + drivers/staging/gdm724x/gdm_tty.h | 59 + + drivers/staging/gdm724x/gdm_usb.c | 1049 ++++ + drivers/staging/gdm724x/gdm_usb.h | 109 + + drivers/staging/gdm724x/hci.h | 55 + + drivers/staging/gdm724x/hci_packet.h | 93 + + drivers/staging/gdm724x/netlink_k.c | 163 + + drivers/staging/gdm724x/netlink_k.h | 25 + + drivers/staging/imx-drm/Kconfig | 2 +- + drivers/staging/imx-drm/TODO | 1 - + drivers/staging/imx-drm/imx-drm-core.c | 21 +- + drivers/staging/imx-drm/imx-ldb.c | 2 +- + drivers/staging/imx-drm/imx-tve.c | 7 +- + drivers/staging/imx-drm/ipu-v3/ipu-common.c | 17 +- + drivers/staging/imx-drm/ipu-v3/ipu-dp.c | 13 +- + drivers/staging/lustre/Makefile | 2 +- + .../staging/lustre/include/linux/libcfs/curproc.h | 2 - + .../staging/lustre/include/linux/libcfs/libcfs.h | 30 - + .../lustre/include/linux/libcfs/libcfs_cpu.h | 46 +- + .../lustre/include/linux/libcfs/libcfs_prim.h | 4 - + .../lustre/include/linux/libcfs/libcfs_private.h | 5 - + .../lustre/include/linux/libcfs/linux/kp30.h | 49 - + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 9 - + .../lustre/include/linux/libcfs/linux/linux-mem.h | 4 +- + .../lustre/include/linux/libcfs/linux/linux-prim.h | 20 - + .../include/linux/libcfs/linux/linux-tcpip.h | 15 - + .../lustre/include/linux/libcfs/linux/linux-time.h | 1 - + .../include/linux/libcfs/linux/portals_compat25.h | 5 - + drivers/staging/lustre/lnet/Makefile | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 10 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 1 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 12 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 50 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 94 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 6 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h | 3 - + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 60 +- + drivers/staging/lustre/lnet/lnet/Makefile | 2 +- + drivers/staging/lustre/lnet/lnet/acceptor.c | 62 +- + drivers/staging/lustre/lnet/lnet/api-errno.c | 39 - + drivers/staging/lustre/lnet/lnet/api-ni.c | 7 +- + drivers/staging/lustre/lnet/selftest/console.c | 2 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 4 +- + drivers/staging/lustre/lustre/Kconfig | 8 +- + drivers/staging/lustre/lustre/Makefile | 4 +- + drivers/staging/lustre/lustre/fid/Makefile | 2 +- + drivers/staging/lustre/lustre/fid/fid_handler.c | 661 --- + drivers/staging/lustre/lustre/fid/fid_internal.h | 36 +- + drivers/staging/lustre/lustre/fid/fid_lib.c | 14 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 133 +- + drivers/staging/lustre/lustre/fid/fid_store.c | 259 - + drivers/staging/lustre/lustre/fid/lproc_fid.c | 3 - + drivers/staging/lustre/lustre/fld/Makefile | 2 +- + drivers/staging/lustre/lustre/fld/fld_handler.c | 447 -- + drivers/staging/lustre/lustre/fld/fld_index.c | 426 -- + drivers/staging/lustre/lustre/fld/fld_internal.h | 29 - + drivers/staging/lustre/lustre/fld/fld_request.c | 40 +- + drivers/staging/lustre/lustre/fld/lproc_fld.c | 205 +- + drivers/staging/lustre/lustre/include/cl_object.h | 10 +- + .../lustre/lustre/include/linux/lprocfs_status.h | 1 - + .../lustre/lustre/include/linux/lustre_compat25.h | 3 - + .../lustre/lustre/include/linux/lustre_fsfilt.h | 10 - + .../lustre/lustre/include/linux/lustre_handles.h | 1 - + .../lustre/lustre/include/linux/lustre_lite.h | 2 - + .../lustre/lustre/include/linux/lustre_net.h | 1 - + .../lustre/include/linux/lustre_patchless_compat.h | 2 +- + .../lustre/lustre/include/linux/lustre_quota.h | 1 - + .../lustre/lustre/include/linux/lustre_user.h | 19 +- + drivers/staging/lustre/lustre/include/linux/lvfs.h | 8 +- + drivers/staging/lustre/lustre/include/linux/obd.h | 5 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 43 +- + drivers/staging/lustre/lustre/include/lu_object.h | 23 +- + drivers/staging/lustre/lustre/include/lu_ref.h | 14 +- + .../lustre/lustre/include/lustre/lustre_errno.h | 215 + + .../lustre/lustre/include/lustre/lustre_idl.h | 82 +- + .../lustre/lustre/include/lustre/lustre_user.h | 12 + + drivers/staging/lustre/lustre/include/lustre_cfg.h | 4 - + .../staging/lustre/lustre/include/lustre_disk.h | 56 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 202 +- + .../lustre/lustre/include/lustre_dlm_flags.h | 460 ++ + drivers/staging/lustre/lustre/include/lustre_fid.h | 113 +- + drivers/staging/lustre/lustre/include/lustre_fld.h | 41 - + .../staging/lustre/lustre/include/lustre_import.h | 2 + + drivers/staging/lustre/lustre/include/lustre_mdc.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_mdt.h | 84 - + drivers/staging/lustre/lustre/include/lustre_net.h | 39 +- + drivers/staging/lustre/lustre/include/md_object.h | 5 - + drivers/staging/lustre/lustre/include/obd.h | 169 +- + drivers/staging/lustre/lustre/include/obd_lov.h | 10 - + .../staging/lustre/lustre/include/obd_support.h | 1 + + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 2 +- + drivers/staging/lustre/lustre/ldlm/l_lock.c | 8 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 18 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 45 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 26 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 248 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 84 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 18 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 60 +- + drivers/staging/lustre/lustre/libcfs/Makefile | 2 +- + drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 3 - + drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 3 - + drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 3 - + .../staging/lustre/lustre/libcfs/libcfs_string.c | 48 - + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 46 +- + .../lustre/lustre/libcfs/linux/linux-crypto.c | 2 + + .../lustre/lustre/libcfs/linux/linux-curproc.c | 16 - + .../lustre/lustre/libcfs/linux/linux-debug.c | 55 +- + .../lustre/lustre/libcfs/linux/linux-module.c | 16 +- + .../lustre/lustre/libcfs/linux/linux-proc.c | 2 - + .../lustre/lustre/libcfs/linux/linux-tcpip.c | 5 +- + .../lustre/lustre/libcfs/linux/linux-tracefile.c | 16 +- + drivers/staging/lustre/lustre/libcfs/module.c | 2 +- + drivers/staging/lustre/lustre/libcfs/watchdog.c | 516 -- + drivers/staging/lustre/lustre/llite/dcache.c | 12 +- + drivers/staging/lustre/lustre/llite/dir.c | 74 +- + drivers/staging/lustre/lustre/llite/file.c | 96 +- + drivers/staging/lustre/lustre/llite/llite_capa.c | 1 - + .../staging/lustre/lustre/llite/llite_internal.h | 30 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 34 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 40 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 31 +- + drivers/staging/lustre/lustre/llite/lloop.c | 1 - + drivers/staging/lustre/lustre/llite/lproc_llite.c | 22 +- + drivers/staging/lustre/lustre/llite/namei.c | 12 +- + drivers/staging/lustre/lustre/llite/remote_perm.c | 12 +- + drivers/staging/lustre/lustre/llite/rw.c | 7 +- + drivers/staging/lustre/lustre/llite/rw26.c | 16 +- + drivers/staging/lustre/lustre/llite/super25.c | 3 +- + drivers/staging/lustre/lustre/llite/symlink.c | 1 - + drivers/staging/lustre/lustre/llite/vvp_io.c | 20 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 8 +- + drivers/staging/lustre/lustre/llite/xattr.c | 9 +- + drivers/staging/lustre/lustre/lmv/lmv_fld.c | 1 - + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 1 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 216 +- + drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 1 - + .../staging/lustre/lustre/lov/lov_cl_internal.h | 11 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 23 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 36 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 73 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 19 +- + drivers/staging/lustre/lustre/lov/lproc_lov.c | 1 - + drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c | 1 - + drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 4 - + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 1 - + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 25 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 29 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 29 +- + drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 1 - + drivers/staging/lustre/lustre/mgc/mgc_request.c | 8 +- + drivers/staging/lustre/lustre/obdclass/Makefile | 2 +- + drivers/staging/lustre/lustre/obdclass/capa.c | 1 - + drivers/staging/lustre/lustre/obdclass/cl_io.c | 17 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 6 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 5 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 11 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 2 +- + drivers/staging/lustre/lustre/obdclass/idmap.c | 12 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 11 +- + .../lustre/lustre/obdclass/linux/linux-obdo.c | 4 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 8 +- + drivers/staging/lustre/lustre/obdclass/llog_osd.c | 4 - + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 17 + + .../staging/lustre/lustre/obdclass/local_storage.c | 4 +- + .../lustre/lustre/obdclass/lprocfs_jobstats.c | 562 -- + .../lustre/lustre/obdclass/lprocfs_status.c | 30 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 30 +- + drivers/staging/lustre/lustre/obdclass/lu_ucred.c | 8 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 11 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 60 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 16 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 15 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 3 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 8 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_lock.c | 124 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 4 + + drivers/staging/lustre/lustre/ptlrpc/Makefile | 1 + + drivers/staging/lustre/lustre/ptlrpc/errno.c | 380 ++ + .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 6 +- + .../staging/lustre/lustre/ptlrpc/gss/lproc_gss.c | 6 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 3 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 43 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 19 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 35 +- + drivers/staging/nvec/nvec.c | 5 - + drivers/staging/octeon-usb/Kconfig | 2 +- + drivers/staging/octeon-usb/cvmx-usb.c | 5160 +++++++++--------- + drivers/staging/octeon-usb/cvmx-usb.h | 749 +-- + drivers/staging/olpc_dcon/olpc_dcon.c | 4 +- + drivers/staging/ozwpan/{Kbuild => Makefile} | 6 +- + drivers/staging/ozwpan/ozcdev.c | 67 +- + drivers/staging/ozwpan/ozconfig.h | 26 - + drivers/staging/ozwpan/ozdbg.h | 54 + + drivers/staging/ozwpan/ozeltbuf.c | 32 +- + drivers/staging/ozwpan/ozhcd.c | 296 +- + drivers/staging/ozwpan/ozmain.c | 7 +- + drivers/staging/ozwpan/ozpd.c | 67 +- + drivers/staging/ozwpan/ozproto.c | 60 +- + drivers/staging/ozwpan/ozproto.h | 2 +- + drivers/staging/ozwpan/oztrace.c | 36 - + drivers/staging/ozwpan/oztrace.h | 35 - + drivers/staging/ozwpan/ozurbparanoia.c | 14 +- + drivers/staging/ozwpan/ozurbparanoia.h | 4 +- + drivers/staging/ozwpan/ozusbsvc.c | 25 +- + drivers/staging/ozwpan/ozusbsvc1.c | 19 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 609 +-- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 8 +- + drivers/staging/silicom/bpctl_mod.c | 582 ++- + drivers/staging/usbip/userspace/src/usbipd.c | 80 +- + drivers/staging/vt6655/device_main.c | 4 +- + drivers/staging/vt6656/baseband.c | 1 - + drivers/staging/vt6656/device_cfg.h | 14 - + drivers/staging/vt6656/dpc.c | 6 - + drivers/staging/vt6656/main_usb.c | 1 - + drivers/staging/vt6656/rxtx.c | 3 - + drivers/staging/vt6656/usbpipe.c | 1 - + drivers/staging/vt6656/wmgr.c | 2 - + drivers/staging/xgifb/XGI_main_26.c | 12 +- + drivers/staging/xgifb/vb_init.c | 36 +- + drivers/staging/xgifb/vb_setmode.c | 333 +- + drivers/staging/xgifb/vb_setmode.h | 9 +- + drivers/staging/xillybus/Kconfig | 32 + + drivers/staging/xillybus/Makefile | 7 + + drivers/staging/xillybus/README | 403 ++ + drivers/staging/xillybus/TODO | 5 + + drivers/staging/xillybus/xillybus.h | 183 + + drivers/staging/xillybus/xillybus_core.c | 2345 +++++++++ + drivers/staging/xillybus/xillybus_of.c | 212 + + drivers/staging/xillybus/xillybus_pcie.c | 262 + + drivers/staging/zram/zram_drv.c | 18 +- + drivers/staging/zsmalloc/zsmalloc-main.c | 4 +- + 429 files changed, 16578 insertions(+), 34034 deletions(-) + delete mode 100644 drivers/staging/asus_oled/Kconfig + delete mode 100644 drivers/staging/asus_oled/Makefile + delete mode 100644 drivers/staging/asus_oled/README + delete mode 100644 drivers/staging/asus_oled/TODO + delete mode 100644 drivers/staging/asus_oled/asus_oled.c + delete mode 100644 drivers/staging/asus_oled/linux.txt + delete mode 100644 drivers/staging/asus_oled/linux_f.txt + delete mode 100644 drivers/staging/asus_oled/linux_fr.txt + delete mode 100644 drivers/staging/asus_oled/tux.txt + delete mode 100644 drivers/staging/asus_oled/tux_r.txt + delete mode 100644 drivers/staging/asus_oled/tux_r2.txt + delete mode 100644 drivers/staging/asus_oled/zig.txt + delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c + delete mode 100644 drivers/staging/comedi/drivers/addi_apci_1710.c + create mode 100644 drivers/staging/comedi/drivers/ni_labpc_isadma.c + create mode 100644 drivers/staging/comedi/drivers/ni_labpc_isadma.h + create mode 100644 drivers/staging/comedi/drivers/ni_labpc_regs.h + create mode 100644 drivers/staging/gdm724x/Kconfig + create mode 100644 drivers/staging/gdm724x/Makefile + create mode 100644 drivers/staging/gdm724x/TODO + create mode 100644 drivers/staging/gdm724x/gdm_endian.c + create mode 100644 drivers/staging/gdm724x/gdm_endian.h + create mode 100644 drivers/staging/gdm724x/gdm_lte.c + create mode 100644 drivers/staging/gdm724x/gdm_lte.h + create mode 100644 drivers/staging/gdm724x/gdm_mux.c + create mode 100644 drivers/staging/gdm724x/gdm_mux.h + create mode 100644 drivers/staging/gdm724x/gdm_tty.c + create mode 100644 drivers/staging/gdm724x/gdm_tty.h + create mode 100644 drivers/staging/gdm724x/gdm_usb.c + create mode 100644 drivers/staging/gdm724x/gdm_usb.h + create mode 100644 drivers/staging/gdm724x/hci.h + create mode 100644 drivers/staging/gdm724x/hci_packet.h + create mode 100644 drivers/staging/gdm724x/netlink_k.c + create mode 100644 drivers/staging/gdm724x/netlink_k.h + delete mode 100644 drivers/staging/lustre/lnet/lnet/api-errno.c + delete mode 100644 drivers/staging/lustre/lustre/fid/fid_handler.c + delete mode 100644 drivers/staging/lustre/lustre/fid/fid_store.c + delete mode 100644 drivers/staging/lustre/lustre/fld/fld_handler.c + delete mode 100644 drivers/staging/lustre/lustre/fld/fld_index.c + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_errno.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_dlm_flags.h + delete mode 100644 drivers/staging/lustre/lustre/include/lustre_mdt.h + delete mode 100644 drivers/staging/lustre/lustre/libcfs/watchdog.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/lprocfs_jobstats.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/errno.c + rename drivers/staging/ozwpan/{Kbuild => Makefile} (93%) + delete mode 100644 drivers/staging/ozwpan/ozconfig.h + create mode 100644 drivers/staging/ozwpan/ozdbg.h + delete mode 100644 drivers/staging/ozwpan/oztrace.c + delete mode 100644 drivers/staging/ozwpan/oztrace.h + create mode 100644 drivers/staging/xillybus/Kconfig + create mode 100644 drivers/staging/xillybus/Makefile + create mode 100644 drivers/staging/xillybus/README + create mode 100644 drivers/staging/xillybus/TODO + create mode 100644 drivers/staging/xillybus/xillybus.h + create mode 100644 drivers/staging/xillybus/xillybus_core.c + create mode 100644 drivers/staging/xillybus/xillybus_of.c + create mode 100644 drivers/staging/xillybus/xillybus_pcie.c +Merging char-misc/char-misc-next (9c5891b Merge 3.11-rc3 into char-misc-next.) +$ git merge --no-ff char-misc/char-misc-next +Removing drivers/uio/uio_pdrv.c +Merge made by the 'recursive' strategy. + drivers/char/pcmcia/synclink_cs.c | 26 ++++----- + drivers/fmc/fmc-chardev.c | 9 ++- + drivers/hv/channel_mgmt.c | 75 +++++++++++++++++-------- + drivers/hv/hv_balloon.c | 4 +- + drivers/hv/hv_kvp.c | 24 +++++++- + drivers/hv/hv_snapshot.c | 18 ++---- + drivers/hv/hv_util.c | 21 ++++++- + drivers/misc/atmel-ssc.c | 8 --- + drivers/misc/lkdtm.c | 63 ++++++++++++++++++++- + drivers/misc/mei/amthif.c | 14 ++++- + drivers/misc/mei/bus.c | 4 +- + drivers/misc/mei/client.c | 15 ++--- + drivers/misc/mei/client.h | 9 ++- + drivers/misc/mei/init.c | 11 ++-- + drivers/misc/mei/main.c | 22 +++++--- + drivers/misc/sram.c | 3 +- + drivers/uio/Kconfig | 7 --- + drivers/uio/Makefile | 1 - + drivers/uio/uio_pdrv.c | 113 -------------------------------------- + include/linux/hyperv.h | 10 +++- + tools/hv/hv_vss_daemon.c | 27 +++++++-- + 21 files changed, 261 insertions(+), 223 deletions(-) + delete mode 100644 drivers/uio/uio_pdrv.c +Merging scsi/for-next (2cb6e5f [SCSI] st: convert class code to use dev_groups) +$ git merge --no-ff scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/sd.c | 149 +++++++++++++++++++++++++++--------------------------- + drivers/scsi/st.c | 27 ++++++---- + 2 files changed, 91 insertions(+), 85 deletions(-) +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 1b0d9d3] 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 hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge --no-ff hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (fa8ec8f Merge branch 'devel' into for-next) +$ git merge --no-ff pinctrl/for-next +Merge made by the 'recursive' strategy. + Documentation/pinctrl.txt | 91 +- + drivers/pinctrl/Kconfig | 2 +- + drivers/pinctrl/core.c | 55 +- + drivers/pinctrl/pinctrl-baytrail.c | 41 +- + drivers/pinctrl/pinctrl-imx.c | 3 - + drivers/pinctrl/sh-pfc/core.c | 99 +- + drivers/pinctrl/sh-pfc/core.h | 10 +- + drivers/pinctrl/sh-pfc/gpio.c | 45 +- + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 158 ++-- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 48 +- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 55 +- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 168 ++-- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 1724 ++++++++++++++++++++-------------- + drivers/pinctrl/sh-pfc/pfc-sh7203.c | 202 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7264.c | 246 +++-- + drivers/pinctrl/sh-pfc/pfc-sh7269.c | 285 +++--- + drivers/pinctrl/sh-pfc/pfc-sh7372.c | 57 +- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 172 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7720.c | 701 +++++++------- + drivers/pinctrl/sh-pfc/pfc-sh7722.c | 747 +++++++-------- + drivers/pinctrl/sh-pfc/pfc-sh7723.c | 381 ++++---- + drivers/pinctrl/sh-pfc/pfc-sh7724.c | 1093 +++++++++++---------- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 60 +- + drivers/pinctrl/sh-pfc/pfc-sh7757.c | 709 +++++++------- + drivers/pinctrl/sh-pfc/pfc-sh7785.c | 700 +++++++------- + drivers/pinctrl/sh-pfc/pfc-sh7786.c | 383 ++++---- + drivers/pinctrl/sh-pfc/pfc-shx3.c | 423 ++++----- + drivers/pinctrl/sh-pfc/pinctrl.c | 49 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 277 +++--- + drivers/pinctrl/sirf/pinctrl-sirf.c | 8 +- + 30 files changed, 4570 insertions(+), 4422 deletions(-) +Merging vhost/linux-next (22fa90c vhost: Remove custom vhost rcu usage) +$ git merge --no-ff vhost/linux-next +Already up-to-date. +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 gpio/for-next (b0305e9 Merge branch 'devel' into for-next) +$ git merge --no-ff gpio/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-palmas.txt | 27 + + .../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 + + MAINTAINERS | 1 - + drivers/gpio/Kconfig | 27 + + drivers/gpio/Makefile | 3 + + drivers/gpio/gpio-em.c | 25 + + drivers/gpio/gpio-kempld.c | 225 ++++++++ + drivers/gpio/gpio-msm-v1.c | 1 + + drivers/gpio/gpio-mxc.c | 37 +- + drivers/gpio/gpio-omap.c | 84 +-- + drivers/gpio/gpio-palmas.c | 12 +- + 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 + + 20 files changed, 1345 insertions(+), 122 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-palmas.txt + 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 (c53414f Merge branch 'fixes' into for-next) +$ git merge --no-ff arm-soc/for-next +Removing arch/arm/include/asm/localtimer.h +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 12 +-- + arch/arm/arm-soc-for-next-contents.txt | 13 ++++ + arch/arm/include/asm/localtimer.h | 34 --------- + arch/arm/kernel/smp.c | 87 ---------------------- + arch/arm/kernel/smp_twd.c | 64 ++++++++++------ + arch/arm/mach-highbank/Kconfig | 2 +- + arch/arm/mach-imx/Kconfig | 3 +- + arch/arm/mach-msm/timer.c | 124 +++++++++++++++++-------------- + arch/arm/mach-omap2/Kconfig | 3 +- + arch/arm/mach-omap2/timer.c | 7 -- + arch/arm/mach-realview/Kconfig | 8 +- + arch/arm/mach-spear/Kconfig | 2 +- + arch/arm/mach-tegra/Kconfig | 2 +- + arch/arm/mach-ux500/Kconfig | 2 +- + arch/arm/mach-vexpress/Kconfig | 2 +- + arch/arm/mach-zynq/Kconfig | 2 +- + drivers/clocksource/exynos_mct.c | 58 +++++++++++---- + drivers/clocksource/time-armada-370-xp.c | 92 +++++++++++------------ + drivers/clocksource/timer-marco.c | 98 +++++++++++++----------- + include/linux/time-armada-370-xp.h | 4 +- + 20 files changed, 278 insertions(+), 341 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/include/asm/localtimer.h +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 (184b94c Merge branches 'mxs/dt', 'imx/fixes', 'imx/weim', 'imx/soc' and 'imx/dt' into for-next) +$ git merge --no-ff imx-mxs/for-next +Resolved 'arch/arm/Kconfig.debug' using previous resolution. +Auto-merging arch/arm/mach-imx/Kconfig +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 +[master 6db1427] 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/imx5-clock.txt | 1 + + .../devicetree/bindings/clock/imx6q-clock.txt | 6 + + 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 | 17 +- + 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 | 120 +- + arch/arm/boot/dts/imx27.dtsi | 119 +- + 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-m28evk.dts | 13 + + arch/arm/boot/dts/imx28.dtsi | 52 +- + arch/arm/boot/dts/imx31.dtsi | 17 + + arch/arm/boot/dts/imx51-apf51.dts | 4 - + arch/arm/boot/dts/imx51-babbage.dts | 5 + + arch/arm/boot/dts/imx51.dtsi | 105 +- + arch/arm/boot/dts/imx53-qsb.dts | 18 +- + arch/arm/boot/dts/imx53.dtsi | 56 +- + 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 | 254 +-- + arch/arm/boot/dts/imx6q-arm2.dts | 14 +- + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 112 +- + arch/arm/boot/dts/imx6q-pinfunc.h | 2050 +++++++++---------- + arch/arm/boot/dts/imx6q-sabreauto.dts | 22 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 22 +- + arch/arm/boot/dts/imx6q-sabresd.dts | 19 +- + arch/arm/boot/dts/imx6q-wandboard.dts | 26 + + arch/arm/boot/dts/imx6q.dtsi | 393 +--- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 22 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 80 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 137 ++ + arch/arm/boot/dts/imx6qdl.dtsi | 770 ++++++- + arch/arm/boot/dts/imx6sl.dtsi | 35 +- + arch/arm/configs/imx_v4_v5_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 45 +- + arch/arm/include/debug/vf.S | 26 + + arch/arm/mach-imx/Kconfig | 3 +- + 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-imx51-imx53.c | 3 +- + arch/arm/mach-imx/clk-imx6q.c | 57 +- + arch/arm/mach-imx/clk-imx6sl.c | 20 +- + arch/arm/mach-imx/clk-pllv3.c | 15 +- + arch/arm/mach-imx/clk.c | 26 + + arch/arm/mach-imx/clk.h | 10 + + arch/arm/mach-imx/common.h | 12 +- + arch/arm/mach-imx/mach-imx6q.c | 153 +- + arch/arm/mach-imx/mach-imx6sl.c | 3 +- + arch/arm/mach-imx/mm-imx5.c | 4 +- + arch/arm/mach-imx/pm-imx5.c | 7 +- + 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 +- + 71 files changed, 4902 insertions(+), 3244 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 (28fd577 Merge branch 'for-3.12/msm-cleanup2' into for-next) +$ git merge --no-ff msm/for-next +Recorded preimage for 'arch/arm/Kconfig.debug' +Auto-merging arch/arm/mach-msm/timer.c +Removing arch/arm/mach-msm/include/mach/uncompress.h +Removing arch/arm/mach-msm/include/mach/msm_iomap-8x60.h +Removing arch/arm/mach-msm/include/mach/msm_iomap-8960.h +Removing arch/arm/mach-msm/include/mach/board.h +Removing arch/arm/mach-msm/devices-iommu.c +Auto-merging arch/arm/include/debug/msm.S +Auto-merging arch/arm/Kconfig.debug +CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/Kconfig.debug'. +[master bb61b7c] Merge remote-tracking branch 'msm/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 1 + + arch/arm/Kconfig.debug | 9 +- + .../mach/debug-macro.S => include/debug/msm.S} | 32 +- + arch/arm/mach-msm/Makefile | 9 +- + arch/arm/mach-msm/board-dt-8660.c | 4 +- + arch/arm/mach-msm/board-dt-8960.c | 3 +- + arch/arm/mach-msm/board-halibut.c | 1 - + arch/arm/mach-msm/board-mahimahi.c | 2 +- + arch/arm/mach-msm/board-msm7x30.c | 1 - + arch/arm/mach-msm/board-qsd8x50.c | 1 - + arch/arm/mach-msm/board-sapphire.c | 2 +- + arch/arm/mach-msm/board-trout.c | 1 - + arch/arm/mach-msm/board-trout.h | 2 +- + arch/arm/mach-msm/common.h | 18 +- + arch/arm/mach-msm/devices-iommu.c | 912 --------------------- + arch/arm/mach-msm/devices-msm7x30.c | 2 +- + arch/arm/mach-msm/devices-qsd8x50.c | 2 +- + arch/arm/mach-msm/include/mach/board.h | 38 - + arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 46 -- + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 53 -- + arch/arm/mach-msm/include/mach/msm_iomap.h | 17 - + arch/arm/mach-msm/include/mach/uncompress.h | 63 -- + arch/arm/mach-msm/io.c | 67 +- + arch/arm/mach-msm/timer.c | 17 +- + drivers/iommu/msm_iommu.c | 4 +- + .../mach/iommu.h => drivers/iommu/msm_iommu.h | 0 + drivers/iommu/msm_iommu_dev.c | 4 +- + .../iommu/msm_iommu_hw-8xxx.h | 0 + drivers/video/msm/msm_fb.c | 1 - + 29 files changed, 93 insertions(+), 1219 deletions(-) + rename arch/arm/{mach-msm/include/mach/debug-macro.S => include/debug/msm.S} (61%) + delete mode 100644 arch/arm/mach-msm/devices-iommu.c + delete mode 100644 arch/arm/mach-msm/include/mach/board.h + delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8960.h + delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h + delete mode 100644 arch/arm/mach-msm/include/mach/uncompress.h + rename arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h (100%) + rename arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h => drivers/iommu/msm_iommu_hw-8xxx.h (100%) +Merging mvebu/for-next (5c0f737 Merge branches 'mvebu/fixes-non-critical', 'mvebu/boards', 'mvebu/defconfig' and 'mvebu/dt' into for-next) +$ git merge --no-ff mvebu/for-next +Removing arch/arm/mach-kirkwood/board-usi_topkick.c +Removing arch/arm/mach-kirkwood/board-ts219.c +Removing arch/arm/mach-kirkwood/board-sheevaplug.c +Removing arch/arm/mach-kirkwood/board-readynas.c +Removing arch/arm/mach-kirkwood/board-openblocks_a6.c +Removing arch/arm/mach-kirkwood/board-ns2.c +Removing arch/arm/mach-kirkwood/board-mplcec4.c +Removing arch/arm/mach-kirkwood/board-lsxl.c +Removing arch/arm/mach-kirkwood/board-km_kirkwood.c +Removing arch/arm/mach-kirkwood/board-iomega_ix2_200.c +Removing arch/arm/mach-kirkwood/board-iconnect.c +Removing arch/arm/mach-kirkwood/board-ib62x0.c +Removing arch/arm/mach-kirkwood/board-guruplug.c +Removing arch/arm/mach-kirkwood/board-goflexnet.c +Removing arch/arm/mach-kirkwood/board-dreamplug.c +Removing arch/arm/mach-kirkwood/board-dockstar.c +Removing arch/arm/mach-kirkwood/board-db88f628x-bp.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 176 +++++++++++++++++++ + arch/arm/boot/dts/dove-cubox.dts | 7 + + arch/arm/boot/dts/dove.dtsi | 56 +++++- + arch/arm/boot/dts/kirkwood-cloudbox.dts | 16 ++ + arch/arm/boot/dts/kirkwood-db.dtsi | 16 ++ + arch/arm/boot/dts/kirkwood-dnskw.dtsi | 16 ++ + arch/arm/boot/dts/kirkwood-dockstar.dts | 17 ++ + arch/arm/boot/dts/kirkwood-dreamplug.dts | 28 +++ + arch/arm/boot/dts/kirkwood-goflexnet.dts | 16 ++ + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 30 ++++ + arch/arm/boot/dts/kirkwood-ib62x0.dts | 16 ++ + arch/arm/boot/dts/kirkwood-iconnect.dts | 16 ++ + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 24 +++ + arch/arm/boot/dts/kirkwood-is2.dts | 2 + + arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 16 ++ + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 28 +++ + arch/arm/boot/dts/kirkwood-mplcec4.dts | 27 +++ + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 36 ++++ + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 16 ++ + arch/arm/boot/dts/kirkwood-ns2.dts | 2 + + arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 + + arch/arm/boot/dts/kirkwood-ns2max.dts | 2 + + arch/arm/boot/dts/kirkwood-ns2mini.dts | 2 + + arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 107 ++++++++++++ + arch/arm/boot/dts/kirkwood-nsa310.dts | 100 +---------- + arch/arm/boot/dts/kirkwood-nsa310a.dts | 165 ++++++++++++++++++ + arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 16 ++ + arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 16 ++ + arch/arm/boot/dts/kirkwood-topkick.dts | 16 ++ + arch/arm/boot/dts/kirkwood-ts219-6281.dts | 4 +- + arch/arm/boot/dts/kirkwood-ts219-6282.dts | 4 +- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 16 ++ + arch/arm/boot/dts/kirkwood.dtsi | 87 +++++++++- + .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 17 ++ + arch/arm/boot/dts/orion5x.dtsi | 34 +++- + arch/arm/configs/kirkwood_defconfig | 33 +--- + arch/arm/mach-dove/Kconfig | 2 + + arch/arm/mach-dove/Makefile | 4 +- + arch/arm/mach-dove/board-dt.c | 30 ++-- + arch/arm/mach-dove/mpp.c | 2 +- + arch/arm/mach-kirkwood/Kconfig | 193 +++------------------ + arch/arm/mach-kirkwood/Makefile | 26 +-- + arch/arm/mach-kirkwood/board-db88f628x-bp.c | 24 --- + arch/arm/mach-kirkwood/board-dnskw.c | 7 - + arch/arm/mach-kirkwood/board-dockstar.c | 32 ---- + arch/arm/mach-kirkwood/board-dreamplug.c | 35 ---- + arch/arm/mach-kirkwood/board-dt.c | 113 ++---------- + arch/arm/mach-kirkwood/board-goflexnet.c | 34 ---- + arch/arm/mach-kirkwood/board-guruplug.c | 33 ---- + arch/arm/mach-kirkwood/board-ib62x0.c | 29 ---- + arch/arm/mach-kirkwood/board-iconnect.c | 24 --- + arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 34 ---- + arch/arm/mach-kirkwood/board-km_kirkwood.c | 44 ----- + arch/arm/mach-kirkwood/board-lsxl.c | 36 ---- + arch/arm/mach-kirkwood/board-mplcec4.c | 35 ---- + arch/arm/mach-kirkwood/board-ns2.c | 35 ---- + arch/arm/mach-kirkwood/board-openblocks_a6.c | 26 --- + arch/arm/mach-kirkwood/board-readynas.c | 27 --- + arch/arm/mach-kirkwood/board-sheevaplug.c | 27 --- + arch/arm/mach-kirkwood/board-ts219.c | 40 ----- + arch/arm/mach-kirkwood/board-usi_topkick.c | 29 ---- + arch/arm/mach-kirkwood/common.h | 109 ------------ + arch/arm/mach-orion5x/edmini_v2-setup.c | 11 +- + arch/arm/plat-orion/irq.c | 2 +- + 65 files changed, 1110 insertions(+), 1117 deletions(-) + create mode 100644 arch/arm/boot/dts/armada-370-netgear-rn102.dts + create mode 100644 arch/arm/boot/dts/kirkwood-nsa310-common.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-nsa310a.dts + delete mode 100644 arch/arm/mach-kirkwood/board-db88f628x-bp.c + delete mode 100644 arch/arm/mach-kirkwood/board-dockstar.c + delete mode 100644 arch/arm/mach-kirkwood/board-dreamplug.c + delete mode 100644 arch/arm/mach-kirkwood/board-goflexnet.c + delete mode 100644 arch/arm/mach-kirkwood/board-guruplug.c + delete mode 100644 arch/arm/mach-kirkwood/board-ib62x0.c + delete mode 100644 arch/arm/mach-kirkwood/board-iconnect.c + delete mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c + delete mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c + delete mode 100644 arch/arm/mach-kirkwood/board-lsxl.c + delete mode 100644 arch/arm/mach-kirkwood/board-mplcec4.c + delete mode 100644 arch/arm/mach-kirkwood/board-ns2.c + delete mode 100644 arch/arm/mach-kirkwood/board-openblocks_a6.c + delete mode 100644 arch/arm/mach-kirkwood/board-readynas.c + delete mode 100644 arch/arm/mach-kirkwood/board-sheevaplug.c + delete mode 100644 arch/arm/mach-kirkwood/board-ts219.c + delete mode 100644 arch/arm/mach-kirkwood/board-usi_topkick.c +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 (b537051 Merge branch 'v3.12-next/mach-exynos' into for-next) +$ git merge --no-ff samsung/for-next +Removing arch/arm/configs/exynos4_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 5 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 456 +++++++++++++++++++++++++++++++ + arch/arm/boot/dts/exynos5250-arndale.dts | 83 +++++- + arch/arm/boot/dts/exynos5440.dtsi | 27 ++ + arch/arm/configs/exynos4_defconfig | 68 ----- + arch/arm/mach-exynos/Kconfig | 5 + + arch/arm/mach-exynos/common.h | 43 --- + arch/arm/mach-exynos/cpuidle.c | 2 +- + drivers/irqchip/exynos-combiner.c | 44 +-- + 9 files changed, 564 insertions(+), 169 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos4412-trats2.dts + delete mode 100644 arch/arm/configs/exynos4_defconfig +Merging tegra/for-next (c8cd3e7 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 +Auto-merging arch/arm/mach-tegra/Kconfig +Removing arch/arm/boot/dts/tegra114-pluto.dts +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/nvidia,tegra114-pinmux.txt | 11 + + .../bindings/pinctrl/nvidia,tegra20-pinmux.txt | 11 + + .../bindings/pinctrl/nvidia,tegra30-pinmux.txt | 12 ++ + 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 +++ + 25 files changed, 476 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 (6d0cf4d ARM: dts: Use the PWM polarity flags) +$ git merge --no-ff pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/atmel-tcb-pwm.txt | 8 +++----- + Documentation/devicetree/bindings/pwm/imx-pwm.txt | 4 ++-- + Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 4 ++-- + .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt | 5 ++--- + .../devicetree/bindings/pwm/nxp,pca9685-pwm.txt | 4 ++-- + .../devicetree/bindings/pwm/pwm-samsung.txt | 10 +++------- + .../devicetree/bindings/pwm/pwm-tiecap.txt | 8 +++----- + .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 8 +++----- + Documentation/devicetree/bindings/pwm/pwm.txt | 7 ++++--- + Documentation/devicetree/bindings/pwm/spear-pwm.txt | 5 ++--- + .../devicetree/bindings/pwm/ti,twl-pwm.txt | 4 ++-- + .../devicetree/bindings/pwm/ti,twl-pwmled.txt | 4 ++-- + .../devicetree/bindings/pwm/vt8500-pwm.txt | 8 +++----- + arch/arm/boot/dts/am335x-evmsk.dts | 3 ++- + arch/arm/boot/dts/wm8850-w70v2.dts | 3 ++- + drivers/pwm/core.c | 7 +++---- + drivers/pwm/pwm-mxs.c | 8 +++++++- + drivers/pwm/sysfs.c | 21 ++++++++++++--------- + include/dt-bindings/pwm/pwm.h | 14 ++++++++++++++ + 19 files changed, 73 insertions(+), 62 deletions(-) + create mode 100644 include/dt-bindings/pwm/pwm.h +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 (406c598 clk: exynos5250: Add G2D gate clock) +$ git merge --no-ff clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/exynos5250-clock.txt | 3 +- + drivers/clk/Kconfig | 2 +- + drivers/clk/clk.c | 13 +++---- + drivers/clk/samsung/clk-exynos-audss.c | 2 +- + drivers/clk/samsung/clk-exynos4.c | 42 ++++++++-------------- + drivers/clk/samsung/clk-exynos5250.c | 19 +++++----- + drivers/clk/samsung/clk-exynos5420.c | 14 ++++---- + drivers/clk/samsung/clk-exynos5440.c | 14 ++++---- + 8 files changed, 51 insertions(+), 58 deletions(-) +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 (ad151d5 GFS2: Replace PTR_RET with PTR_ERR_OR_ZERO) +$ git merge --no-ff ptr-ret/PTR_RET +Auto-merging drivers/staging/zcache/zcache-main.c +Auto-merging drivers/regulator/fan53555.c +Auto-merging drivers/gpu/drm/drm_gem_cma_helper.c +Auto-merging drivers/char/tile-srom.c +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/base/dma-buf.c | 2 +- + drivers/char/tile-srom.c | 2 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- + drivers/infiniband/core/cma.c | 2 +- + drivers/media/platform/sh_veu.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/rtc/rtc-da9052.c | 2 +- + drivers/rtc/rtc-isl12022.c | 2 +- + drivers/rtc/rtc-m48t35.c | 2 +- + drivers/rtc/rtc-pcf8563.c | 2 +- + drivers/rtc/rtc-pcf8583.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 +- + fs/btrfs/volumes.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 +- + 59 files changed, 82 insertions(+), 72 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 +Resolved 'drivers/staging/lustre/lustre/ldlm/ldlm_pool.c' using previous resolution. +Auto-merging kernel/sched/fair.c +Auto-merging kernel/printk/printk.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c +Auto-merging drivers/staging/lustre/lustre/obdclass/lu_object.c +Auto-merging drivers/staging/lustre/lustre/ldlm/ldlm_pool.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/ldlm/ldlm_pool.c +Auto-merging drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h +Auto-merging drivers/isdn/mISDN/core.c +Auto-merging arch/x86/platform/efi/efi.c +Auto-merging arch/x86/platform/ce4100/ce4100.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 607a044] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 1 + + 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 | 38 - + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 139 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 98 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 76 +- + 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 +- + 122 files changed, 4193 insertions(+), 1396 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 + + cad4e85...651e600 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (651e600 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 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..abc71d31061f --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20130731 |