diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-12-05 13:34:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-12-05 13:34:45 +1100 |
| commit | 213c96ce394c25bacffbf19fcb2a735bdd73338b (patch) | |
| tree | 735c181eaf679b27a9945c0aab791e4a9cff33ec | |
| parent | 287dfe2e5d88becb51d7c2b57dcd5db0d42a601e (diff) | |
Add linux-next specific files for 20131205next-20131205
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 212 | ||||
| -rw-r--r-- | Next/Trees | 214 | ||||
| -rw-r--r-- | Next/merge.log | 4133 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4562 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..55a6fb09adc6 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,212 @@ +Name SHA1 +---- ---- +origin 8ecffd7914484b728799dd31968f1339fae91593 +fixes 8ae516aa8b8161254d3e402b3348b2a9b8d1efd0 +kbuild-current 19514fc665ffbce624785f76ee7ad0ea6378a527 +arc-current da990a4f2d5a321911026c26c7eeec3bbc6fb7b7 +arm-current 11d4bb1bd067f9d01d18f620ccfad516dc579593 +m68k-current 77a42796786c2ea2d3a67262fb5f1f707c3e0594 +metag-fixes 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b +powerpc-merge 721cb59e9d95eb7f47ec73711ed35ef85e1ea1ca +sparc 1de425c7b271220df5c1bd28e45ca97ca3f4dae8 +net 988bf4f01e6a1eefdedd76e961044f01fe6a304c +ipsec dff345c5c85df3c5853491b007f6b1b578dc28a4 +sound-current 0756f09c4946fe2d9ce2ebcb6f2e3c58830d22a3 +pci-current 4bff6749905d3abe7436d3b2d20b626886a04475 +wireless a59b40b30f3f51bf5c56c15a7dc4da11b424a34b +driver-core.current dc1ccc48159d63eca5089e507c82c7d22ef60839 +tty.current 39434abd942c8e4b9c14c06a03b3245beaf8467f +usb.current eee52f9edd0ff0a1e65a6fed836c7dbaeded7355 +staging.current 55ef003e4ae684d5660f984eb2352df12572d9df +char-misc.current d0b00d3fb96d155649f80bf43b81a50ecdd2047f +input-current 4ef38351d770cc421f4a0c7a849fd13207fc5741 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current 8ec25c51291681bd68bdc290b35f2e61fa601c21 +ide c2f7d1e103ef1b5f3bd6a8a09aebf5eac7df4aca +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +devicetree-current 1931ee143b0ab72924944bc06e363d837ba05063 +rr-fixes af91706d5ddecb4a9858cca9e90d463037cfd498 +mfd-fixes 88ec6a4d836904a75bef87bfcd906193ad11d88a +vfio-fixes dc1ccc48159d63eca5089e507c82c7d22ef60839 +drm-intel-fixes 0d1430a3f4b7cfd8779b78740a4182321f3ca7f3 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 418556e7743b90f35d1962257dd8ca120b656a05 +arm fb4bdc534590168fdd7ff47d5f9178a0f9378850 +arm-perf 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +arm-soc 2e3b55132560389dced13eed21a20d7dc60dbb20 +arm-v7-cache-opt e11d68fee3683bea42b8cb4fcbc172419194283f +bcm2835 7d132055814ef17a6c7b69f342244c410a5e000f +cortex-m 9c031a483646ea1d9045238616d6eedcbe562f1a +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs 5d49e797de3aa415929f7153935e84d0b4228a59 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 02d93eb266e31811f60741edeb4a2fff1358e164 +renesas c6146726fb940bb99428ef60bd4264d8da6acba1 +samsung 8465d57097cedf138fc7ed94f4430b2f9706acf1 +tegra 850500ad1edd3815238f2dad764037a6b16266aa +arm64 dc1ccc48159d63eca5089e507c82c7d22ef60839 +blackfin 36855dcfc980f247909b8f63776664c6ccb6f183 +c6x 546153d75a488f234709c009faf9fafbe34e1ba0 +cris be8cb7f42ab9a8723082daa83ac28a11d4dde942 +hexagon de44443a45e36b7467af2518d3bf7ec6ec909549 +ia64 959f58544b7f20c92d5eb43d1232c96c15c01bfb +m68k 50190edb2a56bb9efa3e2f8ca32482dbd3e42412 +m68knommu d4d80b54a862c1dbe7a8971c41a8ea0423e4872d +metag 5a25f7bb5aa1b2f876d9df81c44b516e015022f8 +microblaze a1dd107fcafa0ab04b131c5d7b6d4515233a8b69 +mips 6ca0bf323c14ee95bcf69da5ab9f7beb6a2cd25f +openrisc 60a9dd5a10a157faeed6b24d4d6d67843a9f2c0c +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd dc1ccc48159d63eca5089e507c82c7d22ef60839 +powerpc 66c29da6782b9861b17f9fc81746e30315e039c2 +mpc5xxx 4384290b1f1a601cdbdacda36bfd07afdb71ceb5 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 c9b851905dba3a688dd75970df02305518f9554a +sh 37284bd93103ae36b5ea274a985d688fb16f7a38 +sparc-next 049ffa8ab33a63b3bff672d1a0ee6a35ad253fe8 +tile 9248053f80fd70d5c558fba4e9d300ea5ddd6b9d +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa 3bf4c10bb2e31f622c585526fc09a73b7c80dcae +btrfs 91aef86f3b8ab0685d930a5468254384513d1c97 +ceph ff638b7df5a9264024a6448bdfde2b2bf5d1994a +cifs dea4f48a0a301b23c65af8e4fe8ccf360c272fbf +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 2000f5beabc9c6baf084de5f7879975408e3652c +ext3 df4e7ac0bb70abc97fbfd9ef09671fc084b3f9db +ext4 0826a7e1ffac96eaced919fcef9994cff9853ef2 +f2fs 0491fe20cb1108b8fe8d897baf0b15ae8a3bf1af +fscache 7c604e5d6e565f34d0156608be6e63fed5fad5c9 +fuse ce128de6260f86a990ed44a697f26d0859684f28 +gfs2 c599ca2dc6f554a3042e83026b3ecf3441988915 +jfs 8660998608cfa1077e560034db81885af8e1e885 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 3873d064b8538686bbbd4b858dc8a07db1f7f43a +nfsd d2c2ad54c485e7ebca5c0b7e4a7b2c56103fda38 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs f94741fd2832e7abc30fbf6dc13ed627c1fcc01a +ubifs 58a4e23703b22c331b01fbd0c12161aadaa6d50b +xfs f9fd0135610084abef6867d984e9951c3099950d +vfs 27ac0ffeac80ba6b9580529568d06144df044366 +pci 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +hid 074fb898390b99427c9fe31596b4160f6123f331 +i2c af91706d5ddecb4a9858cca9e90d463037cfd498 +jdelvare-hwmon 672cbc9af2bfd67627f085b199a0004b8c7cabe1 +hwmon-staging 7f438058ec86f8a10e62188c9dd7dab6d8a5509a +v4l-dvb 258a9e5cbc634e68df4e2e31af4046da732cac88 +kbuild e6483a58eca62886ee3809e280c5cfce261acc72 +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata c5fd0781fbae9f860a474ec292bb57285d795007 +pstore bd08ec33b5c23833581e5a36b2a69ccae6b39a28 +pm 034b30b068a032f69fdbbcde423db3ff1fb7636f +idle 1ae2a8af42281d6b9888ac8c76bab7bd2f431d44 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 86e0a0bdf81c2dfa2a5a258dbb52f49c40ebc197 +ieee1394 db9ae8fec7b19f0ac6c60d998cac968d801a998d +ubi ae0d146955665411a6d4cea5e0893429cfc52807 +dlm a97f4a66d8ee4faf0f31cc4ad3f4aa0baef23fc7 +swiotlb af51a9f1848ff50079a10def56a2c064f326af22 +slave-dma 29732357a2962bf6c22d29f78888361305193d4d +dmaengine 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +net-next 42a2d923cc349583ebf6fdd52a7d35e1c2f7e6bd +ipsec-next 9bb8ca86075f37d3c169b9c46f8e7c6d3165e18f +wireless-next 4b074b07625f603d40d4d04937f8874a00415dc4 +bluetooth 201a5929c8c788f9ef53b010065c9ce70c9c06f0 +infiniband b4fdf52b3fc8dd3ce13ece334f5fdff869705429 +mtd 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +l2-mtd 79d9d3ba063bf155c61cb3e2c35bc09ad87dd2f5 +crypto f262f0f5cad0c9eca61d1d383e3b67b57dcbe5ea +drm a3483353ca4e6dbeef2ed62ebed01af109b5b27a +drm-intel d299cce76e001406df40c4ff712b33fccbce1222 +drm-tegra 977386a04bae2a5a5092c965c92c7c4d36eed23f +sound b13a714923fe4d444977dccb7a0f7ad1346724cf +sound-asoc 6a097d5531b77f04c40efb66bb9adab8776bfbd0 +modules 74e22fac8858f83af9b589f1dcb004ccf4991003 +virtio 7d2dddda5c928f349a01f1d5ca8ee5e9d4283c7a +input c52b4fc7817579c88db55b2029db7bf2e9d4c934 +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +cgroup 717a24e62220344f9ca942ac73a0034b5cb7ccff +block 391b7a7bfb527de31fee0942a9e45d9e1e9cd190 +device-mapper 27cafc612c3bb25ca19ee66479686bce2d96e38c +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc e395c4387c746b4cc7aace4c44baecd7e69a3249 +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab a8c0b08373596746b31fed1f15381af578fc4cbd +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 6d183de4077191d1201283a9035ce57a9b05254d +mfd 90b128ed1557c2f523995a379a53e5105891ecf8 +mfd-lj 2b12ea963aa29a1322b53c0c124d42f0241443bf +battery d36240d26025bec95f3499e2401a56db98d9f01c +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 46ac29568e63c9da9c15804648d3ed8c25e2dc44 +regulator 9850e8c5d7eac3d53608d891b99db47a924d724d +security 217091dd7a7a1bdac027ddb7c5a25f6ac0b8e241 +selinux dd0a11815a339d6deeea8357574f8126a8404c92 +lblnet 07bc9dc1b01bad7084fed3d2659e5d83317869bc +watchdog 608564867a38916723257efbef9fcf0222eb7503 +dwmw2-iommu e5d0c874391a500be7643d3eef9fb07171eee129 +iommu e6ca48d995e4d5b1e069072e86769db31486dd24 +vfio 15c03dd4859ab16f9212238f29dd315654aa94f6 +osd 861d66601acda6d7a2038fb3c95f68009128003a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 6bbdc3984efb22eab025addf86897fd5a4a9a4de +audit fc582aef7dcc27a7120cf232c1e76c569c7b6eab +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree 355e62f5ad12b005c862838156262eb2df2f8dff +dt-rh 1b50b0c3330e95510fcc747d3d44bbfad02fa6bc +spi 6099087e62dfa852ae03c19990e571f008ce04c1 +tip c4372b1b29f256dcf63da4cdad79bccbfac1b36a +edac 3e45588825c1c9c7b561102dd878d23af1b46bb9 +edac-amd c92132f5980666c7a52ecb53d98226c9986d32cd +ftrace 8a56d7761d2d041ae5e8215d20b4167d8aa93f51 +rcu 4102adab9189c8ea2f0cdd2f88345fd25d2790f1 +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 0a00a775d2a49d16efba721c786859844184599c +kvm-arm ede582224231e64e41af0f89117a302580a2da2e +kvm-ppc 27025a602cb9d8b0fa5162b465334ef059a503b6 +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip aa5437afa9b3e76e36d0517317f05e0d69f372c2 +percpu 90f2492cf9c84fd414ecfd2f40685fb5291a484e +workqueues 4e8b22bd1a37447712f1b1d96352fc53b463c6b3 +drivers-x86 a80e1053aaa395d94fff5ab7c73c89bb0c28c3c5 +chrome-platform 2b8454a75b90d7cd1ac325a0baba77244733354f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap d929555edfbaa151562f809dd0be623755e35b17 +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 4a87d107bfc3cf20660c62d0a9034e6b63926efb +driver-core 2322392b020badfe49730f1529b9c1a15248c387 +tty dc1ccc48159d63eca5089e507c82c7d22ef60839 +usb a458677db6a928535a7186248983d1e192142e83 +usb-gadget 989c78dd56307c85f710533130a2a464f6f3c5ae +staging 877494a7e29c38b0203b32012f7f673304693437 +char-misc 10ee90743e99fb06a0881a35731263c1845275dd +scsi ef5cb624a9b2bc12f881c7a13be606286afcc987 +target-updates 86784c6bdeeef78eed94d298be7a8879f6a97ee2 +target-merge 15c03dd4859ab16f9212238f29dd315654aa94f6 +writeback a8855990e382fc81c04187c5fdb48743307baf32 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 7e0d0f8730c249c83c848637fdd2a90961622d0e +vhost d3d665a654a35c47463d2aa6353bac3ce293f4f5 +remoteproc b9777859ec015a78dae1476e317d04f851bfdd0d +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio 40e3b642538ba8201ea7f791aceb1ddbf4bbae05 +dma-mapping 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +pwm 6ca142ad0d1bdf8dd116351b7b9a2bc5670d5271 +dma-buf 19e8697ba45e7bcdb04f2adf6110fbf4882863e5 +userns 41301ae78a99ead04ea42672a1ab72c6f44cc81d +ktest 298a0d1d575026edec7fbb9b7e8cbb8fe18498cd +signal 20b4fb485227404329e41ad15588afad3df23050 +clk cdf64eeeb0d762585e2126f3024458d199c2635d +random 392a546dc8368d1745f9891ef3f8f7c380de8650 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages af07484863e0c20796081e57093886c22dc16705 +aio ddb8c45ba15149ebd41d7586261c05f7ca37f9a1 +akpm-current 6e7ebeb1cb496d0f4dd5800d952b9c305878aae9 +akpm a295bddb28bf71ea70cc752a80d00fa3812edb38 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b9fdbf745374 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,214 @@ +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 +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#for-linux-next-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 +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +arm-v7-cache-opt git git://linux-arm.org/linux-2.6-lp.git#v7-cache-opt +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.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 +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 +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 +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 git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +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 +mfd-lj git git://git.linaro.org/people/ljones/mfd.git#for-mfd-next +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://git.kernel.org/pub/scm/linux/kernel/git/tomba/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/pcmoore/selinux#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.infradead.org/users/eparis/audit.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/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 +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 +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 +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 +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 +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +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 +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 +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 +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/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 +aio git git://git.kvack.org/~bcrl/aio-next.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..a0f474567560 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4133 @@ +$ date +Thursday 5 December 10:01:25 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at dea4f48a0a30 Merge branch 'leds-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds +Merging origin/master (8ecffd791448 Merge tag 'gpio-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) +$ git merge origin/master +Updating dea4f48a0a30..8ecffd791448 +Fast-forward + Documentation/devicetree/bindings/mmc/ti-omap.txt | 54 +++++++++ + Documentation/gpio/00-INDEX | 14 +++ + arch/arm/boot/dts/am335x-base0033.dts | 79 +++++++++++++ + arch/arm/boot/dts/am335x-igep0033.dtsi | 29 +++++ + arch/arm/boot/dts/armada-370-db.dts | 28 ++--- + arch/arm/boot/dts/armada-370-xp.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 24 ++-- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 109 +++++++++++++---- + arch/arm/boot/dts/at91sam9x5_usart3.dtsi | 4 + + arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 4 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 7 ++ + arch/arm/boot/dts/omap3-beagle.dts | 21 ++++ + arch/arm/boot/dts/omap3-igep.dtsi | 85 +++++++++++-- + arch/arm/boot/dts/omap3-igep0020.dts | 50 +++++++- + arch/arm/boot/dts/omap3-igep0030.dts | 4 +- + arch/arm/boot/dts/omap3-n900.dts | 23 +++- + arch/arm/boot/dts/omap3.dtsi | 42 +++++++ + arch/arm/boot/dts/omap4-panda-common.dtsi | 20 ++-- + arch/arm/boot/dts/omap4-sdp.dts | 12 +- + arch/arm/boot/dts/socfpga.dtsi | 7 +- + arch/arm/configs/multi_v7_defconfig | 3 + + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 7 ++ + arch/arm/configs/u8500_defconfig | 3 + + arch/arm/mach-at91/at91rm9200_time.c | 7 +- + arch/arm/mach-at91/pm.h | 4 + + arch/arm/mach-at91/sama5d3.c | 6 +- + arch/arm/mach-omap2/dss-common.c | 2 +- + arch/arm/mach-omap2/pdata-quirks.c | 1 + + arch/arm/mach-omap2/powerdomain.c | 3 +- + arch/arm/mach-socfpga/Kconfig | 1 + + arch/arm/mach-ux500/cpu-db8500.c | 4 + + arch/arm/plat-omap/include/plat/dmtimer.h | 5 +- + arch/parisc/configs/c3000_defconfig | 2 +- + arch/parisc/configs/c8000_defconfig | 36 +----- + arch/parisc/configs/generic-64bit_defconfig | 39 +----- + arch/parisc/include/asm/serial.h | 2 - + arch/parisc/kernel/hardware.c | 7 +- + arch/parisc/kernel/head.S | 6 +- + arch/parisc/kernel/sys_parisc.c | 25 ++-- + arch/parisc/kernel/unwind.c | 9 +- + arch/parisc/kernel/vmlinux.lds.S | 138 ++++++++++------------ + arch/parisc/mm/init.c | 19 ++- + arch/s390/crypto/aes_s390.c | 31 ++--- + crypto/authenc.c | 7 +- + crypto/ccm.c | 3 +- + crypto/tcrypt.c | 4 + + crypto/testmgr.c | 26 ++-- + drivers/clocksource/Kconfig | 1 + + drivers/clocksource/sh_mtu2.c | 16 ++- + drivers/clocksource/sh_tmu.c | 20 +++- + drivers/crypto/caam/caamalg.c | 51 ++++---- + drivers/crypto/caam/jr.c | 1 + + drivers/crypto/talitos.c | 68 ++++++----- + drivers/gpio/gpio-mpc8xxx.c | 8 +- + drivers/gpio/gpiolib.c | 20 +++- + drivers/mmc/host/omap.c | 45 ++++--- + fs/squashfs/file_direct.c | 5 +- + include/crypto/scatterwalk.h | 1 + + include/linux/gpio/driver.h | 3 + + kernel/rcu/tree_plugin.h | 4 +- + kernel/time/tick-common.c | 15 +++ + kernel/time/tick-sched.c | 25 ++-- + kernel/time/timekeeping.c | 2 +- + kernel/timer.c | 5 +- + 65 files changed, 902 insertions(+), 407 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap.txt + create mode 100644 Documentation/gpio/00-INDEX +Merging fixes/master (8ae516aa8b81 Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (da990a4f2d5a ARC: [perf] Fix a few thinkos) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 1 + + arch/arc/include/uapi/asm/unistd.h | 5 +++++ + arch/arc/kernel/perf_event.c | 4 ++-- + scripts/sortextable.c | 5 +++++ + 4 files changed, 13 insertions(+), 2 deletions(-) +Merging arm-current/fixes (11d4bb1bd067 ARM: 7907/1: lib: delay-loop: Add align directive to fix BogoMIPS calculation) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-merge/merge (721cb59e9d95 powerpc/windfarm: Fix XServe G5 fan control Makefile issue) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (1de425c7b271 sparc64: Fix build regression) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/kernel/kgdb_64.c | 1 + + 1 file changed, 1 insertion(+) +Merging net/master (988bf4f01e6a Merge branch 'cxgb4') +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/broadcom/tg3.c | 26 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 82 +++--- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 278 +++++++++++---------- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 12 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 230 ++++++++++------- + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 14 ++ + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 7 +- + drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 1 - + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 15 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 24 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 4 +- + drivers/net/ethernet/freescale/fec_main.c | 9 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 2 + + drivers/net/ethernet/tehuti/tehuti.c | 1 - + drivers/net/ethernet/ti/cpsw.c | 2 + + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- + drivers/net/xen-netback/interface.c | 20 +- + drivers/pci/pci.c | 8 + + include/linux/pci.h | 1 + + include/linux/skbuff.h | 39 ++- + net/ipv6/addrconf.c | 2 +- + net/ipv6/ndisc.c | 3 + + net/ipv6/route.c | 22 +- + net/rds/ib_send.c | 5 +- + 27 files changed, 482 insertions(+), 333 deletions(-) +Merging ipsec/master (dff345c5c85d be2net: call napi_disable() for all event queues) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (0756f09c4946 ALSA: hda - Fix silent output on MacBook Air 2,1) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/soc-dapm.h | 3 +- + sound/atmel/abdac.c | 3 +- + sound/firewire/dice.c | 4 +- + sound/pci/hda/hda_intel.c | 9 ++-- + sound/pci/hda/patch_analog.c | 6 +++ + sound/pci/hda/patch_hdmi.c | 27 ++++++----- + sound/pci/hda/patch_realtek.c | 92 +++++++++++++++++++++++++++++-------- + sound/soc/atmel/sam9x5_wm8731.c | 2 + + sound/soc/codecs/wm5110.c | 25 ---------- + sound/soc/codecs/wm8731.c | 4 +- + sound/soc/codecs/wm8990.c | 2 + + sound/soc/fsl/pcm030-audio-fabric.c | 3 +- + sound/soc/kirkwood/kirkwood-i2s.c | 22 +++++---- + sound/soc/omap/n810.c | 4 +- + sound/soc/sh/Kconfig | 1 + + sound/soc/soc-core.c | 4 +- + sound/soc/soc-devres.c | 4 +- + sound/soc/soc-pcm.c | 18 +++++--- + 18 files changed, 146 insertions(+), 87 deletions(-) +Merging pci-current/for-linus (4bff6749905d PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev()) +$ git merge pci-current/for-linus +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + drivers/pci/pci-driver.c | 26 +++++++++++++++++++++----- + drivers/pci/remove.c | 4 +++- + kernel/workqueue.c | 32 ++++++++++---------------------- + 3 files changed, 34 insertions(+), 28 deletions(-) +Merging wireless/master (a59b40b30f3f Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 22 ++++---- + drivers/net/wireless/ath/ath9k/hw.c | 7 ++- + drivers/net/wireless/ath/wcn36xx/smd.c | 19 ++++--- + drivers/net/wireless/brcm80211/Kconfig | 2 + + .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 + + drivers/net/wireless/iwlwifi/iwl-7000.c | 29 ++++++++++- + drivers/net/wireless/iwlwifi/iwl-config.h | 5 ++ + drivers/net/wireless/iwlwifi/iwl-csr.h | 5 +- + drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 6 ++- + drivers/net/wireless/iwlwifi/mvm/d3.c | 5 +- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 4 ++ + drivers/net/wireless/iwlwifi/mvm/time-event.c | 7 ++- + drivers/net/wireless/iwlwifi/pcie/drv.c | 21 ++++++++ + drivers/net/wireless/iwlwifi/pcie/internal.h | 8 +++ + drivers/net/wireless/iwlwifi/pcie/rx.c | 7 ++- + drivers/net/wireless/iwlwifi/pcie/trans.c | 3 -- + drivers/net/wireless/iwlwifi/pcie/tx.c | 6 +-- + drivers/net/wireless/mac80211_hwsim.c | 16 ++++-- + drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +- + net/mac80211/cfg.c | 15 ++++-- + net/mac80211/ibss.c | 4 ++ + net/mac80211/ieee80211_i.h | 1 + + net/mac80211/iface.c | 1 - + net/mac80211/main.c | 3 ++ + net/mac80211/mesh.c | 20 +++++--- + net/mac80211/mlme.c | 2 + + net/mac80211/rc80211_minstrel_ht.c | 7 +-- + net/mac80211/rx.c | 3 +- + net/mac80211/scan.c | 2 +- + net/mac80211/spectmgmt.c | 2 + + net/mac80211/util.c | 11 +--- + net/wireless/core.c | 9 ++++ + net/wireless/ibss.c | 18 +++---- + net/wireless/nl80211.c | 60 +++++++++++++--------- + 34 files changed, 233 insertions(+), 103 deletions(-) +Merging driver-core.current/driver-core-linus (dc1ccc48159d Linux 3.13-rc2) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (39434abd942c n_tty: Fix missing newline echo) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/n_tty.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging usb.current/usb-linus (eee52f9edd0f USB: switch maintainership of chipidea to Peter) +$ git merge usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +- + drivers/usb/dwc3/ep0.c | 2 + + drivers/usb/dwc3/gadget.c | 5 +- + drivers/usb/gadget/Kconfig | 1 + + drivers/usb/gadget/composite.c | 1 + + drivers/usb/gadget/f_fs.c | 2 +- + drivers/usb/gadget/f_mass_storage.c | 27 +++--- + drivers/usb/gadget/pxa25x_udc.c | 1 + + drivers/usb/gadget/s3c-hsotg.c | 7 +- + drivers/usb/gadget/storage_common.h | 4 - + drivers/usb/gadget/tcm_usb_gadget.c | 2 +- + drivers/usb/gadget/zero.c | 6 +- + drivers/usb/host/xhci-ring.c | 54 +++++++++++- + drivers/usb/musb/musb_core.c | 9 +- + drivers/usb/musb/musb_cppi41.c | 164 ++++++++++++++++++++++++++++++------ + drivers/usb/musb/musb_gadget.c | 4 + + drivers/usb/phy/phy-am335x.c | 5 +- + drivers/usb/phy/phy-generic.c | 68 +++++++-------- + drivers/usb/phy/phy-generic.h | 4 +- + drivers/usb/phy/phy-mxs-usb.c | 2 +- + drivers/usb/phy/phy-rcar-gen2-usb.c | 4 +- + drivers/usb/serial/ftdi_sio.c | 37 +++++--- + drivers/usb/serial/generic.c | 12 +-- + drivers/usb/serial/mos7840.c | 32 +++---- + drivers/usb/serial/option.c | 27 ++++++ + drivers/usb/serial/pl2303.c | 30 +++---- + drivers/usb/serial/spcp8x5.c | 30 +++---- + drivers/usb/wusbcore/devconnect.c | 72 ++++++---------- + drivers/usb/wusbcore/security.c | 98 ++++++++++++--------- + drivers/usb/wusbcore/wusbhc.h | 6 +- + include/linux/usb.h | 2 + + include/linux/usb/wusb.h | 2 + + 32 files changed, 462 insertions(+), 261 deletions(-) +Merging staging.current/staging-linus (55ef003e4ae6 Merge tag 'iio-fixes-for-3.13b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/hid/hid-sensor-hub.c | 20 ++++++++------------ + drivers/iio/common/hid-sensors/Kconfig | 9 --------- + drivers/iio/common/hid-sensors/hid-sensor-trigger.c | 20 +++++++++++++++----- + drivers/iio/light/Kconfig | 1 + + drivers/staging/tidspbridge/rmgr/drv_interface.c | 13 +++++-------- + include/linux/hid-sensor-hub.h | 2 ++ + include/linux/hid-sensor-ids.h | 12 ++++++++++++ + 7 files changed, 43 insertions(+), 34 deletions(-) +Merging char-misc.current/char-misc-linus (d0b00d3fb96d Merge tag 'extcon-linus-for-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus) +$ git merge char-misc.current/char-misc-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 5 +++++ + Documentation/mic/mpssd/mpssd.c | 18 +++++++++++------ + MAINTAINERS | 8 ++++++++ + drivers/extcon/extcon-arizona.c | 4 +--- + drivers/extcon/extcon-class.c | 3 ++- + drivers/misc/mic/card/mic_virtio.c | 33 +++++++++++++++++-------------- + drivers/misc/mic/card/mic_virtio.h | 7 +++---- + drivers/misc/mic/host/mic_boot.c | 2 +- + drivers/misc/mic/host/mic_virtio.c | 30 ++++++++++++++-------------- + drivers/misc/mic/host/mic_x100.c | 4 ++-- + include/uapi/linux/mic_common.h | 40 +++++++++++++++----------------------- + 11 files changed, 83 insertions(+), 71 deletions(-) +Merging input-current/for-linus (4ef38351d770 Input: usbtouchscreen - separate report and transmit buffer size handling) +$ git merge input-current/for-linus +Auto-merging drivers/input/touchscreen/usbtouchscreen.c +Merge made by the 'recursive' strategy. + drivers/input/keyboard/adp5588-keys.c | 3 ++- + drivers/input/keyboard/adp5589-keys.c | 3 ++- + drivers/input/keyboard/bf54x-keys.c | 3 ++- + drivers/input/misc/pcf8574_keypad.c | 7 +++++-- + drivers/input/touchscreen/sur40.c | 4 ++-- + drivers/input/touchscreen/usbtouchscreen.c | 22 ++++++++++++++++++---- + include/uapi/linux/input.h | 2 ++ + 7 files changed, 33 insertions(+), 11 deletions(-) +Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) +$ git merge md-current/for-linus +Already up-to-date. +Merging crypto-current/master (8ec25c512916 crypto: testmgr - fix sglen in test_aead for case 'dst != src') +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata()) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions) +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory") +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (af91706d5dde ima: store address of template_fmt_copy in a pointer before calling strsep) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master (88ec6a4d8369 Merge tag 'mfd-lee-3.13-fixes-1' of git://git.linaro.org/people/ljones/mfd) +$ git merge mfd-fixes/master +Merge made by the 'recursive' strategy. + drivers/mfd/Kconfig | 2 +- + drivers/mfd/lpc_ich.c | 2 +- + drivers/mfd/ti-ssp.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging vfio-fixes/for-linus (dc1ccc48159d Linux 3.13-rc2) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (0d1430a3f4b7 drm/i915: Hold mutex across i915_gem_release) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_dma.c | 2 + + drivers/gpu/drm/i915/i915_drv.c | 3 ++ + drivers/gpu/drm/i915/i915_gem.c | 7 ++-- + drivers/gpu/drm/i915/i915_gem_context.c | 2 - + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 13 ++++--- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 60 ++++++++++++++++-------------- + drivers/gpu/drm/i915/i915_gem_gtt.c | 6 ++- + drivers/gpu/drm/i915/i915_reg.h | 1 + + drivers/gpu/drm/i915/intel_ddi.c | 5 ++- + drivers/gpu/drm/i915/intel_display.c | 21 ++++++----- + drivers/gpu/drm/i915/intel_dp.c | 34 +++++++---------- + drivers/gpu/drm/i915/intel_drv.h | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 15 ++++---- + 13 files changed, 89 insertions(+), 82 deletions(-) +Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (418556e7743b ARC: [SMP] optimize IPI send and receive) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/include/asm/smp.h | 8 +-- + arch/arc/kernel/smp.c | 121 ++++++++++++++++++++++++-------------------- + arch/arc/plat-arcfpga/smp.c | 12 ++--- + 3 files changed, 75 insertions(+), 66 deletions(-) +Merging arm/for-next (fb4bdc534590 Merge branches 'fixes', 'kees' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/Kconfig.debug | 23 +++ + arch/arm/include/asm/cacheflush.h | 5 + + arch/arm/include/asm/io.h | 2 +- + arch/arm/include/asm/mach/map.h | 27 +-- + arch/arm/include/asm/pgtable-2level.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/include/asm/pgtable.h | 2 + + arch/arm/include/asm/xen/page.h | 2 +- + arch/arm/kernel/entry-v7m.S | 2 - + arch/arm/kernel/etm.c | 6 - + arch/arm/kernel/tcm.c | 4 +- + arch/arm/kernel/traps.c | 2 +- + arch/arm/lib/backtrace.S | 20 +- + arch/arm/mach-at91/setup.c | 2 +- + arch/arm/mach-omap2/io.c | 4 +- + arch/arm/mach-omap2/omap4-common.c | 2 +- + arch/arm/mach-ux500/setup.h | 2 +- + arch/arm/mm/Makefile | 1 + + arch/arm/mm/dma-mapping.c | 6 +- + arch/arm/mm/dump.c | 343 ++++++++++++++++++++++++++++++++++ + arch/arm/mm/ioremap.c | 4 +- + arch/arm/mm/mmu.c | 126 ++++++++++--- + drivers/input/serio/ambakmi.c | 2 - + drivers/mmc/host/mmci.c | 2 - + drivers/mtd/maps/pxa2xx-flash.c | 2 +- + 25 files changed, 522 insertions(+), 71 deletions(-) + create mode 100644 arch/arm/mm/dump.c +Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (2e3b55132560 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Removing include/linux/platform_data/pinctrl-nomadik.h +Removing include/linux/platform_data/clocksource-nomadik-mtu.h +Auto-merging include/linux/clk/at91_pmc.h +Auto-merging arch/arm/mach-ux500/setup.h +Removing arch/arm/mach-ux500/devices.h +Removing arch/arm/mach-ux500/devices.c +Removing arch/arm/mach-ux500/devices-db8500.h +Removing arch/arm/mach-ux500/devices-db8500.c +Removing arch/arm/mach-ux500/board-mop500.c +Removing arch/arm/mach-s3c64xx/dma.c +Auto-merging arch/arm/mach-at91/setup.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/at91-clock.txt | 339 +++++++++ + .../devicetree/bindings/dma/ste-dma40.txt | 3 + + arch/arm/Kconfig | 1 + + arch/arm/arm-soc-for-next-contents.txt | 37 + + arch/arm/boot/dts/armada-370-mirabox.dts | 25 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 32 + + arch/arm/boot/dts/armada-370-xp.dtsi | 9 + + arch/arm/boot/dts/armada-xp-gp.dts | 8 + + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 +- + arch/arm/boot/dts/dove-cubox.dts | 2 +- + arch/arm/boot/dts/dove.dtsi | 13 +- + arch/arm/boot/dts/kirkwood-6281.dtsi | 2 + + arch/arm/boot/dts/kirkwood-6282.dtsi | 2 + + arch/arm/boot/dts/kirkwood-dns320.dts | 2 +- + arch/arm/boot/dts/kirkwood-dns325.dts | 2 +- + arch/arm/boot/dts/kirkwood-dockstar.dts | 2 +- + arch/arm/boot/dts/kirkwood-goflexnet.dts | 2 +- + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 4 +- + arch/arm/boot/dts/kirkwood-ib62x0.dts | 2 +- + arch/arm/boot/dts/kirkwood-iconnect.dts | 4 +- + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 2 +- + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 2 +- + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 14 +- + arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +- + arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 2 +- + arch/arm/boot/dts/kirkwood-sheevaplug.dts | 4 +- + .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +- + arch/arm/boot/dts/sama5d3.dtsi | 379 +++++++++- + arch/arm/boot/dts/sama5d3_can.dtsi | 20 + + arch/arm/boot/dts/sama5d3_emac.dtsi | 11 + + arch/arm/boot/dts/sama5d3_gmac.dtsi | 11 + + arch/arm/boot/dts/sama5d3_lcd.dtsi | 17 + + arch/arm/boot/dts/sama5d3_mci2.dtsi | 12 + + arch/arm/boot/dts/sama5d3_tcb1.dtsi | 12 + + arch/arm/boot/dts/sama5d3_uart.dtsi | 21 + + arch/arm/boot/dts/sama5d3xcm.dtsi | 17 +- + arch/arm/boot/dts/st-pincfg.h | 2 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 32 + + arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 745 +++++++++++++++++++ + arch/arm/boot/dts/ste-href-stuib.dtsi | 41 ++ + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 90 ++- + arch/arm/boot/dts/ste-href.dtsi | 78 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 73 +- + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 217 +++++- + arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 80 ++ + arch/arm/boot/dts/ste-snowball.dts | 225 ++++++ + arch/arm/boot/dts/stih415-pinctrl.dtsi | 36 + + arch/arm/boot/dts/stih415.dtsi | 53 ++ + arch/arm/boot/dts/stih416-pinctrl.dtsi | 35 + + arch/arm/boot/dts/stih416.dtsi | 53 ++ + arch/arm/boot/dts/stih41x-b2000.dtsi | 9 + + arch/arm/boot/dts/stih41x-b2020.dtsi | 22 + + arch/arm/configs/bockw_defconfig | 10 +- + arch/arm/configs/genmai_defconfig | 116 +++ + arch/arm/configs/kirkwood_defconfig | 1 + + arch/arm/configs/kzm9d_defconfig | 1 + + arch/arm/configs/marzen_defconfig | 10 +- + arch/arm/configs/multi_v7_defconfig | 3 + + arch/arm/configs/mvebu_defconfig | 1 + + arch/arm/mach-at91/Kconfig | 43 ++ + arch/arm/mach-at91/Kconfig.non_dt | 6 + + arch/arm/mach-at91/Makefile | 2 +- + arch/arm/mach-at91/at91rm9200.c | 2 +- + arch/arm/mach-at91/at91sam9260.c | 2 +- + arch/arm/mach-at91/at91sam9261.c | 2 +- + arch/arm/mach-at91/at91sam9263.c | 2 +- + arch/arm/mach-at91/at91sam926x_time.c | 14 +- + arch/arm/mach-at91/at91sam9g45.c | 2 +- + arch/arm/mach-at91/at91sam9n12.c | 2 +- + arch/arm/mach-at91/at91sam9rl.c | 2 +- + arch/arm/mach-at91/at91sam9x5.c | 2 +- + arch/arm/mach-at91/board-dt-sama5.c | 10 +- + arch/arm/mach-at91/clock.c | 7 +- + arch/arm/mach-at91/generic.h | 3 +- + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-at91/pm_slowclock.S | 2 +- + arch/arm/mach-at91/sama5d3.c | 344 +-------- + arch/arm/mach-at91/setup.c | 8 +- + arch/arm/mach-davinci/devices-da8xx.c | 4 +- + arch/arm/mach-davinci/dm355.c | 3 +- + arch/arm/mach-davinci/dm365.c | 3 +- + arch/arm/mach-davinci/dm644x.c | 3 +- + arch/arm/mach-davinci/dm646x.c | 6 +- + arch/arm/mach-dove/common.c | 15 +- + arch/arm/mach-ep93xx/Kconfig | 1 + + arch/arm/mach-ep93xx/core.c | 110 ++- + arch/arm/mach-ep93xx/include/mach/platform.h | 3 +- + arch/arm/mach-highbank/highbank.c | 23 + + arch/arm/mach-kirkwood/board-dt.c | 40 +- + arch/arm/mach-mvebu/coherency.c | 1 + + arch/arm/mach-mvebu/coherency.h | 4 +- + arch/arm/mach-mvebu/common.h | 1 - + arch/arm/mach-mvebu/hotplug.c | 1 + + arch/arm/mach-mvebu/platsmp.c | 4 +- + arch/arm/mach-mvebu/pmsu.c | 3 +- + arch/arm/mach-mvebu/system-controller.c | 5 +- + arch/arm/mach-orion5x/board-dt.c | 2 +- + arch/arm/mach-orion5x/common.c | 7 +- + arch/arm/mach-orion5x/db88f5281-setup.c | 2 +- + arch/arm/mach-orion5x/irq.c | 1 + + arch/arm/mach-orion5x/pci.c | 4 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +- + arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +- + arch/arm/mach-orion5x/ts209-setup.c | 2 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- + arch/arm/mach-s3c64xx/Kconfig | 7 +- + arch/arm/mach-s3c64xx/Makefile | 2 +- + arch/arm/mach-s3c64xx/common.h | 5 + + arch/arm/mach-s3c64xx/dma.c | 762 ------------------- + arch/arm/mach-s3c64xx/include/mach/dma.h | 144 ++-- + arch/arm/mach-s3c64xx/pl080.c | 244 +++++++ + arch/arm/mach-shmobile/board-ape6evm.c | 6 +- + arch/arm/mach-shmobile/board-bockw-reference.c | 1 - + arch/arm/mach-shmobile/board-lager-reference.c | 5 +- + arch/arm/mach-shmobile/board-lager.c | 2 +- + arch/arm/mach-shmobile/board-marzen.c | 25 +- + arch/arm/mach-shmobile/clock-r7s72100.c | 3 + + arch/arm/mach-shmobile/clock-r8a7790.c | 2 +- + arch/arm/mach-shmobile/clock-sh7372.c | 9 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 14 +- + arch/arm/mach-shmobile/include/mach/r8a7779.h | 5 - + arch/arm/mach-shmobile/setup-r8a7779.c | 57 -- + arch/arm/mach-shmobile/setup-r8a7790.c | 7 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 16 +- + arch/arm/mach-ux500/Makefile | 6 +- + arch/arm/mach-ux500/board-mop500-audio.c | 3 - + arch/arm/mach-ux500/board-mop500-pins.c | 804 --------------------- + arch/arm/mach-ux500/board-mop500-sdi.c | 2 - + arch/arm/mach-ux500/board-mop500.c | 78 -- + arch/arm/mach-ux500/board-mop500.h | 1 - + arch/arm/mach-ux500/cpu-db8500.c | 22 +- + arch/arm/mach-ux500/cpu.c | 23 +- + arch/arm/mach-ux500/devices-db8500.c | 28 - + arch/arm/mach-ux500/devices-db8500.h | 19 - + arch/arm/mach-ux500/devices.c | 26 - + arch/arm/mach-ux500/devices.h | 15 - + arch/arm/mach-ux500/setup.h | 6 - + arch/arm/mach-ux500/timer.c | 76 +- + arch/arm/plat-orion/common.c | 9 +- + arch/arm/plat-orion/time.c | 3 +- + arch/arm/plat-samsung/devs.c | 10 +- + arch/arm/plat-samsung/dma-ops.c | 8 +- + drivers/bus/mvebu-mbus.c | 10 +- + drivers/clk/Makefile | 1 + + drivers/clk/at91/Makefile | 12 + + drivers/clk/at91/clk-main.c | 187 +++++ + drivers/clk/at91/clk-master.c | 270 +++++++ + drivers/clk/at91/clk-peripheral.c | 410 +++++++++++ + drivers/clk/at91/clk-pll.c | 531 ++++++++++++++ + drivers/clk/at91/clk-plldiv.c | 135 ++++ + drivers/clk/at91/clk-programmable.c | 366 ++++++++++ + drivers/clk/at91/clk-smd.c | 171 +++++ + drivers/clk/at91/clk-system.c | 135 ++++ + drivers/clk/at91/clk-usb.c | 398 ++++++++++ + drivers/clk/at91/clk-utmi.c | 159 ++++ + drivers/clk/at91/pmc.c | 397 ++++++++++ + drivers/clk/at91/pmc.h | 116 +++ + drivers/clk/samsung/clk-s3c64xx.c | 4 +- + drivers/clocksource/nomadik-mtu.c | 23 +- + drivers/dma/ste_dma40.c | 4 + + drivers/gpio/gpio-davinci.c | 4 +- + drivers/pinctrl/pinctrl-nomadik.c | 296 ++++++-- + drivers/pinctrl/pinctrl-nomadik.h | 14 +- + drivers/spi/Kconfig | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + include/dt-bindings/clk/at91.h | 22 + + .../include/mach => include/linux/clk}/at91_pmc.h | 4 +- + .../linux/platform_data/clocksource-nomadik-mtu.h | 9 - + include/linux/platform_data/pinctrl-nomadik.h | 242 ------- + 171 files changed, 7145 insertions(+), 2904 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/at91-clock.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/ste-href-family-pinctrl.dtsi + create mode 100644 arch/arm/configs/genmai_defconfig + delete mode 100644 arch/arm/mach-s3c64xx/dma.c + create mode 100644 arch/arm/mach-s3c64xx/pl080.c + delete mode 100644 arch/arm/mach-ux500/board-mop500.c + delete mode 100644 arch/arm/mach-ux500/devices-db8500.c + delete mode 100644 arch/arm/mach-ux500/devices-db8500.h + delete mode 100644 arch/arm/mach-ux500/devices.c + delete mode 100644 arch/arm/mach-ux500/devices.h + create mode 100644 drivers/clk/at91/Makefile + create mode 100644 drivers/clk/at91/clk-main.c + create mode 100644 drivers/clk/at91/clk-master.c + create mode 100644 drivers/clk/at91/clk-peripheral.c + create mode 100644 drivers/clk/at91/clk-pll.c + create mode 100644 drivers/clk/at91/clk-plldiv.c + create mode 100644 drivers/clk/at91/clk-programmable.c + create mode 100644 drivers/clk/at91/clk-smd.c + create mode 100644 drivers/clk/at91/clk-system.c + create mode 100644 drivers/clk/at91/clk-usb.c + create mode 100644 drivers/clk/at91/clk-utmi.c + create mode 100644 drivers/clk/at91/pmc.c + create mode 100644 drivers/clk/at91/pmc.h + create mode 100644 include/dt-bindings/clk/at91.h + rename {arch/arm/mach-at91/include/mach => include/linux/clk}/at91_pmc.h (98%) + delete mode 100644 include/linux/platform_data/clocksource-nomadik-mtu.h + delete mode 100644 include/linux/platform_data/pinctrl-nomadik.h +Merging arm-v7-cache-opt/v7-cache-opt (e11d68fee368 arm: mm: refactor v7 cache cleaning ops to use way/index sequence) +$ git merge arm-v7-cache-opt/v7-cache-opt +Merge made by the 'recursive' strategy. + arch/arm/mm/cache-v7.S | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) +Merging bcm2835/for-next (7d132055814e Linux 3.10-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging cortex-m/for-next (9c031a483646 ARM: v7-M: drop using mach/entry-macro.S) +$ git merge cortex-m/for-next +Merge made by the 'recursive' strategy. +Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (5d49e797de3a Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Auto-merging drivers/pinctrl/pinctrl-nomadik.c +Auto-merging arch/arm/boot/dts/imx6qdl.dtsi +Auto-merging arch/arm/Kconfig.debug +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/imx5-clock.txt | 195 +---- + .../bindings/pinctrl/fsl,imx27-pinctrl.txt | 22 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + arch/arm/Kconfig.debug | 9 + + arch/arm/boot/dts/Makefile | 15 + + arch/arm/boot/dts/imx23-evk.dts | 8 +- + arch/arm/boot/dts/imx23-olinuxino.dts | 5 +- + arch/arm/boot/dts/imx23-stmp378x_devb.dts | 5 +- + arch/arm/boot/dts/imx25-pinfunc.h | 494 +++++++++++ + arch/arm/boot/dts/imx25-pingrp.h | 79 ++ + arch/arm/boot/dts/imx25.dtsi | 19 +- + arch/arm/boot/dts/imx27-apf27.dts | 16 + + arch/arm/boot/dts/imx27-apf27dev.dts | 98 ++- + arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 50 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 20 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 50 +- + arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 43 +- + arch/arm/boot/dts/imx27-pinfunc.h | 526 ++++++++++++ + arch/arm/boot/dts/imx27-pingrp.h | 142 ++++ + arch/arm/boot/dts/imx27.dtsi | 127 +-- + arch/arm/boot/dts/imx28-apf28dev.dts | 18 +- + arch/arm/boot/dts/imx28-apx4devkit.dts | 5 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 2 + + arch/arm/boot/dts/imx28-cfa10037.dts | 5 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 29 +- + arch/arm/boot/dts/imx28-cfa10057.dts | 5 +- + arch/arm/boot/dts/imx28-cfa10058.dts | 5 +- + arch/arm/boot/dts/imx28-duckbill.dts | 121 +++ + arch/arm/boot/dts/imx28-evk.dts | 24 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 14 +- + arch/arm/boot/dts/imx28-m28evk.dts | 14 +- + arch/arm/boot/dts/imx28-sps1.dts | 5 +- + arch/arm/boot/dts/imx28-tx28.dts | 23 +- + arch/arm/boot/dts/imx28.dtsi | 13 + + arch/arm/boot/dts/imx50-evk.dts | 97 +++ + arch/arm/boot/dts/imx50-pinfunc.h | 923 +++++++++++++++++++++ + arch/arm/boot/dts/imx50-pingrp.h | 144 ++++ + arch/arm/boot/dts/imx50.dtsi | 476 +++++++++++ + arch/arm/boot/dts/imx51-apf51.dts | 18 +- + arch/arm/boot/dts/imx51-apf51dev.dts | 50 +- + arch/arm/boot/dts/imx51-babbage.dts | 100 ++- + arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 71 ++ + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 144 ++++ + arch/arm/boot/dts/imx51-pingrp.h | 247 ++++++ + arch/arm/boot/dts/imx51.dtsi | 455 ++-------- + arch/arm/boot/dts/imx53-ard.dts | 19 +- + arch/arm/boot/dts/imx53-evk.dts | 38 +- + arch/arm/boot/dts/imx53-m53evk.dts | 133 ++- + arch/arm/boot/dts/imx53-mba53.dts | 40 +- + arch/arm/boot/dts/imx53-pingrp.h | 350 ++++++++ + arch/arm/boot/dts/imx53-qsb.dts | 61 +- + arch/arm/boot/dts/imx53-smd.dts | 62 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 112 ++- + arch/arm/boot/dts/imx53-tx53.dtsi | 5 +- + arch/arm/boot/dts/imx53-voipac-bsb.dts | 144 ++++ + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 240 ++++++ + arch/arm/boot/dts/imx53.dtsi | 648 +++------------ + arch/arm/boot/dts/imx6dl-gw51xx.dts | 19 + + arch/arm/boot/dts/imx6dl-gw52xx.dts | 19 + + arch/arm/boot/dts/imx6dl-gw53xx.dts | 19 + + arch/arm/boot/dts/imx6dl-gw54xx.dts | 19 + + arch/arm/boot/dts/imx6dl-pinfunc.h | 1 + + arch/arm/boot/dts/imx6dl.dtsi | 10 +- + arch/arm/boot/dts/imx6q-arm2.dts | 71 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 69 ++ + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 178 ++++ + arch/arm/boot/dts/imx6q-gw51xx.dts | 19 + + arch/arm/boot/dts/imx6q-gw52xx.dts | 23 + + arch/arm/boot/dts/imx6q-gw53xx.dts | 23 + + arch/arm/boot/dts/imx6q-gw5400-a.dts | 493 +++++++++++ + arch/arm/boot/dts/imx6q-gw54xx.dts | 23 + + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 44 +- + arch/arm/boot/dts/imx6q-pinfunc.h | 1 + + arch/arm/boot/dts/imx6q-sabrelite.dts | 68 +- + arch/arm/boot/dts/imx6q-sbc6x.dts | 29 +- + arch/arm/boot/dts/imx6q-udoo.dts | 27 +- + arch/arm/boot/dts/imx6q.dtsi | 9 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 317 +++++++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 424 ++++++++++ + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 484 +++++++++++ + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 511 ++++++++++++ + arch/arm/boot/dts/imx6qdl-pingrp.h | 526 ++++++++++++ + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 58 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 73 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 70 +- + arch/arm/boot/dts/imx6qdl.dtsi | 904 +++----------------- + arch/arm/boot/dts/imx6sl-evk.dts | 88 +- + arch/arm/boot/dts/imx6sl-pingrp.h | 148 ++++ + arch/arm/boot/dts/imx6sl.dtsi | 339 ++------ + arch/arm/configs/imx_v4_v5_defconfig | 2 + + arch/arm/configs/imx_v6_v7_defconfig | 4 + + arch/arm/include/debug/imx-uart.h | 10 + + arch/arm/mach-imx/Kconfig | 27 +- + arch/arm/mach-imx/Makefile | 1 + + arch/arm/mach-imx/avic.c | 25 - + arch/arm/mach-imx/clk-imx51-imx53.c | 801 +++++++++--------- + arch/arm/mach-imx/clk-imx6q.c | 2 +- + arch/arm/mach-imx/clk-imx6sl.c | 2 +- + arch/arm/mach-imx/clk-pllv1.c | 23 +- + arch/arm/mach-imx/clk-vf610.c | 5 + + arch/arm/mach-imx/common.h | 1 + + arch/arm/mach-imx/irq-common.h | 1 - + arch/arm/mach-imx/mach-imx50.c | 38 + + arch/arm/mach-imx/mach-imx6q.c | 30 + + arch/arm/mach-imx/mm-imx5.c | 8 - + arch/arm/mach-mxs/mach-mxs.c | 26 + + drivers/pinctrl/Kconfig | 8 - + drivers/pinctrl/pinctrl-imx1-core.c | 7 + + drivers/pinctrl/pinctrl-nomadik.c | 6 +- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 36 +- + include/dt-bindings/clock/imx5-clock.h | 203 +++++ + include/dt-bindings/clock/imx6sl-clock.h | 2 +- + include/dt-bindings/clock/vf610-clock.h | 6 +- + 113 files changed, 10140 insertions(+), 3026 deletions(-) + create mode 100644 arch/arm/boot/dts/imx25-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx25-pingrp.h + create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx27-pingrp.h + create mode 100644 arch/arm/boot/dts/imx28-duckbill.dts + create mode 100644 arch/arm/boot/dts/imx50-evk.dts + create mode 100644 arch/arm/boot/dts/imx50-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx50-pingrp.h + create mode 100644 arch/arm/boot/dts/imx50.dtsi + create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi + create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts + create mode 100644 arch/arm/boot/dts/imx51-pingrp.h + create mode 100644 arch/arm/boot/dts/imx53-pingrp.h + create mode 100644 arch/arm/boot/dts/imx53-voipac-bsb.dts + create mode 100644 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-gw51xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw52xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw53xx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw54xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts + create mode 100644 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw51xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw52xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw53xx.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw5400-a.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw54xx.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-pingrp.h + create mode 100644 arch/arm/boot/dts/imx6sl-pingrp.h + create mode 100644 arch/arm/mach-imx/mach-imx50.c + create mode 100644 include/dt-bindings/clock/imx5-clock.h +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) +$ git merge msm/for-next +Already up-to-date. +Merging mvebu/for-next (02d93eb266e3 Merge branch 'mvebu/dt' into for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../interrupt-controller/marvell,dove-pmu-intc.txt | 17 ++ + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 82 +++--- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 68 +++-- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 286 +++++++++++++++++++++ + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 99 ++++--- + .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 270 +++++++++++++++++++ + drivers/clk/mvebu/Kconfig | 5 + + drivers/clk/mvebu/Makefile | 1 + + drivers/clk/mvebu/clk-corediv.c | 223 ++++++++++++++++ + drivers/clk/mvebu/clk-cpu.c | 2 +- + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-dove.c | 126 +++++++++ + 13 files changed, 1073 insertions(+), 109 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt + create mode 100644 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts + create mode 100644 arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts + create mode 100644 drivers/clk/mvebu/clk-corediv.c + create mode 100644 drivers/irqchip/irq-dove.c +Merging renesas/next (c6146726fb94 Merge branch 'fixes-for-v3.13' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/board-kzm9d.c +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 14 +- + arch/arm/Makefile | 1 - + arch/arm/boot/compressed/Makefile | 2 +- + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/emev2-kzm9d.dts | 39 ++++- + arch/arm/boot/dts/emev2.dtsi | 86 ++++++++++- + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 15 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 10 +- + arch/arm/boot/dts/r8a73a4.dtsi | 118 +++++++++----- + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 13 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7740.dtsi | 118 +++++++------- + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 57 ++++++- + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7778.dtsi | 170 +++++++++++++++++++-- + arch/arm/boot/dts/r8a7779-marzen-reference.dts | 25 ++- + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7779.dtsi | 82 +++++++--- + arch/arm/boot/dts/r8a7790-lager-reference.dts | 46 +++++- + arch/arm/boot/dts/r8a7790-lager.dts | 7 +- + arch/arm/boot/dts/r8a7790.dtsi | 97 +++++++----- + arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 61 ++++++++ + arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- + arch/arm/boot/dts/r8a7791.dtsi | 144 +++++++++++++++-- + arch/arm/boot/dts/sh7372-mackerel.dts | 2 +- + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 70 ++++++++- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/boot/dts/sh73a0.dtsi | 142 ++++++++--------- + arch/arm/configs/ape6evm_defconfig | 2 +- + arch/arm/configs/armadillo800eva_defconfig | 2 +- + arch/arm/configs/bockw_defconfig | 2 +- + arch/arm/configs/genmai_defconfig | 2 +- + arch/arm/configs/koelsch_defconfig | 2 +- + arch/arm/configs/kzm9d_defconfig | 2 +- + arch/arm/configs/kzm9g_defconfig | 2 +- + arch/arm/configs/lager_defconfig | 2 +- + arch/arm/configs/mackerel_defconfig | 2 +- + arch/arm/configs/marzen_defconfig | 2 +- + arch/arm/mach-shmobile/Kconfig | 18 ++- + arch/arm/mach-shmobile/Makefile | 1 - + arch/arm/mach-shmobile/Makefile.boot | 1 - + arch/arm/mach-shmobile/board-bockw-reference.c | 12 -- + arch/arm/mach-shmobile/board-kzm9d.c | 92 ----------- + arch/arm/mach-shmobile/board-lager.c | 4 +- + arch/arm/mach-shmobile/board-marzen.c | 2 - + arch/arm/mach-shmobile/clock-r7s72100.c | 1 + + arch/arm/mach-shmobile/clock-r8a73a4.c | 10 +- + arch/arm/mach-shmobile/clock-r8a7740.c | 8 +- + arch/arm/mach-shmobile/clock-r8a7778.c | 11 ++ + arch/arm/mach-shmobile/clock-r8a7779.c | 8 + + arch/arm/mach-shmobile/clock-r8a7790.c | 45 +++--- + arch/arm/mach-shmobile/clock-r8a7791.c | 14 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 8 +- + arch/arm/mach-shmobile/include/mach/emev2.h | 5 - + arch/arm/mach-shmobile/include/mach/r8a7791.h | 1 + + arch/arm/mach-shmobile/setup-emev2.c | 163 ++------------------ + arch/arm/mach-shmobile/setup-r7s72100.c | 22 +++ + arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7791.c | 65 ++++++++ + drivers/Makefile | 2 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 8 +- + 62 files changed, 1243 insertions(+), 614 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts + delete mode 100644 arch/arm/mach-shmobile/board-kzm9d.c +Merging samsung/for-next (8465d57097ce Merge branch 'v3.14-next/samsung-defconfig' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/boot/dts/cros5250-common.dtsi +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 2 + + arch/arm/Kconfig | 1 + + arch/arm/boot/dts/cros5250-common.dtsi | 8 +- + arch/arm/boot/dts/exynos5.dtsi | 21 ----- + arch/arm/boot/dts/exynos5250-arndale.dts | 16 +--- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 16 +--- + arch/arm/boot/dts/exynos5250-snow.dts | 2 +- + arch/arm/boot/dts/exynos5250.dtsi | 36 ++++++-- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 33 ++++++++ + arch/arm/boot/dts/exynos5420.dtsi | 96 +++++++++++++++++++++- + arch/arm/configs/exynos_defconfig | 2 +- + arch/arm/plat-samsung/include/plat/uncompress.h | 2 + + arch/arm/plat-samsung/s5p-irq-eint.c | 4 + + drivers/clocksource/exynos_mct.c | 4 + + drivers/irqchip/exynos-combiner.c | 15 +--- + 15 files changed, 185 insertions(+), 73 deletions(-) +Merging tegra/for-next (850500ad1edd Merge branch for-3.14/dt into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm/mach-tegra/fuse.c +Merge made by the 'recursive' strategy. + arch/arm/include/debug/tegra.S | 34 +++++------------------------ + arch/arm/mach-tegra/fuse.c | 41 ++++++++++++++++++++++++++++++++++- + arch/arm/mach-tegra/iomap.h | 14 ++++++------ + arch/arm/mach-tegra/tegra.c | 4 +--- + include/dt-bindings/gpio/tegra-gpio.h | 1 + + 5 files changed, 54 insertions(+), 40 deletions(-) +Merging arm64/upstream (dc1ccc48159d Linux 3.13-rc2) +$ git merge arm64/upstream +Already up-to-date. +Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for unused variable) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/include/asm/cache.h | 1 + + 1 file changed, 1 insertion(+) +Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (959f58544b7f Linux 3.12-rc7) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (50190edb2a56 m68k/amiga: Provide mach_random_get_entropy()) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + Documentation/zorro.txt | 5 +- + arch/m68k/amiga/chipram.c | 2 +- + arch/m68k/amiga/config.c | 44 ++-- + arch/m68k/amiga/platform.c | 9 +- + arch/m68k/apollo/config.c | 26 +- + arch/m68k/atari/config.c | 10 +- + arch/m68k/bvme6000/config.c | 6 +- + arch/m68k/configs/amiga_defconfig | 2 +- + arch/m68k/configs/apollo_defconfig | 2 +- + arch/m68k/configs/atari_defconfig | 2 +- + arch/m68k/configs/bvme6000_defconfig | 2 +- + arch/m68k/configs/hp300_defconfig | 2 +- + arch/m68k/configs/mac_defconfig | 2 +- + arch/m68k/configs/multi_defconfig | 2 +- + arch/m68k/configs/mvme147_defconfig | 2 +- + arch/m68k/configs/mvme16x_defconfig | 2 +- + arch/m68k/configs/q40_defconfig | 2 +- + arch/m68k/configs/sun3_defconfig | 2 +- + arch/m68k/configs/sun3x_defconfig | 2 +- + arch/m68k/emu/natfeat.c | 3 +- + arch/m68k/hp300/config.c | 10 +- + arch/m68k/include/asm/amigahw.h | 28 +-- + arch/m68k/include/asm/apollohw.h | 11 +- + arch/m68k/include/asm/atarihw.h | 2 +- + arch/m68k/include/asm/bootinfo.h | 364 +-------------------------- + arch/m68k/include/asm/hp300hw.h | 20 +- + arch/m68k/include/asm/macintosh.h | 83 ++---- + arch/m68k/include/asm/mvme16xhw.h | 17 -- + arch/m68k/include/asm/setup.h | 5 +- + arch/m68k/include/asm/timex.h | 10 + + arch/m68k/include/uapi/asm/Kbuild | 8 + + arch/m68k/include/uapi/asm/bootinfo-amiga.h | 63 +++++ + arch/m68k/include/uapi/asm/bootinfo-apollo.h | 28 +++ + arch/m68k/include/uapi/asm/bootinfo-atari.h | 44 ++++ + arch/m68k/include/uapi/asm/bootinfo-hp300.h | 50 ++++ + arch/m68k/include/uapi/asm/bootinfo-mac.h | 119 +++++++++ + arch/m68k/include/uapi/asm/bootinfo-q40.h | 16 ++ + arch/m68k/include/uapi/asm/bootinfo-vme.h | 70 ++++++ + arch/m68k/include/uapi/asm/bootinfo.h | 174 +++++++++++++ + arch/m68k/include/uapi/asm/setup.h | 87 ------- + arch/m68k/kernel/head.S | 12 +- + arch/m68k/kernel/setup_mm.c | 60 +++-- + arch/m68k/kernel/time.c | 4 + + arch/m68k/mac/config.c | 34 +-- + arch/m68k/mac/iop.c | 5 +- + arch/m68k/mac/misc.c | 2 - + arch/m68k/mac/oss.c | 1 - + arch/m68k/mac/psc.c | 3 +- + arch/m68k/mac/via.c | 1 - + arch/m68k/mm/init.c | 2 +- + arch/m68k/mm/motorola.c | 2 +- + arch/m68k/mvme147/config.c | 7 +- + arch/m68k/mvme16x/config.c | 30 ++- + arch/m68k/q40/config.c | 4 +- + arch/m68k/sun3/dvma.c | 6 +- + arch/m68k/sun3/mmu_emu.c | 3 +- + arch/m68k/sun3/sun3dvma.c | 8 +- + arch/m68k/sun3x/prom.c | 1 - + drivers/block/z2ram.c | 7 +- + drivers/ide/buddha.c | 2 +- + drivers/net/ethernet/8390/hydra.c | 2 +- + drivers/net/ethernet/8390/zorro8390.c | 4 +- + drivers/net/ethernet/amd/a2065.c | 13 +- + drivers/net/ethernet/amd/ariadne.c | 13 +- + drivers/net/ethernet/natsemi/macsonic.c | 1 - + drivers/parport/parport_mfc3.c | 2 +- + drivers/scsi/a2091.c | 2 +- + drivers/scsi/a3000.c | 2 +- + drivers/scsi/a4000t.c | 2 +- + drivers/scsi/gvp11.c | 2 +- + drivers/scsi/zorro7xx.c | 2 +- + drivers/video/amifb.c | 2 +- + drivers/video/cirrusfb.c | 4 +- + drivers/video/macfb.c | 1 - + drivers/video/valkyriefb.c | 1 - + drivers/zorro/Makefile | 3 +- + drivers/zorro/names.c | 11 - + drivers/zorro/proc.c | 10 +- + drivers/zorro/zorro-driver.c | 11 +- + drivers/zorro/zorro-sysfs.c | 22 +- + drivers/zorro/zorro.c | 27 +- + drivers/zorro/zorro.h | 5 + + include/linux/zorro.h | 121 ++------- + include/uapi/linux/Kbuild | 2 + + include/uapi/linux/zorro.h | 113 +++++++++ + include/{ => uapi}/linux/zorro_ids.h | 0 + 86 files changed, 1025 insertions(+), 885 deletions(-) + create mode 100644 arch/m68k/include/uapi/asm/bootinfo-amiga.h + create mode 100644 arch/m68k/include/uapi/asm/bootinfo-apollo.h + create mode 100644 arch/m68k/include/uapi/asm/bootinfo-atari.h + create mode 100644 arch/m68k/include/uapi/asm/bootinfo-hp300.h + create mode 100644 arch/m68k/include/uapi/asm/bootinfo-mac.h + create mode 100644 arch/m68k/include/uapi/asm/bootinfo-q40.h + create mode 100644 arch/m68k/include/uapi/asm/bootinfo-vme.h + create mode 100644 arch/m68k/include/uapi/asm/bootinfo.h + create mode 100644 include/uapi/linux/zorro.h + rename include/{ => uapi}/linux/zorro_ids.h (100%) +Merging m68knommu/for-next (d4d80b54a862 m68k : Kill CONFIG_MTD_PARTITIONS) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/m5208evb_defconfig | 1 - + arch/m68k/configs/m5249evb_defconfig | 1 - + arch/m68k/configs/m5272c3_defconfig | 1 - + arch/m68k/configs/m5275evb_defconfig | 1 - + arch/m68k/configs/m5307c3_defconfig | 1 - + arch/m68k/configs/m5407c3_defconfig | 1 - + 6 files changed, 6 deletions(-) +Merging metag/for-next (5a25f7bb5aa1 metag: smp: don't set irq regs in do_IPI()) +$ git merge metag/for-next +Merge made by the 'recursive' strategy. + arch/metag/kernel/dma.c | 5 ----- + arch/metag/kernel/smp.c | 7 ++----- + 2 files changed, 2 insertions(+), 10 deletions(-) +Merging microblaze/next (a1dd107fcafa microblaze: Remove duplicate declarations of _stext[] and _etext[]) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/Makefile | 2 ++ + arch/microblaze/include/asm/sections.h | 1 - + arch/microblaze/kernel/setup.c | 5 ++--- + 3 files changed, 4 insertions(+), 4 deletions(-) +Merging mips/mips-for-linux-next (6ca0bf323c14 Merge branch '3.13-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/lasat/picvue_proc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging openrisc/for-upstream (60a9dd5a10a1 openrisc: Use get_signal() signal_setup_done()) +$ git merge openrisc/for-upstream +Merge made by the 'recursive' strategy. + arch/openrisc/kernel/entry.S | 59 ++++++----- + arch/openrisc/kernel/signal.c | 233 +++++++++++++++++++++--------------------- + 2 files changed, 149 insertions(+), 143 deletions(-) +Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (dc1ccc48159d Linux 3.13-rc2) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (66c29da6782b powerpc/powernv: Replace CONFIG_POWERNV_MSI with just CONFIG_PPC_POWERNV) +$ git merge powerpc/next +Merge made by the 'recursive' strategy. + arch/powerpc/boot/.gitignore | 1 + + arch/powerpc/boot/dts/kilauea.dts | 2 +- + arch/powerpc/boot/dts/virtex440-ml507.dts | 2 + + arch/powerpc/include/asm/cache.h | 14 +++++- + arch/powerpc/include/asm/code-patching.h | 7 +++ + arch/powerpc/include/asm/hardirq.h | 3 +- + arch/powerpc/kernel/irq.c | 12 ++++-- + arch/powerpc/kernel/misc_32.S | 4 +- + arch/powerpc/kernel/misc_64.S | 6 +++ + arch/powerpc/kernel/setup_64.c | 6 +-- + arch/powerpc/kernel/smp.c | 9 +--- + arch/powerpc/kernel/sysfs.c | 72 ++++++++++++++++--------------- + arch/powerpc/kernel/time.c | 3 +- + arch/powerpc/lib/code-patching.c | 15 +++++++ + arch/powerpc/mm/tlb_nohash.c | 19 -------- + arch/powerpc/platforms/powernv/Kconfig | 5 --- + arch/powerpc/platforms/ps3/spu.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 2 +- + arch/powerpc/sysdev/Kconfig | 2 +- + 19 files changed, 105 insertions(+), 81 deletions(-) +Merging mpc5xxx/next (4384290b1f1a powerpc/512x: dts: remove misplaced IRQ spec from 'soc' node) +$ git merge mpc5xxx/next +Merge made by the 'recursive' strategy. + arch/powerpc/boot/dts/mpc5121.dtsi | 1 - + 1 file changed, 1 deletion(-) +Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) +$ git merge galak/next +Already up-to-date. +Merging s390/features (c9b851905dba s390/blacklist: Perform subchannel scan only when needed) +$ git merge s390/features +Merge made by the 'recursive' strategy. + Documentation/kmsg/s390/zcrypt | 20 +++ + arch/s390/Kconfig | 6 +- + arch/s390/include/asm/sclp.h | 3 +- + arch/s390/include/uapi/asm/zcrypt.h | 44 ++++++ + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/vdso.c | 2 +- + arch/s390/kernel/vdso32/clock_gettime.S | 9 +- + arch/s390/kernel/vdso64/clock_getres.S | 4 +- + arch/s390/kernel/vdso64/clock_gettime.S | 10 +- + drivers/s390/block/dasd_genhd.c | 1 - + drivers/s390/char/sclp_early.c | 5 +- + drivers/s390/cio/blacklist.c | 6 +- + drivers/s390/cio/chsc.c | 40 +---- + drivers/s390/cio/css.c | 26 +++- + drivers/s390/cio/css.h | 1 + + drivers/s390/crypto/ap_bus.c | 31 +++- + drivers/s390/crypto/ap_bus.h | 4 +- + drivers/s390/crypto/zcrypt_api.c | 101 ++++++++++++- + drivers/s390/crypto/zcrypt_api.h | 2 + + drivers/s390/crypto/zcrypt_cex4.c | 20 ++- + drivers/s390/crypto/zcrypt_error.h | 18 ++- + drivers/s390/crypto/zcrypt_msgtype50.c | 12 ++ + drivers/s390/crypto/zcrypt_msgtype6.c | 256 ++++++++++++++++++++++++++++++++ + drivers/s390/crypto/zcrypt_msgtype6.h | 2 + + drivers/s390/crypto/zcrypt_pcica.c | 11 ++ + drivers/s390/crypto/zcrypt_pcicc.c | 12 ++ + 26 files changed, 565 insertions(+), 82 deletions(-) + create mode 100644 Documentation/kmsg/s390/zcrypt +Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) +$ git merge sh/sh-latest +Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution. +Resolved 'drivers/tty/serial/sh-sci.c' 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 +CONFLICT (content): Merge conflict in 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 dfeeed7d54fa] 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 (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (9248053f80fd tile: Remove tile-specific _sinitdata and _einitdata) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/asm/sections.h | 3 --- + arch/tile/kernel/vmlinux.lds.S | 2 -- + arch/tile/mm/init.c | 12 ++++++------ + 3 files changed, 6 insertions(+), 11 deletions(-) +Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (3bf4c10bb2e3 xtensa: implement CPU hotplug) +$ git merge xtensa/for_next +Auto-merging drivers/irqchip/Makefile +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 47 +- + arch/xtensa/boot/dts/xtfpga.dtsi | 2 +- + arch/xtensa/include/asm/Kbuild | 1 - + arch/xtensa/include/asm/barrier.h | 4 +- + arch/xtensa/include/asm/bitops.h | 8 +- + arch/xtensa/include/asm/cacheflush.h | 40 +- + arch/xtensa/include/asm/delay.h | 9 +- + arch/xtensa/include/asm/ftrace.h | 2 +- + arch/xtensa/include/asm/futex.h | 147 +++++ + arch/xtensa/include/asm/irq.h | 9 + + arch/xtensa/include/asm/mmu.h | 10 +- + arch/xtensa/include/asm/mmu_context.h | 106 ++-- + arch/xtensa/include/asm/mxregs.h | 46 ++ + arch/xtensa/include/asm/processor.h | 20 + + arch/xtensa/include/asm/ptrace.h | 8 + + arch/xtensa/include/asm/smp.h | 38 +- + arch/xtensa/include/asm/spinlock.h | 31 +- + arch/xtensa/include/asm/spinlock_types.h | 20 + + arch/xtensa/include/asm/timex.h | 14 +- + arch/xtensa/include/asm/tlbflush.h | 42 +- + arch/xtensa/include/asm/traps.h | 1 + + arch/xtensa/include/asm/vectors.h | 12 +- + arch/xtensa/kernel/Makefile | 1 + + arch/xtensa/kernel/head.S | 181 +++++-- + arch/xtensa/kernel/irq.c | 207 ++++---- + arch/xtensa/kernel/mxhead.S | 85 +++ + arch/xtensa/kernel/setup.c | 92 ++-- + arch/xtensa/kernel/smp.c | 591 +++++++++++++++++++++ + arch/xtensa/kernel/time.c | 56 +- + arch/xtensa/kernel/traps.c | 56 +- + arch/xtensa/kernel/vmlinux.lds.S | 26 + + arch/xtensa/mm/cache.c | 7 +- + arch/xtensa/mm/fault.c | 2 +- + arch/xtensa/mm/misc.S | 4 +- + arch/xtensa/mm/mmu.c | 4 +- + arch/xtensa/mm/tlb.c | 37 +- + arch/xtensa/platforms/iss/network.c | 290 ++++------ + .../platforms/xtfpga/include/platform/hardware.h | 6 +- + arch/xtensa/variants/s6000/include/variant/irq.h | 1 - + drivers/irqchip/Kconfig | 4 + + drivers/irqchip/Makefile | 2 + + drivers/irqchip/irq-xtensa-mx.c | 164 ++++++ + drivers/irqchip/irq-xtensa-pic.c | 108 ++++ + include/linux/irqchip/xtensa-mx.h | 17 + + include/linux/irqchip/xtensa-pic.h | 18 + + 45 files changed, 1987 insertions(+), 589 deletions(-) + create mode 100644 arch/xtensa/include/asm/futex.h + create mode 100644 arch/xtensa/include/asm/mxregs.h + create mode 100644 arch/xtensa/include/asm/spinlock_types.h + create mode 100644 arch/xtensa/kernel/mxhead.S + create mode 100644 arch/xtensa/kernel/smp.c + create mode 100644 drivers/irqchip/irq-xtensa-mx.c + create mode 100644 drivers/irqchip/irq-xtensa-pic.c + create mode 100644 include/linux/irqchip/xtensa-mx.h + create mode 100644 include/linux/irqchip/xtensa-pic.h +Merging btrfs/next (91aef86f3b8a Btrfs: rename btrfs_start_all_delalloc_inodes) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (ff638b7df5a9 ceph: allocate non-zero page to fscache in readpage()) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (dea4f48a0a30 Merge branch 'leds-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (2000f5beabc9 eCryptfs: file->private_data is always valid) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (df4e7ac0bb70 ext2: Fix oops in ext2_get_block() called from ext2_quota_write()) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 1 + + 1 file changed, 1 insertion(+) +Merging ext4/dev (0826a7e1ffac ext4: check for overlapping extents in ext4_valid_extent_entries()) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/ext4_jbd2.c | 9 +++++++++ + fs/ext4/extents.c | 19 ++++++++++++++++++- + fs/ext4/inode.c | 5 ----- + fs/ext4/mballoc.c | 11 ++++++++--- + fs/jbd2/journal.c | 18 ++++++++---------- + fs/jbd2/recovery.c | 2 +- + fs/jbd2/transaction.c | 16 +++++++++------- + 7 files changed, 53 insertions(+), 27 deletions(-) +Merging f2fs/dev (0491fe20cb11 f2fs: replace the debugfs_root with f2fs_debugfs_root) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 83 +++---- + fs/f2fs/data.c | 347 +++++++++++++++++++++-------- + fs/f2fs/debug.c | 32 ++- + fs/f2fs/f2fs.h | 104 ++++++--- + fs/f2fs/file.c | 48 +--- + fs/f2fs/gc.c | 4 +- + fs/f2fs/node.c | 128 ++++++----- + fs/f2fs/recovery.c | 4 +- + fs/f2fs/segment.c | 524 ++++++++++++++++++++++++++++---------------- + fs/f2fs/segment.h | 22 +- + fs/f2fs/super.c | 32 ++- + include/linux/f2fs_fs.h | 8 + + include/trace/events/f2fs.h | 107 ++++++--- + 13 files changed, 943 insertions(+), 500 deletions(-) +Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt to store a page that is now beyond EOF) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. + fs/fscache/page.c | 37 ++++++++++++++++++++++++++++++++++++- + 1 file changed, 36 insertions(+), 1 deletion(-) +Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary requests from fuse file release) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (c599ca2dc6f5 GFS2: Remove test which is always true) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 18 +++------- + fs/gfs2/incore.h | 1 + + fs/gfs2/lops.c | 1 + + fs/gfs2/quota.c | 37 +++++++------------- + fs/gfs2/rgrp.c | 103 ++++++++++++++++++++++++++++++++++++++++++------------- + 5 files changed, 98 insertions(+), 62 deletions(-) +Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc) +$ git merge jfs/jfs-next +Already up-to-date. +Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (3873d064b853 nfs: fix do_div() warning by instead using sector_div()) +$ git merge nfs/linux-next +Auto-merging include/linux/nfs4.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + fs/nfs/blocklayout/blocklayout.h | 1 + + fs/nfs/blocklayout/extents.c | 2 +- + fs/nfs/dns_resolve.c | 2 ++ + fs/nfs/inode.c | 2 +- + fs/nfs/internal.h | 15 +++++++++++++++ + fs/nfs/nfs4_fs.h | 8 ++++++++ + fs/nfs/nfs4proc.c | 30 +++++++++++++++++++++++------- + include/linux/nfs4.h | 10 ---------- + include/linux/nfs_fs.h | 18 ------------------ + net/sunrpc/auth_gss/auth_gss.c | 2 +- + 11 files changed, 54 insertions(+), 40 deletions(-) +Merging nfsd/nfsd-next (d2c2ad54c485 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (f94741fd2832 net/9p: remove virtio default hack and set appropriate bits instead) +$ git merge v9fs/for-next +Merge made by the 'recursive' strategy. + fs/9p/cache.c | 3 +-- + fs/9p/vfs_file.c | 2 -- + fs/9p/vfs_inode.c | 4 +--- + fs/9p/vfs_inode_dotl.c | 8 -------- + fs/9p/xattr.c | 10 ++++++---- + net/9p/client.c | 3 --- + net/9p/trans_fd.c | 2 +- + net/9p/trans_virtio.c | 2 +- + 8 files changed, 10 insertions(+), 24 deletions(-) +Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (f9fd01356100 xfs: don't perform discard if the given range length is less than block size) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/xfs_buf.c | 26 ++++++++------------------ + fs/xfs/xfs_discard.c | 5 +++-- + fs/xfs/xfs_ioctl.c | 3 ++- + fs/xfs/xfs_ioctl32.c | 3 ++- + fs/xfs/xfs_trans_dquot.c | 4 ++-- + fs/xfs/xfs_vnode.h | 9 --------- + 6 files changed, 17 insertions(+), 33 deletions(-) +Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (6ce4eac1f600 Linux 3.13-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (074fb898390b Merge branch 'for-3.14/upstream' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/i2c-hid/i2c-hid.c +Auto-merging drivers/hid/hid-multitouch.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/Kconfig +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 1 + + drivers/hid/hid-core.c | 4 +- + drivers/hid/hid-ids.h | 8 +- + drivers/hid/hid-lg.c | 2 + + drivers/hid/hid-multitouch.c | 4 +- + drivers/hid/hid-sony.c | 194 ++++++++++++++++++++-------------------- + drivers/hid/i2c-hid/i2c-hid.c | 2 + + drivers/hid/usbhid/hid-quirks.c | 8 +- + drivers/hid/usbhid/usbkbd.c | 2 +- + 9 files changed, 117 insertions(+), 108 deletions(-) +Merging i2c/i2c/for-next (af91706d5dde ima: store address of template_fmt_copy in a pointer before calling strsep) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (672cbc9af2bf hwmon: (it87) Print proper names for the IT8771E and IT8772E) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + Documentation/hwmon/it87 | 27 ++++++++---- + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/it87.c | 104 ++++++++++++++++++++++++++++++++++++++-------- + drivers/hwmon/lm90.c | 4 +- + drivers/hwmon/w83l786ng.c | 10 +++-- + 5 files changed, 116 insertions(+), 33 deletions(-) +Merging hwmon-staging/hwmon-next (7f438058ec86 hwmon: remove DEFINE_PCI_DEVICE_TABLE macro) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/fam15h_power.c | 2 +- + drivers/hwmon/k10temp.c | 2 +- + drivers/hwmon/k8temp.c | 2 +- + drivers/hwmon/sis5595.c | 2 +- + drivers/hwmon/via686a.c | 2 +- + drivers/hwmon/vt8231.c | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) +Merging v4l-dvb/master (258a9e5cbc63 Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 8 +- + drivers/media/common/siano/smscoreapi.h | 4 +- + drivers/media/common/siano/smsdvb.h | 2 +- + drivers/media/dvb-core/dvb_demux.c | 9 +- + drivers/media/dvb-frontends/cxd2820r_c.c | 2 +- + drivers/media/dvb-frontends/dib8000.c | 4 +- + drivers/media/dvb-frontends/drxk_hard.c | 18 +-- + drivers/media/i2c/adv7183_regs.h | 6 +- + drivers/media/i2c/adv7604.c | 2 +- + drivers/media/i2c/adv7842.c | 2 +- + drivers/media/i2c/ir-kbd-i2c.c | 2 +- + drivers/media/i2c/m5mols/m5mols_controls.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +- + drivers/media/i2c/saa7115.c | 2 +- + drivers/media/i2c/soc_camera/ov5642.c | 2 +- + drivers/media/i2c/ths7303.c | 3 +- + drivers/media/i2c/wm8775.c | 4 +- + drivers/media/pci/bt8xx/bttv-driver.c | 3 +- + drivers/media/pci/cx18/cx18-driver.h | 2 +- + drivers/media/pci/cx23885/cx23885-417.c | 2 +- + drivers/media/pci/pluto2/pluto2.c | 2 +- + drivers/media/pci/saa7164/saa7164-core.c | 4 +- + drivers/media/platform/coda.c | 2 +- + drivers/media/platform/exynos4-is/fimc-core.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 2 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 45 +----- + drivers/media/platform/omap3isp/isp.c | 2 +- + drivers/media/platform/s5p-mfc/regs-mfc.h | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 12 +- + drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 2 +- + drivers/media/platform/s5p-tv/mixer.h | 2 +- + drivers/media/platform/s5p-tv/mixer_video.c | 4 +- + drivers/media/platform/soc_camera/omap1_camera.c | 2 +- + drivers/media/platform/vivi.c | 4 +- + drivers/media/platform/vsp1/vsp1_drv.c | 2 +- + drivers/media/platform/vsp1/vsp1_video.c | 4 +- + drivers/media/radio/radio-shark.c | 4 +- + drivers/media/radio/radio-shark2.c | 4 +- + drivers/media/radio/radio-si476x.c | 4 +- + drivers/media/radio/radio-tea5764.c | 2 +- + drivers/media/radio/tef6862.c | 2 +- + drivers/media/rc/imon.c | 2 +- + drivers/media/rc/redrat3.c | 2 +- + drivers/media/tuners/mt2063.c | 4 +- + drivers/media/tuners/tuner-xc2028-types.h | 2 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 2 + + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 4 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +- + drivers/media/usb/em28xx/em28xx-video.c | 2 +- + drivers/media/usb/gspca/gl860/gl860.c | 2 +- + drivers/media/usb/gspca/pac207.c | 2 +- + drivers/media/usb/gspca/pac7302.c | 2 +- + drivers/media/usb/gspca/stk1135.c | 3 + + drivers/media/usb/gspca/stv0680.c | 2 +- + drivers/media/usb/gspca/sunplus.c | 1 + + drivers/media/usb/gspca/zc3xx.c | 2 +- + drivers/media/usb/pwc/pwc-if.c | 2 +- + drivers/media/usb/usbtv/usbtv.c | 174 +++++++++++++++++----- + drivers/media/usb/uvc/uvc_video.c | 2 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 2 +- + drivers/media/v4l2-core/videobuf2-core.c | 8 +- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 +- + include/media/videobuf2-core.h | 2 +- + 65 files changed, 252 insertions(+), 170 deletions(-) +Merging kbuild/for-next (e6483a58eca6 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/package/builddeb | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) +Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm') +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (c5fd0781fbae Merge branch 'for-3.14' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/sata_rcar.txt | 18 ++ + drivers/ata/ahci.c | 60 +++++- + drivers/ata/ahci_imx.c | 240 +++++++++++++-------- + drivers/ata/ata_generic.c | 7 - + drivers/ata/libata-core.c | 3 + + drivers/ata/libata-eh.c | 5 +- + drivers/ata/sata_rcar.c | 118 ++++++++-- + 7 files changed, 332 insertions(+), 119 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/sata_rcar.txt +Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block) +$ git merge pstore/master +Already up-to-date. +Merging pm/linux-next (034b30b068a0 Merge branch 'acpi-hotplug-next' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/acpi/namespace.txt | 9 +- + arch/ia64/hp/common/aml_nfw.c | 3 +- + arch/x86/kernel/apic/apic_flat_64.c | 4 +- + arch/x86/kernel/apic/io_apic.c | 3 - + arch/x86/pci/mmconfig_32.c | 1 - + arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +- + drivers/acpi/ac.c | 3 +- + drivers/acpi/acpi_extlog.c | 1 - + drivers/acpi/acpi_lpss.c | 1 + + drivers/acpi/acpi_memhotplug.c | 15 +- + drivers/acpi/acpi_pad.c | 3 +- + drivers/acpi/acpi_processor.c | 2 +- + drivers/acpi/apei/einj.c | 1 - + drivers/acpi/battery.c | 3 +- + drivers/acpi/blacklist.c | 1 - + drivers/acpi/bus.c | 77 +--- + drivers/acpi/button.c | 3 +- + drivers/acpi/container.c | 11 +- + drivers/acpi/custom_method.c | 2 +- + drivers/acpi/debugfs.c | 2 +- + drivers/acpi/device_pm.c | 22 +- + drivers/acpi/dock.c | 11 +- + drivers/acpi/ec.c | 5 +- + drivers/acpi/event.c | 2 +- + drivers/acpi/fan.c | 3 +- + drivers/acpi/glue.c | 165 +++---- + drivers/acpi/hed.c | 2 - + drivers/acpi/internal.h | 9 +- + drivers/acpi/numa.c | 1 - + drivers/acpi/osl.c | 9 +- + drivers/acpi/pci_irq.c | 2 - + drivers/acpi/pci_link.c | 4 +- + drivers/acpi/pci_root.c | 126 +----- + drivers/acpi/power.c | 3 +- + drivers/acpi/proc.c | 4 +- + drivers/acpi/processor_core.c | 3 +- + drivers/acpi/processor_idle.c | 4 +- + drivers/acpi/processor_perflib.c | 7 +- + drivers/acpi/processor_thermal.c | 7 +- + drivers/acpi/processor_throttling.c | 7 +- + drivers/acpi/sbshc.c | 3 +- + drivers/acpi/scan.c | 482 +++++++++++---------- + drivers/acpi/sleep.c | 4 - + drivers/acpi/sysfs.c | 2 +- + drivers/acpi/thermal.c | 5 +- + drivers/acpi/utils.c | 2 - + drivers/acpi/video.c | 5 +- + drivers/acpi/wakeup.c | 1 - + drivers/ata/libata-acpi.c | 28 +- + drivers/ata/pata_acpi.c | 5 +- + drivers/base/power/main.c | 3 + + drivers/char/hpet.c | 7 +- + drivers/char/tpm/tpm_acpi.c | 2 +- + drivers/char/tpm/tpm_ppi.c | 1 - + drivers/cpufreq/cpufreq-cpu0.c | 2 +- + drivers/cpufreq/cpufreq.c | 46 +- + drivers/cpufreq/spear-cpufreq.c | 2 +- + drivers/cpuidle/cpuidle.c | 2 +- + drivers/gpu/drm/i915/intel_acpi.c | 2 - + drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 6 +- + drivers/hv/vmbus_drv.c | 2 - + drivers/hwmon/acpi_power_meter.c | 3 +- + drivers/hwmon/asus_atk0110.c | 6 +- + drivers/ide/ide-acpi.c | 12 +- + drivers/idle/intel_idle.c | 4 +- + drivers/input/misc/atlas_btns.c | 2 +- + drivers/iommu/amd_iommu_init.c | 1 - + drivers/iommu/intel_irq_remapping.c | 4 +- + drivers/mmc/core/sdio_bus.c | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 6 +- + drivers/pci/hotplug/acpiphp_ibm.c | 3 +- + drivers/pci/hotplug/pciehp.h | 2 - + drivers/pci/ioapic.c | 1 - + drivers/pci/pci-acpi.c | 17 +- + drivers/pci/pci-label.c | 1 - + drivers/pinctrl/pinctrl-baytrail.c | 1 + + drivers/platform/x86/acer-wmi.c | 2 - + drivers/platform/x86/asus-laptop.c | 3 +- + drivers/platform/x86/asus-wmi.c | 3 +- + drivers/platform/x86/classmate-laptop.c | 3 +- + drivers/platform/x86/dell-wmi-aio.c | 1 - + drivers/platform/x86/dell-wmi.c | 1 - + drivers/platform/x86/eeepc-laptop.c | 3 +- + drivers/platform/x86/eeepc-wmi.c | 2 +- + drivers/platform/x86/hp_accel.c | 2 +- + drivers/platform/x86/ideapad-laptop.c | 3 +- + drivers/platform/x86/intel-rst.c | 2 +- + drivers/platform/x86/intel-smartconnect.c | 2 +- + drivers/platform/x86/intel_menlow.c | 4 +- + drivers/platform/x86/intel_oaktrail.c | 3 - + drivers/platform/x86/mxm-wmi.c | 3 +- + drivers/platform/x86/panasonic-laptop.c | 4 +- + drivers/platform/x86/pvpanic.c | 3 +- + drivers/platform/x86/samsung-q10.c | 2 +- + drivers/platform/x86/sony-laptop.c | 4 +- + drivers/platform/x86/tc1100-wmi.c | 4 +- + drivers/platform/x86/thinkpad_acpi.c | 14 +- + drivers/platform/x86/toshiba_acpi.c | 4 +- + drivers/platform/x86/toshiba_bluetooth.c | 4 +- + drivers/platform/x86/wmi.c | 2 - + drivers/platform/x86/xo15-ebook.c | 3 +- + drivers/pnp/pnpacpi/core.c | 22 +- + drivers/pnp/pnpacpi/pnpacpi.h | 1 - + drivers/sfi/sfi_acpi.c | 2 +- + drivers/staging/quickstart/quickstart.c | 2 +- + drivers/usb/core/usb-acpi.c | 41 +- + drivers/xen/xen-acpi-cpuhotplug.c | 11 +- + drivers/xen/xen-acpi-memhotplug.c | 8 +- + drivers/xen/xen-acpi-pad.c | 5 +- + drivers/xen/xen-acpi-processor.c | 4 +- + fs/eventpoll.c | 3 +- + include/acpi/acpi_bus.h | 37 +- + include/acpi/acpi_drivers.h | 3 - + include/linux/acpi.h | 6 + + include/linux/acpi_io.h | 2 +- + include/linux/cpufreq.h | 8 + + include/linux/ide.h | 8 +- + include/linux/iscsi_ibft.h | 2 +- + include/linux/pci_hotplug.h | 3 +- + include/linux/sfi_acpi.h | 2 +- + include/linux/tboot.h | 2 +- + include/uapi/linux/eventpoll.h | 13 +- + kernel/power/hibernate.c | 1 + + .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +- + 125 files changed, 634 insertions(+), 866 deletions(-) +Merging idle/next (1ae2a8af4228 tools/power turbostat: run on HSX) +$ git merge idle/next +Merge made by the 'recursive' strategy. + tools/power/x86/turbostat/turbostat.c | 42 ++++++++++++++++++++++++++--------- + 1 file changed, 31 insertions(+), 11 deletions(-) +Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (86e0a0bdf81c Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next) +$ git merge thermal/next +Already up-to-date. +Merging ieee1394/for-next (db9ae8fec7b1 firewire: ohci: Fix deadlock at bus reset) +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap()) +$ git merge ubi/linux-next +Already up-to-date. +Merging dlm/next (a97f4a66d8ee dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (29732357a296 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Resolved 'arch/arm/boot/dts/imx51.dtsi' using previous resolution. +Resolved 'arch/arm/boot/dts/imx53.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/imx6sl.dtsi +Auto-merging arch/arm/boot/dts/imx6qdl.dtsi +Auto-merging arch/arm/boot/dts/imx53.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53.dtsi +Auto-merging arch/arm/boot/dts/imx51.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx51.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8deb2377da41] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + + arch/arm/boot/dts/imx51.dtsi | 4 +- + arch/arm/boot/dts/imx53.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl.dtsi | 12 +- + arch/arm/boot/dts/imx6sl.dtsi | 12 +- + drivers/dma/amba-pl08x.c | 2 +- + drivers/dma/imx-sdma.c | 19 +- + drivers/dma/mmp_pdma.c | 205 +++++++++++---------- + drivers/dma/mmp_tdma.c | 6 +- + drivers/dma/pl330.c | 6 + + drivers/dma/s3c24xx-dma.c | 33 +--- + drivers/dma/sh/rcar-hpbdma.c | 11 +- + include/linux/platform_data/dma-imx-sdma.h | 5 + + include/linux/platform_data/dma-imx.h | 1 + + sound/soc/fsl/fsl_ssi.c | 27 ++- + 15 files changed, 195 insertions(+), 153 deletions(-) +Merging dmaengine/next (6ce4eac1f600 Linux 3.13-rc1) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (42a2d923cc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (9bb8ca86075f virtio-net: switch to use XPS to choose txq) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (4b074b07625f Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next) +$ git merge wireless-next/master +Resolved 'drivers/net/wireless/brcm80211/Kconfig' using previous resolution. +Resolved 'net/mac80211/util.c' using previous resolution. +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/ibss.c +Auto-merging net/wireless/core.c +Auto-merging net/mac80211/util.c +CONFLICT (content): Merge conflict in net/mac80211/util.c +Auto-merging net/mac80211/scan.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/rc80211_minstrel_ht.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/mesh.c +Auto-merging net/mac80211/main.c +Auto-merging net/mac80211/iface.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/ibss.c +Auto-merging net/mac80211/cfg.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h +Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +Auto-merging drivers/net/wireless/brcm80211/Kconfig +CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/Kconfig +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 528d5dc92bf6] Merge remote-tracking branch 'wireless-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/networking/regulatory.txt | 4 +- + MAINTAINERS | 19 +- + drivers/net/wireless/ath/ath10k/mac.c | 4 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 11 +- + drivers/net/wireless/ath/ath9k/Kconfig | 10 +- + drivers/net/wireless/ath/ath9k/Makefile | 8 +- + .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 31 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 114 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 122 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 9 +- + drivers/net/wireless/ath/ath9k/ar9003_wow.c | 422 ++++++ + drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 390 ++--- + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 32 +- + .../net/wireless/ath/ath9k/ar9462_2p1_initvals.h | 1559 +------------------- + .../net/wireless/ath/ath9k/ar9565_1p1_initvals.h | 64 + + .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 559 ++++--- + drivers/net/wireless/ath/ath9k/ath9k.h | 56 +- + drivers/net/wireless/ath/ath9k/debug.c | 115 +- + drivers/net/wireless/ath/ath9k/hw.c | 24 +- + drivers/net/wireless/ath/ath9k/hw.h | 5 +- + drivers/net/wireless/ath/ath9k/init.c | 26 +- + drivers/net/wireless/ath/ath9k/main.c | 541 +------ + drivers/net/wireless/ath/ath9k/pci.c | 45 + + drivers/net/wireless/ath/ath9k/reg.h | 12 +- + drivers/net/wireless/ath/ath9k/tx99.c | 263 ++++ + drivers/net/wireless/ath/ath9k/wow.c | 589 ++++---- + drivers/net/wireless/ath/ath9k/xmit.c | 7 + + drivers/net/wireless/ath/regd.c | 52 +- + drivers/net/wireless/brcm80211/Kconfig | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 384 +++++ + drivers/net/wireless/brcm80211/brcmfmac/bcdc.h | 24 + + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 3 - + .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 51 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 482 +----- + drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 15 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 392 ----- + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 22 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 36 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 2 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 194 +-- + .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 42 - + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 462 +++--- + drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 54 + + drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 7 +- + drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 61 + + .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 304 ++++ + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 173 ++- + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/proto.c | 62 + + drivers/net/wireless/brcm80211/brcmfmac/proto.h | 57 + + .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 33 +- + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 4 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 29 +- + drivers/net/wireless/brcm80211/brcmsmac/channel.c | 35 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 66 +- + drivers/net/wireless/cw1200/scan.c | 10 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 4 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 8 +- + drivers/net/wireless/iwlegacy/3945-mac.c | 8 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 8 +- + drivers/net/wireless/iwlegacy/common.c | 4 +- + drivers/net/wireless/iwlegacy/debug.c | 8 +- + drivers/net/wireless/iwlwifi/dvm/debugfs.c | 8 +- + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 6 +- + drivers/net/wireless/iwlwifi/dvm/scan.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 4 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 6 +- + drivers/net/wireless/iwlwifi/mvm/scan.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 101 +- + drivers/net/wireless/mwifiex/cfg80211.c | 25 +- + drivers/net/wireless/mwifiex/scan.c | 4 +- + drivers/net/wireless/rtlwifi/regd.c | 54 +- + drivers/net/wireless/ti/wl12xx/scan.c | 2 +- + drivers/net/wireless/ti/wlcore/cmd.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 3 +- + drivers/net/wireless/ti/wlcore/scan.c | 12 +- + include/linux/ieee80211.h | 8 +- + include/net/cfg80211.h | 76 +- + include/net/mac80211.h | 40 + + include/net/regulatory.h | 80 +- + include/uapi/linux/nl80211.h | 47 +- + net/mac80211/cfg.c | 123 +- + net/mac80211/chan.c | 141 +- + net/mac80211/debugfs.c | 168 +++ + net/mac80211/debugfs_sta.c | 134 ++ + net/mac80211/ibss.c | 6 +- + net/mac80211/ieee80211_i.h | 43 +- + net/mac80211/iface.c | 14 +- + net/mac80211/key.c | 62 +- + net/mac80211/key.h | 13 +- + net/mac80211/main.c | 147 +- + net/mac80211/mesh.c | 7 +- + net/mac80211/mesh.h | 6 +- + net/mac80211/mesh_hwmp.c | 91 +- + net/mac80211/mesh_pathtbl.c | 7 +- + net/mac80211/mesh_plink.c | 708 ++++----- + net/mac80211/mesh_ps.c | 3 +- + net/mac80211/mesh_sync.c | 28 +- + net/mac80211/mlme.c | 43 +- + net/mac80211/rate.h | 4 +- + net/mac80211/rc80211_minstrel.c | 3 +- + net/mac80211/rc80211_minstrel_ht.c | 22 +- + net/mac80211/rc80211_minstrel_ht_debugfs.c | 3 +- + net/mac80211/rx.c | 88 +- + net/mac80211/scan.c | 10 +- + net/mac80211/sta_info.c | 40 +- + net/mac80211/sta_info.h | 38 +- + net/mac80211/status.c | 78 + + net/mac80211/trace.h | 21 +- + net/mac80211/tx.c | 41 +- + net/mac80211/util.c | 95 +- + net/mac80211/vht.c | 7 +- + net/mac80211/wpa.c | 116 ++ + net/mac80211/wpa.h | 2 + + net/wireless/chan.c | 203 ++- + net/wireless/core.c | 6 +- + net/wireless/core.h | 18 +- + net/wireless/genregdb.awk | 45 +- + net/wireless/ibss.c | 4 +- + net/wireless/mesh.c | 3 +- + net/wireless/mlme.c | 20 +- + net/wireless/nl80211.c | 107 +- + net/wireless/nl80211.h | 2 +- + net/wireless/rdev-ops.h | 12 +- + net/wireless/reg.c | 802 ++++++---- + net/wireless/reg.h | 3 +- + net/wireless/trace.h | 15 +- + 129 files changed, 6452 insertions(+), 5733 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_wow.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9565_1p1_initvals.h + create mode 100644 drivers/net/wireless/ath/ath9k/tx99.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcdc.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcdc.h + delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c + delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/proto.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/proto.h +Merging bluetooth/master (201a5929c8c7 Bluetooth: Remove dead code from SMP encryption function) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 4 ++ + drivers/bluetooth/btmrvl_drv.h | 25 ++++---- + drivers/bluetooth/btmrvl_main.c | 130 ++++++++++------------------------------ + drivers/bluetooth/btmrvl_sdio.c | 9 +-- + drivers/bluetooth/btmrvl_sdio.h | 2 - + drivers/bluetooth/btusb.c | 7 ++- + net/bluetooth/hci_core.c | 20 ++++--- + net/bluetooth/hci_event.c | 72 ++++++++++------------ + net/bluetooth/mgmt.c | 17 +++++- + net/bluetooth/smp.c | 40 ++++--------- + 10 files changed, 124 insertions(+), 202 deletions(-) +Merging infiniband/for-next (b4fdf52b3fc8 Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (6ce4eac1f600 Linux 3.13-rc1) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (79d9d3ba063b mtd: nand: mxc_nand: Check the return value from clk_prepare_enable()) +$ git merge l2-mtd/master +Auto-merging drivers/mtd/maps/pxa2xx-flash.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/gpmi-nand.txt | 8 + + .../devicetree/bindings/mtd/pxa3xx-nand.txt | 6 +- + Documentation/mtd/nand/pxa3xx-nand.txt | 113 ++++ + drivers/mtd/devices/m25p80.c | 210 ++++++- + drivers/mtd/devices/ms02-nv.c | 2 +- + drivers/mtd/devices/mtd_dataflash.c | 5 +- + drivers/mtd/maps/pxa2xx-flash.c | 2 +- + drivers/mtd/maps/sun_uflash.c | 2 +- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/nand/Kconfig | 6 +- + drivers/mtd/nand/diskonchip.c | 10 +- + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 127 ++-- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 165 ++--- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 2 - + drivers/mtd/nand/mpc5121_nfc.c | 6 - + drivers/mtd/nand/mxc_nand.c | 5 +- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 688 ++++++++++++++++----- + drivers/mtd/ofpart.c | 4 +- + include/linux/mtd/nand.h | 2 +- + include/linux/mtd/partitions.h | 4 +- + include/linux/of_mtd.h | 2 +- + include/linux/platform_data/mtd-nand-pxa3xx.h | 3 + + 23 files changed, 1010 insertions(+), 366 deletions(-) + create mode 100644 Documentation/mtd/nand/pxa3xx-nand.txt +Merging crypto/master (f262f0f5cad0 crypto: s390 - Fix aes-cbc IV corruption) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (a3483353ca4e drm: check for !kdev in drm_unplug_minor()) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-intel/for-linux-next (d299cce76e00 drm/i915: check context reset stats before relocations) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_opregion.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_dma.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ed59907d7b7b] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/char/Makefile | 2 +- + drivers/char/agp/Kconfig | 5 + + drivers/char/agp/Makefile | 2 +- + drivers/char/agp/intel-agp.c | 5 - + drivers/char/agp/intel-gtt.c | 18 + + drivers/gpu/drm/i915/Kconfig | 32 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 73 +-- + drivers/gpu/drm/i915/i915_debugfs.c | 163 ++++-- + drivers/gpu/drm/i915/i915_dma.c | 22 +- + drivers/gpu/drm/i915/i915_drv.c | 42 +- + drivers/gpu/drm/i915/i915_drv.h | 143 +++-- + drivers/gpu/drm/i915/i915_gem.c | 16 +- + drivers/gpu/drm/i915/i915_gem_context.c | 45 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 49 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 26 +- + drivers/gpu/drm/i915/i915_irq.c | 31 +- + drivers/gpu/drm/i915/i915_reg.h | 221 ++++---- + drivers/gpu/drm/i915/i915_suspend.c | 45 -- + drivers/gpu/drm/i915/i915_sysfs.c | 35 +- + drivers/gpu/drm/i915/i915_ums.c | 27 + + drivers/gpu/drm/i915/intel_bios.h | 48 +- + drivers/gpu/drm/i915/intel_crt.c | 5 +- + drivers/gpu/drm/i915/intel_ddi.c | 39 +- + drivers/gpu/drm/i915/intel_display.c | 332 ++++++++--- + drivers/gpu/drm/i915/intel_dp.c | 58 +- + drivers/gpu/drm/i915/intel_drv.h | 25 +- + drivers/gpu/drm/i915/intel_dsi.c | 5 +- + drivers/gpu/drm/i915/intel_dvo.c | 5 +- + drivers/gpu/drm/i915/intel_fbdev.c | 63 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 67 +-- + drivers/gpu/drm/i915/intel_i2c.c | 15 +- + drivers/gpu/drm/i915/intel_lvds.c | 21 +- + drivers/gpu/drm/i915/intel_opregion.c | 51 +- + drivers/gpu/drm/i915/intel_panel.c | 882 +++++++++++++++++++---------- + drivers/gpu/drm/i915/intel_pm.c | 418 ++++++++------ + drivers/gpu/drm/i915/intel_ringbuffer.c | 22 +- + drivers/gpu/drm/i915/intel_sdvo.c | 60 +- + drivers/gpu/drm/i915/intel_sdvo_regs.h | 40 +- + drivers/gpu/drm/i915/intel_sideband.c | 29 +- + drivers/gpu/drm/i915/intel_sprite.c | 18 + + drivers/gpu/drm/i915/intel_uncore.c | 296 ++++++++-- + include/uapi/drm/i915_drm.h | 19 + + 42 files changed, 2231 insertions(+), 1289 deletions(-) +Merging drm-tegra/drm/for-next (977386a04bae drm/tegra: Reserve syncpoint base for gr3d) +$ git merge drm-tegra/drm/for-next +Already up-to-date. +Merging sound/for-next (b13a714923fe ALSA: AACI: Convert to modern PM ops) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/patch_hdmi.c +Removing sound/pci/cs46xx/imgs/cwcsnoop.h +Removing sound/pci/cs46xx/imgs/cwcdma.h +Removing sound/pci/cs46xx/imgs/cwcdma.asp +Removing sound/pci/cs46xx/imgs/cwcbinhack.h +Removing sound/pci/cs46xx/imgs/cwcasync.h +Removing sound/pci/cs46xx/imgs/cwc4630.h +Removing sound/pci/cs46xx/cs46xx_image.h +Merge made by the 'recursive' strategy. + sound/arm/aaci.c | 23 +- + sound/pci/Kconfig | 1 + + sound/pci/cs46xx/cs46xx.h | 5 + + sound/pci/cs46xx/cs46xx_image.h | 3468 ------------------------------------ + sound/pci/cs46xx/cs46xx_lib.c | 265 ++- + sound/pci/cs46xx/imgs/cwc4630.h | 320 ---- + sound/pci/cs46xx/imgs/cwcasync.h | 176 -- + sound/pci/cs46xx/imgs/cwcbinhack.h | 48 - + sound/pci/cs46xx/imgs/cwcdma.asp | 170 -- + sound/pci/cs46xx/imgs/cwcdma.h | 68 - + sound/pci/cs46xx/imgs/cwcsnoop.h | 46 - + sound/pci/hda/Makefile | 5 +- + sound/pci/hda/hda_codec.c | 211 ++- + sound/pci/hda/hda_codec.h | 12 +- + sound/pci/hda/hda_generic.c | 4 + + sound/pci/hda/hda_intel.c | 30 +- + sound/pci/hda/hda_local.h | 8 +- + sound/pci/hda/patch_hdmi.c | 24 +- + sound/pci/hda/patch_realtek.c | 63 +- + 19 files changed, 495 insertions(+), 4452 deletions(-) + delete mode 100644 sound/pci/cs46xx/cs46xx_image.h + delete mode 100644 sound/pci/cs46xx/imgs/cwc4630.h + delete mode 100644 sound/pci/cs46xx/imgs/cwcasync.h + delete mode 100644 sound/pci/cs46xx/imgs/cwcbinhack.h + delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.asp + delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.h + delete mode 100644 sound/pci/cs46xx/imgs/cwcsnoop.h +Merging sound-asoc/for-next (6a097d5531b7 Merge remote-tracking branches 'asoc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/bcm2835', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic/hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/mxs', 'asoc/topic/omap', 'asoc/topic/rcar', 'asoc/topic/spear', 'asoc/topic/ssm2602', 'asoc/topic/uda1380', 'asoc/topic/ux500', 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next) +$ git merge sound-asoc/for-next +Resolved 'sound/soc/fsl/fsl_ssi.c' using previous resolution. +Removing sound/soc/jz4740/jz4740-pcm.h +Removing sound/soc/jz4740/jz4740-pcm.c +Auto-merging sound/soc/fsl/fsl_ssi.c +CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master db4f262ee35b] Merge remote-tracking branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/sound/bcm2835-i2s.txt | 25 + + .../devicetree/bindings/sound/cs42l52.txt | 46 ++ + .../devicetree/bindings/sound/simple-card.txt | 68 ++ + drivers/mfd/wm5110-tables.c | 137 +++- + include/linux/mfd/arizona/registers.h | 158 ++++ + include/sound/cs42l52.h | 14 +- + include/sound/dmaengine_pcm.h | 4 + + include/sound/rcar_snd.h | 2 +- + include/sound/soc-dai.h | 6 + + include/sound/soc.h | 17 +- + sound/soc/Kconfig | 3 +- + sound/soc/Makefile | 3 +- + sound/soc/atmel/atmel_ssc_dai.c | 30 +- + sound/soc/atmel/sam9x5_wm8731.c | 2 +- + sound/soc/bcm/Kconfig | 10 + + sound/soc/bcm/Makefile | 5 + + sound/soc/bcm/bcm2835-i2s.c | 879 +++++++++++++++++++++ + sound/soc/cirrus/ep93xx-pcm.c | 9 +- + sound/soc/codecs/Kconfig | 2 + + sound/soc/codecs/ad193x.c | 6 +- + sound/soc/codecs/adav80x.c | 6 +- + sound/soc/codecs/ak4641.c | 38 +- + sound/soc/codecs/ak4642.c | 138 ++-- + sound/soc/codecs/arizona.c | 18 + + sound/soc/codecs/arizona.h | 3 +- + sound/soc/codecs/cs4271.c | 8 +- + sound/soc/codecs/cs42l52.c | 105 ++- + sound/soc/codecs/da7210.c | 6 +- + sound/soc/codecs/hdmi.c | 2 +- + sound/soc/codecs/ssm2602.c | 56 +- + sound/soc/codecs/uda1380.c | 6 +- + sound/soc/codecs/wm5110.c | 364 ++++++++- + sound/soc/codecs/wm8510.c | 6 +- + sound/soc/codecs/wm8523.c | 6 +- + sound/soc/codecs/wm8580.c | 6 +- + sound/soc/codecs/wm8711.c | 6 +- + sound/soc/codecs/wm8728.c | 6 +- + sound/soc/codecs/wm8731.c | 6 +- + sound/soc/codecs/wm8741.c | 6 +- + sound/soc/codecs/wm8750.c | 6 +- + sound/soc/codecs/wm8753.c | 6 +- + sound/soc/codecs/wm8776.c | 6 +- + sound/soc/codecs/wm8804.c | 6 +- + sound/soc/codecs/wm8900.c | 6 +- + sound/soc/codecs/wm8940.c | 221 +++--- + sound/soc/codecs/wm8962.c | 4 +- + sound/soc/codecs/wm8974.c | 54 +- + sound/soc/codecs/wm8985.c | 6 +- + sound/soc/codecs/wm8988.c | 6 +- + sound/soc/codecs/wm8990.c | 258 +++--- + sound/soc/codecs/wm8990.h | 9 - + sound/soc/codecs/wm8991.c | 293 +++---- + sound/soc/codecs/wm8991.h | 9 - + sound/soc/codecs/wm8994.c | 11 +- + sound/soc/codecs/wm8995.c | 6 +- + sound/soc/codecs/wm9081.c | 2 +- + sound/soc/codecs/wm_adsp.c | 19 +- + sound/soc/fsl/fsl_spdif.c | 8 - + sound/soc/fsl/fsl_ssi.c | 159 ++-- + sound/soc/fsl/imx-pcm-dma.c | 9 +- + sound/soc/fsl/imx-pcm.h | 5 - + sound/soc/fsl/imx-spdif.c | 1 - + sound/soc/fsl/imx-ssi.c | 8 +- + sound/soc/fsl/imx-ssi.h | 1 - + sound/soc/generic/simple-card.c | 156 +++- + sound/soc/{mid-x86 => intel}/Kconfig | 0 + sound/soc/{mid-x86 => intel}/Makefile | 0 + sound/soc/{mid-x86 => intel}/mfld_machine.c | 0 + sound/soc/{mid-x86 => intel}/sst_dsp.h | 0 + sound/soc/{mid-x86 => intel}/sst_platform.c | 0 + sound/soc/{mid-x86 => intel}/sst_platform.h | 0 + sound/soc/jz4740/Kconfig | 1 + + sound/soc/jz4740/jz4740-i2s.c | 135 +--- + sound/soc/jz4740/jz4740-pcm.c | 358 --------- + sound/soc/jz4740/jz4740-pcm.h | 20 - + sound/soc/jz4740/qi_lb60.c | 2 +- + sound/soc/mxs/mxs-pcm.c | 8 +- + sound/soc/mxs/mxs-pcm.h | 1 - + sound/soc/mxs/mxs-saif.c | 8 - + sound/soc/omap/mcbsp.c | 12 +- + sound/soc/omap/omap-dmic.c | 4 +- + sound/soc/omap/omap-mcpdm.c | 4 +- + sound/soc/sh/rcar/gen.c | 248 +++--- + sound/soc/sh/rcar/rsnd.h | 16 +- + sound/soc/sh/rcar/ssi.c | 6 +- + sound/soc/soc-devres.c | 41 + + sound/soc/soc-generic-dmaengine-pcm.c | 3 + + sound/soc/soc-io.c | 4 +- + sound/soc/soc-pcm.c | 161 +++- + sound/soc/spear/spear_pcm.c | 9 +- + sound/soc/ux500/mop500.c | 2 + + sound/soc/ux500/ux500_msp_dai.c | 138 ++-- + sound/soc/ux500/ux500_msp_i2s.c | 56 +- + sound/soc/ux500/ux500_pcm.c | 36 +- + 94 files changed, 3155 insertions(+), 1611 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/bcm2835-i2s.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs42l52.txt + create mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt + create mode 100644 sound/soc/bcm/Kconfig + create mode 100644 sound/soc/bcm/Makefile + create mode 100644 sound/soc/bcm/bcm2835-i2s.c + rename sound/soc/{mid-x86 => intel}/Kconfig (100%) + rename sound/soc/{mid-x86 => intel}/Makefile (100%) + rename sound/soc/{mid-x86 => intel}/mfld_machine.c (100%) + rename sound/soc/{mid-x86 => intel}/sst_dsp.h (100%) + rename sound/soc/{mid-x86 => intel}/sst_platform.c (100%) + rename sound/soc/{mid-x86 => intel}/sst_platform.h (100%) + delete mode 100644 sound/soc/jz4740/jz4740-pcm.c + delete mode 100644 sound/soc/jz4740/jz4740-pcm.h +Merging modules/modules-next (74e22fac8858 module.h: Remove unnecessary semicolon) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + Documentation/module-signing.txt | 240 +++++++++++++++++++++++++++++++++++++++ + include/linux/module.h | 2 +- + kernel/params.c | 25 ++-- + 3 files changed, 250 insertions(+), 17 deletions(-) + create mode 100644 Documentation/module-signing.txt +Merging virtio/virtio-next (7d2dddda5c92 virtio: pci: remove unnecessary pci_set_drvdata()) +$ git merge virtio/virtio-next +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_pci.c | 2 -- + 1 file changed, 2 deletions(-) +Merging input/next (c52b4fc78175 Input: ads7846 - use IS_ENABLED() macro) +$ git merge input/next +Auto-merging drivers/input/tablet/wacom_wac.c +Auto-merging drivers/input/tablet/wacom_sys.c +Auto-merging arch/sh/boards/mach-ecovec24/setup.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/gpio-beeper.txt | 13 ++ + .../bindings/input/touchscreen/tsc2007.txt | 41 ++++ + .../bindings/input/twl4030-pwrbutton.txt | 21 ++ + arch/arm/mach-imx/mach-cpuimx35.c | 2 +- + arch/arm/mach-imx/mach-cpuimx51sd.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 2 +- + drivers/input/misc/Kconfig | 9 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/gpio-beeper.c | 127 ++++++++++++ + drivers/input/misc/twl4030-pwrbutton.c | 46 ++--- + drivers/input/serio/pcips2.c | 1 - + drivers/input/tablet/wacom_sys.c | 13 +- + drivers/input/tablet/wacom_wac.c | 65 ++++-- + drivers/input/tablet/wacom_wac.h | 2 + + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/input/touchscreen/tsc2007.c | 230 ++++++++++++++------- + include/linux/i2c/tsc2007.h | 8 +- + 17 files changed, 457 insertions(+), 130 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/gpio-beeper.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt + create mode 100644 Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt + create mode 100644 drivers/input/misc/gpio-beeper.c +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging cgroup/for-next (717a24e62220 Merge branch 'for-3.14' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + Documentation/cgroups/cgroups.txt | 20 -- + include/linux/cgroup.h | 29 +- + include/linux/vmpressure.h | 8 +- + init/Kconfig | 3 +- + kernel/cgroup.c | 574 ++++++++++++++------------------------ + mm/memcontrol.c | 353 ++++++++++++++++++++--- + mm/vmpressure.c | 26 +- + 7 files changed, 539 insertions(+), 474 deletions(-) +Merging block/for-next (391b7a7bfb52 Merge branch 'for-3.14/drivers' into for-next) +$ git merge block/for-next +Resolved 'fs/f2fs/data.c' using previous resolution. +Resolved 'fs/f2fs/segment.c' using previous resolution. +Resolved 'include/trace/events/f2fs.h' using previous resolution. +Auto-merging include/trace/events/f2fs.h +CONFLICT (content): Merge conflict in include/trace/events/f2fs.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/f2fs/segment.c +CONFLICT (content): Merge conflict in fs/f2fs/segment.c +Auto-merging fs/f2fs/data.c +CONFLICT (content): Merge conflict in fs/f2fs/data.c +Auto-merging drivers/staging/zram/zram_drv.c +Auto-merging drivers/s390/block/dasd_eckd.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/md.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8d6cc9930b65] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/biodoc.txt | 7 +- + Documentation/block/biovecs.txt | 111 ++++++ + arch/m68k/emu/nfblock.c | 13 +- + arch/powerpc/sysdev/axonram.c | 21 +- + block/blk-core.c | 40 +-- + block/blk-flush.c | 21 +- + block/blk-integrity.c | 40 ++- + block/blk-lib.c | 12 +- + block/blk-map.c | 6 +- + block/blk-merge.c | 66 ++-- + block/blk-mq.c | 2 +- + block/blk-throttle.c | 14 +- + block/elevator.c | 2 +- + drivers/block/aoe/aoe.h | 10 +- + drivers/block/aoe/aoecmd.c | 153 ++++----- + drivers/block/brd.c | 16 +- + drivers/block/drbd/drbd_actlog.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/block/drbd/drbd_main.c | 27 +- + drivers/block/drbd/drbd_receiver.c | 19 +- + drivers/block/drbd/drbd_req.c | 6 +- + drivers/block/drbd/drbd_req.h | 2 +- + drivers/block/drbd/drbd_worker.c | 8 +- + drivers/block/floppy.c | 16 +- + drivers/block/loop.c | 27 +- + drivers/block/mtip32xx/mtip32xx.c | 20 +- + drivers/block/nbd.c | 14 +- + drivers/block/nvme-core.c | 142 ++------ + drivers/block/pktcdvd.c | 182 +++++----- + drivers/block/ps3disk.c | 17 +- + drivers/block/ps3vram.c | 12 +- + drivers/block/rbd.c | 91 +---- + drivers/block/rsxx/dev.c | 6 +- + drivers/block/rsxx/dma.c | 15 +- + drivers/block/umem.c | 53 ++- + drivers/block/xen-blkback/blkback.c | 2 +- + drivers/block/xen-blkfront.c | 2 +- + drivers/cdrom/gdrom.c | 4 +- + drivers/md/bcache/bcache.h | 2 - + drivers/md/bcache/btree.c | 8 +- + drivers/md/bcache/debug.c | 21 +- + drivers/md/bcache/io.c | 196 ++--------- + drivers/md/bcache/journal.c | 12 +- + drivers/md/bcache/movinggc.c | 4 +- + drivers/md/bcache/request.c | 131 +++----- + drivers/md/bcache/super.c | 20 +- + drivers/md/bcache/util.c | 4 +- + drivers/md/bcache/writeback.c | 6 +- + drivers/md/bcache/writeback.h | 2 +- + drivers/md/dm-bio-record.h | 37 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-cache-policy-mq.c | 4 +- + drivers/md/dm-cache-target.c | 28 +- + drivers/md/dm-crypt.c | 64 ++-- + drivers/md/dm-delay.c | 7 +- + drivers/md/dm-flakey.c | 7 +- + drivers/md/dm-io.c | 37 +- + drivers/md/dm-linear.c | 3 +- + drivers/md/dm-raid1.c | 20 +- + drivers/md/dm-region-hash.c | 3 +- + drivers/md/dm-snap.c | 19 +- + drivers/md/dm-stripe.c | 13 +- + drivers/md/dm-switch.c | 4 +- + drivers/md/dm-thin.c | 30 +- + drivers/md/dm-verity.c | 62 ++-- + drivers/md/dm.c | 189 ++--------- + drivers/md/faulty.c | 19 +- + drivers/md/linear.c | 96 +++--- + drivers/md/md.c | 24 +- + drivers/md/multipath.c | 13 +- + drivers/md/raid0.c | 79 ++--- + drivers/md/raid1.c | 75 +++-- + drivers/md/raid10.c | 194 +++++------ + drivers/md/raid5.c | 84 ++--- + drivers/message/fusion/mptsas.c | 8 +- + drivers/s390/block/dasd_diag.c | 10 +- + drivers/s390/block/dasd_eckd.c | 48 +-- + drivers/s390/block/dasd_fba.c | 26 +- + drivers/s390/block/dcssblk.c | 21 +- + drivers/s390/block/scm_blk.c | 8 +- + drivers/s390/block/scm_blk_cluster.c | 4 +- + drivers/s390/block/xpram.c | 19 +- + drivers/scsi/libsas/sas_expander.c | 8 +- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 41 +-- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 39 +-- + drivers/scsi/osd/osd_initiator.c | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/sd_dif.c | 30 +- + drivers/staging/lustre/lustre/llite/lloop.c | 26 +- + drivers/staging/zram/zram_drv.c | 33 +- + drivers/target/target_core_iblock.c | 2 +- + fs/bio-integrity.c | 179 +++------- + fs/bio.c | 502 +++++++++++++--------------- + fs/btrfs/check-integrity.c | 40 +-- + fs/btrfs/check-integrity.h | 2 + + fs/btrfs/compression.c | 27 +- + fs/btrfs/disk-io.c | 13 +- + fs/btrfs/extent_io.c | 61 ++-- + fs/btrfs/file-item.c | 19 +- + fs/btrfs/inode.c | 37 +- + fs/btrfs/raid56.c | 22 +- + fs/btrfs/scrub.c | 45 +-- + fs/btrfs/volumes.c | 14 +- + fs/buffer.c | 14 +- + fs/direct-io.c | 4 +- + fs/ext4/page-io.c | 8 +- + fs/f2fs/data.c | 34 +- + fs/gfs2/lops.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/hfsplus/wrapper.c | 19 +- + fs/jfs/jfs_logmgr.c | 12 +- + fs/jfs/jfs_metapage.c | 9 +- + fs/logfs/dev_bdev.c | 53 ++- + fs/mpage.c | 19 +- + fs/nfs/blocklayout/blocklayout.c | 43 +-- + fs/nilfs2/segbuf.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_buf.c | 4 +- + include/linux/bio.h | 283 ++++++++++------ + include/linux/blk_types.h | 24 +- + include/linux/blkdev.h | 9 +- + include/linux/ceph/messenger.h | 4 +- + include/linux/dm-io.h | 4 +- + include/trace/events/bcache.h | 26 +- + include/trace/events/block.h | 26 +- + include/trace/events/f2fs.h | 4 +- + kernel/power/block_io.c | 2 +- + kernel/trace/blktrace.c | 15 +- + mm/bounce.c | 44 ++- + mm/page_io.c | 10 +- + net/ceph/messenger.c | 43 +-- + 132 files changed, 2072 insertions(+), 2662 deletions(-) + create mode 100644 Documentation/block/biovecs.txt +Merging device-mapper/for-next (27cafc612c3b dm snapshot: avoid snapshot space leak on crash) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-thin.c +Auto-merging drivers/md/dm-snap.c +Auto-merging drivers/md/dm-delay.c +Auto-merging drivers/md/dm-cache-target.c +Auto-merging drivers/md/dm-cache-policy-mq.c +Merge made by the 'recursive' strategy. + Documentation/device-mapper/cache.txt | 10 +-- + drivers/md/dm-cache-policy-mq.c | 16 ++--- + drivers/md/dm-cache-target.c | 2 +- + drivers/md/dm-delay.c | 52 +++++----------- + drivers/md/dm-snap.c | 71 +++++++++++++++++++--- + drivers/md/dm-table.c | 27 +++----- + drivers/md/dm-thin.c | 16 ++++- + drivers/md/persistent-data/dm-space-map-metadata.c | 8 ++- + 8 files changed, 121 insertions(+), 81 deletions(-) +Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (e395c4387c74 mmc: wbsd: Silence compiler warning) +$ git merge mmc/mmc-next +Already up-to-date. +Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Resolved 'kernel/debug/debug_core.h' using previous resolution. +Auto-merging kernel/debug/debug_core.h +CONFLICT (content): Merge conflict in kernel/debug/debug_core.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bc3546ee6fb4] Merge remote-tracking branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. +Merging slab/for-next (a8c0b0837359 Merge branch 'slab/next' into for-next) +$ git merge slab/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (6d183de40771 md/raid5: fix newly-broken locking in get_active_stripe.) +$ git merge md/for-next +Already up-to-date. +Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd) +$ git merge mfd/master +Already up-to-date. +Merging mfd-lj/for-mfd-next (2b12ea963aa2 mfd: wm831x: Use PM ops for shutdown) +$ git merge mfd-lj/for-mfd-next +Removing include/linux/mfd/abx500/ab8500-gpio.h +Auto-merging drivers/staging/nvec/nvec.c +Auto-merging drivers/mfd/wm5110-tables.c +Auto-merging drivers/mfd/lpc_ich.c +Auto-merging drivers/mfd/Kconfig +Merge made by the 'recursive' strategy. + drivers/mfd/88pm800.c | 4 +- + drivers/mfd/88pm805.c | 2 +- + drivers/mfd/Kconfig | 13 ++ + drivers/mfd/Makefile | 1 + + drivers/mfd/ab8500-core.c | 16 +- + drivers/mfd/ab8500-debugfs.c | 5 +- + drivers/mfd/arizona-core.c | 8 +- + drivers/mfd/as3722.c | 5 +- + drivers/mfd/asic3.c | 4 +- + drivers/mfd/cros_ec.c | 2 +- + drivers/mfd/cros_ec_i2c.c | 8 +- + drivers/mfd/cros_ec_spi.c | 19 +- + drivers/mfd/cs5535-mfd.c | 2 +- + drivers/mfd/da9052-core.c | 2 +- + drivers/mfd/da9055-core.c | 2 +- + drivers/mfd/da9063-core.c | 2 +- + drivers/mfd/db8500-prcmu.c | 4 +- + drivers/mfd/htc-pasic3.c | 2 +- + drivers/mfd/intel_msic.c | 2 +- + drivers/mfd/janz-cmodio.c | 2 +- + drivers/mfd/jz4740-adc.c | 2 +- + drivers/mfd/lp8788.c | 2 +- + drivers/mfd/lpc_ich.c | 2 +- + drivers/mfd/lpc_sch.c | 2 +- + drivers/mfd/max14577.c | 246 ++++++++++++++++++++++++ + drivers/mfd/max77686.c | 2 +- + drivers/mfd/max77693.c | 2 +- + drivers/mfd/max8907.c | 2 +- + drivers/mfd/max8925-core.c | 8 +- + drivers/mfd/max8997.c | 2 +- + drivers/mfd/max8998.c | 4 +- + drivers/mfd/mc13xxx-spi.c | 1 - + drivers/mfd/omap-usb-host.c | 8 +- + drivers/mfd/omap-usb-tll.c | 8 +- + drivers/mfd/rc5t583.c | 2 +- + drivers/mfd/rdc321x-southbridge.c | 4 +- + drivers/mfd/retu-mfd.c | 6 +- + drivers/mfd/rtl8411.c | 6 +- + drivers/mfd/rtsx_pcr.c | 2 +- + drivers/mfd/sec-core.c | 56 +++++- + drivers/mfd/sec-irq.c | 12 +- + drivers/mfd/sm501.c | 2 +- + drivers/mfd/sta2x11-mfd.c | 2 +- + drivers/mfd/stmpe.c | 10 +- + drivers/mfd/stmpe.h | 2 +- + drivers/mfd/tc3589x.c | 4 +- + drivers/mfd/tc6387xb.c | 2 +- + drivers/mfd/timberdale.c | 14 +- + drivers/mfd/tps6507x.c | 2 +- + drivers/mfd/tps65090.c | 2 +- + drivers/mfd/tps65217.c | 2 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/mfd/tps65910.c | 2 +- + drivers/mfd/tps65912-core.c | 2 +- + drivers/mfd/tps80031.c | 2 +- + drivers/mfd/twl-core.c | 213 ++------------------- + drivers/mfd/viperboard.c | 2 +- + drivers/mfd/vx855.c | 4 +- + drivers/mfd/wm5110-tables.c | 2 +- + drivers/mfd/wm831x-core.c | 14 +- + drivers/mfd/wm831x-i2c.c | 8 +- + drivers/mfd/wm831x-spi.c | 8 +- + drivers/mfd/wm8994-core.c | 4 +- + drivers/pinctrl/pinctrl-abx500.c | 37 +--- + drivers/pinctrl/pinctrl-abx500.h | 12 ++ + drivers/staging/nvec/nvec.c | 2 +- + include/linux/mfd/abx500/ab8500-gpio.h | 33 ---- + include/linux/mfd/abx500/ab8500.h | 2 - + include/linux/mfd/max14577-private.h | 330 +++++++++++++++++++++++++++++++++ + include/linux/mfd/max14577.h | 69 +++++++ + 70 files changed, 876 insertions(+), 398 deletions(-) + create mode 100644 drivers/mfd/max14577.c + delete mode 100644 include/linux/mfd/abx500/ab8500-gpio.h + create mode 100644 include/linux/mfd/max14577-private.h + create mode 100644 include/linux/mfd/max14577.h +Merging battery/master (d36240d26025 power_supply: Add power_supply notifier) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/power/Kconfig | 1 + + drivers/power/power_supply_core.c | 30 ++++++++++++++++++++++++------ + include/linux/power_supply.h | 8 ++++++++ + 3 files changed, 33 insertions(+), 6 deletions(-) +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (46ac29568e63 video: vt8500: fix error handling in probe()) +$ git merge omap_dss2/for-next +Merge made by the 'recursive' strategy. + drivers/video/atmel_lcdfb.c | 1 + + drivers/video/kyro/fbdev.c | 6 +++--- + .../omap2/displays-new/panel-sony-acx565akm.c | 5 ++--- + drivers/video/sh_mobile_meram.c | 2 ++ + drivers/video/vt8500lcdfb.c | 25 ++++++++++------------ + 5 files changed, 19 insertions(+), 20 deletions(-) +Merging regulator/for-next (9850e8c5d7ea Merge remote-tracking branches 'regulator/topic/ab8500', 'regulator/topic/arizona', 'regulator/topic/lp3971', 'regulator/topic/lp3972', 'regulator/topic/pcf50633' and 'regulator/topic/tps51632' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/mfd/pcf50633-core.c | 2 +- + drivers/regulator/ab8500.c | 102 +++------------------------------ + drivers/regulator/arizona-micsupp.c | 52 ++++------------- + drivers/regulator/as3722-regulator.c | 2 +- + drivers/regulator/core.c | 11 +++- + drivers/regulator/lp3971.c | 43 ++------------ + drivers/regulator/lp3972.c | 41 ++----------- + drivers/regulator/pcf50633-regulator.c | 2 +- + drivers/regulator/tps51632-regulator.c | 2 +- + 9 files changed, 43 insertions(+), 214 deletions(-) +Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring) +$ git merge security/next +Already up-to-date. +Merging selinux/master (dd0a11815a33 Merge tag 'v3.12') +$ git merge selinux/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/master (608564867a38 watchdog: Drop unnecessary include of miscdevice.h) +$ git merge watchdog/master +Resolved 'drivers/watchdog/rt2880_wdt.c' using previous resolution. +Auto-merging drivers/watchdog/ux500_wdt.c +Auto-merging drivers/watchdog/txx9wdt.c +Auto-merging drivers/watchdog/stmp3xxx_rtc_wdt.c +Auto-merging drivers/watchdog/softdog.c +Auto-merging drivers/watchdog/shwdt.c +Auto-merging drivers/watchdog/rt2880_wdt.c +CONFLICT (add/add): Merge conflict in drivers/watchdog/rt2880_wdt.c +Auto-merging drivers/watchdog/pnx4008_wdt.c +Auto-merging drivers/watchdog/orion_wdt.c +Auto-merging drivers/watchdog/max63xx_wdt.c +Auto-merging drivers/watchdog/kempld_wdt.c +Auto-merging drivers/watchdog/jz4740_wdt.c +Auto-merging drivers/watchdog/ie6xx_wdt.c +Auto-merging drivers/watchdog/ep93xx_wdt.c +Auto-merging drivers/watchdog/bcm2835_wdt.c +Auto-merging arch/arm/boot/dts/sama5d3.dtsi +Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi +Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0a90e9fb4e41] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/watchdog/atmel-wdt.txt | 30 +- + arch/arm/boot/dts/at91sam9260.dtsi | 5 + + arch/arm/boot/dts/at91sam9263.dtsi | 5 + + arch/arm/boot/dts/at91sam9g45.dtsi | 5 + + arch/arm/boot/dts/at91sam9n12.dtsi | 5 + + arch/arm/boot/dts/at91sam9x5.dtsi | 5 + + arch/arm/boot/dts/kizbox.dts | 6 + + arch/arm/boot/dts/sama5d3.dtsi | 5 + + drivers/watchdog/at91sam9_wdt.c | 309 +++++++++++++++------ + drivers/watchdog/bcm2835_wdt.c | 1 - + drivers/watchdog/ep93xx_wdt.c | 1 - + drivers/watchdog/ie6xx_wdt.c | 1 - + drivers/watchdog/jz4740_wdt.c | 1 - + drivers/watchdog/kempld_wdt.c | 1 - + drivers/watchdog/max63xx_wdt.c | 1 - + drivers/watchdog/orion_wdt.c | 1 - + drivers/watchdog/pnx4008_wdt.c | 1 - + drivers/watchdog/rt2880_wdt.c | 1 - + drivers/watchdog/shwdt.c | 1 - + drivers/watchdog/softdog.c | 1 - + drivers/watchdog/stmp3xxx_rtc_wdt.c | 1 - + drivers/watchdog/txx9wdt.c | 1 - + drivers/watchdog/ux500_wdt.c | 1 - + 23 files changed, 287 insertions(+), 102 deletions(-) +Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into next) +$ git merge iommu/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging vfio/next (15c03dd4859a Linux 3.12-rc3) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages on read error) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (6bbdc3984efb vio: remove dangly makefile bits) +$ git merge trivial/for-next +Auto-merging net/netfilter/ipset/Kconfig +Auto-merging net/core/dev.c +Auto-merging init/Kconfig +Auto-merging include/linux/tracepoint.h +Auto-merging drivers/xen/Kconfig +Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.h +Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_g2d.c +Auto-merging drivers/devfreq/exynos/exynos4_bus.c +Auto-merging drivers/char/Makefile +Auto-merging drivers/block/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm/mach-at91/Kconfig.non_dt +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/DocBook/.gitignore | 1 + + Documentation/DocBook/Makefile | 5 +++-- + Documentation/DocBook/kernel-api.tmpl | 1 + + Documentation/IRQ-domain.txt | 2 +- + Documentation/email-clients.txt | 2 +- + Documentation/io-mapping.txt | 2 +- + Documentation/kernel-parameters.txt | 9 ++++++++- + Documentation/md.txt | 2 +- + Documentation/rfkill.txt | 2 +- + Documentation/rt-mutex-design.txt | 2 +- + Documentation/static-keys.txt | 4 ++-- + Documentation/x86/x86_64/boot-options.txt | 23 ----------------------- + arch/arm/mach-at91/Kconfig.non_dt | 2 +- + arch/x86/Kconfig | 2 +- + drivers/block/Makefile | 1 - + drivers/cdrom/Makefile | 1 - + drivers/char/Makefile | 1 - + drivers/devfreq/exynos/exynos4_bus.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 ++-- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.h | 4 ++-- + drivers/isdn/mISDN/Kconfig | 2 +- + drivers/scsi/Kconfig | 4 ++-- + drivers/xen/Kconfig | 2 +- + include/linux/tracepoint.h | 2 +- + init/Kconfig | 2 +- + net/core/dev.c | 2 +- + net/netfilter/ipset/Kconfig | 2 +- + 31 files changed, 40 insertions(+), 56 deletions(-) +Merging audit/master (fc582aef7dcc Merge tag 'v3.12') +$ git merge audit/master +Merge made by the 'recursive' strategy. +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (1b50b0c3330e Merge branch 'for-3.14' into for-next) +$ git merge dt-rh/for-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Removing Documentation/devicetree/bindings/spi/nvidia,tegra20-spi.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/gic.txt | 1 + + Documentation/devicetree/bindings/arm/omap/mpu.txt | 8 +++ + Documentation/devicetree/bindings/arm/pmu.txt | 1 + + .../devicetree/bindings/arm/samsung/exynos-adc.txt | 2 +- + .../devicetree/bindings/clock/exynos4-clock.txt | 2 +- + .../devicetree/bindings/clock/exynos5250-clock.txt | 2 +- + .../devicetree/bindings/clock/exynos5420-clock.txt | 2 +- + .../devicetree/bindings/clock/exynos5440-clock.txt | 2 +- + .../devicetree/bindings/gpio/8xxx_gpio.txt | 66 +++++++++++++--------- + Documentation/devicetree/bindings/net/fsl-fec.txt | 2 + + .../devicetree/bindings/spi/nvidia,tegra20-spi.txt | 5 -- + .../devicetree/bindings/vendor-prefixes.txt | 2 + + MAINTAINERS | 6 +- + drivers/of/base.c | 53 +++++++++++------ + drivers/of/irq.c | 6 +- + 15 files changed, 104 insertions(+), 56 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-spi.txt +Merging spi/for-next (6099087e62df Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm63xx-hsspi', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi/topic/falcon', 'spi/topic/gpio', 'spi/topic/msiof', 'spi/topic/omap', 'spi/topic/pci', 'spi/topic/rcar', 'spi/topic/sc18is602' and 'spi/topic/xcomm' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi.c +Auto-merging drivers/spi/Kconfig +Merge made by the 'recursive' strategy. + drivers/spi/Kconfig | 11 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-atmel.c | 18 +- + drivers/spi/spi-bcm63xx-hsspi.c | 484 ++++++++++++++++++++++++++++++++++++++++ + drivers/spi/spi-coldfire-qspi.c | 47 ++-- + drivers/spi/spi-davinci.c | 4 +- + drivers/spi/spi-dw-pci.c | 2 +- + drivers/spi/spi-falcon.c | 12 +- + drivers/spi/spi-gpio.c | 8 +- + drivers/spi/spi-omap-100k.c | 20 -- + drivers/spi/spi-omap2-mcspi.c | 38 ++-- + drivers/spi/spi-pxa2xx-pci.c | 2 +- + drivers/spi/spi-rspi.c | 40 ++-- + drivers/spi/spi-sc18is602.c | 13 +- + drivers/spi/spi-sh-msiof.c | 62 ++--- + drivers/spi/spi-topcliff-pch.c | 2 +- + drivers/spi/spi-xcomm.c | 12 +- + drivers/spi/spi.c | 26 ++- + 18 files changed, 614 insertions(+), 188 deletions(-) + create mode 100644 drivers/spi/spi-bcm63xx-hsspi.c +Merging tip/auto-latest (c4372b1b29f2 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging tools/perf/perf-completion.sh +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 10 + + Documentation/memory-barriers.txt | 42 +- + Documentation/robust-futex-ABI.txt | 4 +- + Documentation/x86/x86_64/mm.txt | 7 + + MAINTAINERS | 5 + + arch/mips/ar7/setup.c | 1 - + arch/mips/emma/markeins/setup.c | 3 - + arch/mips/netlogic/xlp/setup.c | 1 - + arch/mips/netlogic/xlr/setup.c | 1 - + arch/mips/sibyte/swarm/setup.c | 2 - + arch/powerpc/Kconfig | 4 + + arch/powerpc/include/asm/setup.h | 1 + + arch/powerpc/include/asm/uprobes.h | 5 +- + arch/powerpc/kernel/setup_32.c | 3 - + arch/powerpc/kernel/setup_64.c | 3 - + arch/powerpc/kernel/uprobes.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 2 +- + arch/x86/Kconfig | 52 +- + arch/x86/boot/Makefile | 2 +- + arch/x86/boot/boot.h | 10 +- + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/boot/compressed/aslr.c | 317 ++++++++++ + arch/x86/boot/compressed/cmdline.c | 2 +- + arch/x86/boot/compressed/cpuflags.c | 12 + + arch/x86/boot/compressed/head_32.S | 10 +- + arch/x86/boot/compressed/head_64.S | 16 +- + arch/x86/boot/compressed/misc.c | 18 +- + arch/x86/boot/compressed/misc.h | 37 +- + arch/x86/boot/cpucheck.c | 100 +--- + arch/x86/boot/cpuflags.c | 104 ++++ + arch/x86/boot/cpuflags.h | 19 + + arch/x86/include/asm/archrandom.h | 21 + + arch/x86/include/asm/efi.h | 64 +- + arch/x86/include/asm/page.h | 1 + + arch/x86/include/asm/page_32.h | 4 - + arch/x86/include/asm/page_64_types.h | 15 +- + arch/x86/include/asm/pgtable-2level.h | 100 ++-- + arch/x86/include/asm/pgtable_64_types.h | 2 +- + arch/x86/include/asm/pgtable_types.h | 3 +- + arch/x86/kernel/cpu/Makefile | 2 +- + arch/x86/kernel/cpu/perf_event_intel_rapl.c | 661 +++++++++++++++++++++ + arch/x86/kernel/cpu/rdrand.c | 14 - + arch/x86/kernel/setup.c | 26 + + arch/x86/lib/copy_user_64.S | 12 +- + arch/x86/mm/hugetlbpage.c | 9 +- + arch/x86/mm/init_32.c | 3 + + arch/x86/mm/pageattr.c | 461 +++++++++++++- + arch/x86/platform/efi/early_printk.c | 2 +- + arch/x86/platform/efi/efi.c | 111 ++-- + arch/x86/platform/efi/efi_32.c | 9 +- + arch/x86/platform/efi/efi_64.c | 109 ++++ + arch/x86/platform/efi/efi_stub_64.S | 54 ++ + arch/x86/tools/relocs.c | 20 +- + drivers/firmware/efi/efi-pstore.c | 163 ++++- + drivers/firmware/efi/efivars.c | 12 +- + drivers/firmware/efi/vars.c | 12 +- + include/linux/efi.h | 5 + + include/linux/kernel.h | 9 + + include/linux/perf_event.h | 5 +- + include/linux/sched.h | 1 - + include/linux/uprobes.h | 52 +- + kernel/events/core.c | 1 + + kernel/events/uprobes.c | 60 +- + kernel/fork.c | 4 +- + kernel/locking/lockdep.c | 4 + + kernel/panic.c | 2 +- + kernel/sched/core.c | 11 +- + kernel/sched/fair.c | 17 +- + kernel/sched/sched.h | 1 + + kernel/softirq.c | 49 +- + lib/Kconfig.debug | 9 + + tools/lib/lockdep/Makefile | 251 ++++++++ + tools/lib/lockdep/common.c | 33 + + tools/lib/lockdep/include/liblockdep/common.h | 50 ++ + tools/lib/lockdep/include/liblockdep/mutex.h | 70 +++ + tools/lib/lockdep/include/liblockdep/rwlock.h | 86 +++ + tools/lib/lockdep/lockdep | 3 + + tools/lib/lockdep/lockdep.c | 2 + + tools/lib/lockdep/lockdep_internals.h | 1 + + tools/lib/lockdep/lockdep_states.h | 1 + + tools/lib/lockdep/preload.c | 447 ++++++++++++++ + tools/lib/lockdep/rbtree.c | 1 + + tools/lib/lockdep/run_tests.sh | 27 + + tools/lib/lockdep/tests/AA.c | 13 + + tools/lib/lockdep/tests/ABBA.c | 13 + + tools/lib/lockdep/tests/ABBCCA.c | 15 + + tools/lib/lockdep/tests/ABBCCDDA.c | 17 + + tools/lib/lockdep/tests/ABCABC.c | 15 + + tools/lib/lockdep/tests/ABCDBCDA.c | 17 + + tools/lib/lockdep/tests/ABCDBDDA.c | 17 + + tools/lib/lockdep/tests/WW.c | 13 + + tools/lib/lockdep/tests/common.h | 12 + + tools/lib/lockdep/tests/unlock_balance.c | 12 + + tools/lib/lockdep/uinclude/asm/hweight.h | 3 + + tools/lib/lockdep/uinclude/asm/sections.h | 3 + + tools/lib/lockdep/uinclude/linux/bitops.h | 3 + + tools/lib/lockdep/uinclude/linux/compiler.h | 7 + + tools/lib/lockdep/uinclude/linux/debug_locks.h | 12 + + tools/lib/lockdep/uinclude/linux/delay.h | 3 + + tools/lib/lockdep/uinclude/linux/export.h | 7 + + tools/lib/lockdep/uinclude/linux/ftrace.h | 3 + + tools/lib/lockdep/uinclude/linux/gfp.h | 3 + + tools/lib/lockdep/uinclude/linux/hardirq.h | 11 + + tools/lib/lockdep/uinclude/linux/hash.h | 1 + + tools/lib/lockdep/uinclude/linux/interrupt.h | 3 + + tools/lib/lockdep/uinclude/linux/irqflags.h | 38 ++ + tools/lib/lockdep/uinclude/linux/kallsyms.h | 32 + + tools/lib/lockdep/uinclude/linux/kern_levels.h | 25 + + tools/lib/lockdep/uinclude/linux/kernel.h | 44 ++ + tools/lib/lockdep/uinclude/linux/kmemcheck.h | 8 + + tools/lib/lockdep/uinclude/linux/linkage.h | 3 + + tools/lib/lockdep/uinclude/linux/list.h | 1 + + tools/lib/lockdep/uinclude/linux/lockdep.h | 55 ++ + tools/lib/lockdep/uinclude/linux/module.h | 6 + + tools/lib/lockdep/uinclude/linux/mutex.h | 3 + + tools/lib/lockdep/uinclude/linux/poison.h | 1 + + tools/lib/lockdep/uinclude/linux/prefetch.h | 6 + + tools/lib/lockdep/uinclude/linux/proc_fs.h | 3 + + tools/lib/lockdep/uinclude/linux/rbtree.h | 1 + + .../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 + + tools/lib/lockdep/uinclude/linux/rcu.h | 16 + + tools/lib/lockdep/uinclude/linux/seq_file.h | 3 + + tools/lib/lockdep/uinclude/linux/spinlock.h | 25 + + tools/lib/lockdep/uinclude/linux/stacktrace.h | 32 + + tools/lib/lockdep/uinclude/linux/stringify.h | 7 + + tools/lib/lockdep/uinclude/linux/types.h | 58 ++ + tools/lib/lockdep/uinclude/trace/events/lock.h | 3 + + tools/lib/traceevent/event-parse.c | 7 +- + tools/perf/Documentation/perf-record.txt | 12 +- + tools/perf/Documentation/perf-script.txt | 6 + + tools/perf/Documentation/perf-timechart.txt | 26 +- + tools/perf/Documentation/perf-top.txt | 5 +- + tools/perf/Makefile | 7 +- + tools/perf/Makefile.perf | 4 +- + tools/perf/builtin-record.c | 13 +- + tools/perf/builtin-script.c | 209 ++++++- + tools/perf/builtin-stat.c | 114 +++- + tools/perf/builtin-timechart.c | 418 ++++++++----- + tools/perf/builtin-top.c | 29 +- + tools/perf/builtin-trace.c | 13 +- + tools/perf/{bash_completion => perf-completion.sh} | 100 +++- + tools/perf/perf.h | 1 + + tools/perf/tests/attr/test-record-no-inherit | 2 +- + tools/perf/util/event.c | 3 +- + tools/perf/util/evlist.c | 6 +- + tools/perf/util/evsel.c | 7 +- + tools/perf/util/evsel.h | 3 + + tools/perf/util/parse-events.c | 28 +- + tools/perf/util/parse-options.c | 21 + + tools/perf/util/parse-options.h | 8 + + tools/perf/util/pmu.c | 138 ++++- + tools/perf/util/pmu.h | 3 +- + tools/perf/util/session.c | 10 +- + tools/perf/util/svghelper.c | 77 ++- + tools/perf/util/svghelper.h | 11 +- + tools/perf/util/symbol.c | 41 +- + tools/perf/util/symbol.h | 4 + + tools/perf/util/target.c | 11 +- + tools/perf/util/target.h | 4 +- + tools/perf/util/thread.h | 12 + + 160 files changed, 5108 insertions(+), 709 deletions(-) + create mode 100644 arch/x86/boot/compressed/aslr.c + create mode 100644 arch/x86/boot/compressed/cpuflags.c + create mode 100644 arch/x86/boot/cpuflags.c + create mode 100644 arch/x86/boot/cpuflags.h + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_rapl.c + create mode 100644 tools/lib/lockdep/Makefile + create mode 100644 tools/lib/lockdep/common.c + create mode 100644 tools/lib/lockdep/include/liblockdep/common.h + create mode 100644 tools/lib/lockdep/include/liblockdep/mutex.h + create mode 100644 tools/lib/lockdep/include/liblockdep/rwlock.h + create mode 100755 tools/lib/lockdep/lockdep + create mode 100644 tools/lib/lockdep/lockdep.c + create mode 100644 tools/lib/lockdep/lockdep_internals.h + create mode 100644 tools/lib/lockdep/lockdep_states.h + create mode 100644 tools/lib/lockdep/preload.c + create mode 100644 tools/lib/lockdep/rbtree.c + create mode 100644 tools/lib/lockdep/run_tests.sh + create mode 100644 tools/lib/lockdep/tests/AA.c + create mode 100644 tools/lib/lockdep/tests/ABBA.c + create mode 100644 tools/lib/lockdep/tests/ABBCCA.c + create mode 100644 tools/lib/lockdep/tests/ABBCCDDA.c + create mode 100644 tools/lib/lockdep/tests/ABCABC.c + create mode 100644 tools/lib/lockdep/tests/ABCDBCDA.c + create mode 100644 tools/lib/lockdep/tests/ABCDBDDA.c + create mode 100644 tools/lib/lockdep/tests/WW.c + create mode 100644 tools/lib/lockdep/tests/common.h + create mode 100644 tools/lib/lockdep/tests/unlock_balance.c + create mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h + create mode 100644 tools/lib/lockdep/uinclude/asm/sections.h + create mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h + create mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h + create mode 100644 tools/lib/lockdep/uinclude/linux/debug_locks.h + create mode 100644 tools/lib/lockdep/uinclude/linux/delay.h + create mode 100644 tools/lib/lockdep/uinclude/linux/export.h + create mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h + create mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h + create mode 100644 tools/lib/lockdep/uinclude/linux/hardirq.h + create mode 100644 tools/lib/lockdep/uinclude/linux/hash.h + create mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h + create mode 100644 tools/lib/lockdep/uinclude/linux/irqflags.h + create mode 100644 tools/lib/lockdep/uinclude/linux/kallsyms.h + create mode 100644 tools/lib/lockdep/uinclude/linux/kern_levels.h + create mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h + create mode 100644 tools/lib/lockdep/uinclude/linux/kmemcheck.h + create mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h + create mode 100644 tools/lib/lockdep/uinclude/linux/list.h + create mode 100644 tools/lib/lockdep/uinclude/linux/lockdep.h + create mode 100644 tools/lib/lockdep/uinclude/linux/module.h + create mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h + create mode 100644 tools/lib/lockdep/uinclude/linux/poison.h + create mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h + create mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h + create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h + create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h + create mode 100644 tools/lib/lockdep/uinclude/linux/rcu.h + create mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h + create mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h + create mode 100644 tools/lib/lockdep/uinclude/linux/stacktrace.h + create mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h + create mode 100644 tools/lib/lockdep/uinclude/linux/types.h + create mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h + rename tools/perf/{bash_completion => perf-completion.sh} (65%) +Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (c92132f59806 edac/85xx: Add PCIe error interrupt edac support) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/mpc85xx_edac.c | 98 ++++++++++++++++++++++++++++++++++++++++----- + drivers/edac/mpc85xx_edac.h | 7 ++++ + 2 files changed, 94 insertions(+), 11 deletions(-) +Merging ftrace/for-next (8a56d7761d2d ftrace: Fix function graph with loading of modules) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (4102adab9189 rcu: Move RCU-related source code to kernel/rcu directory) +$ git merge rcu/rcu/next +Already up-to-date. +Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (0a00a775d2a4 KVM: Change maintainer email address) +$ git merge kvm/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kvm-arm/kvm-arm-next (ede582224231 Merge tag 'kvm-arm64/for-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-next) +$ git merge kvm-arm/kvm-arm-next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as fast return) +$ git merge kvm-ppc/kvm-ppc-next +Merge made by the 'recursive' strategy. + arch/powerpc/kvm/book3s_hv.c | 10 ++++------ + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 19 ++++++++++++++++++- + 2 files changed, 22 insertions(+), 7 deletions(-) +Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen-tip/linux-next (aa5437afa9b3 Merge branch 'xentip-3.13-3' into linux-next-3) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/arm/xen/enlighten.c | 4 ++-- + drivers/xen/grant-table.c | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging percpu/for-next (90f2492cf9c8 x86: remove this_cpu_xor() implementation) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (4e8b22bd1a37 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/linux-next (a80e1053aaa3 x86, wmi fix modalias_show return values) +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 14 ++ + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/chromeos_laptop.c | 298 +++++++++++++++++++++--------- + drivers/platform/chrome/chromeos_pstore.c | 101 ++++++++++ + 4 files changed, 323 insertions(+), 91 deletions(-) + create mode 100644 drivers/platform/chrome/chromeos_pstore.c +Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (d929555edfba Merge remote-tracking branch 'regmap/topic/core' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-mmio.c | 11 ++++++----- + drivers/base/regmap/regmap.c | 12 ++++++++---- + 2 files changed, 14 insertions(+), 9 deletions(-) +Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (4a87d107bfc3 leds: lp5521/5523: Remove duplicate mutex) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/tca6507.txt | 16 ++ + Documentation/leds/leds-lp55xx.txt | 10 +- + drivers/leds/leds-lp5521.c | 30 ++- + drivers/leds/leds-lp5523.c | 32 ++-- + drivers/leds/leds-lp55xx-common.c | 2 + + drivers/leds/leds-tca6507.c | 204 +++++++++++---------- + 6 files changed, 180 insertions(+), 114 deletions(-) +Merging driver-core/driver-core-next (2322392b020b kernfs: implement "trusted.*" xattr support) +$ git merge driver-core/driver-core-next +Auto-merging fs/kernfs/inode.c +Merge made by the 'recursive' strategy. + fs/Makefile | 2 +- + fs/kernfs/Makefile | 5 + + fs/kernfs/dir.c | 1020 +++++++++++++++++++++++++++++++++++++++ + fs/kernfs/file.c | 814 +++++++++++++++++++++++++++++++ + fs/{sysfs => kernfs}/inode.c | 179 ++++--- + fs/kernfs/kernfs-internal.h | 122 +++++ + fs/kernfs/mount.c | 165 +++++++ + fs/kernfs/symlink.c | 152 ++++++ + fs/namespace.c | 2 + + fs/sysfs/Makefile | 2 +- + fs/sysfs/dir.c | 1030 +--------------------------------------- + fs/sysfs/file.c | 931 +++++++----------------------------- + fs/sysfs/group.c | 59 +-- + fs/sysfs/mount.c | 182 +------ + fs/sysfs/symlink.c | 179 +------ + fs/sysfs/sysfs.h | 228 +-------- + include/linux/kernfs.h | 356 ++++++++++++++ + include/linux/sysfs.h | 43 +- + lib/kobject.c | 27 +- + samples/kobject/kset-example.c | 1 + + 20 files changed, 3052 insertions(+), 2447 deletions(-) + create mode 100644 fs/kernfs/Makefile + create mode 100644 fs/kernfs/dir.c + create mode 100644 fs/kernfs/file.c + rename fs/{sysfs => kernfs}/inode.c (67%) + create mode 100644 fs/kernfs/kernfs-internal.h + create mode 100644 fs/kernfs/mount.c + create mode 100644 fs/kernfs/symlink.c + create mode 100644 include/linux/kernfs.h +Merging tty/tty-next (dc1ccc48159d Linux 3.13-rc2) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (a458677db6a9 usb: host: Remove superfluous name casts) +$ git merge usb/usb-next +Auto-merging drivers/usb/host/xhci-ring.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_pci.c | 2 +- + drivers/usb/chipidea/host.c | 3 +- + drivers/usb/class/cdc-acm.c | 116 ++++++++++++++++++++++--- + drivers/usb/class/cdc-acm.h | 3 + + drivers/usb/core/driver.c | 4 +- + drivers/usb/gadget/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/fsl_udc_core.c | 2 +- + drivers/usb/host/Makefile | 2 - + drivers/usb/host/ehci-dbg.c | 8 +- + drivers/usb/host/ehci-fsl.c | 2 +- + drivers/usb/host/ehci-hcd.c | 14 +-- + drivers/usb/host/ehci-hub.c | 6 +- + drivers/usb/host/ehci-q.c | 4 +- + drivers/usb/host/ehci.h | 8 +- + drivers/usb/host/fotg210-hcd.c | 95 +++----------------- + drivers/usb/host/fotg210.h | 8 -- + drivers/usb/host/fusbh200-hcd.c | 97 ++------------------- + drivers/usb/host/fusbh200.h | 12 --- + drivers/usb/host/imx21-dbg.c | 4 + + drivers/usb/host/imx21-hcd.c | 6 +- + drivers/usb/host/imx21-hcd.h | 4 + + drivers/usb/host/isp116x-hcd.c | 2 +- + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/ohci-dbg.c | 69 --------------- + drivers/usb/host/ohci-hcd.c | 20 +---- + drivers/usb/host/ohci-hub.c | 6 +- + drivers/usb/host/ohci-q.c | 12 +-- + drivers/usb/host/ohci.h | 13 +-- + drivers/usb/host/oxu210hp-hcd.c | 4 + + drivers/usb/host/r8a66597-hcd.c | 2 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/usb/host/uhci-debug.c | 4 +- + drivers/usb/host/uhci-hcd.c | 44 ++++++---- + drivers/usb/host/xhci-dbg.c | 42 ++++----- + drivers/usb/host/xhci-hub.c | 106 +++++++++++------------ + drivers/usb/host/xhci-mem.c | 68 +++++++-------- + drivers/usb/host/xhci-ring.c | 36 ++++---- + drivers/usb/host/xhci-trace.h | 6 +- + drivers/usb/host/xhci.c | 173 ++++++++++++++++++------------------- + drivers/usb/host/xhci.h | 54 +++--------- + 40 files changed, 432 insertions(+), 635 deletions(-) +Merging usb-gadget/next (989c78dd5630 usb: gadget: r8a66597-udc: convert to clk_prepare/unprepare) +$ git merge usb-gadget/next +Merge made by the 'recursive' strategy. + drivers/usb/gadget/r8a66597-udc.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging staging/staging-next (877494a7e29c staging: lustre: reapply an older patch that was reverted) +$ git merge staging/staging-next +Resolved 'include/linux/hid-sensor-ids.h' using previous resolution. +Auto-merging include/linux/hid-sensor-ids.h +CONFLICT (content): Merge conflict in include/linux/hid-sensor-ids.h +Removing drivers/staging/lustre/lustre/ptlrpc/wirehdr.c +Removing drivers/staging/lustre/lustre/ptlrpc/llog_server.c +Removing drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c +Auto-merging drivers/staging/lustre/lustre/llite/lloop.c +Removing drivers/staging/lustre/lustre/libcfs/lwt.c +Removing drivers/staging/lustre/lustre/include/lustre/lustreapi.h +Removing drivers/staging/lustre/lustre/include/lustre/liblustreapi.h +Removing drivers/staging/lustre/lustre/include/lu_target.h +Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 26f7711cceac] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/iio/light/tsl2563.txt | 19 + + .../bindings/iio/magnetometer/hmc5843.txt | 17 + + Documentation/devicetree/bindings/staging/dwc2.txt | 4 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/driver-model/devres.txt | 2 + + Documentation/vme_api.txt | 12 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 12 + + drivers/iio/adc/mcp3422.c | 9 +- + drivers/iio/adc/viperboard_adc.c | 20 +- + drivers/iio/dac/ad5421.c | 12 +- + drivers/iio/dac/ad5755.c | 12 +- + drivers/iio/gyro/adis16130.c | 9 +- + drivers/iio/gyro/adxrs450.c | 14 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 11 + + drivers/iio/industrialio-core.c | 101 + + drivers/iio/industrialio-event.c | 6 + + drivers/iio/industrialio-trigger.c | 28 +- + drivers/iio/light/hid-sensor-als.c | 11 + + drivers/iio/light/tsl2563.c | 4 + + drivers/iio/light/vcnl4000.c | 9 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 12 + + drivers/iio/pressure/Kconfig | 12 + + drivers/iio/pressure/Makefile | 1 + + drivers/iio/pressure/mpl3115.c | 329 ++ + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/android/alarm-dev.c | 8 +- + drivers/staging/android/sync.h | 50 +- + drivers/staging/bcm/Bcmchar.c | 136 +- + drivers/staging/bcm/DDRInit.c | 1501 ++++--- + drivers/staging/ced1401/ced_ioc.c | 2 +- + drivers/staging/comedi/Makefile | 2 + + drivers/staging/comedi/comedi_buf.c | 99 +- + drivers/staging/comedi/comedi_fops.c | 488 ++- + drivers/staging/comedi/comedi_internal.h | 4 + + drivers/staging/comedi/comedidev.h | 39 +- + drivers/staging/comedi/drivers.c | 14 +- + drivers/staging/comedi/drivers/8255_pci.c | 2 +- + drivers/staging/comedi/drivers/Makefile | 1 + + drivers/staging/comedi/drivers/addi_apci_035.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1032.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1516.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_16xx.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_2032.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_2200.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_3200.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_3501.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 2 +- + drivers/staging/comedi/drivers/adl_pci7x3x.c | 2 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 2 +- + drivers/staging/comedi/drivers/adq12b.c | 2 - + drivers/staging/comedi/drivers/adv_pci1710.c | 29 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 2 +- + drivers/staging/comedi/drivers/adv_pci1724.c | 2 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 2 +- + drivers/staging/comedi/drivers/amplc_dio200_pci.c | 2 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 16 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 54 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 2 +- + drivers/staging/comedi/drivers/c6xdigio.c | 54 - + drivers/staging/comedi/drivers/cb_pcidas.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 128 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 2 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 19 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 2 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 2 +- + drivers/staging/comedi/drivers/daqboard2000.c | 2 +- + drivers/staging/comedi/drivers/das08_pci.c | 2 +- + drivers/staging/comedi/drivers/das16m1.c | 78 +- + drivers/staging/comedi/drivers/das6402.c | 9 - + drivers/staging/comedi/drivers/dmm32at.c | 68 +- + drivers/staging/comedi/drivers/dt2801.c | 37 +- + drivers/staging/comedi/drivers/dt2811.c | 101 +- + drivers/staging/comedi/drivers/dt2814.c | 66 +- + drivers/staging/comedi/drivers/dt2815.c | 19 +- + drivers/staging/comedi/drivers/dt282x.c | 130 +- + drivers/staging/comedi/drivers/dt3000.c | 25 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 5 +- + drivers/staging/comedi/drivers/fl512.c | 2 - + drivers/staging/comedi/drivers/gsc_hpdi.c | 80 +- + drivers/staging/comedi/drivers/icp_multi.c | 2 +- + drivers/staging/comedi/drivers/jr3_pci.c | 2 +- + drivers/staging/comedi/drivers/ke_counter.c | 2 +- + drivers/staging/comedi/drivers/me4000.c | 2 +- + drivers/staging/comedi/drivers/me_daq.c | 2 +- + drivers/staging/comedi/drivers/mite.c | 145 +- + drivers/staging/comedi/drivers/mite.h | 12 - + drivers/staging/comedi/drivers/mpc624.c | 19 +- + drivers/staging/comedi/drivers/ni_6527.c | 2 +- + drivers/staging/comedi/drivers/ni_65xx.c | 5 +- + drivers/staging/comedi/drivers/ni_660x.c | 2 +- + drivers/staging/comedi/drivers/ni_670x.c | 2 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 25 - + drivers/staging/comedi/drivers/ni_atmio.c | 15 - + drivers/staging/comedi/drivers/ni_atmio16d.c | 42 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 157 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 2 - + drivers/staging/comedi/drivers/ni_pcidio.c | 139 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 10 +- + drivers/staging/comedi/drivers/ni_tio.c | 1 - + drivers/staging/comedi/drivers/pcl812.c | 71 +- + drivers/staging/comedi/drivers/pcl816.c | 142 +- + drivers/staging/comedi/drivers/pcl818.c | 108 +- + drivers/staging/comedi/drivers/pcm3724.c | 6 - + drivers/staging/comedi/drivers/pcmmio.c | 40 +- + drivers/staging/comedi/drivers/plx9080.h | 13 +- + drivers/staging/comedi/drivers/rtd520.c | 5 +- + drivers/staging/comedi/drivers/s626.c | 2 +- + drivers/staging/comedi/drivers/skel.c | 2 +- + drivers/staging/comedi/drivers/unioxx5.c | 68 +- + drivers/staging/comedi/kcomedilib/Makefile | 2 + + .../staging/comedi/kcomedilib/kcomedilib_main.c | 74 +- + drivers/staging/comedi/proc.c | 6 +- + drivers/staging/comedi/range.c | 9 +- + drivers/staging/crystalhd/crystalhd_cmds.c | 2 +- + drivers/staging/crystalhd/crystalhd_lnx.c | 2 +- + drivers/staging/cxt1e1/comet.c | 60 +- + drivers/staging/cxt1e1/comet.h | 601 +-- + drivers/staging/cxt1e1/functions.c | 2 +- + drivers/staging/cxt1e1/musycc.c | 4 +- + drivers/staging/cxt1e1/pmcc4_drv.c | 10 +- + drivers/staging/cxt1e1/pmcc4_private.h | 2 +- + drivers/staging/cxt1e1/sbeid.c | 323 +- + drivers/staging/dgnc/dgnc_trace.c | 18 +- + drivers/staging/dgrp/dgrp_net_ops.c | 330 +- + drivers/staging/dwc2/core.c | 378 +- + drivers/staging/dwc2/core.h | 62 +- + drivers/staging/dwc2/core_intr.c | 10 +- + drivers/staging/dwc2/hcd.c | 8 +- + drivers/staging/dwc2/hcd.h | 4 +- + drivers/staging/dwc2/hcd_ddma.c | 8 +- + drivers/staging/dwc2/hcd_intr.c | 6 +- + drivers/staging/dwc2/hcd_queue.c | 195 +- + drivers/staging/dwc2/pci.c | 2 +- + drivers/staging/dwc2/platform.c | 60 +- + drivers/staging/et131x/et131x.c | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/boot.h | 252 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 2 + + .../staging/ft1000/ft1000-usb/ft1000_download.c | 106 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 1308 +++--- + drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 14 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 5 - + drivers/staging/gdm724x/gdm_lte.c | 44 +- + drivers/staging/gdm724x/gdm_mux.c | 8 +- + drivers/staging/gdm724x/gdm_usb.c | 40 +- + drivers/staging/iio/accel/adis16220_core.c | 7 +- + drivers/staging/iio/adc/ad7816.c | 12 +- + drivers/staging/iio/adc/lpc32xx_adc.c | 12 +- + drivers/staging/iio/addac/adt7316-i2c.c | 6 - + drivers/staging/iio/addac/adt7316-spi.c | 6 - + drivers/staging/iio/addac/adt7316.c | 12 +- + drivers/staging/iio/addac/adt7316.h | 1 - + drivers/staging/iio/gyro/adis16060_core.c | 10 +- + drivers/staging/iio/light/isl29018.c | 13 +- + drivers/staging/iio/magnetometer/hmc5843.c | 7 + + drivers/staging/iio/resolver/ad2s1200.c | 10 +- + drivers/staging/imx-drm/imx-drm-core.c | 4 +- + drivers/staging/imx-drm/imx-ldb.c | 5 +- + drivers/staging/keucr/smil.h | 6 - + drivers/staging/keucr/smilmain.c | 99 +- + drivers/staging/keucr/smilsub.c | 37 +- + drivers/staging/keucr/smscsi.c | 28 +- + .../staging/lustre/include/linux/libcfs/curproc.h | 1 - + .../staging/lustre/include/linux/libcfs/libcfs.h | 2 - + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 63 +- + .../lustre/include/linux/libcfs/linux/kp30.h | 149 +- + .../lustre/include/linux/libcfs/linux/libcfs.h | 1 - + .../lustre/include/linux/libcfs/linux/linux-fs.h | 92 - + drivers/staging/lustre/include/linux/lnet/types.h | 11 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 1 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 3 - + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 358 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 1 - + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 6 - + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 307 -- + .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 124 +- + drivers/staging/lustre/lnet/lnet/acceptor.c | 16 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 16 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 4 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 4 +- + drivers/staging/lustre/lnet/lnet/module.c | 4 +- + drivers/staging/lustre/lnet/lnet/router.c | 44 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 14 - + drivers/staging/lustre/lnet/selftest/brw_test.c | 7 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 56 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 2 +- + drivers/staging/lustre/lnet/selftest/console.c | 103 +- + drivers/staging/lustre/lnet/selftest/console.h | 6 +- + drivers/staging/lustre/lnet/selftest/framework.c | 8 +- + drivers/staging/lustre/lnet/selftest/ping_test.c | 3 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 2 - + drivers/staging/lustre/lnet/selftest/selftest.h | 3 - + drivers/staging/lustre/lnet/selftest/timer.c | 11 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 5 +- + drivers/staging/lustre/lustre/include/cl_object.h | 6 +- + drivers/staging/lustre/lustre/include/dt_object.h | 2 +- + .../lustre/lustre/include/linux/lustre_acl.h | 18 +- + .../lustre/lustre/include/linux/lustre_intent.h | 2 +- + .../lustre/lustre/include/linux/lustre_lite.h | 1 + + drivers/staging/lustre/lustre/include/lu_object.h | 19 - + drivers/staging/lustre/lustre/include/lu_target.h | 91 - + .../lustre/lustre/include/lustre/liblustreapi.h | 43 - + .../lustre/lustre/include/lustre/lustre_idl.h | 72 +- + .../lustre/lustre/include/lustre/lustre_user.h | 27 +- + .../lustre/lustre/include/lustre/lustreapi.h | 310 -- + .../staging/lustre/lustre/include/lustre_disk.h | 1 + + drivers/staging/lustre/lustre/include/lustre_dlm.h | 3 +- + .../lustre/lustre/include/lustre_dlm_flags.h | 90 +- + drivers/staging/lustre/lustre/include/lustre_ha.h | 3 - + drivers/staging/lustre/lustre/include/lustre_lib.h | 11 +- + drivers/staging/lustre/lustre/include/lustre_log.h | 13 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 9 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 11 - + .../lustre/lustre/include/lustre_req_layout.h | 7 + + drivers/staging/lustre/lustre/include/md_object.h | 4 +- + drivers/staging/lustre/lustre/include/obd.h | 15 +- + .../staging/lustre/lustre/include/obd_support.h | 9 + + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 6 + + .../staging/lustre/lustre/lclient/lcommon_misc.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 45 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 7 + + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 57 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 43 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 19 +- + drivers/staging/lustre/lustre/libcfs/debug.c | 42 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 4 +- + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 6 +- + .../lustre/lustre/libcfs/linux/linux-curproc.c | 13 - + .../lustre/lustre/libcfs/linux/linux-proc.c | 36 +- + drivers/staging/lustre/lustre/libcfs/lwt.c | 266 -- + drivers/staging/lustre/lustre/libcfs/module.c | 53 +- + drivers/staging/lustre/lustre/libcfs/nidstrings.c | 34 +- + drivers/staging/lustre/lustre/libcfs/tracefile.c | 22 +- + drivers/staging/lustre/lustre/llite/Makefile | 2 +- + drivers/staging/lustre/lustre/llite/dcache.c | 34 +- + drivers/staging/lustre/lustre/llite/dir.c | 24 +- + drivers/staging/lustre/lustre/llite/file.c | 503 ++- + .../staging/lustre/lustre/llite/llite_internal.h | 60 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 59 +- + drivers/staging/lustre/lustre/llite/lloop.c | 3 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 37 + + drivers/staging/lustre/lustre/llite/namei.c | 14 +- + drivers/staging/lustre/lustre/llite/super25.c | 4 + + drivers/staging/lustre/lustre/llite/vvp_io.c | 54 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 2 +- + drivers/staging/lustre/lustre/llite/xattr.c | 102 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 617 +++ + .../staging/lustre/lustre/lov/lov_cl_internal.h | 16 + + drivers/staging/lustre/lustre/lov/lov_io.c | 15 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 35 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 20 +- + drivers/staging/lustre/lustre/lov/lproc_lov.c | 36 +- + drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c | 760 ---- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 3 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 31 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 112 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 54 +- + drivers/staging/lustre/lustre/mgc/libmgc.c | 3 - + drivers/staging/lustre/lustre/mgc/mgc_request.c | 398 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 7 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 3 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 1 - + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 21 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 214 +- + drivers/staging/lustre/lustre/obdclass/llog_test.c | 2 +- + .../staging/lustre/lustre/obdclass/local_storage.c | 11 +- + .../staging/lustre/lustre/obdclass/local_storage.h | 3 + + .../lustre/lustre/obdclass/lprocfs_status.c | 8 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 30 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 3 + + .../staging/lustre/lustre/obdecho/echo_client.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 4 - + drivers/staging/lustre/lustre/ptlrpc/Makefile | 2 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 25 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 75 +- + .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h | 6 +- + drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h | 10 +- + .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 2 +- + .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 40 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 73 +- + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/llog_server.c | 450 -- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 81 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 375 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 70 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 10 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 50 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 77 +- + drivers/staging/lustre/lustre/ptlrpc/wirehdr.c | 47 - + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 28 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 2 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 4 +- + drivers/staging/media/dt3155v4l/dt3155v4l.c | 2 +- + drivers/staging/media/go7007/go7007-fw.c | 3 +- + drivers/staging/media/go7007/saa7134-go7007.c | 2 +- + drivers/staging/media/lirc/lirc_igorplugusb.c | 4 +- + drivers/staging/media/lirc/lirc_imon.c | 11 +- + drivers/staging/media/lirc/lirc_serial.c | 6 +- + drivers/staging/media/lirc/lirc_zilog.c | 4 +- + drivers/staging/media/solo6x10/solo6x10-core.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 6 +- + drivers/staging/ozwpan/ozeltbuf.c | 2 +- + drivers/staging/ozwpan/ozproto.c | 2 +- + drivers/staging/phison/phison.c | 2 +- + drivers/staging/rtl8187se/ieee80211/dot11d.c | 132 +- + drivers/staging/rtl8187se/ieee80211/dot11d.h | 66 +- + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 125 +- + .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 3 +- + .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 12 +- + .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 52 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 39 +- + .../rtl8187se/ieee80211/ieee80211_softmac.c | 134 +- + .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 64 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 13 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 8 +- + drivers/staging/rtl8187se/r8180.h | 32 +- + drivers/staging/rtl8187se/r8180_core.c | 29 +- + drivers/staging/rtl8187se/r8180_dm.h | 2 +- + drivers/staging/rtl8187se/r8180_rtl8225.h | 3 +- + drivers/staging/rtl8187se/r8180_wx.c | 202 +- + drivers/staging/rtl8187se/r8185b_init.c | 17 +- + drivers/staging/rtl8188eu/core/rtw_io.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 34 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 2 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- + drivers/staging/rtl8192e/dot11d.c | 2 +- + drivers/staging/rtl8192e/dot11d.h | 5 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 13 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 1 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 24 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 + + drivers/staging/rtl8192e/rtl819x_BAProc.c | 10 +- + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 4 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 6 +- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 4 +- + drivers/staging/rtl8192e/rtllib_module.c | 4 +- + drivers/staging/rtl8192e/rtllib_rx.c | 74 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 28 +- + drivers/staging/rtl8192e/rtllib_tx.c | 16 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 3 - + drivers/staging/rts5208/Kconfig | 15 + + drivers/staging/rts5208/Makefile | 6 + + drivers/staging/rts5208/TODO | 7 + + drivers/staging/rts5208/debug.h | 43 + + drivers/staging/rts5208/general.c | 35 + + drivers/staging/rts5208/general.h | 31 + + drivers/staging/rts5208/ms.c | 4208 ++++++++++++++++++ + drivers/staging/rts5208/ms.h | 227 + + drivers/staging/rts5208/rtsx.c | 1071 +++++ + drivers/staging/rts5208/rtsx.h | 186 + + drivers/staging/rts5208/rtsx_card.c | 1126 +++++ + drivers/staging/rts5208/rtsx_card.h | 1098 +++++ + drivers/staging/rts5208/rtsx_chip.c | 1979 +++++++++ + drivers/staging/rts5208/rtsx_chip.h | 1002 +++++ + drivers/staging/rts5208/rtsx_scsi.c | 3370 +++++++++++++++ + drivers/staging/rts5208/rtsx_scsi.h | 143 + + drivers/staging/rts5208/rtsx_sys.h | 50 + + drivers/staging/rts5208/rtsx_transport.c | 769 ++++ + drivers/staging/rts5208/rtsx_transport.h | 66 + + drivers/staging/rts5208/sd.c | 4525 ++++++++++++++++++++ + drivers/staging/rts5208/sd.h | 301 ++ + drivers/staging/rts5208/spi.c | 877 ++++ + drivers/staging/rts5208/spi.h | 65 + + drivers/staging/rts5208/trace.h | 93 + + drivers/staging/rts5208/xd.c | 2088 +++++++++ + drivers/staging/rts5208/xd.h | 188 + + drivers/staging/sb105x/sb_mp_register.h | 8 +- + drivers/staging/sb105x/sb_pci_mp.c | 4 +- + drivers/staging/sep/sep_main.c | 2 +- + drivers/staging/silicom/bpctl_mod.c | 2 - + drivers/staging/silicom/bypasslib/bypass.c | 14 +- + drivers/staging/slicoss/slicoss.c | 2 +- + drivers/staging/sm7xxfb/sm7xxfb.c | 2 +- + drivers/staging/speakup/main.c | 2 - + drivers/staging/speakup/serialio.c | 4 + + drivers/staging/speakup/serialio.h | 26 - + drivers/staging/tidspbridge/pmgr/cmm.c | 7 +- + drivers/staging/tidspbridge/pmgr/dbll.c | 21 +- + drivers/staging/tidspbridge/pmgr/dev.c | 6 +- + drivers/staging/tidspbridge/pmgr/dmm.c | 20 +- + drivers/staging/tidspbridge/pmgr/dspapi.c | 12 +- + drivers/staging/usbip/stub_rx.c | 20 +- + drivers/staging/usbip/usbip_common.c | 5 +- + drivers/staging/usbip/vhci_hcd.c | 15 +- + drivers/staging/vme/devices/vme_user.c | 13 +- + drivers/staging/vt6655/baseband.c | 4 +- + drivers/staging/vt6655/bssdb.c | 354 +- + drivers/staging/vt6655/card.c | 10 +- + drivers/staging/vt6655/channel.c | 16 +- + drivers/staging/vt6655/datarate.c | 8 +- + drivers/staging/vt6655/device_main.c | 62 +- + drivers/staging/vt6655/dpc.c | 40 +- + drivers/staging/vt6655/hostap.c | 12 +- + drivers/staging/vt6655/iwctl.c | 2 +- + drivers/staging/vt6655/key.c | 44 +- + drivers/staging/vt6655/mac.c | 4 +- + drivers/staging/vt6655/power.c | 9 +- + drivers/staging/vt6655/rf.c | 2 +- + drivers/staging/vt6655/rxtx.c | 12 +- + drivers/staging/vt6655/vntwifi.c | 6 +- + drivers/staging/vt6655/wcmd.c | 22 +- + drivers/staging/vt6655/wctl.c | 6 +- + drivers/staging/vt6655/wmgr.c | 125 +- + drivers/staging/vt6655/wpa.c | 2 +- + drivers/staging/vt6655/wpa2.c | 18 +- + drivers/staging/vt6655/wpactl.c | 12 +- + drivers/staging/vt6656/aes_ccmp.c | 16 +- + drivers/staging/vt6656/baseband.c | 8 +- + drivers/staging/vt6656/bssdb.c | 4 +- + drivers/staging/vt6656/card.c | 4 +- + drivers/staging/vt6656/channel.c | 3 +- + drivers/staging/vt6656/datarate.c | 2 +- + drivers/staging/vt6656/desc.h | 8 - + drivers/staging/vt6656/device.h | 16 +- + drivers/staging/vt6656/dpc.c | 2 +- + drivers/staging/vt6656/main_usb.c | 543 ++- + drivers/staging/vt6656/rf.c | 7 +- + drivers/staging/vt6656/rndis.h | 30 +- + drivers/staging/vt6656/rxtx.c | 222 +- + drivers/staging/vt6656/rxtx.h | 12 +- + drivers/staging/vt6656/tkip.c | 4 +- + drivers/staging/vt6656/wcmd.c | 1712 ++++---- + drivers/staging/vt6656/wmgr.c | 10 +- + drivers/staging/vt6656/wpa.c | 12 +- + drivers/staging/vt6656/wpa2.c | 16 +- + drivers/staging/winbond/mds.c | 101 +- + drivers/staging/wlags49_h2/sta_h25.c | 6 +- + drivers/staging/wlan-ng/cfg80211.c | 18 +- + drivers/staging/wlan-ng/hfa384x.h | 4 +- + drivers/staging/wlan-ng/prism2mgmt.c | 4 +- + drivers/staging/wlan-ng/prism2mgmt.h | 6 +- + drivers/staging/wlan-ng/prism2mib.c | 6 +- + drivers/staging/wlan-ng/prism2sta.c | 6 +- + drivers/staging/xgifb/XGI_main.h | 2 +- + drivers/staging/xillybus/xillybus_pcie.c | 2 +- + drivers/vme/boards/vme_vmivme7805.c | 2 +- + drivers/vme/bridges/vme_ca91cx42.c | 2 +- + drivers/vme/bridges/vme_tsi148.c | 2 +- + drivers/vme/vme.c | 19 +- + include/linux/hid-sensor-ids.h | 8 + + include/linux/iio/iio.h | 81 +- + include/linux/vme.h | 3 +- + 460 files changed, 33260 insertions(+), 12296 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2563.txt + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/hmc5843.txt + create mode 100644 drivers/iio/pressure/mpl3115.c + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h + delete mode 100644 drivers/staging/lustre/lustre/include/lu_target.h + delete mode 100644 drivers/staging/lustre/lustre/include/lustre/liblustreapi.h + delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustreapi.h + delete mode 100644 drivers/staging/lustre/lustre/libcfs/lwt.c + create mode 100644 drivers/staging/lustre/lustre/llite/xattr_cache.c + delete mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c + delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_server.c + delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c + create mode 100644 drivers/staging/rts5208/Kconfig + create mode 100644 drivers/staging/rts5208/Makefile + create mode 100644 drivers/staging/rts5208/TODO + create mode 100644 drivers/staging/rts5208/debug.h + create mode 100644 drivers/staging/rts5208/general.c + create mode 100644 drivers/staging/rts5208/general.h + create mode 100644 drivers/staging/rts5208/ms.c + create mode 100644 drivers/staging/rts5208/ms.h + create mode 100644 drivers/staging/rts5208/rtsx.c + create mode 100644 drivers/staging/rts5208/rtsx.h + create mode 100644 drivers/staging/rts5208/rtsx_card.c + create mode 100644 drivers/staging/rts5208/rtsx_card.h + create mode 100644 drivers/staging/rts5208/rtsx_chip.c + create mode 100644 drivers/staging/rts5208/rtsx_chip.h + create mode 100644 drivers/staging/rts5208/rtsx_scsi.c + create mode 100644 drivers/staging/rts5208/rtsx_scsi.h + create mode 100644 drivers/staging/rts5208/rtsx_sys.h + create mode 100644 drivers/staging/rts5208/rtsx_transport.c + create mode 100644 drivers/staging/rts5208/rtsx_transport.h + create mode 100644 drivers/staging/rts5208/sd.c + create mode 100644 drivers/staging/rts5208/sd.h + create mode 100644 drivers/staging/rts5208/spi.c + create mode 100644 drivers/staging/rts5208/spi.h + create mode 100644 drivers/staging/rts5208/trace.h + create mode 100644 drivers/staging/rts5208/xd.c + create mode 100644 drivers/staging/rts5208/xd.h +Merging char-misc/char-misc-next (10ee90743e99 mei: cleanup mei_irq_read_handler) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + drivers/misc/mei/client.c | 2 -- + drivers/misc/mei/init.c | 17 +++++++--- + drivers/misc/mei/interrupt.c | 79 ++++++++++++++++++++++---------------------- + drivers/misc/mei/mei_dev.h | 13 +++++++- + drivers/misc/mei/nfc.c | 6 +++- + drivers/misc/mei/pci-me.c | 2 +- + 6 files changed, 70 insertions(+), 49 deletions(-) +Merging scsi/for-next (ef5cb624a9b2 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/pmcraid.c +Removing drivers/scsi/aic7xxx_old/sequencer.h +Removing drivers/scsi/aic7xxx_old/scsi_message.h +Removing drivers/scsi/aic7xxx_old/aic7xxx_seq.c +Removing drivers/scsi/aic7xxx_old/aic7xxx_reg.h +Removing drivers/scsi/aic7xxx_old/aic7xxx_proc.c +Removing drivers/scsi/aic7xxx_old/aic7xxx.seq +Removing drivers/scsi/aic7xxx_old/aic7xxx.reg +Removing drivers/scsi/aic7xxx_old/aic7xxx.h +Removing drivers/scsi/aic7xxx_old.c +Auto-merging drivers/scsi/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/scsi/aic7xxx_old.txt +Merge made by the 'recursive' strategy. + Documentation/scsi/00-INDEX | 2 - + Documentation/scsi/aic7xxx_old.txt | 511 -- + Documentation/scsi/scsi_eh.txt | 69 +- + Documentation/scsi/scsi_mid_low_api.txt | 9 +- + MAINTAINERS | 7 +- + drivers/ata/libata-scsi.c | 1 + + drivers/firewire/sbp2.c | 1 + + drivers/misc/enclosure.c | 7 + + drivers/scsi/3w-9xxx.c | 3 +- + drivers/scsi/3w-sas.c | 3 +- + drivers/scsi/3w-xxxx.c | 3 +- + drivers/scsi/Kconfig | 41 - + drivers/scsi/Makefile | 1 - + drivers/scsi/aacraid/linit.c | 1 + + drivers/scsi/aic7xxx_old.c | 11149 ---------------------------- + drivers/scsi/aic7xxx_old/aic7xxx.h | 28 - + drivers/scsi/aic7xxx_old/aic7xxx.reg | 1401 ---- + drivers/scsi/aic7xxx_old/aic7xxx.seq | 1539 ---- + drivers/scsi/aic7xxx_old/aic7xxx_proc.c | 270 - + drivers/scsi/aic7xxx_old/aic7xxx_reg.h | 629 -- + drivers/scsi/aic7xxx_old/aic7xxx_seq.c | 817 -- + drivers/scsi/aic7xxx_old/scsi_message.h | 49 - + drivers/scsi/aic7xxx_old/sequencer.h | 135 - + drivers/scsi/arcmsr/arcmsr_hba.c | 1 + + drivers/scsi/be2iscsi/be_iscsi.c | 8 +- + drivers/scsi/bfa/bfa_fcs.h | 1 + + drivers/scsi/bfa/bfa_fcs_lport.c | 14 +- + drivers/scsi/bfa/bfad_attr.c | 7 +- + drivers/scsi/gdth.c | 1 + + drivers/scsi/hosts.c | 31 +- + drivers/scsi/hpsa.c | 313 +- + drivers/scsi/hpsa.h | 20 + + drivers/scsi/ipr.c | 5 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/ips.c | 1 + + drivers/scsi/libsas/sas_ata.c | 2 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 2 +- + drivers/scsi/megaraid.c | 1 + + drivers/scsi/megaraid/megaraid_mbox.c | 1 + + drivers/scsi/megaraid/megaraid_sas.h | 1 - + drivers/scsi/megaraid/megaraid_sas_base.c | 6 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 + + drivers/scsi/pm8001/pm8001_hwi.h | 4 + + drivers/scsi/pm8001/pm8001_init.c | 91 +- + drivers/scsi/pm8001/pm8001_sas.c | 4 +- + drivers/scsi/pm8001/pm8001_sas.h | 9 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 + + drivers/scsi/pm8001/pm80xx_hwi.h | 2 + + drivers/scsi/pmcraid.c | 1 + + drivers/scsi/qla2xxx/qla_attr.c | 116 +- + drivers/scsi/qla2xxx/qla_bsg.c | 44 + + drivers/scsi/qla2xxx/qla_bsg.h | 13 + + drivers/scsi/qla2xxx/qla_dbg.c | 7 +- + drivers/scsi/qla2xxx/qla_def.h | 22 +- + drivers/scsi/qla2xxx/qla_gbl.h | 15 +- + drivers/scsi/qla2xxx/qla_init.c | 2 + + drivers/scsi/qla2xxx/qla_inline.h | 19 - + drivers/scsi/qla2xxx/qla_isr.c | 82 +- + drivers/scsi/qla2xxx/qla_mbx.c | 73 +- + drivers/scsi/qla2xxx/qla_mr.c | 39 +- + drivers/scsi/qla2xxx/qla_mr.h | 12 +- + drivers/scsi/qla2xxx/qla_nx.c | 22 +- + drivers/scsi/qla2xxx/qla_nx2.c | 33 +- + drivers/scsi/qla2xxx/qla_os.c | 368 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla4xxx/ql4_def.h | 32 + + drivers/scsi/qla4xxx/ql4_fw.h | 43 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 1 + + drivers/scsi/qla4xxx/ql4_isr.c | 32 + + drivers/scsi/qla4xxx/ql4_mbx.c | 111 +- + drivers/scsi/qla4xxx/ql4_os.c | 1137 ++- + drivers/scsi/qla4xxx/ql4_version.h | 2 +- + drivers/scsi/scsi.c | 9 +- + drivers/scsi/scsi_debug.c | 266 +- + drivers/scsi/scsi_error.c | 229 +- + drivers/scsi/scsi_pm.c | 62 +- + drivers/scsi/scsi_priv.h | 2 + + drivers/scsi/scsi_sysfs.c | 36 +- + drivers/scsi/scsi_transport_iscsi.c | 340 +- + drivers/scsi/sd.c | 34 +- + drivers/scsi/sr.c | 37 +- + drivers/scsi/storvsc_drv.c | 1 + + include/scsi/iscsi_if.h | 117 +- + include/scsi/scsi_cmnd.h | 1 + + include/scsi/scsi_driver.h | 2 +- + include/scsi/scsi_host.h | 16 + + include/scsi/scsi_transport_iscsi.h | 3 + + 87 files changed, 3078 insertions(+), 17512 deletions(-) + delete mode 100644 Documentation/scsi/aic7xxx_old.txt + delete mode 100644 drivers/scsi/aic7xxx_old.c + delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.h + delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.reg + delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.seq + delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_proc.c + delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_reg.h + delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_seq.c + delete mode 100644 drivers/scsi/aic7xxx_old/scsi_message.h + delete mode 100644 drivers/scsi/aic7xxx_old/sequencer.h +Merging target-updates/for-next (86784c6bdeee iscsi-target: chap auth shouldn't match username with trailing garbage) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (15c03dd4859a Linux 3.12-rc3) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (a8855990e382 writeback: Do not sort b_io list only because of block device inode) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (7e0d0f8730c2 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/pinctrl-baytrail.c +Auto-merging drivers/pinctrl/pinctrl-abx500.h +Auto-merging drivers/pinctrl/pinctrl-abx500.c +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/fsl,imx25-pinctrl.txt | 23 ++ + drivers/pinctrl/Kconfig | 9 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-abx500.c | 6 +- + drivers/pinctrl/pinctrl-abx500.h | 2 +- + drivers/pinctrl/pinctrl-baytrail.c | 8 +- + drivers/pinctrl/pinctrl-imx25.c | 351 +++++++++++++++++++++ + drivers/pinctrl/pinctrl-rockchip.c | 5 +- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-sh7372.c | 2 +- + include/linux/pinctrl/pinconf-generic.h | 6 +- + 11 files changed, 404 insertions(+), 11 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx25-pinctrl.txt + create mode 100644 drivers/pinctrl/pinctrl-imx25.c +Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (40e3b642538b Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging drivers/pinctrl/pinctrl-nomadik.c +Auto-merging drivers/pinctrl/pinctrl-baytrail.c +Removing arch/arm/mach-mv78xx0/include/mach/gpio.h +Removing arch/arm/mach-lpc32xx/include/mach/gpio.h +Removing arch/arm/mach-ks8695/include/mach/gpio.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/moxa,moxart-gpio.txt | 19 +++ + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 3 +- + arch/arm/mach-ks8695/include/mach/gpio.h | 19 --- + arch/arm/mach-lpc32xx/include/mach/gpio.h | 6 - + arch/arm/mach-lpc32xx/phy3250.c | 2 +- + arch/arm/mach-mv78xx0/include/mach/gpio.h | 9 - + drivers/gpio/Kconfig | 9 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-74x164.c | 2 +- + drivers/gpio/gpio-adnp.c | 25 ++- + drivers/gpio/gpio-adp5520.c | 2 +- + drivers/gpio/gpio-adp5588.c | 2 +- + drivers/gpio/gpio-amd8111.c | 2 +- + drivers/gpio/gpio-arizona.c | 2 +- + drivers/gpio/gpio-bcm-kona.c | 22 +++ + drivers/gpio/gpio-bt8xx.c | 4 +- + drivers/gpio/gpio-da9052.c | 2 +- + drivers/gpio/gpio-da9055.c | 2 +- + drivers/gpio/gpio-em.c | 28 ++- + drivers/gpio/gpio-ich.c | 2 +- + drivers/gpio/gpio-intel-mid.c | 30 +++- + drivers/gpio/gpio-kempld.c | 2 +- + drivers/gpio/gpio-ks8695.c | 2 +- + drivers/gpio/gpio-lpc32xx.c | 14 +- + drivers/gpio/gpio-lynxpoint.c | 39 ++++- + drivers/gpio/gpio-max730x.c | 2 +- + drivers/gpio/gpio-max732x.c | 2 +- + drivers/gpio/gpio-mc33880.c | 2 +- + drivers/gpio/gpio-mc9s08dz60.c | 2 +- + drivers/gpio/gpio-mcp23s08.c | 2 +- + drivers/gpio/gpio-ml-ioh.c | 4 +- + drivers/gpio/gpio-moxart.c | 158 +++++++++++++++++ + drivers/gpio/gpio-msic.c | 9 +- + drivers/gpio/gpio-mvebu.c | 2 +- + drivers/gpio/gpio-octeon.c | 2 +- + drivers/gpio/gpio-omap.c | 188 ++++++++++----------- + drivers/gpio/gpio-palmas.c | 2 +- + drivers/gpio/gpio-pca953x.c | 2 +- + drivers/gpio/gpio-pcf857x.c | 2 +- + drivers/gpio/gpio-pch.c | 4 +- + drivers/gpio/gpio-rc5t583.c | 2 +- + drivers/gpio/gpio-rcar.c | 61 +++++-- + drivers/gpio/gpio-sodaville.c | 2 +- + drivers/gpio/gpio-sta2x11.c | 2 +- + drivers/gpio/gpio-stmpe.c | 2 +- + drivers/gpio/gpio-sx150x.c | 2 +- + drivers/gpio/gpio-tb10x.c | 2 +- + drivers/gpio/gpio-tc3589x.c | 2 +- + drivers/gpio/gpio-timberdale.c | 6 +- + drivers/gpio/gpio-tnetv107x.c | 2 +- + drivers/gpio/gpio-tps6586x.c | 2 +- + drivers/gpio/gpio-tps65910.c | 2 +- + drivers/gpio/gpio-tps65912.c | 2 +- + drivers/gpio/gpio-twl4030.c | 2 +- + drivers/gpio/gpio-twl6040.c | 2 +- + drivers/gpio/gpio-ucb1400.c | 2 +- + drivers/gpio/gpio-viperboard.c | 4 +- + drivers/gpio/gpio-vx855.c | 2 +- + drivers/gpio/gpio-wm831x.c | 2 +- + drivers/gpio/gpio-wm8350.c | 2 +- + drivers/gpio/gpio-wm8994.c | 2 +- + drivers/gpio/gpiolib.c | 7 +- + drivers/pinctrl/pinctrl-as3722.c | 2 +- + drivers/pinctrl/pinctrl-at91.c | 2 +- + drivers/pinctrl/pinctrl-baytrail.c | 2 +- + drivers/pinctrl/pinctrl-bcm2835.c | 2 +- + drivers/pinctrl/pinctrl-nomadik.c | 2 +- + drivers/pinctrl/pinctrl-sunxi.c | 2 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +- + include/linux/gpio.h | 1 - + include/linux/gpio/driver.h | 9 +- + .../linux/platform_data}/gpio-lpc32xx.h | 0 + 72 files changed, 537 insertions(+), 234 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/moxa,moxart-gpio.txt + delete mode 100644 arch/arm/mach-ks8695/include/mach/gpio.h + delete mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio.h + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/gpio.h + create mode 100644 drivers/gpio/gpio-moxart.c + rename {arch/arm/mach-lpc32xx/include/mach => include/linux/platform_data}/gpio-lpc32xx.h (100%) +Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (6ca142ad0d1b pwm: sysfs: Convert to use ATTRIBUTE_GROUPS macro) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++ + drivers/pwm/pwm-pxa.c | 53 +++++++++++++++++++++++ + drivers/pwm/sysfs.c | 12 +---- + 3 files changed, 85 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt +Merging dma-buf/for-next (19e8697ba45e dma-buf: Expose buffer size to userspace (v2)) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (41301ae78a99 vfs: Fix a regression in mounting proc) +$ git merge userns/for-next +Auto-merging kernel/fork.c +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/dcache.c | 7 ++++++- + fs/namespace.c | 2 +- + kernel/fork.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) +Merging ktest/for-next (298a0d1d5750 ktest: Add documentation of CLOSE_CONSOLE_SIGNAL) +$ git merge ktest/for-next +Auto-merging tools/testing/ktest/ktest.pl +Merge made by the 'recursive' strategy. + tools/testing/ktest/ktest.pl | 5 ++++- + tools/testing/ktest/sample.conf | 7 +++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) +Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (cdf64eeeb0d7 clk: exynos5420: fix cpll clock register offsets) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../bindings/clock/fixed-factor-clock.txt | 4 +- + .../bindings/clock/nvidia,tegra124-car.txt | 59 + + drivers/clk/clk-composite.c | 28 + + drivers/clk/clk.c | 3 +- + drivers/clk/samsung/clk-exynos5420.c | 4 +- + drivers/clk/socfpga/clk.c | 4 +- + drivers/clk/sunxi/clk-factors.c | 4 +- + drivers/clk/sunxi/clk-sunxi.c | 58 +- + drivers/clk/tegra/Makefile | 7 +- + drivers/clk/tegra/clk-id.h | 235 +++ + drivers/clk/tegra/clk-periph-gate.c | 8 +- + drivers/clk/tegra/clk-periph.c | 32 +- + drivers/clk/tegra/clk-pll.c | 407 +++-- + drivers/clk/tegra/clk-tegra-audio.c | 215 +++ + drivers/clk/tegra/clk-tegra-fixed.c | 111 ++ + drivers/clk/tegra/clk-tegra-periph.c | 674 ++++++++ + drivers/clk/tegra/clk-tegra-pmc.c | 132 ++ + drivers/clk/tegra/clk-tegra-super-gen4.c | 149 ++ + drivers/clk/tegra/clk-tegra114.c | 1687 +++++--------------- + drivers/clk/tegra/clk-tegra124.c | 1424 +++++++++++++++++ + drivers/clk/tegra/clk-tegra20.c | 818 ++++------ + drivers/clk/tegra/clk-tegra30.c | 1506 ++++++----------- + drivers/clk/tegra/clk.c | 166 ++ + drivers/clk/tegra/clk.h | 115 +- + include/dt-bindings/clock/tegra114-car.h | 8 +- + include/dt-bindings/clock/tegra124-car.h | 341 ++++ + include/dt-bindings/clock/tegra30-car.h | 10 +- + 27 files changed, 5174 insertions(+), 3035 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt + create mode 100644 drivers/clk/tegra/clk-id.h + create mode 100644 drivers/clk/tegra/clk-tegra-audio.c + create mode 100644 drivers/clk/tegra/clk-tegra-fixed.c + create mode 100644 drivers/clk/tegra/clk-tegra-periph.c + create mode 100644 drivers/clk/tegra/clk-tegra-pmc.c + create mode 100644 drivers/clk/tegra/clk-tegra-super-gen4.c + create mode 100644 drivers/clk/tegra/clk-tegra124.c + create mode 100644 include/dt-bindings/clock/tegra124-car.h +Merging random/dev (392a546dc836 random: add debugging code to detect early use of get_random_bytes()) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.) +$ git merge arm64-hugepages/for-next/hugepages +Already up-to-date. +Merging aio/master (ddb8c45ba151 aio: nullify aio->ring_pages after freeing it) +$ git merge aio/master +Already up-to-date. +Merging akpm-current/current (6e7ebeb1cb49 lib/decompress_unlz4.c: always set an error return code on failures) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'kernel/params.c' +Resolved 'arch/um/kernel/sysrq.c' using previous resolution. +Auto-merging mm/memcontrol.c +Auto-merging kernel/params.c +CONFLICT (content): Merge conflict in kernel/params.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/blkdev.h +Removing include/asm-generic/int-l64.h +Removing fs/coredump.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_acpi.c +Auto-merging block/blk-mq.c +Auto-merging arch/um/kernel/sysrq.c +CONFLICT (content): Merge conflict in arch/um/kernel/sysrq.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/params.c'. +[master ca2bc854aebd] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/dynamic-debug-howto.txt | 9 + + Documentation/filesystems/proc.txt | 9 + + Documentation/filesystems/sysfs.txt | 6 +- + Documentation/leds/leds-class.txt | 3 - + MAINTAINERS | 6 + + arch/ia64/include/asm/processor.h | 1 + + arch/sh/kernel/dwarf.c | 18 +- + block/blk-mq-cpu.c | 37 +--- + block/blk-mq.c | 68 +----- + block/blk-mq.h | 1 - + block/cmdline-parser.c | 107 ++++++--- + block/genhd.c | 2 +- + drivers/block/cciss.c | 4 +- + drivers/block/paride/pg.c | 2 +- + drivers/block/sx8.c | 16 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +- + drivers/gpu/drm/drm_edid_load.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 8 + + drivers/gpu/drm/nouveau/nouveau_acpi.c | 6 + + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 6 + + drivers/input/leds.c | 247 +++++++++++++++++++++ + drivers/leds/Kconfig | 3 - + drivers/mailbox/omap-mbox.h | 2 +- + drivers/memstick/host/rtsx_pci_ms.c | 30 ++- + drivers/misc/ti-st/st_core.c | 2 +- + drivers/mtd/ubi/attach.c | 49 +---- + drivers/mtd/ubi/wl.c | 25 +-- + drivers/net/irda/donauboe.c | 15 +- + drivers/pps/pps.c | 57 ++--- + drivers/rtc/rtc-as3722.c | 19 +- + drivers/rtc/rtc-at91rm9200.c | 2 + + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-s5m.c | 54 ++--- + drivers/scsi/megaraid/megaraid_mm.c | 2 + + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 +++++++--- + drivers/w1/masters/w1-gpio.c | 22 ++ + drivers/w1/w1_int.c | 12 - + fs/autofs4/autofs_i.h | 4 +- + fs/autofs4/dev-ioctl.c | 16 +- + fs/autofs4/inode.c | 36 ++- + fs/autofs4/waitq.c | 16 +- + fs/binfmt_elf.c | 21 +- + fs/coredump.c | 1 - + fs/coredump.h | 6 - + fs/exec.c | 115 ++-------- + fs/ext3/dir.c | 36 +-- + fs/ext4/block_validity.c | 33 +-- + fs/ext4/dir.c | 35 +-- + fs/fat/cache.c | 25 ++- + fs/fat/fat.h | 3 +- + fs/fat/file.c | 91 +++++++- + fs/fat/inode.c | 35 ++- + fs/jffs2/nodelist.c | 28 +-- + fs/jffs2/readinode.c | 26 +-- + fs/ocfs2/alloc.c | 40 +++- + fs/ocfs2/cluster/tcp.c | 13 +- + fs/ocfs2/file.c | 60 +++-- + fs/ocfs2/localalloc.c | 40 ++++ + fs/ocfs2/localalloc.h | 6 + + fs/ocfs2/namei.c | 12 +- + fs/posix_acl.c | 84 ++++++- + fs/proc/array.c | 18 +- + fs/proc/base.c | 69 +++--- + fs/proc/meminfo.c | 37 ++++ + fs/ramfs/file-mmu.c | 7 - + fs/ramfs/file-nommu.c | 17 +- + fs/ramfs/inode.c | 7 + + fs/ramfs/internal.h | 1 - + fs/ubifs/debug.c | 22 +- + fs/ubifs/log.c | 21 +- + fs/ubifs/orphan.c | 21 +- + fs/ubifs/recovery.c | 21 +- + fs/ubifs/super.c | 24 +- + fs/ubifs/tnc.c | 22 +- + include/asm-generic/int-l64.h | 49 ----- + include/linux/blkdev.h | 5 +- + include/linux/cache.h | 4 +- + include/linux/cmdline-parser.h | 8 +- + include/linux/crc64_ecma.h | 56 +++++ + include/linux/huge_mm.h | 23 ++ + include/linux/hugetlb.h | 12 +- + include/linux/input.h | 21 ++ + include/linux/kthread.h | 1 + + include/linux/mm.h | 41 +++- + include/linux/mmzone.h | 6 + + include/linux/page-flags.h | 4 +- + include/linux/parser.h | 1 + + include/linux/posix_acl.h | 78 +------ + include/linux/printk.h | 19 +- + include/linux/ramfs.h | 7 - + include/linux/reboot.h | 1 + + include/linux/sched.h | 28 ++- + include/linux/smp.h | 6 +- + include/linux/w1-gpio.h | 1 + + include/uapi/asm-generic/types.h | 3 +- + init/main.c | 6 +- + kernel/fork.c | 1 - + kernel/kexec.c | 3 +- + kernel/kmod.c | 11 +- + kernel/kthread.c | 9 + + kernel/params.c | 2 +- + kernel/reboot.c | 2 +- + kernel/signal.c | 7 +- + kernel/smp.c | 51 ++--- + kernel/sys.c | 8 +- + kernel/time/sched_clock.c | 4 + + kernel/watchdog.c | 10 +- + lib/Kconfig | 10 +- + lib/Makefile | 1 + + lib/cmdline.c | 14 +- + lib/crc64_ecma.c | 341 +++++++++++++++++++++++++++++ + lib/decompress_unlz4.c | 1 + + lib/dma-debug.c | 7 + + lib/dynamic_debug.c | 15 +- + lib/kstrtox.c | 1 - + lib/parser.c | 62 +++++- + lib/rbtree_test.c | 13 +- + mm/hugetlb.c | 36 +-- + mm/internal.h | 3 +- + mm/memcontrol.c | 23 +- + mm/memory-failure.c | 2 +- + mm/memory.c | 11 +- + mm/page_alloc.c | 13 ++ + mm/swap.c | 278 ++++++++++++----------- + mm/swap_state.c | 63 +++++- + mm/swapfile.c | 20 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 27 +-- + scripts/checkpatch.pl | 9 + + scripts/get_maintainer.pl | 91 +++++++- + 132 files changed, 2291 insertions(+), 1293 deletions(-) + create mode 100644 drivers/input/leds.c + delete mode 100644 fs/coredump.h + delete mode 100644 include/asm-generic/int-l64.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ 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: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 15d1c69907ec...a295bddb28bf akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (a295bddb28bf mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 +++++++ + mm/backing-dev.c | 35 +++++++++++++++++++++++++++++++ + 2 files changed, 43 insertions(+) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..84d9c1a0fbc3 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on af91706d5ddecb4a9858cca9e90d463037cfd498 +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..cb854be06386 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20131205 |