diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-05 15:28:29 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-05 15:28:29 +1000 |
| commit | f8f126f22a32f2f2b3b61bd5b8a3d51a2cac09ec (patch) | |
| tree | 99e5c5351a13c869139b6e73e420abf2a35bcfe3 | |
| parent | 21f19dd575eb5b5bc403f08495fca727fed652ec (diff) | |
Add linux-next specific files for 20130605next-20130605
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 229 | ||||
| -rw-r--r-- | Next/Trees | 231 | ||||
| -rw-r--r-- | Next/merge.log | 6574 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7039 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c70e1b6c8a2c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,229 @@ +Name SHA1 +---- ---- +origin 844ce9f2044723a9da0f4bce588cca410e774d24 +fixes 0279b3c0ada1d78882f24acf94ac4595bd657a89 +kbuild-current 42a0940d9d582214a8d0f8ba41f2b4fe987e21b0 +arc-current ce3f8084ad6b3493a0b74e80d29a5371807a2556 +arm-current f27d6e172367a424ecf9d373062a820338671277 +m68k-current df66834a43c461de2565c45d815288ba1c0def37 +powerpc-merge badec11b645e21acbc2411d7759e3efa559af443 +sparc de9c9f86be0dc3495de98dc65c80abe6e7c7d643 +net 5e71d9d77c07fa7d4c42287a177f7b738d0cd4b9 +ipsec 01cb71d2d47b78354358e4bb938bb06323e17498 +sound-current 8eafc0a161123d90617c9ca2eddfe87b382b1b89 +pci-current f3f011750a18abc389ef1b0d504fbeeacf641919 +wireless f12d67a948434c760219f951e015ce41a8897a51 +driver-core.current e4aa937ec75df0eea0bee03bffa3303ad36c986b +tty.current 317a68427d4b0a302ecff252fd83a00557947db8 +usb.current a26f009a070e840fadacb91013b2391ba7ab6cc2 +staging.current 1f89b8fc41b66e5761bb8c3af5517fd42bf2067d +char-misc.current e4aa937ec75df0eea0bee03bffa3303ad36c986b +input-current 3bd1f7e2db4124a2726f9afdeaaf82f09b0bd8eb +md-current 32f9f570d04461a41bdcd5c1d93b41ebc5ce182a +audit-current c158a35c8a681cf68d36f22f058f9f5466386c71 +crypto-current de614e561b9c633073caae8f86399aa8923ef85d +ide bf6b4388c61cf88c6faa19cc45390fd36be8fb66 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +sh-current 44033109e99cf584d6285226ed521098f5ef7250 +irqdomain-current c44cd9e91861d0bf306e62b243f604684c509c5f +devicetree-current 2c302eb0a6a5fec1abdd8f3a4df75255eaa87311 +spi-current 0d2d0cc5216db678070efc911ef47f4cb53b4aad +gpio-current e97f9b5277afeabb54892ebc6f68500098467ba1 +rr-fixes 6407d75afd08545f2252bb39806ffd3f10c7faac +mfd-fixes 5649d8f9e335f2b093751fcc2bdd5953f79f66ef +vfio-fixes 3655b22de04e3635fe3a2d7b9529cb12609a9bd0 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 46e9babdf697cce289df506b913b3e3373943a18 +arm b59c112d5dfaee57a16db0a7eed5a097ba68e818 +arm-perf e4aa937ec75df0eea0bee03bffa3303ad36c986b +davinci fe0d42203cb5616eeff68b14576a0f7e2dd56625 +xilinx 64e3fd3c96fe3416879c8ea985e606f80a28dea5 +arm64 6427ae722cc38e8002ede78e95e7c7444ecab511 +blackfin 5ae89ee043ce96e3790e6c75f3807c8e37d98634 +c6x f934af05cb1bf20558542185299394a69060b829 +cris 32ade6a282a36aae1803b190bae452f1e46f6b6c +hexagon de44443a45e36b7467af2518d3bf7ec6ec909549 +ia64 326f4135d697f530ece267619e3e921879d9996f +m68k a77b39550da0857c2f0c52ae26281685a524b522 +m68knommu e4aa937ec75df0eea0bee03bffa3303ad36c986b +metag 164c013858a2e89b450cd8021a8be896f9e05697 +microblaze 62bc82a82bb1e2b5ee5048c088af7260ddb2b7b5 +mips f67821921eb0258bb05f7a3d59bfa01723af3829 +openrisc 6af609515d788bd4c94116344f00601b058f75a6 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 0f7dafd44e2de131f67fca87378e30ca86bc00d5 +powerpc 519fe2ecb755b875d9814cdda19778c2e88c6901 +4xx 2074b1d9d53ae696dd3f49482bad43254f40f01d +mpc5xxx a4f4124cf308275b4a2219d1e332dfc01d8bd6b7 +galak 9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 +s390 2677b3f6bbf6e94ec9ba9476ac2c4934166c559b +sh 37284bd93103ae36b5ea274a985d688fb16f7a38 +sparc-next f8ce1faf55955de62e0a12e330c6d9a526071f65 +tile 9fc1894c9883439245b225d16100d6a55b25373a +unicore32 c284464658acab50c67ff65ff3dc9215a0231ad2 +xtensa db81b03c76f5d6426569e5d2236b4f2a5e713d4d +btrfs 667e7d94a1683661cff5fe9a0fa0d7f8fdd2c007 +ceph 19bb6a83cb93383b363cc5956e304213f0f1b79f +cifs 82bae9197db19bba6b4104ebbb9ed1ee3ecb2103 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 6fd99d33edcb5f7a78ae8f9205891ce03f180d4e +ext3 e162b2f835eeda0d255bd463753b5eb823735205 +ext4 74039f20b5e2fdea658add9b95a0d075420b95dc +f2fs 83d5d6f66b375f21bee4c2e17178f7c073a66301 +fscache bbd645c7a7b56f170940e81335ba4549f50aae95 +fuse e5c5f05dca0cf90f0f3bb1aea85dcf658baff185 +gfs2 f3996d5bffc07cdd197df105d32ec7b12ecf479a +jfs 95bbb82f60c80808e5a49d8233c2de8451901531 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs b739a5d062269e1aff9e9685523671ffae3e49a3 +nfsd 1a9357f443d64aa41e9b0dc414953663a6fcca19 +ocfs2 4538df64655dcfe17b33080b219dc783161a262e +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 4b0180a49f08dd1c681cdc99edc9e0cec0a833fa +v9fs 7a0d932b50945c21e7185451182087499e8116e5 +ubifs c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +xfs 59913f14dfe8eb772ff93eb442947451b4416329 +vfs ac3e3c5b1164397656df81b9e9ab4991184d3236 +pci b1267d60ce106be38a136b51a9edbf7c172b9dae +hid 3a60eb9b5bae4f7138af0419daebc4b5bdfc424d +i2c e9b526fe704812364bca07edd15eadeba163ebfb +jdelvare-hwmon 1aaf6d3d3d1e95f4be07e32dd84aa1c93855fbbd +hwmon-staging de9eea098db0b62b8e267e3c3be14b1fef32eb02 +v4l-dvb f6b831f4cddf7fc8118111ac1bada0563ae0cd86 +kbuild ed553175a29ce50f3374f31ee3702e044592e996 +kconfig 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb +libata 9c331e7fe847d376688b5ccec4980cab14da6cd3 +infiniband c9a2433a901250637e05539ef111b91dbc52edb8 +pstore bd08ec33b5c23833581e5a36b2a69ccae6b39a28 +pm b3c83bb9acb39cd4075582201cfa6fbdce7d1546 +idle 5c99726b5faaf1ba4ca80c39d319f419c227f803 +apm fb9d78aca709b7a6389c79d6211fb384c69bb79f +cpuidle 817c876374a090391e7f2873a8b6076537f42253 +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal fa91ac6015e7d870e2fb01294b5391c58a934ace +ieee1394 6fe9efb9c9fbce690018c31e652924ae28019868 +ubi 584d4623357db8f79029db76ec2b4953418018f0 +dlm 900083183959107159f962b83b3b439d53796499 +swiotlb af51a9f1848ff50079a10def56a2c064f326af22 +scsi 002edf25068cee35f06a8d58f60302f6b7444147 +target-updates c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 +target-merge c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 +ibft 935a9fee51c945b8942be2d7b4bae069167b4886 +isci 6734092e66011def7875bd67beef889d0fee1cc9 +slave-dma c403614e2154365f3c725374bfed1690616636f5 +dmaengine 41ef2d5678d83af030125550329b6ae8b74618fa +net-next 11a164a04382d735230b01f4cc46ad78a7c4abf6 +ipsec-next 5865fc1b6a99bc7dcf245770c2735577b8596b6e +wireless-next 99e94940697adec4f84758adb2db71f4a82c7ba5 +bluetooth cd60aab8566db1ed1040e3b92402662b455e67e1 +mtd a637b0d45947df686979b85361ad5bfa9d19fdd3 +l2-mtd 449e74c867be28b4965a27d46dbbbc3b5b8f521a +crypto bbb85b25688fcdc70b895711870c23de7b12721b +drm 328a4719b6a0930721b5f8d5c69993d3b6e3913f +drm-intel cb8b2a30b32cde5ac9053d399d084c487598976a +drm-tegra 5ddfe3dbd1dda9b79981791e0fc34648ec2bd156 +sound 7b5593976c2cae886afb920885580e300ebb01ca +sound-asoc db2a53aee0313a116a5705c6c129122849829238 +modules 06df44ee41442d83be061c5fd1b1de4f5fc6fbbf +virtio b3087e48ce20be784fae1dbabc2e42e2ad0f21bc +input fc4f314618923c2bef708a535f8483fa7f7dbad2 +input-mt 194664eecd213375ef585b258379be26836edec0 +cgroup d9ed7c6720ef89da6fbcd12120fc24c6a7b01bcb +block f4d5f9480b42d324b0f0133820b94fe876a4ab57 +device-mapper 11531a4fcbd15e1e094b5d85ead9e40505fa692a +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 0e748234293f5f2caa8dbd152caba5efb754c707 +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +slab 8a965b3baa89ffedc73c0fbc750006c631012ced +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md ae59b84df415c756e62af6e118d34f900676d91e +mfd 57d5b9c7a286840dc2b6b34ee868fd6b78e6a84b +battery dccab6092d3c25bf943d12fb658e63fd88bf8b4a +fbdev 09bb64ab7b15c229c3c0a7a8cd9d9e9878098a19 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 e72b7536e4e1e44e56dba50205d5a5092bf1d3c0 +regulator fc646018b4105d60b85f8d8cea364ed81a23f365 +security e2fa3d799b7471f00adae59ff36260ad8237929f +selinux c2d7b247f0c028d325a5da5b9611b60ba160f237 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +watchdog 64da82bf9fa60dbfc325bd925e5978fe0e51dd13 +dwmw2-iommu 6491d4d02893d9787ba67279595990217177b351 +iommu 0c4513be3d01a854867446ee793748409cc0ebdf +vfio 3655b22de04e3635fe3a2d7b9529cb12609a9bd0 +osd 861d66601acda6d7a2038fb3c95f68009128003a +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial e3d1848f29d6f02d74ea978e1a699bde5802d7d4 +audit dcd6c92267155e70a94b3927bce681ce74b80d1f +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +edac de4772c621487fd4cadb4138f2481297c8e0cb0d +edac-amd 9713faecff3d071de1208b081d4943b002e9cb1c +devicetree 3132f623386e9ac87077bd839e726f7b940fbc94 +dt-rh a2b9ea73967386ec5e524ab206bd549d5aafea17 +spi 00ab5392cbc3f87ddfeada311e22f55dfb0bc5c6 +spi-mb d595c00d51abcf381c2ef25bdbd8b989b065ae7c +tip e4aa937ec75df0eea0bee03bffa3303ad36c986b +ftrace 4c69e6ea415a35eb7f0fc8ee9390c8f7436492a2 +rcu 557c3deceb096de154d68442f71d90c322ecc658 +cputime c3e0ef9a298e028a82ada28101ccd5cf64d209ee +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm e47a5f5fb715b90b40747e9e235de557c6abd56c +kvm-arm a1b02cbe5771a9e48928c13bb41cc1549af54ae0 +kvm-ppc 5975a2e0950291a6bfe9fd5880e7952ff87764be +oprofile f722406faae2d073cc1d01063d1123c35425939e +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen af3a3ab2966112c0d0a44df7eeb1e95fe32d4495 +xen-two e592f8de0b08d5c0a2d4d72787e8569c2a31bc34 +xen-arm 3a885582a366caf868b0782041c44854ff4c3568 +percpu c1ae6e9b4db00023b9caed72af49a93abad46452 +workqueues bbe2a23b3b6f559b7b3d6803bc2b8f4675f6f2f8 +drivers-x86 a1ec56ed9f42fb5374cd2add373811c9527c0995 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap af844eaa0ffcec8bcf8201072d8e1e5d44709f1a +hsi 43139a61fc68f4b0af7327a0e63f340a7c81c69a +leds 19401945d81a1d9c7a5a837dfb26d2cb13004638 +driver-core ddf1f0648e8cd6d2208b1d3bfabd6501f5a9407f +tty e943f58ea84a80cc88dfceb6a5ed788d0ba24a1e +usb 0c967e7ecdc2cf42853b4c76f0b2e94ba53c5b92 +usb-gadget 2d22b42db02fdafeb7b990c2c25caabff4dd46fe +staging ec0ee957f657b6200a2629d4c54df68d2c622e12 +char-misc 143e9c76c487957de89808cf2a3c828518ad131b +bcon e284f3493206d4268267db4557c7ee6f89ed2314 +tmem 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 +writeback ed84825b785ceb932af7dd5aa08614801721320b +arm-dt ede338f4ce2fb5ee99d18751df32fbd3b10df268 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl f264441d4cfde0430e3a3f74123869a2084e5cb1 +vhost f722406faae2d073cc1d01063d1123c35425939e +memblock 7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077 +remoteproc b9777859ec015a78dae1476e317d04f851bfdd0d +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +irqdomain 560aa5394d2db5437b2deb3bb897655f0fd99f61 +gpio 08ffb2229fafc2c3a696b325a74bf4198d6b91d7 +gpio-lw 644c8df2fb276e6cdfab18d60e9e0bf7a5b65b9a +mailbox c497eba5247728c67ba0e0de0907723dd114134a +arm-soc 050a8efab67b4f605a36418939ba97cb5cff79d6 +bcm2835 0f1d8f7bb79a751e289d28e6773e25185ecabf61 +cortex 6fae9cdafc92ae9958a3a45dd68205f72e3ad900 +ep93xx 7ec44295ef66efcac08433298661a18008883885 +imx-mxs 81426b766a26143542d0ff6f5977b4cee01c1240 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +msm d39b15626e4261773a830561f61c7009e12b251d +mvebu cddafe7043902717084a050e4a50a2199cc135ce +renesas 58e3e8accf4f2e5f14a632dd51f5146de416524c +samsung 924fd92cf1b31e490362f6ea28d4565f3f9aefa7 +tegra f2c3e054ef26f2cc1aeb0eec1098fbaaa0bb7fef +dma-mapping c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 +pwm e7927141ed51d94d6e1267f2ff0362a1f255e007 +dma-buf b89e35636bc75b72d15a1af6d49798802aff77d5 +userns 78008c404acd8e731d1e06618cc5995961e847a6 +ktest df5f7c66013c46cec9aa8156af257bc5eb29b5c5 +signal 20b4fb485227404329e41ad15588afad3df23050 +clk 061cec925f212f145516e826f39962624a738ded +random b980955236922ae6106774511c5c05003d3ad225 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +scsi-post-merge 65112dccf8a113737684366349d7f9ec373ddc47 +akpm-current bb3ec6b08396bbd631b6441102dd1c3d89cbc576 +akpm 818f354e93554437743a126cfbbb656ca8bb1a07 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..35ee52e0de19 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,231 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +sh-current git git://github.com/pmundt/linux-sh.git#sh-fixes-for-linus +irqdomain-current git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/merge +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +gpio-current git git://git.secretlab.ca/git/linux-2.6#gpio/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +davinci git git://gitorious.org/linux-davinci/linux-davinci.git#davinci-next +xilinx git git://git.xilinx.com/linux-xlnx.git#arm-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git#upstream +blackfin git git://github.com/realmz/blackfin-linux.git#blackfin-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sh git git://github.com/pmundt/linux-sh.git#sh-latest +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#testing +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs.git#for-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +pstore git git://git.infradead.org/users/cbou/linux-pstore.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +cpuidle git git://git.linaro.org/people/dlezcano/cpuidle-next.git#cpuidle-next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git#linux-next +isci git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git#all +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-intel git git://people.freedesktop.org/~danvet/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://github.com/rydberg/linux.git#for-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper quilt http://people.redhat.com/agk/patches/linux/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git#master +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit.git#for-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://sources.calxeda.com/kernel/linux.git#for-next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +spi-mb git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +cputime git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#cputime +uprobes git git://github.com/srikard/linux.git#for-next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://github.com/columbia/linux-kvm-arm.git#kvm-arm-next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/next +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-arm git git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://cavan.codon.org.uk/platform-drivers-x86.git#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +bcon git git://git.kernel.org/pub/scm/linux/kernel/git/joern/bcon2.git#master +tmem git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm.git#linux-next +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#memblock-kill-early_node_map +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +irqdomain git git://git.secretlab.ca/git/linux-2.6.git#irqdomain/next +gpio git git://git.secretlab.ca/git/linux-2.6#gpio/next +gpio-lw git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +mailbox git git://github.com/sumananna/mailbox.git#dbx500-prcmu-mailbox +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next +cortex git git://git.pengutronix.de/git/ukl/linux-2.6.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.linaro.org/people/shawnguo/linux-2.6.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/users/jcooper/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://gitorious.org/linux-pwm/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..805ea81d7745 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6574 @@ +$ date +Wednesday 5 June 10:46:51 EST 2013 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 042dd60 Merge tag 'regulator-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator +Merging origin/master (844ce9f Merge tag 'mmc-fixes-for-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc) +$ git merge origin/master +Updating 042dd60..844ce9f +Fast-forward + arch/arm/kvm/arm.c | 15 +- + arch/arm/kvm/mmu.c | 41 +++-- + arch/microblaze/include/asm/cacheflush.h | 34 ++-- + arch/microblaze/include/asm/uaccess.h | 4 +- + arch/mips/include/asm/kvm_host.h | 4 - + arch/mips/include/uapi/asm/kvm.h | 137 ++++++++++++--- + arch/mips/kvm/kvm_mips.c | 280 ++++++++++++++++++++++++++++--- + arch/mips/kvm/kvm_trap_emul.c | 50 ------ + arch/x86/kvm/emulate.c | 9 +- + arch/x86/kvm/lapic.c | 9 +- + drivers/input/mouse/synaptics.c | 2 + + drivers/input/tablet/wacom_wac.c | 8 +- + drivers/mmc/host/atmel-mci.c | 25 ++- + drivers/mmc/host/omap_hsmmc.c | 51 +++--- + drivers/mmc/host/sdhci-acpi.c | 69 +++++++- + drivers/mmc/host/sdhci-esdhc-imx.c | 41 ++++- + drivers/mmc/host/sdhci-pci.c | 54 ++++++ + fs/fuse/dir.c | 12 +- + fs/fuse/file.c | 58 ++++++- + fs/fuse/inode.c | 7 +- + fs/gfs2/bmap.c | 17 +- + fs/gfs2/dir.c | 43 +++-- + fs/gfs2/file.c | 19 ++- + fs/gfs2/inode.c | 1 + + fs/gfs2/lops.c | 4 +- + fs/gfs2/rgrp.c | 4 +- + fs/gfs2/super.c | 6 +- + 27 files changed, 776 insertions(+), 228 deletions(-) +Merging fixes/master (0279b3c Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) +$ git merge kbuild-current/rc-fixes +Merge made by the 'recursive' strategy. + scripts/Makefile.lib | 2 +- + scripts/config | 2 +- + scripts/kconfig/lxdialog/menubox.c | 9 +++++---- + scripts/kconfig/mconf.c | 11 ++++++----- + scripts/kconfig/menu.c | 15 ++++++++++++++- + 5 files changed, 27 insertions(+), 12 deletions(-) +Merging arc-current/for-curr (ce3f808 ARC: [plat-arcfpga] Fix build breakage when !CONFIG_ARC_SERIAL) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/plat-arcfpga/platform.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) +Merging arm-current/fixes (f27d6e1 ARM: 7729/1: vfp: ensure VFP_arch is non-zero when VFP is not supported) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (df66834 m68k/mac: Fix unexpected interrupt with CONFIG_EARLY_PRINTK) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge (badec11 powerpc/cputable: Fix typo on P7+ cputable entry) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) +$ git merge sparc/master +Already up-to-date. +Merging net/master (5e71d9d net: fix sk_buff head without data area) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/can/usb/esd_usb2.c | 127 +++++++++++-------- + drivers/net/can/usb/kvaser_usb.c | 64 ++++++---- + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 61 +++++---- + drivers/net/can/usb/peak_usb/pcan_usb_pro.h | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 16 ++- + drivers/net/ethernet/broadcom/tg3.c | 21 +++- + drivers/net/ethernet/broadcom/tg3.h | 5 +- + drivers/net/ethernet/emulex/benet/be.h | 1 + + drivers/net/ethernet/emulex/benet/be_cmds.c | 6 +- + drivers/net/ethernet/emulex/benet/be_hw.h | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 55 ++++---- + drivers/net/ethernet/freescale/fec_main.c | 12 ++ + drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 - + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 17 ++- + drivers/net/ethernet/mellanox/mlx4/fw.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 20 +-- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 1 + + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 3 +- + drivers/net/hyperv/netvsc_drv.c | 3 +- + drivers/net/phy/phy.c | 2 +- + drivers/net/team/team.c | 7 +- + drivers/net/tun.c | 4 + + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 9 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 3 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 14 +-- + drivers/net/wireless/ath/ath9k/hw.c | 25 ++-- + drivers/net/wireless/ath/ath9k/mac.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 3 +- + drivers/net/wireless/ath/ath9k/rc.c | 5 +- + drivers/net/wireless/ath/ath9k/reg.h | 11 ++ + drivers/net/wireless/ath/ath9k/xmit.c | 138 ++++++--------------- + drivers/net/wireless/atmel.c | 2 +- + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 18 --- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 16 ++- + drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 3 +- + .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 6 + + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 74 ++++++++--- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 89 ++++++++++--- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 3 +- + drivers/net/wireless/iwlwifi/dvm/sta.c | 2 +- + drivers/nfc/Kconfig | 2 +- + drivers/nfc/mei_phy.c | 9 ++ + drivers/nfc/microread/mei.c | 20 +-- + drivers/nfc/pn544/mei.c | 20 +-- + drivers/ptp/ptp_pch.c | 8 +- + include/linux/list.h | 11 ++ + include/linux/netfilter_ipv6.h | 16 +++ + include/linux/rculist_nulls.h | 7 +- + include/linux/skbuff.h | 15 +++ + include/net/addrconf.h | 2 +- + include/net/sch_generic.h | 18 +-- + include/net/xfrm.h | 5 + + net/core/dev_addr_lists.c | 17 ++- + net/core/skbuff.c | 4 +- + net/core/sock.c | 6 +- + net/ipv4/ip_tunnel.c | 2 +- + net/ipv4/netfilter/ipt_ULOG.c | 6 +- + net/ipv4/route.c | 7 +- + net/ipv6/addrconf.c | 6 +- + net/ipv6/netfilter.c | 7 ++ + net/ipv6/proc.c | 2 +- + net/ipv6/udp_offload.c | 20 +-- + net/key/af_key.c | 4 + + net/mac80211/iface.c | 44 +++++-- + net/mac80211/mlme.c | 12 +- + net/netfilter/core.c | 2 + + net/netfilter/ipvs/ip_vs_core.c | 35 ++++++ + net/netfilter/ipvs/ip_vs_sh.c | 2 +- + net/netfilter/xt_LOG.c | 2 +- + net/netfilter/xt_addrtype.c | 27 ++-- + net/netlink/af_netlink.c | 2 +- + net/nfc/Makefile | 1 - + net/sched/act_police.c | 8 +- + net/sched/sch_generic.c | 8 +- + net/sched/sch_htb.c | 8 +- + net/sched/sch_tbf.c | 8 +- + net/socket.c | 33 ++++- + net/wireless/nl80211.c | 2 +- + net/wireless/sme.c | 3 + + net/xfrm/xfrm_policy.c | 3 +- + net/xfrm/xfrm_user.c | 2 + + security/selinux/xfrm.c | 34 +++-- + 82 files changed, 819 insertions(+), 494 deletions(-) +Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (8eafc0a ALSA: usb-audio - Apply Logitech QuickCam Pro 9000 quirk only to audio iface) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_generic.c | 68 ++++++++++++++++++++++++------------------- + sound/pci/hda/hda_generic.h | 1 + + sound/pci/hda/patch_realtek.c | 3 ++ + sound/pci/hda/patch_via.c | 10 ++++++- + sound/pci/sis7019.c | 3 +- + sound/usb/quirks-table.h | 14 +++++++-- + 6 files changed, 65 insertions(+), 34 deletions(-) +Merging pci-current/for-linus (f3f0117 Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0") +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (f12d67a Revert "ath9k_hw: Update rx gain initval to improve rx sensitivity") +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/Kconfig | 4 +- + drivers/bluetooth/btmrvl_sdio.c | 28 +++++ + .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 10 +- + drivers/net/wireless/ath/ath9k/init.c | 3 +- + drivers/net/wireless/iwlegacy/common.h | 6 +- + drivers/net/wireless/mwifiex/debugfs.c | 22 +++- + drivers/net/wireless/rtlwifi/pci.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 134 +++++++++++++++------ + drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 4 - + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 18 ++- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.h | 3 + + drivers/net/wireless/rtlwifi/usb.c | 13 ++ + drivers/net/wireless/rtlwifi/wifi.h | 4 + + drivers/net/wireless/ti/wl12xx/scan.c | 2 +- + drivers/net/wireless/ti/wl12xx/wl12xx.h | 6 +- + drivers/net/wireless/ti/wl18xx/scan.c | 2 +- + include/net/bluetooth/hci_core.h | 1 + + include/net/bluetooth/mgmt.h | 1 + + net/bluetooth/hci_core.c | 6 +- + net/bluetooth/l2cap_core.c | 70 ++++++++--- + net/bluetooth/mgmt.c | 23 +++- + net/bluetooth/smp.c | 4 +- + net/mac80211/ieee80211_i.h | 5 +- + net/mac80211/mlme.c | 87 +++++++++++-- + net/mac80211/util.c | 4 +- + 26 files changed, 369 insertions(+), 96 deletions(-) +Merging driver-core.current/driver-core-linus (e4aa937 Linux 3.10-rc3) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (317a684 Revert "serial: 8250: Make SERIAL_8250_RUNTIME_UARTS work correctly") +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/8250/8250_core.c | 14 +++++++------- + drivers/tty/serial/imx.c | 2 ++ + drivers/tty/serial/samsung.c | 13 +++++++++++++ + 3 files changed, 22 insertions(+), 7 deletions(-) +Merging usb.current/usb-linus (a26f009 USB: mos7720: fix hardware flow control) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/devio.c | 10 +++++++--- + drivers/usb/dwc3/dwc3-exynos.c | 2 +- + drivers/usb/dwc3/dwc3-pci.c | 2 +- + drivers/usb/dwc3/gadget.c | 16 ++++++++++++---- + drivers/usb/host/ehci-sched.c | 9 +++++++-- + drivers/usb/host/xhci-mem.c | 10 +++++++--- + drivers/usb/host/xhci-pci.c | 8 ++++++++ + drivers/usb/host/xhci.c | 16 +++++++++++++--- + drivers/usb/host/xhci.h | 3 +++ + drivers/usb/musb/musb_host.c | 18 ++++++++---------- + drivers/usb/musb/musb_host.h | 1 + + drivers/usb/serial/ark3116.c | 2 +- + drivers/usb/serial/cypress_m8.c | 18 +++++++++++++++++- + drivers/usb/serial/cypress_m8.h | 4 ++++ + drivers/usb/serial/iuu_phoenix.c | 4 ++-- + drivers/usb/serial/keyspan.c | 10 ---------- + drivers/usb/serial/mos7720.c | 25 ++++++++++++++++++------- + drivers/usb/serial/mos7840.c | 35 +++++++++++++++++++++++++++-------- + drivers/usb/serial/qcserial.c | 1 + + drivers/usb/serial/visor.c | 9 +++++++++ + drivers/usb/serial/zte_ev.c | 34 ++++++++++++++-------------------- + 21 files changed, 161 insertions(+), 76 deletions(-) +Merging staging.current/staging-linus (1f89b8f Merge tag 'iio-fixes-for-3.10b' 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/iio/buffer_cb.c | 5 ++++- + drivers/iio/frequency/adf4350.c | 2 +- + drivers/iio/inkern.c | 4 ++-- + drivers/staging/android/alarm-dev.c | 8 ++++++-- + drivers/staging/dwc2/hcd.c | 5 ++--- + drivers/staging/zcache/ramster.h | 4 ---- + drivers/staging/zcache/ramster/debug.c | 2 ++ + drivers/staging/zcache/ramster/ramster.c | 6 ++++-- + 8 files changed, 21 insertions(+), 15 deletions(-) +Merging char-misc.current/char-misc-linus (e4aa937 Linux 3.10-rc3) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (3bd1f7e Input: wacom - fix a typo for Cintiq 22HDT) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array) +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master (de614e5 crypto: sha256_ssse3 - fix stack corruption with SSSE3 and AVX implementations) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/gayle.c | 15 +-------------- + drivers/ide/tx4938ide.c | 13 +------------ + drivers/ide/tx4939ide.c | 13 +------------ + 3 files changed, 3 insertions(+), 38 deletions(-) +Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging irqdomain-current/irqdomain/merge (c44cd9e irqdomain: export irq_domain_add_simple) +$ git merge irqdomain-current/irqdomain/merge +Auto-merging kernel/irq/irqdomain.c +Merge made by the 'recursive' strategy. + kernel/irq/irqdomain.c | 1 + + 1 file changed, 1 insertion(+) +Merging devicetree-current/devicetree/merge (2c302eb kbuild: make sure we clean up DTB temporary files) +$ git merge devicetree-current/devicetree/merge +Resolved 'scripts/Makefile.lib' using previous resolution. +Auto-merging scripts/Makefile.lib +CONFLICT (content): Merge conflict in scripts/Makefile.lib +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a3c2a41] Merge remote-tracking branch 'devicetree-current/devicetree/merge' +$ git diff -M --stat --summary HEAD^.. + scripts/Makefile.lib | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) +$ git merge spi-current/spi/merge +Already up-to-date. +Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect) +$ git merge gpio-current/gpio/merge +Already up-to-date. +Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) +$ git merge mfd-fixes/master +Already up-to-date. +Merging vfio-fixes/for-linus (3655b22 Merge tag 'stable/for-linus-3.10-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (46e9bab ARC: Use kconfig helper IS_ENABLED() to get rid of defines.h) +$ git merge arc/for-next +Removing arch/arc/include/asm/defines.h +Merge made by the 'recursive' strategy. + arch/arc/Makefile | 4 +- + arch/arc/include/asm/arcregs.h | 100 +------------------------------------- + arch/arc/include/asm/cache.h | 37 ++++++++++++++ + arch/arc/include/asm/cacheflush.h | 7 +++ + arch/arc/include/asm/defines.h | 56 --------------------- + arch/arc/include/asm/mmu.h | 54 ++++++++++++++++++++ + arch/arc/kernel/setup.c | 8 +-- + arch/arc/kernel/time.c | 11 +++++ + arch/arc/mm/cache_arc700.c | 24 ++++++--- + arch/arc/mm/fault.c | 1 + + arch/arc/mm/tlb.c | 10 ++-- + 11 files changed, 140 insertions(+), 172 deletions(-) + delete mode 100644 arch/arc/include/asm/defines.h +Merging arm/for-next (b59c112 Merge branches 'devel-stable', 'fixes', 'misc' and 'mmci' into for-next) +$ git merge arm/for-next +Removing arch/arm/mach-virt/platsmp.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/l2cc.txt | 3 + + arch/arm/Kconfig | 4 +- + arch/arm/Kconfig-nommu | 2 +- + arch/arm/Makefile | 1 + + arch/arm/boot/compressed/atags_to_fdt.c | 44 ++++++- + arch/arm/boot/dts/bcm11351.dtsi | 8 +- + arch/arm/include/asm/assembler.h | 17 ++- + arch/arm/include/asm/cputype.h | 44 ++++++- + arch/arm/include/asm/div64.h | 2 +- + arch/arm/include/asm/glue-cache.h | 27 ++++ + arch/arm/include/asm/glue-df.h | 8 ++ + arch/arm/include/asm/glue-proc.h | 9 ++ + arch/arm/include/asm/io.h | 8 +- + arch/arm/include/asm/irqflags.h | 22 +++- + arch/arm/include/asm/mach/arch.h | 5 + + arch/arm/include/asm/psci.h | 9 ++ + arch/arm/include/asm/ptrace.h | 4 + + arch/arm/include/asm/system_info.h | 1 + + arch/arm/include/asm/v7m.h | 44 +++++++ + arch/arm/include/uapi/asm/ptrace.h | 35 ++++-- + arch/arm/kernel/Makefile | 13 +- + arch/arm/kernel/entry-common.S | 4 + + arch/arm/kernel/entry-header.S | 124 +++++++++++++++++++ + arch/arm/kernel/entry-v7m.S | 143 +++++++++++++++++++++ + arch/arm/kernel/head-nommu.S | 10 +- + arch/arm/kernel/psci.c | 7 +- + arch/arm/kernel/psci_smp.c | 84 +++++++++++++ + arch/arm/kernel/setup.c | 33 ++++- + arch/arm/kernel/traps.c | 8 ++ + arch/arm/mach-ebsa110/core.c | 2 +- + arch/arm/mach-imx/mm-imx3.c | 2 +- + arch/arm/mach-iop13xx/io.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-msm/common.h | 2 +- + arch/arm/mach-msm/io.c | 2 +- + arch/arm/mach-virt/Makefile | 1 - + arch/arm/mach-virt/platsmp.c | 50 -------- + arch/arm/mach-virt/virt.c | 3 - + arch/arm/mm/Kconfig | 21 +++- + arch/arm/mm/Makefile | 2 + + arch/arm/mm/cache-l2x0.c | 158 +++++++++++++++++++++++ + arch/arm/mm/cache-nop.S | 50 ++++++++ + arch/arm/mm/dma-mapping.c | 20 ++- + arch/arm/mm/ioremap.c | 10 +- + arch/arm/mm/nommu.c | 13 +- + arch/arm/mm/proc-v7m.S | 157 +++++++++++++++++++++++ + drivers/mmc/host/mmci.c | 165 +++++++++++++++++++------ + drivers/mmc/host/mmci.h | 4 + + 48 files changed, 1231 insertions(+), 158 deletions(-) + create mode 100644 arch/arm/include/asm/v7m.h + create mode 100644 arch/arm/kernel/entry-v7m.S + create mode 100644 arch/arm/kernel/psci_smp.c + delete mode 100644 arch/arm/mach-virt/platsmp.c + create mode 100644 arch/arm/mm/cache-nop.S + create mode 100644 arch/arm/mm/proc-v7m.S +Merging arm-perf/for-next/perf (e4aa937 Linux 3.10-rc3) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) +$ git merge davinci/davinci-next +Already up-to-date. +Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu) +$ git merge xilinx/arm-next +Resolved 'arch/arm/mach-highbank/highbank.c' using previous resolution. +Resolved 'arch/arm/mach-imx/mach-imx6q.c' using previous resolution. +Resolved 'arch/arm/mach-spear/spear13xx.c' using previous resolution. +Resolved 'arch/arm/mach-vexpress/v2m.c' using previous resolution. +Resolved 'arch/arm/mach-zynq/platsmp.c' using previous resolution. +Resolved 'drivers/clocksource/Makefile' using previous resolution. +Resolved 'drivers/clocksource/tegra20_timer.c' using previous resolution. +Auto-merging drivers/clocksource/tegra20_timer.c +CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c +Auto-merging drivers/clocksource/Makefile +CONFLICT (content): Merge conflict in drivers/clocksource/Makefile +Auto-merging arch/arm/mach-zynq/platsmp.c +CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c +Auto-merging arch/arm/mach-vexpress/v2m.c +CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c +Auto-merging arch/arm/mach-spear/spear13xx.c +CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c +Auto-merging arch/arm/mach-imx/mach-imx6q.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c +Auto-merging arch/arm/mach-highbank/highbank.c +CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7b4c3d0] Merge remote-tracking branch 'xilinx/arm-next' +$ git diff -M --stat --summary HEAD^.. +Merging arm64/upstream (6427ae7 arm64: Provide default implementation for dma_{alloc,free}_attrs) +$ git merge arm64/upstream +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/dma-mapping.h | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) +Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcplb map for BF60x) +$ git merge blackfin/blackfin-linus +Already up-to-date. +Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file) +$ git merge cris/for-next +Auto-merging arch/cris/include/asm/processor.h +Auto-merging arch/cris/arch-v32/drivers/Kconfig +Auto-merging arch/cris/Kconfig +Merge made by the 'recursive' strategy. + arch/cris/Kconfig | 81 ------- + arch/cris/arch-v10/drivers/Kconfig | 70 ------ + arch/cris/arch-v10/drivers/Makefile | 2 - + arch/cris/arch-v32/drivers/Kconfig | 394 ---------------------------------- + arch/cris/arch-v32/mach-a3/Kconfig | 4 - + arch/cris/include/asm/processor.h | 1 - + arch/cris/include/uapi/asm/kvm_para.h | 1 + + 7 files changed, 1 insertion(+), 552 deletions(-) + create mode 100644 arch/cris/include/uapi/asm/kvm_para.h +Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (326f413 Merge branch 'misc-3.11' into next) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + arch/ia64/hp/sim/simscsi.c | 4 ++-- + arch/ia64/kernel/pci-dma.c | 9 --------- + arch/ia64/kernel/perfmon.c | 20 ++------------------ + arch/ia64/kernel/traps.c | 2 +- + drivers/firmware/efi/efi-pstore.c | 3 +-- + 5 files changed, 6 insertions(+), 32 deletions(-) +Merging m68k/for-next (a77b395 Merge branch 'exotic-arch-fixes' into for-next) +$ git merge m68k/for-next +Resolved 'arch/cris/arch-v32/drivers/Kconfig' using previous resolution. +Auto-merging drivers/parport/Kconfig +Removing arch/score/include/asm/dma-mapping.h +Removing arch/m68k/lib/string.c +Removing arch/h8300/include/asm/linkage.h +Removing arch/cris/include/asm/linkage.h +Auto-merging arch/cris/arch-v32/drivers/Kconfig +CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig +Auto-merging arch/cris/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master be9b81d] Merge remote-tracking branch 'm68k/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/avr32/mach-at32ap/at32ap700x.c | 2 + + arch/c6x/include/asm/Kbuild | 1 + + arch/cris/Kconfig | 32 +- + arch/cris/arch-v10/kernel/kgdb.c | 870 +++++++---------------- + arch/cris/arch-v32/drivers/Kconfig | 7 - + arch/cris/include/asm/Kbuild | 4 + + arch/cris/include/asm/io.h | 3 + + arch/cris/include/asm/linkage.h | 6 - + arch/frv/kernel/head.S | 5 - + arch/h8300/Kconfig | 118 +-- + arch/h8300/Kconfig.cpu | 4 + + arch/h8300/include/asm/Kbuild | 2 + + arch/h8300/include/asm/barrier.h | 2 + + arch/h8300/include/asm/linkage.h | 6 - + arch/h8300/include/asm/tlb.h | 15 - + arch/h8300/kernel/entry.S | 118 +-- + arch/h8300/kernel/syscalls.S | 648 ++++++++--------- + arch/h8300/lib/abs.S | 4 +- + arch/h8300/lib/memcpy.S | 4 +- + arch/h8300/lib/memset.S | 4 +- + arch/h8300/platform/h8300h/aki3068net/crt0_ram.S | 16 +- + arch/h8300/platform/h8300h/generic/crt0_ram.S | 14 +- + arch/h8300/platform/h8300h/generic/crt0_rom.S | 14 +- + arch/h8300/platform/h8300h/h8max/crt0_ram.S | 16 +- + arch/h8300/platform/h8s/edosk2674/crt0_ram.S | 16 +- + arch/h8300/platform/h8s/edosk2674/crt0_rom.S | 14 +- + arch/h8300/platform/h8s/generic/crt0_ram.S | 16 +- + arch/h8300/platform/h8s/generic/crt0_rom.S | 12 +- + arch/m68k/Kconfig.debug | 3 +- + arch/m68k/include/asm/string.h | 32 - + arch/m68k/lib/Makefile | 2 +- + arch/m68k/lib/string.c | 22 - + arch/m68k/math-emu/fp_arith.c | 2 +- + arch/m68k/sun3/sun3dvma.c | 2 +- + arch/openrisc/include/asm/Kbuild | 1 + + arch/score/include/asm/Kbuild | 1 + + arch/score/include/asm/dma-mapping.h | 6 - + drivers/input/keyboard/cros_ec_keyb.c | 54 +- + drivers/media/platform/Kconfig | 2 +- + drivers/parport/Kconfig | 4 +- + drivers/scsi/a3000.c | 13 +- + drivers/scsi/a4000t.c | 15 +- + drivers/staging/media/solo6x10/Kconfig | 3 +- + drivers/usb/misc/sisusbvga/Kconfig | 1 + + drivers/video/console/Kconfig | 16 +- + drivers/video/console/Makefile | 16 +- + kernel/time/ntp.c | 1 - + 47 files changed, 795 insertions(+), 1374 deletions(-) + delete mode 100644 arch/cris/include/asm/linkage.h + delete mode 100644 arch/h8300/include/asm/linkage.h + delete mode 100644 arch/m68k/lib/string.c + delete mode 100644 arch/score/include/asm/dma-mapping.h +Merging m68knommu/for-next (e4aa937 Linux 3.10-rc3) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (164c013 metag: defconfigs: increase log buffer 8KiB => 128KiB) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (62bc82a microblaze: Use static inline functions in cacheflush.h) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (f678219 Merge branch '3.10-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging drivers/usb/host/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 19 +--------- + arch/mips/cavium-octeon/Kconfig | 17 +++------ + arch/mips/cavium-octeon/Platform | 8 ++-- + arch/mips/cavium-octeon/setup.c | 44 ++++++---------------- + arch/mips/configs/cavium_octeon_defconfig | 2 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 7 +--- + arch/mips/include/asm/ptrace.h | 32 ++++++++++++++++ + arch/mips/include/uapi/asm/ptrace.h | 17 +-------- + arch/mips/kernel/prom.c | 2 +- + arch/mips/kernel/rtlx.c | 1 + + arch/mips/kernel/traps.c | 28 +++++++------- + arch/mips/lantiq/prom.c | 2 +- + arch/mips/mm/tlbex.c | 4 -- + arch/mips/pci/Makefile | 4 +- + arch/mips/powertv/asic/asic_devices.c | 13 +------ + arch/mips/ralink/of.c | 2 +- + drivers/ata/Kconfig | 2 +- + drivers/char/hw_random/Kconfig | 2 +- + drivers/edac/Kconfig | 6 +-- + drivers/i2c/busses/Kconfig | 2 +- + drivers/net/ethernet/octeon/Kconfig | 2 +- + drivers/net/phy/Kconfig | 2 +- + drivers/spi/Kconfig | 2 +- + drivers/staging/octeon/Kconfig | 2 +- + drivers/usb/host/Kconfig | 4 +- + drivers/watchdog/Kconfig | 2 +- + 26 files changed, 95 insertions(+), 133 deletions(-) +Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (0f7dafd Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (519fe2e Merge branch 'leds-fixes-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next (2074b1d powerpc: Fix irq distribution) +$ git merge 4xx/next +Already up-to-date. +Merging mpc5xxx/next (a4f4124 powerpc/mpc512x: initialize board restart earlier) +$ git merge mpc5xxx/next +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/mpc5121.h | 1 - + arch/powerpc/platforms/512x/mpc5121_ads.c | 6 ++---- + arch/powerpc/platforms/512x/mpc512x.h | 11 ++--------- + arch/powerpc/platforms/512x/mpc512x_generic.c | 4 ++-- + arch/powerpc/platforms/512x/mpc512x_shared.c | 16 ++++++++++++++-- + arch/powerpc/platforms/512x/pdm360ng.c | 4 ++-- + 6 files changed, 22 insertions(+), 20 deletions(-) +Merging galak/next (9e2ecdb 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 (2677b3f s390/kvm: Provide function for setting the guest storage key) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/asm/io.h | 22 ------------------ + arch/s390/include/asm/pgalloc.h | 3 +++ + arch/s390/kernel/smp.c | 5 +---- + arch/s390/mm/pgtable.c | 48 ++++++++++++++++++++++++++++++++++++++++ + arch/s390/pci/pci_dma.c | 6 ++--- + arch/s390/pci/pci_sysfs.c | 8 +++---- + drivers/s390/char/sclp.c | 49 +++++++++++++++++++++++++++++++++++++++++ + drivers/s390/char/sclp.h | 5 ++++- + drivers/s390/char/sclp_con.c | 4 +++- + drivers/s390/char/sclp_vt220.c | 4 +++- + drivers/s390/cio/qdio_main.c | 44 ------------------------------------ + 11 files changed, 118 insertions(+), 80 deletions(-) +Merging sh/sh-latest (37284bd 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. +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 b3fd0e1] Merge remote-tracking branch 'sh/sh-latest' +$ git diff -M --stat --summary HEAD^.. + .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++ + arch/sh/include/asm/hw_breakpoint.h | 12 +- + arch/sh/include/cpu-common/cpu/ubc.h | 17 +++ + arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++ + arch/sh/kernel/cpu/sh2a/Makefile | 1 + + arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++ + arch/sh/kernel/hw_breakpoint.c | 8 ++ + drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++- + include/linux/serial_sci.h | 4 + + 9 files changed, 375 insertions(+), 15 deletions(-) + create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt + create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h + create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h + create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c +Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (9fc1894 arch/tile: Fix syscall return value passed to tracepoint) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (db81b03 xtensa: fix section mismatch in pcibios_fixup_bus) +$ git merge xtensa/for_next +Merge made by the 'recursive' strategy. + arch/xtensa/boot/.gitignore | 2 + + arch/xtensa/boot/boot-elf/.gitignore | 1 + + arch/xtensa/include/asm/cmpxchg.h | 1 + + arch/xtensa/include/asm/pgtable.h | 140 +++++++++++++++++++++-------------- + arch/xtensa/include/asm/platform.h | 5 -- + arch/xtensa/kernel/.gitignore | 1 + + arch/xtensa/kernel/entry.S | 11 ++- + arch/xtensa/kernel/pci.c | 10 +-- + arch/xtensa/kernel/platform.c | 1 - + arch/xtensa/mm/tlb.c | 87 +++++++++++++++++++++- + arch/xtensa/platforms/iss/network.c | 2 +- + arch/xtensa/platforms/xtfpga/setup.c | 2 +- + 12 files changed, 189 insertions(+), 74 deletions(-) + create mode 100644 arch/xtensa/boot/.gitignore + create mode 100644 arch/xtensa/boot/boot-elf/.gitignore + create mode 100644 arch/xtensa/kernel/.gitignore +Merging btrfs/next (667e7d9 Btrfs: allow superblock mismatch from older mkfs) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/testing (19bb6a8 libceph: print more info for short message header) +$ git merge ceph/testing +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 142 +++++++++++++++++++++++++++++++++++--------------- + fs/ceph/locks.c | 75 ++++++++++++++++---------- + fs/ceph/mds_client.c | 65 ++++++++++++----------- + fs/ceph/mdsmap.c | 42 ++++++++------- + fs/ceph/super.h | 9 +++- + net/ceph/osd_client.c | 20 +++---- + 6 files changed, 222 insertions(+), 131 deletions(-) +Merging cifs/for-next (82bae91 cifs: break out lanman NEGOTIATE handling into separate function) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsencrypt.c | 1 - + fs/cifs/cifsglob.h | 17 +-- + fs/cifs/cifspdu.h | 4 +- + fs/cifs/cifssmb.c | 305 +++++++++++++++++++++++++++----------------------- + fs/cifs/connect.c | 14 ++- + fs/cifs/sess.c | 29 ++--- + fs/cifs/smb1ops.c | 18 +-- + fs/cifs/smb2pdu.c | 20 ++-- + 8 files changed, 200 insertions(+), 208 deletions(-) +Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (6fd99d3 eCryptfs: Cocci spatch "memdup.spatch") +$ git merge ecryptfs/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + fs/ecryptfs/file.c | 1 + + fs/ecryptfs/messaging.c | 3 +-- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (74039f2 ext4: remove ext4_ioend_wait()) +$ git merge ext4/dev +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/reiserfs/inode.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 6 +- + Documentation/filesystems/vfs.txt | 20 +- + fs/9p/vfs_addr.c | 5 +- + fs/afs/file.c | 10 +- + fs/btrfs/disk-io.c | 3 +- + fs/btrfs/extent_io.c | 2 +- + fs/btrfs/inode.c | 3 +- + fs/buffer.c | 21 +- + fs/ceph/addr.c | 15 +- + fs/cifs/file.c | 5 +- + fs/exofs/inode.c | 6 +- + fs/ext3/inode.c | 9 +- + fs/ext4/ext4.h | 102 +-- + fs/ext4/ext4_jbd2.c | 58 +- + fs/ext4/ext4_jbd2.h | 29 +- + fs/ext4/extents.c | 156 ++-- + fs/ext4/file.c | 14 +- + fs/ext4/fsync.c | 45 +- + fs/ext4/ialloc.c | 3 +- + fs/ext4/indirect.c | 32 +- + fs/ext4/inline.c | 2 +- + fs/ext4/inode.c | 1727 ++++++++++++++++--------------------- + fs/ext4/page-io.c | 323 ++++--- + fs/ext4/super.c | 83 +- + fs/f2fs/data.c | 3 +- + fs/f2fs/node.c | 3 +- + fs/gfs2/aops.c | 17 +- + fs/jbd/transaction.c | 19 +- + fs/jbd2/checkpoint.c | 14 +- + fs/jbd2/commit.c | 178 ++-- + fs/jbd2/journal.c | 83 +- + fs/jbd2/recovery.c | 11 +- + fs/jbd2/revoke.c | 49 +- + fs/jbd2/transaction.c | 437 ++++++---- + fs/jfs/jfs_metapage.c | 5 +- + fs/logfs/file.c | 3 +- + fs/logfs/segment.c | 3 +- + fs/nfs/file.c | 8 +- + fs/ntfs/aops.c | 2 +- + fs/ocfs2/aops.c | 5 +- + fs/reiserfs/inode.c | 12 +- + fs/ubifs/file.c | 5 +- + fs/xfs/xfs_aops.c | 14 +- + fs/xfs/xfs_trace.h | 15 +- + include/linux/buffer_head.h | 3 +- + include/linux/fs.h | 2 +- + include/linux/jbd.h | 27 +- + include/linux/jbd2.h | 143 ++- + include/linux/jbd_common.h | 26 - + include/linux/mm.h | 3 +- + include/trace/events/ext3.h | 12 +- + include/trace/events/ext4.h | 169 ++-- + mm/readahead.c | 2 +- + mm/truncate.c | 117 ++- + 54 files changed, 2130 insertions(+), 1939 deletions(-) +Merging f2fs/dev (83d5d6f f2fs: cover cp_file information with ilock) +$ git merge f2fs/dev +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 36 +++++++++++- + fs/f2fs/data.c | 38 +++++++++---- + fs/f2fs/debug.c | 4 +- + fs/f2fs/dir.c | 95 ++++++++++++++++++-------------- + fs/f2fs/f2fs.h | 38 ++++++++++--- + fs/f2fs/file.c | 18 +++--- + fs/f2fs/gc.c | 17 ++++-- + fs/f2fs/inode.c | 9 +-- + fs/f2fs/namei.c | 12 +--- + fs/f2fs/node.c | 24 ++++---- + fs/f2fs/node.h | 67 +++++++--------------- + fs/f2fs/recovery.c | 144 +++++++++++++++++++++++++++++++----------------- + fs/f2fs/segment.c | 23 ++++---- + fs/f2fs/super.c | 2 +- + include/linux/f2fs_fs.h | 4 +- + 15 files changed, 308 insertions(+), 223 deletions(-) +Merging fscache/fscache (bbd645c FS-Cache: Don't use spin_is_locked() in assertions) +$ git merge fscache/fscache +Auto-merging include/linux/wait.h +Merge made by the 'recursive' strategy. + fs/cachefiles/interface.c | 13 +- + fs/cachefiles/namei.c | 10 +- + fs/cachefiles/xattr.c | 6 +- + fs/fscache/cache.c | 34 +- + fs/fscache/cookie.c | 93 ++-- + fs/fscache/fsdef.c | 1 + + fs/fscache/internal.h | 11 +- + fs/fscache/main.c | 11 +- + fs/fscache/netfs.c | 1 + + fs/fscache/object-list.c | 103 ++-- + fs/fscache/object.c | 1106 +++++++++++++++++++++-------------------- + fs/fscache/operation.c | 37 +- + fs/fscache/page.c | 65 ++- + include/linux/fscache-cache.h | 175 +++---- + include/linux/wait.h | 24 + + kernel/wait.c | 88 ++++ + 16 files changed, 956 insertions(+), 822 deletions(-) +Merging fuse/for-next (e5c5f05 fuse: fix alignment in short read optimization for async_dio) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (f3996d5 GFS2: Don't cache iopen glocks) +$ git merge gfs2/master +Auto-merging fs/gfs2/lops.c +Auto-merging fs/gfs2/inode.c +Merge made by the 'recursive' strategy. + fs/gfs2/inode.c | 2 +- + fs/gfs2/lops.c | 21 ++++++++++++++++----- + fs/gfs2/lops.h | 1 - + fs/gfs2/quota.c | 7 +------ + 4 files changed, 18 insertions(+), 13 deletions(-) +Merging jfs/jfs-next (95bbb82 fs/jfs: Add check if journaling to disk has been disabled in lbmRead()) +$ git merge jfs/jfs-next +Already up-to-date. +Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (b739a5d Merge branch 'labeled-nfs' into linux-next) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/Kconfig | 14 + + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nfs/callback.c | 1 + + fs/nfs/callback_xdr.c | 6 +- + fs/nfs/client.c | 2 +- + fs/nfs/dir.c | 75 ++-- + fs/nfs/getroot.c | 2 +- + fs/nfs/inode.c | 125 ++++++- + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs3proc.c | 7 +- + fs/nfs/nfs4_fs.h | 8 +- + fs/nfs/nfs4client.c | 5 + + fs/nfs/nfs4file.c | 1 - + fs/nfs/nfs4filelayout.c | 3 +- + fs/nfs/nfs4filelayout.h | 3 +- + fs/nfs/nfs4filelayoutdev.c | 7 +- + fs/nfs/nfs4proc.c | 661 ++++++++++++++++++++++++++++++------ + fs/nfs/nfs4state.c | 13 +- + fs/nfs/nfs4xdr.c | 174 ++++++++-- + fs/nfs/objlayout/objlayout.c | 3 +- + fs/nfs/pnfs.c | 4 +- + fs/nfs/pnfs.h | 3 +- + fs/nfs/proc.c | 13 +- + fs/nfs/super.c | 24 +- + fs/nfsd/nfsd.h | 6 + + include/linux/nfs4.h | 22 ++ + include/linux/nfs_fs.h | 27 +- + include/linux/nfs_fs_sb.h | 8 +- + include/linux/nfs_xdr.h | 20 +- + include/linux/security.h | 57 +++- + include/linux/sunrpc/sched.h | 20 -- + net/sunrpc/sched.c | 19 +- + security/capability.c | 19 +- + security/security.c | 24 +- + security/selinux/hooks.c | 92 ++++- + security/selinux/include/security.h | 2 + + security/selinux/ss/policydb.c | 5 +- + security/smack/smack_lsm.c | 11 + + 38 files changed, 1210 insertions(+), 280 deletions(-) +Merging nfsd/nfsd-next (1a9357f nfsd: avoid undefined signed overflow) +$ git merge nfsd/nfsd-next +Auto-merging security/capability.c +Merge made by the 'recursive' strategy. + fs/nfsd/Kconfig | 16 ++++++++ + fs/nfsd/nfs4proc.c | 41 +++++++++++++++++++ + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfs4xdr.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++---- + fs/nfsd/nfsd.h | 20 +++++++-- + fs/nfsd/vfs.c | 28 +++++++++++++ + fs/nfsd/vfs.h | 7 +--- + fs/nfsd/xdr4.h | 4 ++ + net/sunrpc/cache.c | 8 ++-- + net/sunrpc/xprtsock.c | 1 - + security/capability.c | 2 +- + 11 files changed, 218 insertions(+), 24 deletions(-) +Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/ocfs2/cluster/heartbeat.c +Merge made by the 'recursive' strategy. + fs/ocfs2/cluster/heartbeat.c | 40 +++++++++------------------------------- + fs/ocfs2/cluster/masklog.h | 3 ++- + fs/ocfs2/dlm/dlmmaster.c | 8 +++++++- + fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ + 4 files changed, 25 insertions(+), 33 deletions(-) +Merging omfs/for-next (976d167 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (7a0d932 fs/9p: xattr: add trusted and security namespaces) +$ git merge v9fs/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 +++ + fs/9p/Kconfig | 13 ++++++++ + fs/9p/Makefile | 4 ++- + fs/9p/xattr.c | 4 +++ + fs/9p/xattr.h | 2 ++ + fs/9p/xattr_security.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ + fs/9p/xattr_trusted.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ + include/net/9p/transport.h | 3 ++ + include/trace/events/9p.h | 28 ++-------------- + net/9p/client.c | 60 +++++++++++++--------------------- + net/9p/trans_fd.c | 40 ++++++++++++++++++++++- + 11 files changed, 254 insertions(+), 65 deletions(-) + create mode 100644 fs/9p/xattr_security.c + create mode 100644 fs/9p/xattr_trusted.c +Merging ubifs/linux-next (c1be5a5 Linux 3.9) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (59913f1 xfs: fix remote attribute invalidation for a leaf) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_log_recover.c +Auto-merging fs/xfs/xfs_attr_leaf.c +Merge made by the 'recursive' strategy. + fs/xfs/xfs_alloc.c | 24 ++++++++++++++++++------ + fs/xfs/xfs_attr_leaf.c | 2 +- + fs/xfs/xfs_dquot.c | 37 ++++++++++++++++--------------------- + fs/xfs/xfs_log_recover.c | 10 ++++++++++ + fs/xfs/xfs_mount.c | 18 +++++++++++------- + fs/xfs/xfs_qm.c | 40 ++++++++++++++++++++++++++++++---------- + fs/xfs/xfs_quota.h | 2 ++ + 7 files changed, 88 insertions(+), 45 deletions(-) +Merging vfs/for-next (ac3e3c5 don't bother with deferred freeing of fdtables) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (b1267d6 Merge branch 'pci/shane-amd-ahci-i2c' into next) +$ git merge pci/next +Resolved 'drivers/acpi/pci_root.c' using previous resolution. +Auto-merging include/acpi/acpi_bus.h +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/ata/ahci.c +Auto-merging drivers/acpi/pci_root.c +CONFLICT (content): Merge conflict in drivers/acpi/pci_root.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4321a8d] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/i2c/busses/i2c-piix4 | 2 +- + arch/powerpc/kernel/pci_of_scan.c | 2 +- + arch/sparc/kernel/pci.c | 2 +- + arch/x86/pci/acpi.c | 7 +-- + drivers/acpi/pci_root.c | 101 ++++++++++++++----------------------- + drivers/ata/ahci.c | 1 + + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-piix4.c | 3 +- + drivers/pci/ioapic.c | 13 +---- + drivers/pci/pci-acpi.c | 4 +- + drivers/pci/pci-sysfs.c | 18 +++---- + drivers/pci/pci.c | 2 +- + drivers/pci/pcie/aspm.c | 29 ++++++++--- + drivers/pci/probe.c | 31 +++++++++--- + drivers/pci/quirks.c | 27 ++++++++++ + include/acpi/acpi_bus.h | 1 - + include/linux/pci_ids.h | 4 +- + include/uapi/linux/pci_regs.h | 2 +- + 18 files changed, 138 insertions(+), 112 deletions(-) +Merging hid/for-next (3a60eb9 Merge branch 'for-3.11/upstream' into for-next) +$ git merge hid/for-next +Removing drivers/hid/hid-wiimote-ext.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-hid-wiimote | 39 +- + drivers/hid/Kconfig | 52 +- + drivers/hid/Makefile | 8 +- + drivers/hid/hid-core.c | 11 +- + drivers/hid/hid-elo.c | 273 +++ + drivers/hid/hid-holtek-mouse.c | 77 + + drivers/hid/hid-huion.c | 177 ++ + drivers/hid/hid-hyperv.c | 4 +- + drivers/hid/hid-ids.h | 21 +- + drivers/hid/hid-input.c | 4 +- + drivers/hid/hid-multitouch.c | 34 +- + drivers/hid/hid-sony.c | 289 +++- + drivers/hid/hid-wiimote-core.c | 1635 ++++++++++++------ + drivers/hid/hid-wiimote-debug.c | 14 +- + drivers/hid/hid-wiimote-ext.c | 849 ---------- + drivers/hid/hid-wiimote-modules.c | 1791 ++++++++++++++++++++ + drivers/hid/hid-wiimote.h | 215 ++- + net/bluetooth/hidp/core.c | 56 +- + net/bluetooth/hidp/hidp.h | 2 + + 19 files changed, 4052 insertions(+), 1499 deletions(-) + create mode 100644 drivers/hid/hid-elo.c + create mode 100644 drivers/hid/hid-holtek-mouse.c + create mode 100644 drivers/hid/hid-huion.c + delete mode 100644 drivers/hid/hid-wiimote-ext.c + create mode 100644 drivers/hid/hid-wiimote-modules.c +Merging i2c/i2c/for-next (e9b526f i2c: suppress lockdep warning on delete_device) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (de9eea0 hwmon: (ds1621) Remove detect function) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/ds1621 | 115 +++++++++++++++++++-- + drivers/hwmon/Kconfig | 10 +- + drivers/hwmon/abituguru3.c | 1 - + drivers/hwmon/coretemp.c | 2 - + drivers/hwmon/ds1621.c | 223 +++++++++++++++++++++++++++++++---------- + drivers/hwmon/i5k_amb.c | 2 - + drivers/hwmon/ntc_thermistor.c | 1 - + drivers/hwmon/w83627ehf.c | 2 - + 8 files changed, 283 insertions(+), 73 deletions(-) +Merging v4l-dvb/master (f6b831f Merge /home/v4l/v4l/patchwork) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + Documentation/DocBook/media/v4l/dev-codec.xml | 35 ++-- + .../devicetree/bindings/media/exynos-fimc-lite.txt | 2 +- + Documentation/video4linux/CARDLIST.bttv | 3 + + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/CARDLIST.tuner | 6 +- + drivers/media/common/siano/smscoreapi.c | 6 +- + drivers/media/common/siano/smsdvb-main.c | 1 + + drivers/media/i2c/ad9389b.c | 8 +- + drivers/media/i2c/adp1653.c | 5 +- + drivers/media/i2c/adv7170.c | 3 +- + drivers/media/i2c/adv7175.c | 3 +- + drivers/media/i2c/adv7180.c | 23 ++- + drivers/media/i2c/adv7183.c | 38 ++-- + drivers/media/i2c/adv7393.c | 8 +- + drivers/media/i2c/adv7604.c | 11 +- + drivers/media/i2c/ak881x.c | 4 +- + drivers/media/i2c/as3645a.c | 7 +- + drivers/media/i2c/bt819.c | 4 +- + drivers/media/i2c/bt856.c | 3 +- + drivers/media/i2c/bt866.c | 3 +- + drivers/media/i2c/cs5345.c | 4 +- + drivers/media/i2c/cs53l32a.c | 4 +- + drivers/media/i2c/cx25840/cx25840-core.c | 4 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 7 +- + drivers/media/i2c/ir-kbd-i2c.c | 10 +- + drivers/media/i2c/ks0127.c | 3 +- + drivers/media/i2c/m52790.c | 3 +- + drivers/media/i2c/m5mols/m5mols_core.c | 43 ++--- + drivers/media/i2c/msp3400-driver.c | 5 +- + drivers/media/i2c/mt9m032.c | 4 +- + drivers/media/i2c/mt9p031.c | 14 +- + drivers/media/i2c/mt9t001.c | 4 +- + drivers/media/i2c/mt9v011.c | 6 +- + drivers/media/i2c/mt9v032.c | 8 +- + drivers/media/i2c/noon010pc30.c | 40 ++-- + drivers/media/i2c/ov7640.c | 5 +- + drivers/media/i2c/ov7670.c | 5 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 81 +++----- + drivers/media/i2c/s5k6aa.c | 73 +++---- + drivers/media/i2c/saa6588.c | 10 +- + drivers/media/i2c/saa7110.c | 4 +- + drivers/media/i2c/saa7115.c | 213 +++++++++++++++------ + drivers/media/i2c/saa7127.c | 4 +- + drivers/media/i2c/saa717x.c | 5 +- + drivers/media/i2c/saa7185.c | 3 +- + drivers/media/i2c/saa7191.c | 4 +- + drivers/media/i2c/smiapp/smiapp-core.c | 18 +- + drivers/media/i2c/sony-btf-mpx.c | 3 +- + drivers/media/i2c/sr030pc30.c | 4 +- + drivers/media/i2c/tda7432.c | 4 +- + drivers/media/i2c/tda9840.c | 3 +- + drivers/media/i2c/tea6415c.c | 3 +- + drivers/media/i2c/tea6420.c | 3 +- + drivers/media/i2c/tlv320aic23b.c | 4 +- + drivers/media/i2c/tvaudio.c | 5 +- + drivers/media/i2c/tvp514x.c | 1 - + drivers/media/i2c/tvp5150.c | 14 +- + drivers/media/i2c/tvp7002.c | 96 +++++++++- + drivers/media/i2c/tw2804.c | 5 +- + drivers/media/i2c/tw9903.c | 5 +- + drivers/media/i2c/tw9906.c | 5 +- + drivers/media/i2c/uda1342.c | 3 +- + drivers/media/i2c/upd64031a.c | 3 +- + drivers/media/i2c/upd64083.c | 3 +- + drivers/media/i2c/vp27smpx.c | 3 +- + drivers/media/i2c/vpx3220.c | 5 +- + drivers/media/i2c/vs6624.c | 20 +- + drivers/media/i2c/wm8739.c | 4 +- + drivers/media/i2c/wm8775.c | 4 +- + drivers/media/pci/bt8xx/bttv-cards.c | 52 ++++- + drivers/media/pci/bt8xx/bttv.h | 4 + + drivers/media/pci/mantis/mantis_vp1041.c | 2 +- + drivers/media/pci/ttpci/budget-av.c | 2 +- + drivers/media/pci/ttpci/budget-ci.c | 2 +- + drivers/media/platform/blackfin/bfin_capture.c | 28 ++- + drivers/media/platform/blackfin/ppi.c | 12 ++ + drivers/media/platform/davinci/vpbe_display.c | 17 +- + drivers/media/platform/davinci/vpbe_osd.c | 24 +-- + drivers/media/platform/davinci/vpfe_capture.c | 3 +- + drivers/media/platform/davinci/vpif_capture.c | 19 +- + drivers/media/platform/davinci/vpif_capture.h | 5 +- + drivers/media/platform/davinci/vpif_display.c | 25 +-- + drivers/media/platform/davinci/vpif_display.h | 5 +- + drivers/media/platform/exynos4-is/fimc-is-regs.c | 2 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 2 +- + drivers/media/platform/s3c-camif/camif-core.h | 2 +- + drivers/media/radio/Kconfig | 1 + + drivers/media/radio/radio-si476x.c | 2 +- + drivers/media/radio/wl128x/fmdrv_common.c | 24 ++- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-delock-61959.c | 83 ++++++++ + drivers/media/usb/Kconfig | 5 +- + drivers/media/usb/dvb-usb/az6027.c | 2 +- + drivers/media/usb/dvb-usb/pctv452e.c | 2 +- + drivers/media/usb/em28xx/em28xx-cards.c | 16 ++ + drivers/media/usb/em28xx/em28xx-dvb.c | 5 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/gspca/sonixb.c | 7 + + drivers/media/usb/hdpvr/Kconfig | 2 +- + drivers/media/usb/hdpvr/hdpvr-core.c | 8 - + drivers/media/usb/hdpvr/hdpvr-video.c | 6 +- + drivers/media/usb/pwc/pwc.h | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 19 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 10 +- + drivers/media/v4l2-core/videobuf-vmalloc.c | 10 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 6 +- + drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 38 ++-- + include/media/davinci/vpbe_osd.h | 4 +- + include/media/rc-map.h | 1 + + include/media/tvp7002.h | 2 + + include/media/v4l2-chip-ident.h | 2 + + include/uapi/linux/videodev2.h | 2 +- + 112 files changed, 792 insertions(+), 633 deletions(-) + create mode 100644 drivers/media/rc/keymaps/rc-delock-61959.c +Merging kbuild/for-next (ed55317 Merge branch 'kbuild/rc-fixes' into kbuild/for-next) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/Makefile.headersinst | 20 ++++++++++++++------ + scripts/headers_install.sh | 7 +++++-- + 2 files changed, 19 insertions(+), 8 deletions(-) +Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (9c331e7 Merge branch 'for-3.10-fixes' into for-next) +$ git merge libata/for-next +Auto-merging drivers/ata/ahci.c +Auto-merging drivers/ata/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 2 + + drivers/ata/Kconfig | 1 - + drivers/ata/acard-ahci.c | 4 +- + drivers/ata/ahci.c | 8 ++- + drivers/ata/ahci.h | 1 + + drivers/ata/ata_piix.c | 6 +- + drivers/ata/libahci.c | 10 +++ + drivers/ata/libata-core.c | 9 ++- + drivers/ata/libata-transport.c | 4 +- + drivers/ata/pata_ali.c | 2 +- + drivers/ata/pata_amd.c | 2 +- + drivers/ata/pata_arasan_cf.c | 2 +- + drivers/ata/pata_artop.c | 2 +- + drivers/ata/pata_at91.c | 2 +- + drivers/ata/pata_atp867x.c | 2 +- + drivers/ata/pata_bf54x.c | 10 ++- + drivers/ata/pata_cmd640.c | 2 +- + drivers/ata/pata_cmd64x.c | 2 +- + drivers/ata/pata_cs5520.c | 4 +- + drivers/ata/pata_cs5530.c | 2 +- + drivers/ata/pata_hpt366.c | 2 +- + drivers/ata/pata_hpt3x3.c | 2 +- + drivers/ata/pata_imx.c | 2 +- + drivers/ata/pata_it821x.c | 2 +- + drivers/ata/pata_macio.c | 6 +- + drivers/ata/pata_mpc52xx.c | 4 +- + drivers/ata/pata_ninja32.c | 2 +- + drivers/ata/pata_ns87415.c | 2 +- + drivers/ata/pata_pdc2027x.c | 2 +- + drivers/ata/pata_pxa.c | 2 +- + drivers/ata/pata_rdc.c | 2 +- + drivers/ata/pata_rz1000.c | 2 +- + drivers/ata/pata_serverworks.c | 2 +- + drivers/ata/pata_sil680.c | 2 +- + drivers/ata/pata_sis.c | 2 +- + drivers/ata/pata_sl82c105.c | 2 +- + drivers/ata/pata_triflex.c | 2 +- + drivers/ata/pata_via.c | 2 +- + drivers/ata/sata_fsl.c | 14 ++-- + drivers/ata/sata_highbank.c | 20 +++++- + drivers/ata/sata_inic162x.c | 2 +- + drivers/ata/sata_nv.c | 2 +- + drivers/ata/sata_rcar.c | 138 +++++++++++++++++++----------------- + drivers/ata/sata_sil.c | 2 +- + drivers/ata/sata_sil24.c | 2 +- + drivers/scsi/ipr.c | 1 - + include/linux/libata.h | 2 + + 47 files changed, 171 insertions(+), 131 deletions(-) +Merging infiniband/for-next (c9a2433 Merge branches 'iser' and 'qib' into for-next) +$ git merge infiniband/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 ++++++++++ + drivers/infiniband/hw/qib/qib_keys.c | 2 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + + drivers/infiniband/ulp/iser/iscsi_iser.h | 1 + + drivers/infiniband/ulp/iser/iser_initiator.c | 1 + + drivers/infiniband/ulp/iser/iser_memory.c | 1 + + drivers/infiniband/ulp/iser/iser_verbs.c | 16 +++++++++------- + 7 files changed, 24 insertions(+), 8 deletions(-) +Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) +$ git merge pstore/master +Already up-to-date. +Merging pm/linux-next (b3c83bb Merge branch 'pm-assorted-next' into linux-next) +$ git merge pm/linux-next +Auto-merging net/sunrpc/sched.c +Auto-merging include/acpi/acpi_bus.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/nfs3proc.c +Auto-merging fs/nfs/inode.c +Auto-merging drivers/devfreq/exynos/exynos4_bus.c +Auto-merging drivers/ata/libata-core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-devfreq | 20 + + Documentation/ABI/testing/sysfs-devices-online | 20 + + Documentation/ABI/testing/sysfs-firmware-acpi | 10 + + Documentation/acpi/apei/einj.txt | 8 +- + Documentation/cpu-freq/cpu-drivers.txt | 10 +- + Documentation/power/runtime_pm.txt | 20 +- + MAINTAINERS | 5 +- + arch/arm/mach-davinci/da850.c | 8 +- + arch/arm/mach-omap2/omap_device.c | 7 +- + arch/arm/mach-s3c24xx/cpufreq-utils.c | 2 +- + arch/arm/mach-s3c24xx/cpufreq.c | 4 +- + arch/arm/mach-s3c24xx/pll-s3c2410.c | 54 +- + arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 54 +- + arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 110 +-- + arch/arm/mach-shmobile/clock-sh7372.c | 6 +- + arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 2 +- + arch/mips/loongson/lemote-2f/clock.c | 3 +- + arch/powerpc/platforms/pasemi/cpufreq.c | 5 +- + arch/x86/include/asm/acpi.h | 2 +- + arch/x86/kernel/acpi/boot.c | 7 + + arch/x86/kernel/acpi/sleep.c | 4 +- + arch/x86/kernel/acpi/sleep.h | 2 + + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_lpss.c | 88 ++- + drivers/acpi/acpi_memhotplug.c | 62 +- + drivers/acpi/acpi_processor.c | 494 +++++++++++++ + drivers/acpi/acpica/Makefile | 1 + + drivers/acpi/acpica/aclocal.h | 17 - + drivers/acpi/acpica/acmacros.h | 10 +- + drivers/acpi/acpica/acnamesp.h | 43 +- + drivers/acpi/acpica/acpredef.h | 4 +- + drivers/acpi/acpica/acstruct.h | 40 +- + drivers/acpi/acpica/acutils.h | 6 + + drivers/acpi/acpica/evgpe.c | 1 - + drivers/acpi/acpica/evregion.c | 63 +- + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/hwxface.c | 6 +- + drivers/acpi/acpica/nsarguments.c | 294 ++++++++ + drivers/acpi/acpica/nseval.c | 247 ++++--- + drivers/acpi/acpica/nsinit.c | 7 +- + drivers/acpi/acpica/nspredef.c | 202 ++--- + drivers/acpi/acpica/nsprepkg.c | 76 +- + drivers/acpi/acpica/nsrepair.c | 50 +- + drivers/acpi/acpica/nsrepair2.c | 87 +-- + drivers/acpi/acpica/nsxfeval.c | 162 +++- + drivers/acpi/acpica/psxface.c | 14 +- + drivers/acpi/acpica/rsutils.c | 2 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utpredef.c | 16 +- + drivers/acpi/acpica/utxferror.c | 51 +- + drivers/acpi/apei/einj.c | 44 +- + drivers/acpi/apei/ghes.c | 9 +- + drivers/acpi/battery.c | 18 +- + drivers/acpi/bus.c | 17 +- + drivers/acpi/device_pm.c | 1 - + drivers/acpi/ec_sys.c | 18 +- + drivers/acpi/glue.c | 12 +- + drivers/acpi/internal.h | 5 + + drivers/acpi/processor_driver.c | 812 ++------------------- + drivers/acpi/resource.c | 16 +- + drivers/acpi/scan.c | 124 +++- + drivers/acpi/sleep.c | 2 + + drivers/acpi/sysfs.c | 31 + + drivers/acpi/video.c | 16 + + drivers/amba/bus.c | 2 +- + drivers/ata/libata-core.c | 2 +- + drivers/base/core.c | 130 ++++ + drivers/base/cpu.c | 101 ++- + drivers/base/memory.c | 114 ++- + drivers/base/platform.c | 1 - + drivers/base/power/domain.c | 1 - + drivers/base/power/generic_ops.c | 23 - + drivers/base/power/opp.c | 4 +- + drivers/base/power/runtime.c | 12 +- + drivers/clk/x86/clk-lpt.c | 4 +- + drivers/cpufreq/acpi-cpufreq.c | 14 +- + drivers/cpufreq/blackfin-cpufreq.c | 10 +- + drivers/cpufreq/cpufreq.c | 115 ++- + drivers/cpufreq/cpufreq_governor.c | 50 +- + drivers/cpufreq/cpufreq_governor.h | 1 - + drivers/cpufreq/e_powersaver.c | 8 +- + drivers/cpufreq/freq_table.c | 26 +- + drivers/cpufreq/ia64-acpi-cpufreq.c | 2 +- + drivers/cpufreq/kirkwood-cpufreq.c | 2 +- + drivers/cpufreq/longhaul.c | 16 +- + drivers/cpufreq/loongson2_cpufreq.c | 2 +- + drivers/cpufreq/p4-clockmod.c | 4 +- + drivers/cpufreq/powernow-k6.c | 8 +- + drivers/cpufreq/powernow-k7.c | 16 +- + drivers/cpufreq/powernow-k8.c | 18 +- + drivers/cpufreq/ppc_cbe_cpufreq.c | 4 +- + drivers/cpufreq/pxa2xx-cpufreq.c | 8 +- + drivers/cpufreq/pxa3xx-cpufreq.c | 4 +- + drivers/cpufreq/s3c2416-cpufreq.c | 2 +- + drivers/cpufreq/s3c64xx-cpufreq.c | 2 +- + drivers/cpufreq/sc520_freq.c | 2 +- + drivers/cpufreq/sparc-us2e-cpufreq.c | 12 +- + drivers/cpufreq/sparc-us3-cpufreq.c | 8 +- + drivers/cpufreq/spear-cpufreq.c | 4 +- + drivers/cpufreq/speedstep-centrino.c | 8 +- + drivers/cpufreq/tegra-cpufreq.c | 19 +- + drivers/cpuidle/Kconfig | 16 +- + drivers/devfreq/Kconfig | 12 +- + drivers/devfreq/Makefile | 3 +- + drivers/devfreq/devfreq.c | 25 +- + drivers/devfreq/exynos/Makefile | 3 + + drivers/devfreq/{ => exynos}/exynos4_bus.c | 1 + + drivers/devfreq/exynos/exynos5_bus.c | 503 +++++++++++++ + drivers/devfreq/exynos/exynos_ppmu.c | 56 ++ + drivers/devfreq/exynos/exynos_ppmu.h | 78 ++ + drivers/dma/intel_mid_dma.c | 2 +- + drivers/gpio/gpio-langwell.c | 6 +- + drivers/i2c/i2c-core.c | 2 +- + drivers/mfd/ab8500-gpadc.c | 8 +- + drivers/mfd/db8500-prcmu.c | 10 +- + drivers/mmc/core/bus.c | 2 +- + drivers/mmc/core/sdio_bus.c | 2 +- + drivers/pci/pci-driver.c | 14 +- + drivers/platform/x86/hp-wmi.c | 2 +- + drivers/pnp/manager.c | 14 +- + drivers/scsi/scsi_pm.c | 11 +- + drivers/sh/clk/core.c | 4 +- + drivers/sh/pm_runtime.c | 2 +- + drivers/spi/spi.c | 2 +- + drivers/staging/android/binder.c | 5 +- + drivers/tty/serial/mfd.c | 9 +- + drivers/usb/core/driver.c | 3 +- + drivers/usb/core/port.c | 1 - + fs/cifs/transport.c | 2 +- + fs/eventpoll.c | 4 +- + fs/nfs/inode.c | 2 +- + fs/nfs/nfs3proc.c | 2 +- + fs/nfs/nfs4proc.c | 4 +- + fs/select.c | 4 +- + include/acpi/acconfig.h | 4 +- + include/acpi/acoutput.h | 8 +- + include/acpi/acpi_bus.h | 9 +- + include/acpi/acpixf.h | 2 +- + include/acpi/processor.h | 5 + + include/linux/cpufreq.h | 8 +- + include/linux/debug_locks.h | 4 +- + include/linux/devfreq.h | 2 + + include/linux/device.h | 21 + + include/linux/freezer.h | 171 ++++- + include/linux/memory_hotplug.h | 14 +- + include/linux/pm_runtime.h | 2 - + include/xen/acpi.h | 16 +- + kernel/exit.c | 2 +- + kernel/freezer.c | 12 + + kernel/futex.c | 3 +- + kernel/hrtimer.c | 3 +- + kernel/lockdep.c | 17 +- + kernel/power/process.c | 26 +- + kernel/power/snapshot.c | 5 +- + kernel/resource.c | 1 + + kernel/signal.c | 2 +- + mm/memory_hotplug.c | 81 +- + net/sunrpc/sched.c | 2 +- + net/unix/af_unix.c | 3 +- + 159 files changed, 3522 insertions(+), 2010 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-online + create mode 100644 drivers/acpi/acpi_processor.c + create mode 100644 drivers/acpi/acpica/nsarguments.c + create mode 100644 drivers/devfreq/exynos/Makefile + rename drivers/devfreq/{ => exynos}/exynos4_bus.c (99%) + create mode 100644 drivers/devfreq/exynos/exynos5_bus.c + create mode 100644 drivers/devfreq/exynos/exynos_ppmu.c + create mode 100644 drivers/devfreq/exynos/exynos_ppmu.h +Merging idle/next (5c99726b Merge branch 'fspin' into next) +$ git merge idle/next +Merge made by the 'recursive' strategy. + tools/power/fspin/Makefile | 21 +++ + tools/power/fspin/fspin.1 | 68 +++++++ + tools/power/fspin/fspin.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 532 insertions(+) + create mode 100644 tools/power/fspin/Makefile + create mode 100644 tools/power/fspin/fspin.1 + create mode 100644 tools/power/fspin/fspin.c +Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) +$ git merge apm/for-next +Already up-to-date. +Merging cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next) +$ git merge cpuidle/cpuidle-next +Resolved 'drivers/acpi/processor_driver.c' using previous resolution. +Resolved 'drivers/base/power/qos.c' using previous resolution. +Auto-merging drivers/base/power/qos.c +CONFLICT (content): Merge conflict in drivers/base/power/qos.c +Auto-merging drivers/acpi/processor_driver.c +CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e34d9df] Merge remote-tracking branch 'cpuidle/cpuidle-next' +$ git diff -M --stat --summary HEAD^.. +Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (fa91ac6 Merge branch 'for-rc' of .git into next) +$ git merge thermal/next +Auto-merging drivers/thermal/exynos_thermal.c +Auto-merging drivers/thermal/dove_thermal.c +Auto-merging drivers/thermal/armada_thermal.c +Auto-merging drivers/staging/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal}/ti_soc_thermal.txt | 0 + MAINTAINERS | 4 ++-- + drivers/staging/Kconfig | 2 -- + drivers/staging/Makefile | 1 - + drivers/thermal/Kconfig | 3 +++ + drivers/thermal/Makefile | 2 +- + drivers/thermal/armada_thermal.c | 3 +-- + drivers/thermal/cpu_cooling.c | 2 +- + drivers/thermal/dove_thermal.c | 10 ++-------- + drivers/thermal/exynos_thermal.c | 3 --- + drivers/thermal/kirkwood_thermal.c | 10 ++-------- + drivers/thermal/rcar_thermal.c | 10 ++-------- + drivers/thermal/spear_thermal.c | 20 ++++++-------------- + drivers/thermal/thermal_core.c | 8 ++++++-- + drivers/{staging => thermal}/ti-soc-thermal/Kconfig | 0 + drivers/{staging => thermal}/ti-soc-thermal/Makefile | 0 + drivers/{staging => thermal}/ti-soc-thermal/TODO | 0 + .../ti-soc-thermal/omap4-thermal-data.c | 0 + .../ti-soc-thermal/omap4xxx-bandgap.h | 0 + .../ti-soc-thermal/omap5-thermal-data.c | 0 + .../ti-soc-thermal/omap5xxx-bandgap.h | 0 + .../{staging => thermal}/ti-soc-thermal/ti-bandgap.c | 0 + .../{staging => thermal}/ti-soc-thermal/ti-bandgap.h | 0 + .../ti-soc-thermal/ti-thermal-common.c | 0 + .../{staging => thermal}/ti-soc-thermal/ti-thermal.h | 0 + 25 files changed, 26 insertions(+), 52 deletions(-) + rename {drivers/staging/ti-soc-thermal => Documentation/devicetree/bindings/thermal}/ti_soc_thermal.txt (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/Kconfig (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/Makefile (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/TODO (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/omap4-thermal-data.c (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/omap4xxx-bandgap.h (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/omap5-thermal-data.c (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/omap5xxx-bandgap.h (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/ti-bandgap.c (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/ti-bandgap.h (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/ti-thermal-common.c (100%) + rename drivers/{staging => thermal}/ti-soc-thermal/ti-thermal.h (100%) +Merging ieee1394/for-next (6fe9efb firewire: ohci: dump_stack() for PHY regs read/write failures) +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next (584d462 UBI: fastmap break out of used PEB search) +$ git merge ubi/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 20 ++++++++++++-------- + drivers/mtd/ubi/fastmap.c | 4 +++- + include/uapi/mtd/ubi-user.h | 5 ++++- + 3 files changed, 19 insertions(+), 10 deletions(-) +Merging dlm/next (9000831 dlm: avoid unnecessary posix unlock) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging scsi/for-next (002edf2 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/ipr.c +Removing drivers/s390/scsi/zfcp_cfdc.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 16 + + drivers/s390/scsi/Makefile | 2 +- + drivers/s390/scsi/zfcp_aux.c | 36 +- + drivers/s390/scsi/zfcp_ccw.c | 13 +- + drivers/s390/scsi/zfcp_cfdc.c | 446 --------------------- + drivers/s390/scsi/zfcp_dbf.c | 11 +- + drivers/s390/scsi/zfcp_def.h | 4 - + drivers/s390/scsi/zfcp_erp.c | 3 +- + drivers/s390/scsi/zfcp_ext.h | 20 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + drivers/s390/scsi/zfcp_fsf.c | 154 ++----- + drivers/s390/scsi/zfcp_fsf.h | 26 -- + drivers/s390/scsi/zfcp_scsi.c | 10 +- + drivers/s390/scsi/zfcp_sysfs.c | 27 +- + drivers/s390/scsi/zfcp_unit.c | 9 +- + drivers/scsi/aic94xx/aic94xx_task.c | 3 +- + drivers/scsi/bfa/bfa_fcs_rport.c | 4 +- + drivers/scsi/bfa/bfa_svc.c | 2 +- + drivers/scsi/csiostor/csio_hw.c | 91 ----- + drivers/scsi/csiostor/csio_hw.h | 11 - + drivers/scsi/csiostor/csio_mb.c | 77 ---- + drivers/scsi/csiostor/csio_mb.h | 11 - + drivers/scsi/csiostor/csio_scsi.c | 4 +- + drivers/scsi/ipr.c | 16 - + drivers/scsi/ipr.h | 6 +- + drivers/scsi/isci/request.c | 4 +- + drivers/scsi/libsas/sas_scsi_host.c | 2 +- + drivers/scsi/mvsas/mv_sas.c | 3 +- + drivers/scsi/pm8001/pm8001_hwi.c | 5 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 21 +- + drivers/scsi/qla2xxx/qla_inline.h | 11 + + drivers/scsi/qla2xxx/qla_isr.c | 27 +- + drivers/scsi/qla2xxx/qla_mbx.c | 2 - + drivers/scsi/qla2xxx/qla_mr.c | 10 +- + drivers/scsi/qla2xxx/qla_nx.c | 26 +- + drivers/scsi/scsi_error.c | 7 +- + drivers/scsi/scsi_scan.c | 2 + + drivers/scsi/scsi_sysfs.c | 30 ++ + drivers/scsi/sd.c | 29 +- + drivers/scsi/ufs/Kconfig | 2 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 1 - + include/scsi/libsas.h | 2 +- + include/scsi/scsi.h | 5 + + include/scsi/scsi_device.h | 1 + + 44 files changed, 214 insertions(+), 980 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt + delete mode 100644 drivers/s390/scsi/zfcp_cfdc.c +Merging target-updates/for-next (c778879 Linux 3.10-rc2) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (c778879 Linux 3.10-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) +$ git merge ibft/linux-next +Already up-to-date. +Merging isci/all (6734092 isci: add a couple __iomem annotations) +$ git merge isci/all +Already up-to-date. +Merging slave-dma/next (c403614 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/fsl-imx-dma.txt | 48 +++++++ + drivers/dma/at_hdmac.c | 144 +++++++++++++++++---- + drivers/dma/at_hdmac_regs.h | 5 + + drivers/dma/dw_dmac.c | 4 +- + drivers/dma/fsldma.c | 5 +- + drivers/dma/imx-dma.c | 77 ++++++++++- + drivers/dma/mxs-dma.c | 2 +- + drivers/dma/of-dma.c | 17 +-- + drivers/dma/ppc4xx/adma.c | 5 +- + drivers/dma/sirf-dma.c | 17 +++ + drivers/dma/ste_dma40.c | 8 +- + drivers/dma/tegra20-apb-dma.c | 3 +- + drivers/dma/timb_dma.c | 2 - + include/linux/of_dma.h | 1 - + include/linux/platform_data/dma-atmel.h | 4 + + include/linux/platform_data/dma-imx.h | 6 +- + 16 files changed, 287 insertions(+), 61 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-dma.txt +Merging dmaengine/next (41ef2d5 Linux 3.9-rc7) +$ git merge dmaengine/next +Already up-to-date. +Merging net-next/master (11a164a net: sun4i-emac: Staticize local symbols) +$ git merge net-next/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/sched/sch_tbf.c +Auto-merging net/mac80211/iface.c +Auto-merging net/ipv6/udp_offload.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/route.c +Auto-merging net/ipv4/ip_tunnel.c +Auto-merging net/core/skbuff.c +Removing net/batman-adv/ring_buffer.h +Removing net/batman-adv/ring_buffer.c +Auto-merging include/linux/skbuff.h +Auto-merging drivers/net/team/team.c +Auto-merging drivers/net/phy/phy.c +Auto-merging drivers/net/phy/Kconfig +Auto-merging drivers/net/ethernet/xilinx/xilinx_emaclite.c +Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_main.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/emulex/benet/be_main.c +Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h +Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c +Auto-merging drivers/net/ethernet/emulex/benet/be.h +Auto-merging drivers/net/ethernet/broadcom/tg3.h +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +Auto-merging arch/arm/configs/omap2plus_defconfig +Removing Documentation/networking/ifenslave.c +Merge made by the 'recursive' strategy. + .../bindings/net/allwinner,sun4i-emac.txt | 22 + + .../bindings/net/allwinner,sun4i-mdio.txt | 26 + + Documentation/devicetree/bindings/net/cpsw.txt | 6 + + .../devicetree/bindings/net/davicom-dm9000.txt | 26 + + .../devicetree/bindings/net/marvell-orion-net.txt | 85 ++ + .../devicetree/bindings/net/micrel-ks8851.txt | 9 + + .../devicetree/bindings/net/via-velocity.txt | 20 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/networking/.gitignore | 1 - + Documentation/networking/00-INDEX | 2 - + Documentation/networking/Makefile | 5 - + Documentation/networking/bonding.txt | 54 +- + Documentation/networking/ifenslave.c | 1105 -------------------- + Documentation/networking/ip-sysctl.txt | 2 +- + Documentation/networking/netlink_mmap.txt | 14 +- + Documentation/networking/scaling.txt | 58 + + Documentation/sysctl/net.txt | 3 +- + arch/arm/boot/dts/am335x-bone.dts | 2 + + arch/arm/boot/dts/am335x-evm.dts | 2 + + arch/arm/boot/dts/am335x-evmsk.dts | 10 + + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 15 + + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 41 + + arch/arm/boot/dts/sun4i-a10.dtsi | 27 + + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/mach-imx/Kconfig | 4 - + arch/arm/mach-imx/devices/Kconfig | 1 - + arch/arm/mach-mxs/Kconfig | 1 - + arch/arm/net/bpf_jit_32.c | 18 +- + arch/ia64/hp/sim/simeth.c | 2 +- + arch/mips/txx9/generic/setup_tx4939.c | 3 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/net/bpf_jit_comp.c | 19 +- + arch/sparc/net/bpf_jit_comp.c | 20 +- + arch/x86/net/bpf_jit_comp.c | 61 +- + drivers/infiniband/core/cma.c | 4 +- + drivers/infiniband/hw/mlx4/main.c | 2 +- + drivers/isdn/i4l/isdn_net.c | 2 +- + drivers/net/bonding/bond_alb.c | 8 +- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/bonding/bond_sysfs.c | 14 +- + drivers/net/can/Kconfig | 5 +- + drivers/net/can/at91_can.c | 4 +- + drivers/net/can/bfin_can.c | 10 +- + drivers/net/can/c_can/c_can_platform.c | 2 - + drivers/net/can/cc770/cc770_isa.c | 5 +- + drivers/net/can/cc770/cc770_platform.c | 4 +- + drivers/net/can/flexcan.c | 27 +- + drivers/net/can/grcan.c | 12 +- + drivers/net/can/janz-ican3.c | 2 +- + drivers/net/can/led.c | 4 +- + drivers/net/can/mscan/mpc5xxx_can.c | 10 +- + drivers/net/can/sja1000/sja1000_isa.c | 5 +- + drivers/net/can/sja1000/sja1000_of_platform.c | 6 +- + drivers/net/can/sja1000/sja1000_platform.c | 5 +- + drivers/net/can/slcan.c | 2 +- + drivers/net/can/softing/softing_main.c | 2 +- + drivers/net/can/ti_hecc.c | 1 - + drivers/net/ethernet/3com/3c509.c | 19 - + drivers/net/ethernet/3com/3c59x.c | 17 +- + drivers/net/ethernet/8390/ne.c | 1 - + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/adi/bfin_mac.c | 4 - + drivers/net/ethernet/aeroflex/greth.c | 4 +- + drivers/net/ethernet/allwinner/Kconfig | 36 + + drivers/net/ethernet/allwinner/Makefile | 5 + + drivers/net/ethernet/allwinner/sun4i-emac.c | 954 +++++++++++++++++ + drivers/net/ethernet/allwinner/sun4i-emac.h | 108 ++ + drivers/net/ethernet/alteon/acenic.c | 15 +- + drivers/net/ethernet/amd/amd8111e.c | 13 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 - + drivers/net/ethernet/amd/sunlance.c | 6 +- + drivers/net/ethernet/apple/bmac.c | 4 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 25 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 25 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 27 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 1 - + drivers/net/ethernet/broadcom/bnx2.c | 16 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 58 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 91 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 26 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 52 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h | 3 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | 7 - + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 100 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 2 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 661 +++++++----- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 6 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 284 ++--- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 55 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 36 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 4 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 21 +- + drivers/net/ethernet/broadcom/cnic.c | 2 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 9 +- + drivers/net/ethernet/broadcom/tg3.c | 414 +++++--- + drivers/net/ethernet/broadcom/tg3.h | 2 + + drivers/net/ethernet/brocade/bna/bfa_defs.h | 3 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 7 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.h | 2 + + drivers/net/ethernet/brocade/bna/bna.h | 2 + + drivers/net/ethernet/brocade/bna/bna_enet.c | 7 +- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 15 + + drivers/net/ethernet/brocade/bna/bnad.c | 3 + + drivers/net/ethernet/brocade/bna/bnad.h | 2 +- + drivers/net/ethernet/brocade/bna/cna.h | 4 +- + drivers/net/ethernet/cadence/at91_ether.c | 1 - + drivers/net/ethernet/cadence/macb.c | 2 - + drivers/net/ethernet/calxeda/xgmac.c | 2 - + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 15 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 9 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 116 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 27 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 9 + + drivers/net/ethernet/cirrus/ep93xx_eth.c | 1 - + drivers/net/ethernet/davicom/dm9000.c | 53 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 6 - + drivers/net/ethernet/dec/tulip/xircom_cb.c | 14 +- + drivers/net/ethernet/emulex/benet/be.h | 4 + + drivers/net/ethernet/emulex/benet/be_cmds.c | 66 ++ + drivers/net/ethernet/emulex/benet/be_cmds.h | 3 + + drivers/net/ethernet/emulex/benet/be_ethtool.c | 37 +- + drivers/net/ethernet/emulex/benet/be_hw.h | 2 + + drivers/net/ethernet/emulex/benet/be_main.c | 115 +- + drivers/net/ethernet/ethoc.c | 2 - + drivers/net/ethernet/faraday/ftgmac100.c | 2 - + drivers/net/ethernet/faraday/ftmac100.c | 2 - + drivers/net/ethernet/freescale/fec.h | 1 + + drivers/net/ethernet/freescale/fec_main.c | 50 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 9 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 5 +- + .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 6 +- + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 6 +- + drivers/net/ethernet/freescale/gianfar.c | 6 +- + drivers/net/ethernet/freescale/gianfar_ptp.c | 4 +- + drivers/net/ethernet/freescale/ucc_geth.c | 4 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 4 +- + drivers/net/ethernet/ibm/Kconfig | 3 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +- + drivers/net/ethernet/ibm/emac/mal.c | 6 +- + drivers/net/ethernet/ibm/emac/rgmii.c | 18 +- + drivers/net/ethernet/ibm/emac/tah.c | 14 +- + drivers/net/ethernet/ibm/emac/zmii.c | 18 +- + drivers/net/ethernet/icplus/ipg.c | 13 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.c | 24 +- + drivers/net/ethernet/intel/e1000e/82571.c | 30 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 34 +- + drivers/net/ethernet/intel/e1000e/hw.h | 34 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 62 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 55 +- + drivers/net/ethernet/intel/e1000e/nvm.c | 1 - + drivers/net/ethernet/intel/e1000e/phy.c | 22 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 120 ++- + drivers/net/ethernet/intel/igb/e1000_defines.h | 36 +- + drivers/net/ethernet/intel/igb/e1000_hw.h | 2 + + drivers/net/ethernet/intel/igb/e1000_i210.h | 6 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 45 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 124 +++ + drivers/net/ethernet/intel/igb/e1000_phy.h | 20 + + drivers/net/ethernet/intel/igb/igb.h | 14 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 74 +- + drivers/net/ethernet/intel/igb/igb_main.c | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 23 + + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 3 + + drivers/net/ethernet/jme.c | 1 - + drivers/net/ethernet/korina.c | 6 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 198 +++- + drivers/net/ethernet/marvell/mvneta.c | 46 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 1 - + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 6 +- + drivers/net/ethernet/micrel/ks8695net.c | 1 - + drivers/net/ethernet/micrel/ks8842.c | 1 - + drivers/net/ethernet/micrel/ks8851_mll.c | 34 +- + drivers/net/ethernet/netx-eth.c | 5 +- + drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 - + drivers/net/ethernet/nvidia/forcedeth.c | 17 +- + drivers/net/ethernet/nxp/lpc_eth.c | 2 - + drivers/net/ethernet/octeon/octeon_mgmt.c | 4 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 14 +- + .../net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 3 + + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 133 ++- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 27 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 77 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 1 + + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 35 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 39 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 45 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 15 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 1 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 88 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 2 + + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 7 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 36 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 126 ++- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 13 +- + drivers/net/ethernet/renesas/sh_eth.c | 1 - + drivers/net/ethernet/s6gmac.c | 1 - + drivers/net/ethernet/seeq/sgiseeq.c | 1 - + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 14 +- + drivers/net/ethernet/sgi/meth.c | 1 - + drivers/net/ethernet/silan/sc92031.c | 14 +- + drivers/net/ethernet/sis/sis190.c | 13 +- + drivers/net/ethernet/smsc/Kconfig | 2 +- + drivers/net/ethernet/smsc/smc911x.c | 2 - + drivers/net/ethernet/smsc/smc91x.c | 3 - + drivers/net/ethernet/smsc/smsc911x.c | 2 - + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 - + drivers/net/ethernet/sun/niu.c | 5 +- + drivers/net/ethernet/sun/sunbmac.c | 5 +- + drivers/net/ethernet/sun/sungem.c | 13 +- + drivers/net/ethernet/sun/sunhme.c | 4 +- + drivers/net/ethernet/sun/sunqe.c | 10 +- + drivers/net/ethernet/ti/cpsw.c | 3 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 5 + + drivers/net/ethernet/ti/davinci_emac.c | 2 - + drivers/net/ethernet/ti/tlan.c | 1 - + drivers/net/ethernet/ti/tlan.h | 1 - + drivers/net/ethernet/toshiba/tc35815.c | 14 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 1 - + drivers/net/ethernet/via/Kconfig | 3 +- + drivers/net/ethernet/via/via-velocity.c | 507 +++++---- + drivers/net/ethernet/via/via-velocity.h | 8 +- + drivers/net/ethernet/wiznet/w5100.c | 2 - + drivers/net/ethernet/wiznet/w5300.c | 2 - + drivers/net/ethernet/xilinx/Kconfig | 4 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 5 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 236 ++--- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 - + drivers/net/fddi/skfp/skfddi.c | 13 +- + drivers/net/hamradio/bpqether.c | 7 +- + drivers/net/hippi/rrunner.c | 13 +- + drivers/net/irda/bfin_sir.c | 1 - + drivers/net/irda/sh_irda.c | 1 - + drivers/net/irda/sh_sir.c | 1 - + drivers/net/macvlan.c | 2 +- + drivers/net/macvtap.c | 2 +- + drivers/net/netconsole.c | 5 +- + drivers/net/phy/Kconfig | 10 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/at803x.c | 128 ++- + drivers/net/phy/bcm63xx.c | 4 +- + drivers/net/phy/marvell.c | 108 +- + drivers/net/phy/mdio-sun4i.c | 194 ++++ + drivers/net/phy/phy.c | 26 +- + drivers/net/phy/phy_device.c | 11 +- + drivers/net/phy/spi_ks8995.c | 14 +- + drivers/net/phy/vitesse.c | 38 +- + drivers/net/ppp/pppoe.c | 2 +- + drivers/net/team/team.c | 2 +- + drivers/net/usb/kalmia.c | 45 +- + drivers/net/usb/r8152.c | 14 +- + drivers/net/vxlan.c | 272 +++-- + drivers/net/wan/dlci.c | 2 +- + drivers/net/wan/hdlc.c | 2 +- + drivers/net/wan/ixp4xx_hss.c | 1 - + drivers/net/wan/lapbether.c | 2 +- + drivers/net/wireless/ath/ath5k/ahb.c | 2 - + drivers/net/wireless/ath/ath9k/ahb.c | 2 - + drivers/net/wireless/ath/ath9k/debug.c | 14 +- + drivers/net/wireless/ath/ath9k/dfs_debug.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- + drivers/net/wireless/iwlegacy/3945-mac.c | 2 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 4 +- + drivers/net/wireless/libertas/mesh.c | 2 +- + drivers/net/wireless/rtlwifi/base.c | 2 +- + drivers/net/xen-netback/common.h | 14 +- + drivers/net/xen-netback/interface.c | 102 +- + drivers/net/xen-netback/netback.c | 38 +- + drivers/net/xen-netback/xenbus.c | 46 +- + drivers/net/xen-netfront.c | 205 +++- + drivers/of/of_net.c | 1 + + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/fcoe/fcoe_transport.c | 2 +- + drivers/ssb/sprom.c | 2 +- + drivers/staging/csr/netdev.c | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 2 +- + drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 2 +- + drivers/staging/silicom/bpctl_mod.c | 2 +- + include/linux/filter.h | 4 +- + include/linux/marvell_phy.h | 2 + + include/linux/mv643xx_eth.h | 2 + + include/linux/net.h | 6 +- + include/linux/netdev_features.h | 4 +- + include/linux/netdevice.h | 44 + + include/linux/netpoll.h | 4 +- + include/linux/phy.h | 27 + + include/linux/skbuff.h | 136 +-- + include/linux/tcp.h | 1 - + include/net/if_inet6.h | 2 +- + include/net/inet_ecn.h | 6 +- + include/net/ip_fib.h | 1 + + include/net/ip_tunnels.h | 2 +- + include/net/ipv6.h | 6 + + include/net/net_namespace.h | 11 + + include/net/ping.h | 65 +- + include/net/tcp.h | 9 +- + include/net/transp_v6.h | 79 +- + include/uapi/linux/ethtool.h | 4 +- + include/xen/interface/io/netif.h | 12 + + net/8021q/vlan.c | 2 +- + net/Kconfig | 13 + + net/Makefile | 1 + + net/appletalk/aarp.c | 2 +- + net/appletalk/ddp.c | 2 +- + net/atm/clip.c | 8 +- + net/atm/mpc.c | 6 +- + net/ax25/af_ax25.c | 6 +- + net/batman-adv/Makefile | 1 - + net/batman-adv/bat_iv_ogm.c | 122 ++- + net/batman-adv/bridge_loop_avoidance.c | 94 +- + net/batman-adv/bridge_loop_avoidance.h | 12 +- + net/batman-adv/distributed-arp-table.c | 82 +- + net/batman-adv/hard-interface.c | 98 +- + net/batman-adv/icmp_socket.c | 4 +- + net/batman-adv/main.h | 18 +- + net/batman-adv/network-coding.c | 22 +- + net/batman-adv/network-coding.h | 6 +- + net/batman-adv/originator.c | 6 +- + net/batman-adv/originator.h | 2 +- + net/batman-adv/ring_buffer.c | 51 - + net/batman-adv/ring_buffer.h | 27 - + net/batman-adv/routing.c | 64 +- + net/batman-adv/routing.h | 1 - + net/batman-adv/send.c | 36 +- + net/batman-adv/send.h | 6 +- + net/batman-adv/soft-interface.c | 6 +- + net/batman-adv/translation-table.c | 74 +- + net/batman-adv/translation-table.h | 2 +- + net/batman-adv/types.h | 6 +- + net/batman-adv/unicast.c | 2 +- + net/batman-adv/vis.c | 19 +- + net/bridge/br_device.c | 13 +- + net/bridge/br_multicast.c | 70 +- + net/bridge/br_notify.c | 2 +- + net/bridge/br_private.h | 2 + + net/bridge/br_sysfs_br.c | 26 + + net/caif/caif_dev.c | 4 +- + net/caif/caif_usb.c | 4 +- + net/can/af_can.c | 4 +- + net/can/bcm.c | 4 +- + net/can/gw.c | 4 +- + net/can/raw.c | 4 +- + net/core/dev.c | 136 ++- + net/core/drop_monitor.c | 4 +- + net/core/dst.c | 2 +- + net/core/ethtool.c | 3 +- + net/core/fib_rules.c | 4 +- + net/core/net-procfs.c | 16 +- + net/core/netpoll.c | 16 +- + net/core/netprio_cgroup.c | 2 +- + net/core/pktgen.c | 29 +- + net/core/rtnetlink.c | 2 +- + net/core/skbuff.c | 19 +- + net/core/sysctl_net_core.c | 104 ++ + net/decnet/af_decnet.c | 4 +- + net/ieee802154/6lowpan.c | 5 +- + net/ipv4/Kconfig | 11 +- + net/ipv4/af_inet.c | 4 +- + net/ipv4/ah4.c | 7 +- + net/ipv4/arp.c | 8 +- + net/ipv4/devinet.c | 2 +- + net/ipv4/esp4.c | 7 +- + net/ipv4/fib_frontend.c | 2 +- + net/ipv4/icmp.c | 51 +- + net/ipv4/igmp.c | 2 +- + net/ipv4/ip_gre.c | 2 +- + net/ipv4/ip_tunnel.c | 4 +- + net/ipv4/ipcomp.c | 7 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/ipmr.c | 10 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 7 +- + net/ipv4/ping.c | 641 ++++++++---- + net/ipv4/route.c | 77 +- + net/ipv4/tcp.c | 104 +- + net/ipv4/tcp_input.c | 501 ++++----- + net/ipv4/tcp_ipv4.c | 10 +- + net/ipv4/tcp_minisocks.c | 6 +- + net/ipv4/udp.c | 4 +- + net/ipv4/xfrm4_tunnel.c | 2 +- + net/ipv6/Makefile | 2 +- + net/ipv6/addrconf.c | 78 +- + net/ipv6/af_inet6.c | 12 + + net/ipv6/datagram.c | 27 + + net/ipv6/exthdrs_core.c | 2 +- + net/ipv6/icmp.c | 21 +- + net/ipv6/ip6_offload.c | 1 + + net/ipv6/ip6mr.c | 2 +- + net/ipv6/mcast.c | 5 +- + net/ipv6/mip6.c | 6 +- + net/ipv6/ndisc.c | 11 +- + net/ipv6/netfilter/ip6t_MASQUERADE.c | 6 +- + net/ipv6/output_core.c | 3 +- + net/ipv6/ping.c | 272 +++++ + net/ipv6/raw.c | 48 +- + net/ipv6/route.c | 6 +- + net/ipv6/sit.c | 119 ++- + net/ipv6/udp.c | 49 +- + net/ipv6/udp_offload.c | 3 +- + net/ipx/af_ipx.c | 2 +- + net/iucv/af_iucv.c | 2 +- + net/mac80211/iface.c | 5 +- + net/mpls/Kconfig | 9 + + net/mpls/Makefile | 4 + + net/mpls/mpls_gso.c | 108 ++ + net/netfilter/ipvs/ip_vs_ctl.c | 4 +- + net/netfilter/nf_nat_helper.c | 2 +- + net/netfilter/nfnetlink_queue_core.c | 2 +- + net/netfilter/xt_TEE.c | 2 +- + net/netlabel/netlabel_unlabeled.c | 7 +- + net/netrom/af_netrom.c | 2 +- + net/openvswitch/dp_notify.c | 2 +- + net/packet/af_packet.c | 5 +- + net/phonet/pn_dev.c | 4 +- + net/rose/af_rose.c | 6 +- + net/sched/act_mirred.c | 2 +- + net/sched/sch_tbf.c | 47 +- + net/sctp/input.c | 2 +- + net/sctp/ipv6.c | 2 +- + net/tipc/eth_media.c | 4 +- + net/tipc/ib_media.c | 4 +- + net/wireless/core.c | 5 +- + net/x25/af_x25.c | 2 +- + net/xfrm/xfrm_output.c | 9 +- + net/xfrm/xfrm_policy.c | 2 +- + security/selinux/netif.c | 2 +- + 436 files changed, 8385 insertions(+), 5356 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt + create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt + create mode 100644 Documentation/devicetree/bindings/net/davicom-dm9000.txt + create mode 100644 Documentation/devicetree/bindings/net/marvell-orion-net.txt + create mode 100644 Documentation/devicetree/bindings/net/micrel-ks8851.txt + create mode 100644 Documentation/devicetree/bindings/net/via-velocity.txt + delete mode 100644 Documentation/networking/ifenslave.c + create mode 100644 drivers/net/ethernet/allwinner/Kconfig + create mode 100644 drivers/net/ethernet/allwinner/Makefile + create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.c + create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.h + create mode 100644 drivers/net/phy/mdio-sun4i.c + delete mode 100644 net/batman-adv/ring_buffer.c + delete mode 100644 net/batman-adv/ring_buffer.h + create mode 100644 net/ipv6/ping.c + create mode 100644 net/mpls/Kconfig + create mode 100644 net/mpls/Makefile + create mode 100644 net/mpls/mpls_gso.c +Merging ipsec-next/master (5865fc1 tg3: remove redundant pm init code) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (99e9494 brcmsmac: Reduce log spam in heavy tx, make err print in debug) +$ git merge wireless-next/master +Resolved 'drivers/net/wireless/ath/ath9k/debug.c' using previous resolution. +Resolved 'net/mac80211/iface.c' using previous resolution. +Auto-merging net/wireless/core.c +Auto-merging net/mac80211/util.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/iface.c +CONFLICT (content): Merge conflict in net/mac80211/iface.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath9k/mac.c +Auto-merging drivers/net/wireless/ath/ath9k/init.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/wireless/ath/ath9k/debug.h +Auto-merging drivers/net/wireless/ath/ath9k/debug.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/debug.c +Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h +Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.c +Auto-merging drivers/net/wireless/ath/ath9k/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a0f5d4b] Merge remote-tracking branch 'wireless-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 2 - + MAINTAINERS | 5 + + drivers/bcma/sprom.c | 71 +- + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 2 + + drivers/net/wireless/ath/ath9k/Kconfig | 8 - + drivers/net/wireless/ath/ath9k/ani.c | 57 +- + drivers/net/wireless/ath/ath9k/ani.h | 12 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 4 - + drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 14 - + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 5 +- + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 19 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- + drivers/net/wireless/ath/ath9k/beacon.c | 8 +- + drivers/net/wireless/ath/ath9k/debug.c | 418 +--- + drivers/net/wireless/ath/ath9k/debug.h | 59 - + drivers/net/wireless/ath/ath9k/htc.h | 7 + + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 5 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 7 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 35 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 17 +- + drivers/net/wireless/ath/ath9k/hw.h | 13 +- + drivers/net/wireless/ath/ath9k/init.c | 19 +- + drivers/net/wireless/ath/ath9k/link.c | 9 +- + drivers/net/wireless/ath/ath9k/mac.c | 16 +- + drivers/net/wireless/ath/ath9k/mac.h | 4 +- + drivers/net/wireless/ath/ath9k/main.c | 47 +- + drivers/net/wireless/ath/ath9k/recv.c | 9 +- + drivers/net/wireless/ath/ath9k/wow.c | 168 +- + drivers/net/wireless/ath/wil6210/Kconfig | 12 + + drivers/net/wireless/ath/wil6210/Makefile | 21 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 4 + + drivers/net/wireless/ath/wil6210/debug.c | 69 + + drivers/net/wireless/ath/wil6210/debugfs.c | 8 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 29 +- + drivers/net/wireless/ath/wil6210/main.c | 24 +- + drivers/net/wireless/ath/wil6210/netdev.c | 54 + + drivers/net/wireless/ath/wil6210/trace.c | 20 + + drivers/net/wireless/ath/wil6210/trace.h | 235 ++ + drivers/net/wireless/ath/wil6210/txrx.c | 175 +- + drivers/net/wireless/ath/wil6210/txrx.h | 32 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 27 +- + drivers/net/wireless/ath/wil6210/wmi.c | 13 +- + .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 3 +- + drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 2 +- + drivers/net/wireless/cw1200/Kconfig | 45 + + drivers/net/wireless/cw1200/Makefile | 22 + + drivers/net/wireless/cw1200/bh.c | 616 +++++ + drivers/net/wireless/cw1200/bh.h | 28 + + drivers/net/wireless/cw1200/cw1200.h | 331 +++ + drivers/net/wireless/cw1200/cw1200_sdio.c | 424 ++++ + drivers/net/wireless/cw1200/cw1200_spi.c | 465 ++++ + drivers/net/wireless/cw1200/debug.c | 658 ++++++ + drivers/net/wireless/cw1200/debug.h | 98 + + drivers/net/wireless/cw1200/fwio.c | 525 +++++ + drivers/net/wireless/cw1200/fwio.h | 39 + + drivers/net/wireless/cw1200/hwbus.h | 33 + + drivers/net/wireless/cw1200/hwio.c | 311 +++ + drivers/net/wireless/cw1200/hwio.h | 247 ++ + drivers/net/wireless/cw1200/itp.c | 730 ++++++ + drivers/net/wireless/cw1200/itp.h | 144 ++ + drivers/net/wireless/cw1200/main.c | 628 +++++ + drivers/net/wireless/cw1200/pm.c | 367 +++ + drivers/net/wireless/cw1200/pm.h | 43 + + drivers/net/wireless/cw1200/queue.c | 583 +++++ + drivers/net/wireless/cw1200/queue.h | 116 + + drivers/net/wireless/cw1200/scan.c | 461 ++++ + drivers/net/wireless/cw1200/scan.h | 56 + + drivers/net/wireless/cw1200/sta.c | 2406 ++++++++++++++++++++ + drivers/net/wireless/cw1200/sta.h | 123 + + drivers/net/wireless/cw1200/txrx.c | 1474 ++++++++++++ + drivers/net/wireless/cw1200/txrx.h | 106 + + drivers/net/wireless/cw1200/wsm.c | 1883 +++++++++++++++ + drivers/net/wireless/cw1200/wsm.h | 1879 +++++++++++++++ + drivers/net/wireless/ipw2x00/ipw2100.c | 2 - + drivers/net/wireless/iwlegacy/commands.h | 8 - + drivers/net/wireless/iwlwifi/dvm/agn.h | 21 +- + drivers/net/wireless/iwlwifi/dvm/calib.c | 8 +- + drivers/net/wireless/iwlwifi/dvm/commands.h | 12 - + drivers/net/wireless/iwlwifi/dvm/dev.h | 57 +- + drivers/net/wireless/iwlwifi/dvm/devices.c | 107 +- + drivers/net/wireless/iwlwifi/dvm/lib.c | 20 +- + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 14 +- + drivers/net/wireless/iwlwifi/dvm/main.c | 45 +- + drivers/net/wireless/iwlwifi/dvm/power.c | 6 +- + drivers/net/wireless/iwlwifi/dvm/rs.c | 8 +- + drivers/net/wireless/iwlwifi/dvm/rx.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/scan.c | 12 +- + drivers/net/wireless/iwlwifi/dvm/tt.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/tx.c | 12 +- + drivers/net/wireless/iwlwifi/dvm/ucode.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 3 - + drivers/net/wireless/iwlwifi/iwl-2000.c | 39 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 4 - + drivers/net/wireless/iwlwifi/iwl-6000.c | 32 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 53 +- + drivers/net/wireless/iwlwifi/iwl-config.h | 49 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 19 + + drivers/net/wireless/iwlwifi/iwl-drv.c | 3 + + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-fw.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-modparams.h | 1 + + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 12 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 7 +- + drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 6 +- + drivers/net/wireless/iwlwifi/mvm/d3.c | 27 + + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 427 +++- + drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 4 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 93 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 1 + + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 233 ++ + drivers/net/wireless/iwlwifi/mvm/fw.c | 37 +- + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 30 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 227 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 196 +- + drivers/net/wireless/iwlwifi/mvm/nvm.c | 212 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 30 +- + drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 75 +- + drivers/net/wireless/iwlwifi/mvm/power.c | 183 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 26 + + drivers/net/wireless/iwlwifi/mvm/rs.h | 5 + + drivers/net/wireless/iwlwifi/mvm/rx.c | 22 + + drivers/net/wireless/iwlwifi/mvm/scan.c | 6 - + drivers/net/wireless/iwlwifi/mvm/sta.c | 13 +- + drivers/net/wireless/iwlwifi/mvm/sta.h | 6 + + drivers/net/wireless/iwlwifi/mvm/tt.c | 509 +++++ + drivers/net/wireless/iwlwifi/mvm/utils.c | 31 + + drivers/net/wireless/iwlwifi/pcie/drv.c | 50 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 32 +- + drivers/net/wireless/iwlwifi/pcie/tx.c | 14 +- + drivers/net/wireless/mwifiex/Kconfig | 4 +- + drivers/net/wireless/mwifiex/cfg80211.c | 77 +- + drivers/net/wireless/mwifiex/cmdevt.c | 1 + + drivers/net/wireless/mwifiex/fw.h | 17 + + drivers/net/wireless/mwifiex/init.c | 53 +- + drivers/net/wireless/mwifiex/join.c | 5 +- + drivers/net/wireless/mwifiex/main.c | 14 + + drivers/net/wireless/mwifiex/main.h | 5 +- + drivers/net/wireless/mwifiex/scan.c | 23 +- + drivers/net/wireless/mwifiex/sdio.c | 463 ++-- + drivers/net/wireless/mwifiex/sdio.h | 340 ++- + drivers/net/wireless/mwifiex/sta_cmd.c | 62 + + drivers/net/wireless/mwifiex/sta_cmdresp.c | 17 + + drivers/net/wireless/mwifiex/uap_cmd.c | 21 + + drivers/net/wireless/mwifiex/uap_event.c | 25 +- + drivers/net/wireless/mwl8k.c | 11 +- + drivers/net/wireless/p54/p54spi.c | 37 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 782 ++++--- + drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 36 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 9 +- + drivers/net/wireless/rt2x00/rt61pci.c | 2 +- + include/linux/ieee80211.h | 9 + + include/linux/platform_data/net-cw1200.h | 81 + + include/linux/ssb/ssb_regs.h | 1 + + include/net/cfg80211.h | 89 +- + include/net/ieee80211_radiotap.h | 7 + + include/net/mac80211.h | 14 +- + include/uapi/linux/nl80211.h | 24 + + net/mac80211/aes_ccm.c | 6 +- + net/mac80211/cfg.c | 33 +- + net/mac80211/debugfs_netdev.c | 15 +- + net/mac80211/driver-ops.h | 3 +- + net/mac80211/ht.c | 4 +- + net/mac80211/ibss.c | 49 +- + net/mac80211/ieee80211_i.h | 28 +- + net/mac80211/iface.c | 29 +- + net/mac80211/key.c | 24 +- + net/mac80211/key.h | 15 +- + net/mac80211/main.c | 4 +- + net/mac80211/mesh.c | 38 +- + net/mac80211/mesh_plink.c | 7 +- + net/mac80211/mlme.c | 345 +-- + net/mac80211/rx.c | 30 +- + net/mac80211/sta_info.c | 2 + + net/mac80211/sta_info.h | 5 + + net/mac80211/tx.c | 5 +- + net/mac80211/util.c | 36 +- + net/mac80211/wep.c | 48 +- + net/mac80211/wpa.c | 68 +- + net/wireless/core.c | 224 +- + net/wireless/core.h | 93 +- + net/wireless/debugfs.c | 4 +- + net/wireless/ibss.c | 10 +- + net/wireless/mesh.c | 3 +- + net/wireless/mlme.c | 216 +- + net/wireless/nl80211.c | 350 ++- + net/wireless/reg.c | 136 +- + net/wireless/scan.c | 47 +- + net/wireless/sme.c | 107 +- + net/wireless/sysfs.c | 8 +- + net/wireless/trace.h | 4 +- + net/wireless/util.c | 39 +- + net/wireless/wext-compat.c | 22 +- + net/wireless/wext-sme.c | 41 +- + 203 files changed, 20749 insertions(+), 3320 deletions(-) + create mode 100644 drivers/net/wireless/ath/wil6210/debug.c + create mode 100644 drivers/net/wireless/ath/wil6210/trace.c + create mode 100644 drivers/net/wireless/ath/wil6210/trace.h + create mode 100644 drivers/net/wireless/cw1200/Kconfig + create mode 100644 drivers/net/wireless/cw1200/Makefile + create mode 100644 drivers/net/wireless/cw1200/bh.c + create mode 100644 drivers/net/wireless/cw1200/bh.h + create mode 100644 drivers/net/wireless/cw1200/cw1200.h + create mode 100644 drivers/net/wireless/cw1200/cw1200_sdio.c + create mode 100644 drivers/net/wireless/cw1200/cw1200_spi.c + create mode 100644 drivers/net/wireless/cw1200/debug.c + create mode 100644 drivers/net/wireless/cw1200/debug.h + create mode 100644 drivers/net/wireless/cw1200/fwio.c + create mode 100644 drivers/net/wireless/cw1200/fwio.h + create mode 100644 drivers/net/wireless/cw1200/hwbus.h + create mode 100644 drivers/net/wireless/cw1200/hwio.c + create mode 100644 drivers/net/wireless/cw1200/hwio.h + create mode 100644 drivers/net/wireless/cw1200/itp.c + create mode 100644 drivers/net/wireless/cw1200/itp.h + create mode 100644 drivers/net/wireless/cw1200/main.c + create mode 100644 drivers/net/wireless/cw1200/pm.c + create mode 100644 drivers/net/wireless/cw1200/pm.h + create mode 100644 drivers/net/wireless/cw1200/queue.c + create mode 100644 drivers/net/wireless/cw1200/queue.h + create mode 100644 drivers/net/wireless/cw1200/scan.c + create mode 100644 drivers/net/wireless/cw1200/scan.h + create mode 100644 drivers/net/wireless/cw1200/sta.c + create mode 100644 drivers/net/wireless/cw1200/sta.h + create mode 100644 drivers/net/wireless/cw1200/txrx.c + create mode 100644 drivers/net/wireless/cw1200/txrx.h + create mode 100644 drivers/net/wireless/cw1200/wsm.c + create mode 100644 drivers/net/wireless/cw1200/wsm.h + create mode 100644 drivers/net/wireless/iwlwifi/mvm/tt.c + create mode 100644 include/linux/platform_data/net-cw1200.h +Merging bluetooth/master (cd60aab Bluetooth: Add missing reset_resume dev_pm_ops) +$ git merge bluetooth/master +Resolved 'net/bluetooth/mgmt.c' using previous resolution. +Auto-merging net/bluetooth/mgmt.c +CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/hidp/core.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging include/net/bluetooth/hci_core.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5637f79] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/btusb.c | 1 + + include/net/bluetooth/hci.h | 1 - + include/net/bluetooth/hci_core.h | 29 ++--- + include/net/bluetooth/l2cap.h | 2 +- + net/bluetooth/hci_core.c | 182 +++++++++---------------------- + net/bluetooth/hci_event.c | 71 +----------- + net/bluetooth/hidp/core.c | 14 +-- + net/bluetooth/l2cap_core.c | 121 ++++++++++++++------- + net/bluetooth/l2cap_sock.c | 4 +- + net/bluetooth/mgmt.c | 229 ++++++++++++++++++++++++++------------- + 10 files changed, 312 insertions(+), 342 deletions(-) +Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (449e74c mtd: tests: don't print error messages when out-of-memory) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/fsmc-nand.txt | 25 ++- + arch/mips/bcm63xx/nvram.c | 11 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 + + drivers/mtd/bcm63xxpart.c | 9 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 4 +- + drivers/mtd/devices/bcm47xxsflash.c | 68 ++++++ + drivers/mtd/devices/bcm47xxsflash.h | 2 + + drivers/mtd/devices/block2mtd.c | 58 +++--- + drivers/mtd/devices/elm.c | 6 +- + drivers/mtd/devices/m25p80.c | 44 +++- + drivers/mtd/devices/mtd_dataflash.c | 8 +- + drivers/mtd/devices/spear_smi.c | 6 +- + drivers/mtd/devices/sst25l.c | 6 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/davinci_nand.c | 13 +- + drivers/mtd/nand/fsl_ifc_nand.c | 3 +- + drivers/mtd/nand/fsmc_nand.c | 24 ++- + drivers/mtd/nand/gpio.c | 227 ++++++--------------- + drivers/mtd/nand/nand_base.c | 27 +-- + drivers/mtd/nand/pxa3xx_nand.c | 93 +++------ + drivers/mtd/nand/r852.c | 5 +- + drivers/mtd/tests/mtd_oobtest.c | 12 +- + drivers/mtd/tests/mtd_pagetest.c | 20 +- + drivers/mtd/tests/mtd_readtest.c | 12 +- + drivers/mtd/tests/mtd_speedtest.c | 8 +- + drivers/mtd/tests/mtd_stresstest.c | 8 +- + drivers/mtd/tests/mtd_subpagetest.c | 12 +- + include/linux/mtd/fsmc.h | 1 + + include/linux/mtd/nand.h | 9 +- + 29 files changed, 350 insertions(+), 375 deletions(-) +Merging crypto/master (bbb85b2 crypto: ux500 - Cocci spatch "resource_size.spatch") +$ git merge crypto/master +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx28.dtsi | 2 +- + arch/x86/crypto/Makefile | 2 + + arch/x86/crypto/crct10dif-pcl-asm_64.S | 643 ++++++++++++++++++++++ + arch/x86/crypto/crct10dif-pclmul_glue.c | 151 ++++++ + arch/x86/crypto/sha256_ssse3_glue.c | 57 +- + arch/x86/crypto/sha512_ssse3_glue.c | 58 +- + crypto/Kconfig | 19 + + crypto/Makefile | 1 + + crypto/crct10dif.c | 178 ++++++ + crypto/sha512_generic.c | 2 + + crypto/tcrypt.c | 8 + + crypto/testmgr.c | 10 + + crypto/testmgr.h | 33 ++ + drivers/char/hw_random/atmel-rng.c | 2 - + drivers/char/hw_random/bcm63xx-rng.c | 2 - + drivers/char/hw_random/timeriomem-rng.c | 2 - + drivers/char/hw_random/tx4939-rng.c | 1 - + drivers/crypto/Kconfig | 12 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/caam/ctrl.c | 10 +- + drivers/crypto/caam/desc.h | 22 +- + drivers/crypto/caam/desc_constr.h | 81 ++- + drivers/crypto/caam/pdb.h | 1 + + drivers/crypto/caam/regs.h | 42 +- + drivers/crypto/dcp.c | 925 ++++++++++++++++++++++++++++++++ + drivers/crypto/hifn_795x.c | 4 +- + drivers/crypto/mv_cesa.c | 1 - + drivers/crypto/omap-aes.c | 7 +- + drivers/crypto/omap-sham.c | 7 +- + drivers/crypto/s5p-sss.c | 2 - + drivers/crypto/ux500/cryp/cryp_core.c | 2 +- + include/linux/crc-t10dif.h | 4 + + lib/Kconfig | 2 + + lib/crc-t10dif.c | 75 ++- + 34 files changed, 2283 insertions(+), 86 deletions(-) + create mode 100644 arch/x86/crypto/crct10dif-pcl-asm_64.S + create mode 100644 arch/x86/crypto/crct10dif-pclmul_glue.c + create mode 100644 crypto/crct10dif.c + create mode 100644 drivers/crypto/dcp.c +Merging drm/drm-next (328a471 drm_modes: videomode: add doubleclk flag) +$ git merge drm/drm-next +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 2 + + .../devicetree/bindings/video/display-timing.txt | 1 + + Documentation/fb/uvesafb.txt | 16 +- + arch/x86/include/asm/io.h | 7 + + arch/x86/include/asm/mtrr.h | 10 +- + arch/x86/kernel/cpu/mtrr/main.c | 71 + + drivers/char/agp/frontend.c | 8 +- + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/ast/ast_ttm.c | 13 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 15 +- + drivers/gpu/drm/drm_bufs.c | 26 +- + drivers/gpu/drm/drm_ioctl.c | 15 +- + drivers/gpu/drm/drm_modes.c | 2 + + drivers/gpu/drm/drm_pci.c | 8 +- + drivers/gpu/drm/drm_rect.c | 295 ++++ + drivers/gpu/drm/drm_stub.c | 10 +- + drivers/gpu/drm/drm_vm.c | 24 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 28 +- + drivers/gpu/drm/i915/i915_debugfs.c | 70 +- + drivers/gpu/drm/i915/i915_dma.c | 69 +- + drivers/gpu/drm/i915/i915_drv.c | 24 +- + drivers/gpu/drm/i915/i915_drv.h | 214 +-- + drivers/gpu/drm/i915/i915_gem.c | 24 +- + drivers/gpu/drm/i915/i915_gem_context.c | 74 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 110 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 18 +- + drivers/gpu/drm/i915/i915_irq.c | 441 +++++- + drivers/gpu/drm/i915/i915_reg.h | 366 +++-- + drivers/gpu/drm/i915/i915_suspend.c | 10 + + drivers/gpu/drm/i915/i915_sysfs.c | 74 +- + drivers/gpu/drm/i915/i915_ums.c | 88 +- + drivers/gpu/drm/i915/intel_bios.c | 100 +- + drivers/gpu/drm/i915/intel_crt.c | 8 +- + drivers/gpu/drm/i915/intel_ddi.c | 710 +++------ + drivers/gpu/drm/i915/intel_display.c | 1594 ++++++++++++-------- + drivers/gpu/drm/i915/intel_dp.c | 352 ++++- + drivers/gpu/drm/i915/intel_drv.h | 117 +- + drivers/gpu/drm/i915/intel_dvo.c | 7 + + drivers/gpu/drm/i915/intel_hdmi.c | 139 +- + drivers/gpu/drm/i915/intel_lvds.c | 248 +-- + drivers/gpu/drm/i915/intel_opregion.c | 102 +- + drivers/gpu/drm/i915/intel_panel.c | 296 +++- + drivers/gpu/drm/i915/intel_pm.c | 591 +++++++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 2 + + drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- + drivers/gpu/drm/i915/intel_sdvo.c | 44 +- + drivers/gpu/drm/i915/intel_sprite.c | 213 ++- + drivers/gpu/drm/i915/intel_tv.c | 8 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 13 +- + drivers/gpu/drm/radeon/radeon_object.c | 5 +- + drivers/gpu/drm/savage/savage_bci.c | 43 +- + drivers/gpu/drm/savage/savage_drv.h | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 10 +- + drivers/video/of_display_timing.c | 7 +- + drivers/video/uvesafb.c | 70 +- + include/drm/drmP.h | 34 +- + include/drm/drm_os_linux.h | 16 - + include/drm/drm_rect.h | 160 ++ + include/linux/io.h | 25 + + include/video/display_timing.h | 1 + + include/video/uvesafb.h | 1 + + 62 files changed, 4640 insertions(+), 2433 deletions(-) + create mode 100644 drivers/gpu/drm/drm_rect.c + create mode 100644 include/drm/drm_rect.h +Merging drm-intel/for-linux-next (cb8b2a3 drm/i915: check for strange pfit pipe assignemnt on ivb/hsw) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_dma.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 8 +- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 300 ++++++++--- + drivers/gpu/drm/i915/i915_dma.c | 13 +- + drivers/gpu/drm/i915/i915_drv.c | 61 +-- + drivers/gpu/drm/i915/i915_drv.h | 63 ++- + drivers/gpu/drm/i915/i915_gem.c | 101 ++-- + drivers/gpu/drm/i915/i915_gem_context.c | 14 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 4 +- + drivers/gpu/drm/i915/i915_irq.c | 319 +++++++---- + drivers/gpu/drm/i915/i915_reg.h | 262 ++++----- + drivers/gpu/drm/i915/i915_sysfs.c | 2 +- + drivers/gpu/drm/i915/intel_crt.c | 27 +- + drivers/gpu/drm/i915/intel_ddi.c | 40 +- + drivers/gpu/drm/i915/intel_display.c | 818 ++++++++++++++--------------- + drivers/gpu/drm/i915/intel_dp.c | 193 ++++--- + drivers/gpu/drm/i915/intel_drv.h | 39 +- + drivers/gpu/drm/i915/intel_dvo.c | 24 + + drivers/gpu/drm/i915/intel_fb.c | 19 +- + drivers/gpu/drm/i915/intel_hdmi.c | 73 ++- + drivers/gpu/drm/i915/intel_lvds.c | 26 + + drivers/gpu/drm/i915/intel_overlay.c | 13 +- + drivers/gpu/drm/i915/intel_panel.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 695 +++++++++++++++++++----- + drivers/gpu/drm/i915/intel_ringbuffer.c | 201 +++++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 24 +- + drivers/gpu/drm/i915/intel_sdvo.c | 45 ++ + drivers/gpu/drm/i915/intel_sideband.c | 177 +++++++ + drivers/gpu/drm/i915/intel_sprite.c | 8 +- + include/drm/drm_rect.h | 9 +- + include/uapi/drm/i915_drm.h | 3 +- + 33 files changed, 2445 insertions(+), 1152 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_sideband.c +Merging drm-tegra/drm/for-next (5ddfe3d gpu: host1x: Rework CPU syncpoint increment) +$ git merge drm-tegra/drm/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 +- + drivers/gpu/host1x/dev.h | 8 +-- + drivers/gpu/host1x/drm/dc.c | 5 ++ + drivers/gpu/host1x/drm/drm.c | 14 +++- + drivers/gpu/host1x/drm/gr2d.c | 12 ++-- + drivers/gpu/host1x/hw/cdma_hw.c | 2 +- + drivers/gpu/host1x/hw/syncpt_hw.c | 12 ++-- + drivers/gpu/host1x/job.c | 135 +++++++++++++++++--------------------- + drivers/gpu/host1x/syncpt.c | 26 +++----- + drivers/gpu/host1x/syncpt.h | 13 ++-- + include/uapi/drm/tegra_drm.h | 2 + + 11 files changed, 112 insertions(+), 123 deletions(-) +Merging sound/for-next (7b55939 ALSA: hdspm - Allow SingleSpeed WordClock when in DS/QS mode) +$ git merge sound/for-next +Auto-merging sound/pci/sis7019.c +Merge made by the 'recursive' strategy. + include/sound/core.h | 2 +- + include/sound/pcm.h | 5 ++- + sound/arm/aaci.c | 2 - + sound/arm/pxa2xx-ac97.c | 1 - + sound/core/Kconfig | 9 +++++ + sound/core/init.c | 55 ++++++++++++++------------- + sound/core/pcm_lib.c | 3 +- + sound/drivers/aloop.c | 1 - + sound/drivers/dummy.c | 1 - + sound/drivers/ml403-ac97cr.c | 1 - + sound/drivers/mpu401/mpu401.c | 1 - + sound/drivers/mtpav.c | 1 - + sound/drivers/pcsp/pcsp.c | 1 - + sound/drivers/serial-u16550.c | 1 - + sound/drivers/virmidi.c | 1 - + sound/isa/ad1848/ad1848.c | 1 - + sound/isa/adlib.c | 1 - + sound/isa/cmi8328.c | 1 - + sound/isa/cmi8330.c | 1 - + sound/isa/cs423x/cs4231.c | 1 - + sound/isa/cs423x/cs4236.c | 2 - + sound/isa/es1688/es1688.c | 1 - + sound/isa/es18xx.c | 2 - + sound/isa/galaxy/galaxy.c | 1 - + sound/isa/gus/gusclassic.c | 1 - + sound/isa/gus/gusextreme.c | 1 - + sound/isa/gus/gusmax.c | 1 - + sound/isa/gus/interwave.c | 1 - + sound/isa/msnd/msnd_pinnacle.c | 1 - + sound/isa/opl3sa2.c | 2 - + sound/isa/opti9xx/miro.c | 1 - + sound/isa/opti9xx/opti92x-ad1848.c | 1 - + sound/isa/sb/jazz16.c | 1 - + sound/isa/sb/sb16.c | 1 - + sound/isa/sb/sb8.c | 1 - + sound/isa/sc6000.c | 1 - + sound/isa/sscape.c | 1 - + sound/isa/wavefront/wavefront.c | 1 - + sound/oss/kahlua.c | 2 - + sound/parisc/harmony.c | 3 -- + sound/pci/ad1889.c | 1 - + sound/pci/ali5451/ali5451.c | 1 - + sound/pci/als300.c | 1 - + sound/pci/als4000.c | 1 - + sound/pci/asihpi/hpioctl.c | 1 - + sound/pci/atiixp.c | 1 - + sound/pci/atiixp_modem.c | 1 - + sound/pci/au88x0/au88x0.c | 1 - + sound/pci/aw2/aw2-alsa.c | 1 - + sound/pci/azt3328.c | 1 - + sound/pci/bt87x.c | 1 - + sound/pci/ca0106/ca0106_main.c | 1 - + sound/pci/cmipci.c | 1 - + sound/pci/cs4281.c | 1 - + sound/pci/cs46xx/cs46xx.c | 1 - + sound/pci/cs5530.c | 1 - + sound/pci/cs5535audio/cs5535audio.c | 1 - + sound/pci/ctxfi/xfi.c | 1 - + sound/pci/echoaudio/echoaudio.c | 1 - + sound/pci/emu10k1/emu10k1.c | 1 - + sound/pci/emu10k1/emu10k1x.c | 1 - + sound/pci/ens1370.c | 1 - + sound/pci/es1938.c | 1 - + sound/pci/es1968.c | 74 +++++++++++++++++++++++++------------ + sound/pci/fm801.c | 1 - + sound/pci/hda/hda_intel.c | 5 ++- + sound/pci/hda/patch_sigmatel.c | 4 ++ + sound/pci/ice1712/ice1712.c | 1 - + sound/pci/ice1712/ice1724.c | 1 - + sound/pci/intel8x0.c | 1 - + sound/pci/intel8x0m.c | 1 - + sound/pci/korg1212/korg1212.c | 1 - + sound/pci/lola/lola.c | 1 - + sound/pci/lx6464es/lx6464es.c | 1 - + sound/pci/maestro3.c | 1 - + sound/pci/mixart/mixart.c | 1 - + sound/pci/nm256/nm256.c | 1 - + sound/pci/oxygen/oxygen_lib.c | 1 - + sound/pci/pcxhr/pcxhr.c | 1 - + sound/pci/riptide/riptide.c | 2 - + sound/pci/rme32.c | 1 - + sound/pci/rme96.c | 1 - + sound/pci/rme9652/hdsp.c | 1 - + sound/pci/rme9652/hdspm.c | 59 +++++++++++++++++++---------- + sound/pci/rme9652/rme9652.c | 1 - + sound/pci/sis7019.c | 1 - + sound/pci/sonicvibes.c | 1 - + sound/pci/trident/trident.c | 1 - + sound/pci/via82xx.c | 1 - + sound/pci/via82xx_modem.c | 1 - + sound/pci/vx222/vx222.c | 1 - + sound/pci/ymfpci/ymfpci.c | 1 - + sound/ppc/powermac.c | 1 - + sound/sh/aica.c | 1 - + sound/sh/sh_dac_audio.c | 2 - + sound/sparc/dbri.c | 2 - + sound/spi/at73c213.c | 1 - + 97 files changed, 140 insertions(+), 174 deletions(-) +Merging sound-asoc/for-next (db2a53a Merge remote-tracking branch 'asoc/topic/x86' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/pxa/tavorevb3.c +Removing sound/soc/pxa/saarb.c +Removing sound/soc/fsl/imx-pcm.c +Auto-merging sound/soc/codecs/spdif_transmitter.c +Auto-merging sound/soc/codecs/hdmi.c +Auto-merging sound/soc/codecs/bt-sco.c +Removing sound/soc/blackfin/bf5xx-tdm.h +Removing sound/soc/blackfin/bf5xx-tdm.c +Removing sound/soc/blackfin/bf5xx-tdm-pcm.h +Removing sound/soc/blackfin/bf5xx-tdm-pcm.c +Removing sound/soc/blackfin/bf5xx-ac97-pcm.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/arizona.txt | 62 ++ + .../devicetree/bindings/sound/adi,adau1701.txt | 23 + + .../devicetree/bindings/sound/mxs-saif.txt | 17 +- + .../devicetree/bindings/sound/spdif-receiver.txt | 10 + + .../bindings/sound/spdif-transmitter.txt | 10 + + .../devicetree/bindings/sound/ssm2518.txt | 20 + + MAINTAINERS | 5 +- + arch/blackfin/mach-bf527/boards/ad7160eval.c | 12 - + arch/blackfin/mach-bf527/boards/ezkit.c | 32 +- + arch/blackfin/mach-bf533/boards/ezkit.c | 12 - + arch/blackfin/mach-bf533/boards/stamp.c | 35 +- + arch/blackfin/mach-bf537/boards/stamp.c | 30 +- + arch/blackfin/mach-bf548/boards/ezkit.c | 28 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 14 +- + arch/blackfin/mach-bf609/boards/ezkit.c | 2 +- + drivers/mfd/arizona-core.c | 234 +++++- + drivers/mfd/arizona-i2c.c | 10 +- + drivers/mfd/arizona-spi.c | 10 +- + drivers/mfd/arizona.h | 12 + + drivers/mfd/timberdale.c | 1 - + drivers/mfd/wm5110-tables.c | 8 + + drivers/spi/spi-altera.c | 14 - + drivers/spi/spi-ath79.c | 6 +- + drivers/spi/spi-atmel.c | 51 +- + drivers/spi/spi-au1550.c | 14 +- + drivers/spi/spi-bcm2835.c | 7 +- + drivers/spi/spi-bcm63xx.c | 23 +- + drivers/spi/spi-bfin-sport.c | 13 +- + drivers/spi/spi-bfin5xx.c | 24 +- + drivers/spi/spi-clps711x.c | 9 +- + drivers/spi/spi-coldfire-qspi.c | 23 +- + drivers/spi/spi-davinci.c | 12 +- + drivers/spi/spi-dw-mmio.c | 2 - + drivers/spi/spi-dw.c | 26 +- + drivers/spi/spi-ep93xx.c | 14 +- + drivers/spi/spi-fsl-espi.c | 9 +- + drivers/spi/spi-fsl-lib.c | 2 +- + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spi-gpio.c | 6 +- + drivers/spi/spi-imx.c | 17 +- + drivers/spi/spi-mpc512x-psc.c | 341 ++++---- + drivers/spi/spi-mpc52xx-psc.c | 2 +- + drivers/spi/spi-mpc52xx.c | 4 +- + drivers/spi/spi-mxs.c | 13 +- + drivers/spi/spi-nuc900.c | 13 - + drivers/spi/spi-oc-tiny.c | 2 - + drivers/spi/spi-omap-100k.c | 16 +- + drivers/spi/spi-omap-uwire.c | 4 +- + drivers/spi/spi-omap2-mcspi.c | 24 +- + drivers/spi/spi-orion.c | 4 +- + drivers/spi/spi-pl022.c | 1 + + drivers/spi/spi-ppc4xx.c | 19 +- + drivers/spi/spi-pxa2xx-dma.c | 11 +- + drivers/spi/spi-pxa2xx.c | 60 +- + drivers/spi/spi-rspi.c | 4 +- + drivers/spi/spi-s3c24xx.c | 2 - + drivers/spi/spi-s3c64xx.c | 5 +- + drivers/spi/spi-sh-hspi.c | 6 +- + drivers/spi/spi-sh.c | 4 +- + drivers/spi/spi-sirf.c | 61 +- + drivers/spi/spi-tegra114.c | 4 +- + drivers/spi/spi-tegra20-sflash.c | 4 +- + drivers/spi/spi-tegra20-slink.c | 4 +- + drivers/spi/spi-ti-ssp.c | 16 +- + drivers/spi/spi-topcliff-pch.c | 28 +- + drivers/spi/spi-txx9.c | 10 +- + drivers/spi/spi-xcomm.c | 12 +- + drivers/spi/spi-xilinx.c | 120 ++- + include/linux/mfd/arizona/core.h | 2 + + include/linux/mfd/arizona/pdata.h | 2 +- + include/linux/mfd/arizona/registers.h | 3 + + include/linux/mfd/wm8994/pdata.h | 5 + + include/linux/mfd/wm8994/registers.h | 8 + + include/linux/platform_data/ssm2518.h | 22 + + include/linux/spi/spi.h | 3 + + include/linux/spi/xilinx_spi.h | 1 - + include/sound/soc-dapm.h | 2 + + sound/soc/atmel/sam9g20_wm8731.c | 9 - + sound/soc/blackfin/Kconfig | 47 +- + sound/soc/blackfin/Makefile | 4 - + sound/soc/blackfin/bf5xx-ac97-pcm.c | 1 - + sound/soc/blackfin/bf5xx-ac97-pcm.h | 26 - + sound/soc/blackfin/bf5xx-ac97.c | 8 +- + sound/soc/blackfin/bf5xx-ad1836.c | 19 +- + sound/soc/blackfin/bf5xx-ad193x.c | 40 +- + sound/soc/blackfin/bf5xx-ad1980.c | 1 - + sound/soc/blackfin/bf5xx-ad73311.c | 1 - + sound/soc/blackfin/bf5xx-i2s-pcm.c | 183 +++-- + sound/soc/blackfin/bf5xx-i2s-pcm.h | 21 +- + sound/soc/blackfin/bf5xx-i2s.c | 129 +++- + sound/soc/blackfin/bf5xx-sport.c | 10 +- + sound/soc/blackfin/bf5xx-sport.h | 2 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 1 - + sound/soc/blackfin/bf5xx-tdm-pcm.c | 345 --------- + sound/soc/blackfin/bf5xx-tdm-pcm.h | 18 - + sound/soc/blackfin/bf5xx-tdm.c | 328 -------- + sound/soc/blackfin/bf5xx-tdm.h | 23 - + sound/soc/cirrus/Kconfig | 2 +- + sound/soc/cirrus/ep93xx-ac97.c | 16 +- + sound/soc/cirrus/ep93xx-i2s.c | 16 +- + sound/soc/cirrus/ep93xx-pcm.c | 138 +--- + sound/soc/codecs/88pm860x-codec.c | 9 +- + sound/soc/codecs/Kconfig | 12 +- + sound/soc/codecs/Makefile | 12 +- + sound/soc/codecs/ab8500-codec.c | 85 +- + sound/soc/codecs/ab8500-codec.h | 42 +- + sound/soc/codecs/adau1701.c | 44 +- + sound/soc/codecs/arizona.c | 7 + + sound/soc/codecs/arizona.h | 3 +- + sound/soc/codecs/{dfbmcs320.c => bt-sco.c} | 37 +- + sound/soc/codecs/cs42l52.c | 6 +- + sound/soc/codecs/{omap-hdmi.c => hdmi.c} | 26 +- + sound/soc/codecs/jz4740.c | 2 - + sound/soc/codecs/max98090.c | 22 +- + sound/soc/codecs/sgtl5000.c | 228 ++++-- + sound/soc/codecs/sgtl5000.h | 2 +- + sound/soc/codecs/sn95031.c | 2 +- + sound/soc/codecs/spdif_receiver.c | 10 + + .../{spdif_transciever.c => spdif_transmitter.c} | 10 + + sound/soc/codecs/ssm2518.c | 856 +++++++++++++++++++++ + sound/soc/codecs/ssm2518.h | 20 + + sound/soc/codecs/wm0010.c | 10 + + sound/soc/codecs/wm5102.c | 181 ++++- + sound/soc/codecs/wm5110.c | 179 +++++ + sound/soc/codecs/wm8994.c | 191 +++-- + sound/soc/codecs/wm8994.h | 3 + + sound/soc/codecs/wm_adsp.c | 459 ++++++++++- + sound/soc/codecs/wm_adsp.h | 3 + + sound/soc/davinci/davinci-mcasp.c | 4 +- + sound/soc/davinci/davinci-sffsdr.c | 2 +- + sound/soc/fsl/Kconfig | 5 - + sound/soc/fsl/Makefile | 11 +- + sound/soc/fsl/eukrea-tlv320.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 13 +- + sound/soc/fsl/imx-audmux.c | 8 - + sound/soc/fsl/imx-mc13783.c | 2 +- + sound/soc/fsl/imx-pcm-dma.c | 2 + + sound/soc/fsl/imx-pcm-fiq.c | 92 +++ + sound/soc/fsl/imx-pcm.c | 145 ---- + sound/soc/fsl/imx-pcm.h | 10 +- + sound/soc/fsl/imx-sgtl5000.c | 7 +- + sound/soc/fsl/imx-ssi.c | 44 +- + sound/soc/fsl/imx-ssi.h | 3 - + sound/soc/fsl/mx27vis-aic32x4.c | 2 +- + sound/soc/fsl/phycore-ac97.c | 2 +- + sound/soc/fsl/wm1133-ev1.c | 2 +- + sound/soc/jz4740/jz4740-i2s.c | 17 +- + sound/soc/kirkwood/kirkwood-dma.c | 2 +- + sound/soc/mid-x86/mfld_machine.c | 1 - + sound/soc/mxs/mxs-pcm.c | 18 - + sound/soc/mxs/mxs-pcm.h | 7 - + sound/soc/mxs/mxs-saif.c | 37 +- + sound/soc/mxs/mxs-saif.h | 1 - + sound/soc/mxs/mxs-sgtl5000.c | 10 +- + sound/soc/omap/Makefile | 1 - + sound/soc/omap/omap-hdmi-card.c | 2 +- + sound/soc/omap/omap-mcbsp.c | 2 - + sound/soc/pxa/Kconfig | 20 - + sound/soc/pxa/Makefile | 4 - + sound/soc/pxa/mmp-pcm.c | 6 +- + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/soc/pxa/saarb.c | 190 ----- + sound/soc/pxa/tavorevb3.c | 189 ----- + sound/soc/samsung/Kconfig | 2 +- + sound/soc/samsung/bells.c | 14 + + sound/soc/samsung/neo1973_wm8753.c | 2 +- + sound/soc/samsung/smdk_wm8580pcm.c | 1 - + sound/soc/samsung/smdk_wm8994pcm.c | 1 - + sound/soc/sh/fsi.c | 10 +- + sound/soc/soc-core.c | 106 ++- + sound/soc/soc-dapm.c | 47 +- + sound/soc/soc-pcm.c | 97 +-- + sound/soc/soc-utils.c | 13 +- + sound/soc/spear/spdif_in.c | 21 +- + sound/soc/spear/spdif_out.c | 16 +- + sound/soc/spear/spear_pcm.c | 152 +--- + sound/soc/tegra/tegra30_ahub.c | 25 + + sound/soc/tegra/tegra30_i2s.c | 26 + + sound/soc/tegra/tegra_asoc_utils.c | 23 +- + sound/soc/ux500/mop500.c | 2 +- + sound/soc/ux500/mop500_ab8500.c | 62 +- + sound/soc/ux500/ux500_msp_dai.h | 2 - + sound/soc/ux500/ux500_msp_i2s.c | 75 +- + sound/soc/ux500/ux500_msp_i2s.h | 59 +- + 184 files changed, 3781 insertions(+), 3392 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/arizona.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau1701.txt + create mode 100644 Documentation/devicetree/bindings/sound/spdif-receiver.txt + create mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt + create mode 100644 Documentation/devicetree/bindings/sound/ssm2518.txt + create mode 100644 include/linux/platform_data/ssm2518.h + delete mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.h + delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.c + delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.h + delete mode 100644 sound/soc/blackfin/bf5xx-tdm.c + delete mode 100644 sound/soc/blackfin/bf5xx-tdm.h + rename sound/soc/codecs/{dfbmcs320.c => bt-sco.c} (53%) + rename sound/soc/codecs/{omap-hdmi.c => hdmi.c} (69%) + rename sound/soc/codecs/{spdif_transciever.c => spdif_transmitter.c} (88%) + create mode 100644 sound/soc/codecs/ssm2518.c + create mode 100644 sound/soc/codecs/ssm2518.h + delete mode 100644 sound/soc/fsl/imx-pcm.c + delete mode 100644 sound/soc/pxa/saarb.c + delete mode 100644 sound/soc/pxa/tavorevb3.c +Merging modules/modules-next (06df44e modpost.c: Add .text.unlikely to TEXT_SECTIONS) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + scripts/mod/modpost.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging virtio/virtio-next (b3087e4 virtio: remove virtqueue_add_buf().) +$ git merge virtio/virtio-next +Auto-merging include/uapi/linux/virtio_console.h +Merge made by the 'recursive' strategy. + arch/x86/lguest/Makefile | 2 +- + arch/x86/lguest/{i386_head.S => head_32.S} | 0 + drivers/block/virtio_blk.c | 2 +- + drivers/virtio/virtio_ring.c | 37 +++--------------------------- + include/linux/virtio.h | 7 ------ + include/uapi/linux/virtio_console.h | 3 +++ + include/uapi/linux/virtio_pci.h | 4 +++- + 7 files changed, 11 insertions(+), 44 deletions(-) + rename arch/x86/lguest/{i386_head.S => head_32.S} (100%) +Merging input/next (fc4f314 Input: add TI-Nspire keypad support) +$ git merge input/next +Auto-merging drivers/input/touchscreen/egalax_ts.c +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/input/keyboard/omap4-keypad.c +Auto-merging drivers/input/keyboard/Makefile +Auto-merging drivers/input/keyboard/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/ti,nspire-keypad.txt | 60 +++++ + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/amikbd.c | 1 - + drivers/input/keyboard/bf54x-keys.c | 2 - + drivers/input/keyboard/davinci_keyscan.c | 2 - + drivers/input/keyboard/ep93xx_keypad.c | 7 +- + drivers/input/keyboard/gpio_keys.c | 1 - + drivers/input/keyboard/gpio_keys_polled.c | 2 - + drivers/input/keyboard/jornada680_kbd.c | 2 - + drivers/input/keyboard/jornada720_kbd.c | 2 - + drivers/input/keyboard/matrix_keypad.c | 2 - + drivers/input/keyboard/nspire-keypad.c | 285 +++++++++++++++++++++ + drivers/input/keyboard/omap4-keypad.c | 2 - + drivers/input/keyboard/opencores-kbd.c | 2 - + drivers/input/keyboard/pmic8xxx-keypad.c | 2 - + drivers/input/keyboard/pxa27x_keypad.c | 5 +- + drivers/input/keyboard/pxa930_rotary.c | 1 - + drivers/input/keyboard/samsung-keypad.c | 2 - + drivers/input/keyboard/sh_keysc.c | 2 - + drivers/input/keyboard/spear-keyboard.c | 1 - + drivers/input/keyboard/tnetv107x-keypad.c | 2 - + drivers/input/keyboard/twl4030_keypad.c | 3 +- + drivers/input/keyboard/w90p910_keypad.c | 5 +- + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ab8500-ponkey.c | 2 - + drivers/input/misc/bfin_rotary.c | 1 - + drivers/input/misc/gpio_tilt_polled.c | 2 - + drivers/input/misc/ixp4xx-beeper.c | 5 +- + drivers/input/misc/m68kspkr.c | 1 - + drivers/input/misc/max8925_onkey.c | 2 - + drivers/input/misc/mc13783-pwrbutton.c | 1 - + drivers/input/misc/pcspkr.c | 1 - + drivers/input/misc/pm8xxx-vibrator.c | 2 - + drivers/input/misc/pmic8xxx-pwrkey.c | 4 +- + drivers/input/misc/pwm-beeper.c | 1 - + drivers/input/misc/rotary_encoder.c | 2 - + drivers/input/misc/sgi_btns.c | 7 +- + drivers/input/misc/sirfsoc-onkey.c | 165 ++++++++++++ + drivers/input/misc/sparcspkr.c | 14 +- + drivers/input/mouse/amimouse.c | 1 - + drivers/input/mouse/gpio_mouse.c | 3 - + drivers/input/mouse/navpoint.c | 2 +- + drivers/input/serio/altera_ps2.c | 1 - + drivers/input/serio/at32psif.c | 2 - + drivers/input/serio/q40kbd.c | 1 - + drivers/input/serio/xilinx_ps2.c | 2 - + drivers/input/touchscreen/88pm860x-ts.c | 3 +- + drivers/input/touchscreen/atmel-wm97xx.c | 2 - + drivers/input/touchscreen/atmel_tsadcc.c | 2 +- + drivers/input/touchscreen/da9052_tsi.c | 2 - + drivers/input/touchscreen/egalax_ts.c | 53 +--- + drivers/input/touchscreen/intel-mid-touch.c | 2 - + drivers/input/touchscreen/jornada720_ts.c | 2 - + drivers/input/touchscreen/mc13783_ts.c | 2 - + drivers/input/touchscreen/ti_am335x_tsc.c | 1 - + drivers/input/touchscreen/tnetv107x-ts.c | 2 - + drivers/input/touchscreen/w90p910_ts.c | 2 - + 59 files changed, 566 insertions(+), 144 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/ti,nspire-keypad.txt + create mode 100644 drivers/input/keyboard/nspire-keypad.c + create mode 100644 drivers/input/misc/sirfsoc-onkey.c +Merging input-mt/for-next (194664e Input: MT - handle semi-mt devices in core) +$ git merge input-mt/for-next +Merge made by the 'recursive' strategy. +Merging cgroup/for-next (d9ed7c6 Merge branch 'for-3.10-fixes' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + include/linux/cgroup.h | 33 ++++++-- + kernel/cgroup.c | 216 ++++++++++++++++++++++++++++++++++++----------- + security/device_cgroup.c | 56 ++++-------- + 3 files changed, 212 insertions(+), 93 deletions(-) +Merging block/for-next (f4d5f94 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Auto-merging include/linux/cgroup.h +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/bcache.txt | 12 +- + Documentation/cgroups/blkio-controller.txt | 29 +- + Documentation/devices.txt | 8 +- + Documentation/kernel-parameters.txt | 3 - + Documentation/m68k/kernel-options.txt | 2 - + block/blk-cgroup.c | 105 ++- + block/blk-cgroup.h | 38 +- + block/blk-core.c | 2 +- + block/blk-throttle.c | 1064 +++++++++++++++++++--------- + drivers/block/mtip32xx/mtip32xx.c | 8 +- + drivers/block/pktcdvd.c | 3 +- + drivers/md/bcache/Kconfig | 1 - + drivers/md/bcache/bcache.h | 2 +- + drivers/md/bcache/stats.c | 34 +- + drivers/md/bcache/super.c | 185 +++-- + drivers/md/bcache/writeback.c | 2 +- + drivers/md/raid5.c | 2 + + include/linux/cgroup.h | 2 + + include/linux/scatterlist.h | 3 + + 19 files changed, 961 insertions(+), 544 deletions(-) +Merging device-mapper/master (11531a4 Fix detection of the need to resize the dm thin metadata device.) +$ git merge device-mapper/master +Merge made by the 'recursive' strategy. +Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (0e74823 mmc: sdhci: Add size for caller in init+register) +$ git merge mmc/mmc-next +Auto-merging drivers/mmc/core/bus.c +Merge made by the 'recursive' strategy. + drivers/mmc/card/block.c | 100 +++++++++++++----- + drivers/mmc/card/queue.c | 2 +- + drivers/mmc/core/bus.c | 14 ++- + drivers/mmc/core/core.c | 117 ++++++++------------- + drivers/mmc/core/core.h | 5 +- + drivers/mmc/core/debugfs.c | 8 +- + drivers/mmc/core/mmc.c | 203 +++++++++++++++++++++++++----------- + drivers/mmc/core/mmc_ops.c | 36 +------ + drivers/mmc/core/mmc_ops.h | 1 - + drivers/mmc/core/sd.c | 62 ++++++++++- + drivers/mmc/core/sdio.c | 28 ++++- + drivers/mmc/host/android-goldfish.c | 2 - + drivers/mmc/host/atmel-mci.c | 12 +-- + drivers/mmc/host/au1xmmc.c | 1 - + drivers/mmc/host/bfin_sdh.c | 2 - + drivers/mmc/host/davinci_mmc.c | 1 - + drivers/mmc/host/dw_mmc-pltfm.c | 1 - + drivers/mmc/host/dw_mmc.c | 10 +- + drivers/mmc/host/jz4740_mmc.c | 2 - + drivers/mmc/host/mvsdio.c | 1 - + drivers/mmc/host/mxcmmc.c | 2 - + drivers/mmc/host/mxs-mmc.c | 3 +- + drivers/mmc/host/omap.c | 2 - + drivers/mmc/host/omap_hsmmc.c | 2 - + drivers/mmc/host/pxamci.c | 2 - + drivers/mmc/host/rtsx_pci_sdmmc.c | 2 - + drivers/mmc/host/sdhci-acpi.c | 66 +++++++++++- + drivers/mmc/host/sdhci-bcm2835.c | 2 +- + drivers/mmc/host/sdhci-cns3xxx.c | 2 +- + drivers/mmc/host/sdhci-dove.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- + drivers/mmc/host/sdhci-of-esdhc.c | 2 +- + drivers/mmc/host/sdhci-of-hlwd.c | 2 +- + drivers/mmc/host/sdhci-pci.c | 2 + + drivers/mmc/host/sdhci-pltfm.c | 23 ++-- + drivers/mmc/host/sdhci-pltfm.h | 14 ++- + drivers/mmc/host/sdhci-pxav2.c | 4 +- + drivers/mmc/host/sdhci-pxav3.c | 4 +- + drivers/mmc/host/sdhci-s3c.c | 1 - + drivers/mmc/host/sdhci-spear.c | 2 - + drivers/mmc/host/sdhci-tegra.c | 2 +- + drivers/mmc/host/sdhci.c | 35 ++++++- + drivers/mmc/host/sh_mmcif.c | 2 - + drivers/mmc/host/sh_mobile_sdhi.c | 24 +++-- + drivers/mmc/host/tmio_mmc.c | 2 - + drivers/mmc/host/tmio_mmc_dma.c | 48 ++++++--- + drivers/mmc/host/wmt-sdmmc.c | 2 - + include/linux/mfd/tmio.h | 5 + + include/linux/mmc/card.h | 10 +- + include/linux/mmc/core.h | 5 + + include/linux/mmc/host.h | 8 +- + include/linux/mmc/sdhci.h | 2 + + 52 files changed, 591 insertions(+), 303 deletions(-) +Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging slab/for-next (8a965b3 mm, slab_common: Fix bootstrap creation of kmalloc caches) +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (ae59b84 dm-raid: silence compiler warning on rebuilds_per_group.) +$ git merge md/for-next +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-raid.txt | 1 + + drivers/md/dm-raid.c | 67 ++++++++++++++++++++++++++++++++- + drivers/md/md.c | 2 +- + drivers/md/raid1.c | 7 ++-- + drivers/md/raid10.c | 10 +++-- + 5 files changed, 77 insertions(+), 10 deletions(-) +Merging mfd/master (57d5b9c Merge tag 'mfd-arizona-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc) +$ git merge mfd/master +Auto-merging include/linux/mfd/wm8994/pdata.h +Removing drivers/ssbi/Makefile +Removing drivers/ssbi/Kconfig +Auto-merging drivers/mfd/intel_msic.c +CONFLICT (content): Merge conflict in drivers/mfd/intel_msic.c +Auto-merging drivers/mfd/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/mfd/intel_msic.c'. +[master 66ab6df] Merge remote-tracking branch 'mfd/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + drivers/Kconfig | 2 - + drivers/Makefile | 1 - + drivers/mfd/Kconfig | 5 +- + drivers/mfd/Makefile | 2 +- + drivers/mfd/intel_msic.c | 1 - + drivers/mfd/jz4740-adc.c | 7 +-- + drivers/mfd/lpc_ich.c | 10 +++ + drivers/mfd/max77686.c | 1 + + drivers/mfd/mcp-sa11x0.c | 3 - + drivers/mfd/rtl8411.c | 132 +++++++++++++++++++++++++++++++++++++++ + drivers/mfd/rtsx_pcr.c | 5 ++ + drivers/mfd/rtsx_pcr.h | 1 + + drivers/mfd/sec-core.c | 3 +- + drivers/{ssbi => mfd}/ssbi.c | 0 + drivers/mfd/t7l66xb.c | 1 - + drivers/mfd/tc6387xb.c | 1 - + drivers/mfd/tc6393xb.c | 1 - + drivers/mfd/twl-core.c | 12 +--- + drivers/mfd/twl4030-audio.c | 5 +- + drivers/mfd/twl4030-madc.c | 5 +- + drivers/mfd/wm8994-irq.c | 100 +++++++++++++++++++++++++++-- + drivers/ssbi/Kconfig | 16 ----- + drivers/ssbi/Makefile | 1 - + include/linux/mfd/rtsx_pci.h | 1 + + include/linux/mfd/wm8994/core.h | 2 + + include/linux/mfd/wm8994/pdata.h | 5 ++ + 27 files changed, 266 insertions(+), 61 deletions(-) + rename drivers/{ssbi => mfd}/ssbi.c (100%) + delete mode 100644 drivers/ssbi/Kconfig + delete mode 100644 drivers/ssbi/Makefile +Merging battery/master (dccab60 pm2301_charger: Fix module alias prefix) +$ git merge battery/master +Already up-to-date. +Merging fbdev/for-next (09bb64a video: imxfb: Add DT support) +$ git merge fbdev/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/video/fsl,imx-fb.txt | 51 ++++++ + drivers/video/Kconfig | 2 + + drivers/video/imxfb.c | 194 +++++++++++++++++---- + 3 files changed, 212 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/video/fsl,imx-fb.txt +Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning) +$ git merge omap_dss2/for-next +Merge made by the 'recursive' strategy. +Merging regulator/for-next (fc64601 Merge remote-tracking branch 'regulator/topic/lp872x' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/lp872x.txt | 160 ++++ + .../bindings/regulator/ti-abb-regulator.txt | 128 +++ + drivers/regulator/88pm8607.c | 1 - + drivers/regulator/Kconfig | 10 + + drivers/regulator/Makefile | 1 + + drivers/regulator/isl6271a-regulator.c | 2 +- + drivers/regulator/lp3971.c | 11 +- + drivers/regulator/lp3972.c | 11 +- + drivers/regulator/lp872x.c | 116 ++- + drivers/regulator/lp8755.c | 1 - + drivers/regulator/lp8788-buck.c | 1 - + drivers/regulator/lp8788-ldo.c | 2 - + drivers/regulator/max77686.c | 1 - + drivers/regulator/max8925-regulator.c | 1 - + drivers/regulator/mc13783-regulator.c | 2 - + drivers/regulator/mc13892-regulator.c | 2 - + drivers/regulator/pcap-regulator.c | 1 - + drivers/regulator/pcf50633-regulator.c | 1 - + drivers/regulator/s2mps11.c | 1 - + drivers/regulator/ti-abb-regulator.c | 912 +++++++++++++++++++++ + drivers/regulator/tps65217-regulator.c | 2 - + drivers/regulator/virtual.c | 2 - + drivers/regulator/wm831x-dcdc.c | 7 - + drivers/regulator/wm831x-isink.c | 2 - + drivers/regulator/wm831x-ldo.c | 2 - + drivers/regulator/wm8400-regulator.c | 1 - + drivers/regulator/wm8994-regulator.c | 2 - + 27 files changed, 1332 insertions(+), 51 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/lp872x.txt + create mode 100644 Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt + create mode 100644 drivers/regulator/ti-abb-regulator.c +Merging security/next (e2fa3d7 tpm: fix regression caused by section type conflict of tpm_dev_release() in ppc builds) +$ git merge security/next +Auto-merging include/linux/security.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 +- + drivers/char/tpm/tpm.c | 2 +- + drivers/char/tpm/tpm.h | 2 +- + drivers/char/tpm/tpm_tis.c | 17 +++- + include/linux/security.h | 3 +- + include/linux/tpm.h | 2 + + security/apparmor/audit.c | 2 +- + security/apparmor/context.c | 44 +++++---- + security/apparmor/domain.c | 26 ++--- + security/apparmor/include/apparmor.h | 12 ++- + security/apparmor/include/context.h | 61 ++++++++---- + security/apparmor/include/file.h | 14 +-- + security/apparmor/include/match.h | 21 ++-- + security/apparmor/include/policy.h | 16 ++-- + security/apparmor/include/procattr.h | 1 - + security/apparmor/include/sid.h | 4 +- + security/apparmor/ipc.c | 13 +-- + security/apparmor/lib.c | 44 ++++----- + security/apparmor/lsm.c | 69 +++++++------ + security/apparmor/match.c | 23 ++--- + security/apparmor/path.c | 2 +- + security/apparmor/policy.c | 181 ++++++++++++++++------------------- + security/apparmor/policy_unpack.c | 4 +- + security/apparmor/procattr.c | 6 -- + security/apparmor/resource.c | 15 ++- + 25 files changed, 311 insertions(+), 279 deletions(-) +Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) +$ git merge selinux/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) +$ git merge lblnet/master +Already up-to-date. +Merging watchdog/master (64da82b watchdog: core: don't try to stop device if not running) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/at32ap700x_wdt.c | 17 +++------- + drivers/watchdog/bcm63xx_wdt.c | 9 +++--- + drivers/watchdog/cpwd.c | 4 +-- + drivers/watchdog/da9052_wdt.c | 4 +-- + drivers/watchdog/da9055_wdt.c | 4 +-- + drivers/watchdog/dw_wdt.c | 11 +++---- + drivers/watchdog/imx2_wdt.c | 6 ++-- + drivers/watchdog/jz4740_wdt.c | 2 +- + drivers/watchdog/mpcore_wdt.c | 2 -- + drivers/watchdog/mtx-1_wdt.c | 3 +- + drivers/watchdog/mv64x60_wdt.c | 4 +-- + drivers/watchdog/nuc900_wdt.c | 50 +++++++---------------------- + drivers/watchdog/pnx4008_wdt.c | 7 ++-- + drivers/watchdog/rc32434_wdt.c | 10 ++---- + drivers/watchdog/riowd.c | 12 +++---- + drivers/watchdog/s3c2410_wdt.c | 20 ++++++------ + drivers/watchdog/shwdt.c | 18 +++-------- + drivers/watchdog/sp805_wdt.c | 7 ++-- + drivers/watchdog/ts72xx_wdt.c | 67 ++++++--------------------------------- + drivers/watchdog/twl4030_wdt.c | 5 +-- + drivers/watchdog/watchdog_dev.c | 6 ++-- + drivers/watchdog/wm831x_wdt.c | 21 +++++------- + 22 files changed, 82 insertions(+), 207 deletions(-) +Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (0c4513b Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next) +$ git merge iommu/next +Already up-to-date. +Merging vfio/next (3655b22 Merge tag 'stable/for-linus-3.10-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (e3d1848 lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment) +$ git merge trivial/for-next +Resolved 'Documentation/networking/netlink_mmap.txt' using previous resolution. +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/pm8001/pm80xx_hwi.c +Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c +Auto-merging Documentation/networking/netlink_mmap.txt +CONFLICT (content): Merge conflict in Documentation/networking/netlink_mmap.txt +Auto-merging Documentation/bcache.txt +Auto-merging Documentation/DocBook/drm.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5d99e14] Merge remote-tracking branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 6 +++--- + Documentation/DocBook/media/dvb/frontend.xml | 2 +- + Documentation/DocBook/media/v4l/controls.xml | 2 +- + Documentation/DocBook/writing_usb_driver.tmpl | 2 +- + Documentation/bcache.txt | 10 +++++----- + Documentation/block/queue-sysfs.txt | 2 +- + Documentation/cgroups/memory.txt | 2 +- + Documentation/device-mapper/cache.txt | 2 +- + .../devicetree/bindings/arm/samsung/interrupt-combiner.txt | 6 +++--- + Documentation/devicetree/bindings/arm/spear/shirq.txt | 2 +- + Documentation/devicetree/bindings/clock/silabs,si5351.txt | 2 +- + Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt | 2 +- + Documentation/devicetree/bindings/powerpc/4xx/emac.txt | 2 +- + Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt | 2 +- + .../devicetree/bindings/timer/samsung,exynos4210-mct.txt | 2 +- + Documentation/devicetree/bindings/usb/am33xx-usb.txt | 2 +- + Documentation/devicetree/bindings/usb/omap-usb.txt | 2 +- + Documentation/dynamic-debug-howto.txt | 2 +- + Documentation/fb/cirrusfb.txt | 2 +- + Documentation/filesystems/jfs.txt | 2 +- + Documentation/filesystems/qnx6.txt | 2 +- + Documentation/filesystems/vfat.txt | 2 +- + Documentation/kdump/kdump.txt | 8 -------- + Documentation/kernel-doc-nano-HOWTO.txt | 11 ++++++----- + Documentation/kernel-per-CPU-kthreads.txt | 2 +- + Documentation/laptops/dslm.c | 2 +- + Documentation/media-framework.txt | 2 +- + Documentation/metag/kernel-ABI.txt | 2 +- + Documentation/misc-devices/mei/mei.txt | 2 +- + Documentation/pinctrl.txt | 2 +- + Documentation/thermal/exynos_thermal_emulation | 2 +- + Documentation/virtual/kvm/api.txt | 6 +++--- + Documentation/vm/pagemap.txt | 2 +- + Documentation/w1/slaves/w1_ds28e04 | 2 +- + arch/powerpc/relocs_check.pl | 10 +++++----- + arch/x86/kernel/cpu/powerflags.c | 8 ++++---- + drivers/gpu/drm/drm_fb_cma_helper.c | 4 ++-- + drivers/gpu/drm/radeon/radeon_fb.c | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 2 +- + drivers/lguest/page_tables.c | 2 +- + drivers/media/platform/exynos4-is/Kconfig | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 +- + drivers/misc/dummy-irq.c | 2 +- + drivers/misc/lattice-ecp3-config.c | 2 +- + drivers/misc/mei/hbm.c | 2 +- + drivers/misc/mei/init.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 +- + drivers/nfc/pn533.c | 2 +- + drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- + drivers/scsi/scsi_error.c | 2 +- + drivers/tty/serial/serial-tegra.c | 2 +- + drivers/usb/musb/musb_dsps.c | 2 +- + drivers/usb/musb/omap2430.c | 2 +- + drivers/video/omap2/displays/panel-n8x0.c | 2 +- + fs/btrfs/ctree.c | 2 +- + fs/btrfs/free-space-cache.c | 2 +- + include/linux/cpu.h | 3 +-- + include/linux/kernel.h | 5 ++--- + lib/vsprintf.c | 2 +- + mm/sparse.c | 3 +-- + tools/testing/ktest/ktest.pl | 2 +- + 62 files changed, 85 insertions(+), 95 deletions(-) +Merging audit/for-next (dcd6c92 Linux 3.3-rc1) +$ git merge audit/for-next +Already up-to-date. +Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased) +$ git merge edac-amd/for-next +Already up-to-date. +Merging devicetree/devicetree/next (3132f62 Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (a2b9ea7 Documentation/devicetree: make semantic of initrd-end more explicit) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration) +$ git merge spi/spi/next +Already up-to-date. +Merging spi-mb/for-next (d595c00 Merge remote-tracking branch 'spi/topic/xilinx' into spi-next) +$ git merge spi-mb/for-next +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (e4aa937 Linux 3.10-rc3) +$ git merge tip/auto-latest +Already up-to-date. +Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being added) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (557c3de Merge commit '14ffcff86dc36fad827ef8350d847daee56e63e4' into HEAD) +$ git merge rcu/rcu/next +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging Documentation/kernel-per-CPU-kthreads.txt +Merge made by the 'recursive' strategy. + Documentation/RCU/RTFP.txt | 855 +++++++++++++++--------- + Documentation/RCU/checklist.txt | 6 - + Documentation/RCU/rcubarrier.txt | 12 +- + Documentation/RCU/torture.txt | 6 - + Documentation/RCU/trace.txt | 100 +-- + Documentation/RCU/whatisRCU.txt | 22 +- + Documentation/kernel-per-CPU-kthreads.txt | 47 ++ + Documentation/timers/NO_HZ.txt | 79 ++- + arch/powerpc/kvm/book3s_hv.c | 2 +- + include/linux/debugobjects.h | 6 +- + include/linux/hardirq.h | 2 +- + include/linux/rcupdate.h | 9 +- + include/linux/rcutiny.h | 41 +- + include/linux/rcutree.h | 3 +- + include/linux/srcu.h | 43 -- + include/linux/tracepoint.h | 4 +- + init/Kconfig | 47 +- + kernel/rcu.h | 10 +- + kernel/rcupdate.c | 129 +--- + kernel/rcutiny.c | 21 +- + kernel/rcutiny_plugin.h | 1009 +---------------------------- + kernel/rcutorture.c | 76 ++- + kernel/rcutree.c | 267 +++----- + kernel/rcutree.h | 17 +- + kernel/rcutree_plugin.h | 81 ++- + lib/debugobjects.c | 20 +- + 26 files changed, 991 insertions(+), 1923 deletions(-) +Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) +$ git merge cputime/cputime +Already up-to-date. +Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (e47a5f5 KVM: x86 emulator: convert XADD to fastop) +$ git merge kvm/linux-next +Resolved 'arch/s390/include/asm/pgtable.h' using previous resolution. +Auto-merging virt/kvm/arm/arch_timer.c +Auto-merging arch/x86/kvm/lapic.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5f2e3821] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/include/asm/kvm_host.h | 4 +- + arch/arm/kvm/Makefile | 7 +- + arch/ia64/kvm/Makefile | 7 +- + arch/powerpc/kvm/Makefile | 13 +- + arch/s390/include/asm/kvm_host.h | 8 +- + arch/s390/include/asm/pgtable.h | 83 +++-- + arch/s390/kernel/asm-offsets.c | 3 + + arch/s390/kernel/entry64.S | 80 ++--- + arch/s390/kvm/Makefile | 3 +- + arch/s390/kvm/intercept.c | 39 +- + arch/s390/kvm/kvm-s390.c | 81 ++++- + arch/s390/kvm/kvm-s390.h | 5 + + arch/s390/kvm/priv.c | 3 +- + arch/s390/mm/pgtable.c | 2 +- + arch/x86/kvm/Makefile | 13 +- + arch/x86/kvm/emulate.c | 391 ++++++--------------- + arch/x86/kvm/lapic.c | 57 ++- + arch/x86/kvm/lapic.h | 6 +- + arch/x86/kvm/mmu.c | 11 +- + arch/x86/kvm/x86.c | 30 +- + .../kvm/arm_arch_timer.h | 0 + .../asm/kvm_vgic.h => include/kvm/arm_vgic.h | 0 + include/linux/kvm_host.h | 1 + + {arch/arm/kvm => virt/kvm/arm}/arch_timer.c | 4 +- + {arch/arm/kvm => virt/kvm/arm}/vgic.c | 0 + virt/kvm/irq_comm.c | 9 +- + virt/kvm/kvm_main.c | 1 + + 27 files changed, 383 insertions(+), 478 deletions(-) + rename arch/arm/include/asm/kvm_arch_timer.h => include/kvm/arm_arch_timer.h (100%) + rename arch/arm/include/asm/kvm_vgic.h => include/kvm/arm_vgic.h (100%) + rename {arch/arm/kvm => virt/kvm/arm}/arch_timer.c (99%) + rename {arch/arm/kvm => virt/kvm/arm}/vgic.c (100%) +Merging kvm-arm/kvm-arm-next (a1b02cb fixup! ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq) +$ git merge kvm-arm/kvm-arm-next +Auto-merging arch/arm/kvm/mmu.c +Auto-merging arch/arm/kvm/arm.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_arm.h | 1 - + arch/arm/include/asm/kvm_asm.h | 2 -- + arch/arm/include/asm/kvm_emulate.h | 5 ----- + arch/arm/include/asm/kvm_host.h | 4 ++-- + arch/arm/kvm/arm.c | 8 ++++---- + arch/arm/kvm/handle_exit.c | 3 --- + arch/arm/kvm/mmio.c | 6 ------ + arch/arm/kvm/mmu.c | 3 --- + arch/arm/kvm/psci.c | 2 +- + arch/arm/kvm/reset.c | 12 ++++++++++++ + include/kvm/arm_arch_timer.h | 4 ++++ + virt/kvm/arm/arch_timer.c | 29 ++++++++++++++++++++--------- + 12 files changed, 43 insertions(+), 36 deletions(-) +Merging kvm-ppc/kvm-ppc-next (5975a2e KVM: PPC: Book3S: Add API for in-kernel XICS emulation) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (f722406 Linux 3.10-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes) +$ git merge xen/upstream/xen +Already up-to-date. +Merging xen-two/linux-next (e592f8d Merge branch 'stable/for-linus-3.10' into linux-next) +$ git merge xen-two/linux-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging xen-arm/linux-next (3a88558 xen/arm: account for stolen ticks) +$ git merge xen-arm/linux-next +Auto-merging arch/arm/kernel/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 20 +++++++++ + arch/arm/include/asm/paravirt.h | 19 +++++++++ + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/paravirt.c | 25 +++++++++++ + arch/arm/xen/enlighten.c | 21 ++++++++++ + arch/ia64/xen/time.c | 48 +++------------------- + arch/x86/xen/time.c | 76 +--------------------------------- + drivers/xen/Makefile | 2 +- + drivers/xen/time.c | 91 +++++++++++++++++++++++++++++++++++++++++ + include/xen/xen-ops.h | 5 +++ + kernel/sched/cputime.c | 4 +- + 11 files changed, 193 insertions(+), 119 deletions(-) + create mode 100644 arch/arm/include/asm/paravirt.h + create mode 100644 arch/arm/kernel/paravirt.c + create mode 100644 drivers/xen/time.c +Merging percpu/for-next (c1ae6e9 percpu-refcount: Don't use silly cmpxchg()) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/percpu-refcount.h | 122 ++++++++++++++++++++++++++++++++++++++++ + lib/Makefile | 2 +- + lib/percpu-refcount.c | 117 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 240 insertions(+), 1 deletion(-) + create mode 100644 include/linux/percpu-refcount.h + create mode 100644 lib/percpu-refcount.c +Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for-next) +$ git merge workqueues/for-next +Auto-merging drivers/net/phy/phy.c +Auto-merging block/blk-core.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 15 +++++++++++++++ + block/blk-core.c | 3 ++- + block/blk-ioc.c | 3 ++- + block/genhd.c | 12 ++++++++---- + drivers/net/phy/phy.c | 9 +++++---- + drivers/video/console/fbcon.c | 2 +- + include/linux/workqueue.h | 35 +++++++++++++++++++++++++++++++++++ + kernel/power/Kconfig | 20 ++++++++++++++++++++ + kernel/workqueue.c | 26 +++++++++++++++++++++++++- + 9 files changed, 113 insertions(+), 12 deletions(-) +Merging drivers-x86/linux-next (a1ec56e Add support for fan button on Ideapad Z580) +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (af844ea Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 2 + + drivers/base/regmap/regcache-rbtree.c | 68 ++++++++++++++++------ + drivers/base/regmap/regcache.c | 103 +++++++++++++++++++++++++++++----- + drivers/base/regmap/regmap-debugfs.c | 9 ++- + drivers/base/regmap/regmap.c | 26 +++++---- + include/linux/regmap.h | 12 ++++ + include/trace/events/regmap.h | 23 ++++++++ + 7 files changed, 198 insertions(+), 45 deletions(-) +Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (1940194 leds: renesas-tpu: cleanup a small type issue) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-lp55xx.txt | 147 +++++++++++++++++++++ + drivers/leds/leds-88pm860x.c | 2 +- + drivers/leds/leds-atmel-pwm.c | 1 - + drivers/leds/leds-gpio.c | 8 -- + drivers/leds/leds-lp5521.c | 28 +++- + drivers/leds/leds-lp5523.c | 28 +++- + drivers/leds/leds-lp5562.c | 28 +++- + drivers/leds/leds-lp55xx-common.c | 45 +++++++ + drivers/leds/leds-lp55xx-common.h | 4 + + drivers/leds/leds-mc13783.c | 1 - + drivers/leds/leds-ns2.c | 2 - + drivers/leds/leds-renesas-tpu.c | 8 +- + drivers/leds/leds-sunfire.c | 4 +- + drivers/leds/leds-wm831x-status.c | 2 +- + 14 files changed, 273 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.txt +Merging driver-core/driver-core-next (ddf1f06 firmware loader: fix build failure with !CONFIG_FW_LOADER_USER_HELPER) +$ git merge driver-core/driver-core-next +Resolved 'drivers/base/cpu.c' using previous resolution. +Auto-merging kernel/power/Kconfig +Auto-merging init/Kconfig +Auto-merging drivers/edac/Kconfig +Auto-merging drivers/base/platform.c +Auto-merging drivers/base/cpu.c +CONFLICT (content): Merge conflict in drivers/base/cpu.c +Auto-merging drivers/base/core.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/cris/arch-v32/drivers/Kconfig +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f69aba2] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-pci | 5 +- + Documentation/HOWTO | 2 +- + Documentation/SubmitChecklist | 2 +- + Documentation/cpu-hotplug.txt | 2 +- + Documentation/hwmon/submitting-patches | 3 +- + Documentation/kbuild/kconfig.txt | 2 +- + Documentation/usb/hotplug.txt | 6 +-- + arch/arm/Kconfig | 2 +- + arch/arm/kernel/module.c | 8 ---- + arch/arm/kernel/vmlinux.lds.S | 4 -- + arch/arm/mach-ixp4xx/Kconfig | 1 - + arch/blackfin/Kconfig | 2 +- + arch/cris/arch-v32/drivers/Kconfig | 1 - + arch/ia64/Kconfig | 1 - + arch/mips/Kconfig | 2 +- + arch/parisc/Kconfig | 1 - + arch/powerpc/Kconfig | 2 +- + arch/powerpc/mm/tlb_hash64.c | 4 +- + arch/s390/Kconfig | 1 - + arch/sh/Kconfig | 2 +- + arch/sparc/Kconfig | 1 - + arch/x86/Kconfig | 2 +- + drivers/base/Kconfig | 2 - + drivers/base/core.c | 16 ++++--- + drivers/base/cpu.c | 26 ++++++---- + drivers/base/firmware_class.c | 84 ++++++++++++++++++++++++++------- + drivers/base/platform.c | 8 ++-- + drivers/char/pcmcia/Kconfig | 2 +- + drivers/edac/Kconfig | 2 +- + drivers/firmware/Kconfig | 1 + + drivers/pci/Kconfig | 2 - + drivers/pci/hotplug/Kconfig | 2 +- + drivers/pcmcia/Kconfig | 1 - + drivers/staging/media/go7007/go7007.txt | 1 - + fs/debugfs/file.c | 43 +++++++++++++++++ + fs/gfs2/Kconfig | 5 +- + fs/sysfs/dir.c | 2 +- + fs/sysfs/inode.c | 2 - + include/asm-generic/vmlinux.lds.h | 20 -------- + include/linux/debugfs.h | 2 + + include/linux/platform_device.h | 8 +++- + init/Kconfig | 3 -- + kernel/power/Kconfig | 1 - + lib/fault-inject.c | 21 --------- + mm/Kconfig | 2 +- + 45 files changed, 177 insertions(+), 135 deletions(-) +Merging tty/tty-next (e943f58 stallion: final cleanup) +$ git merge tty/tty-next +Auto-merging drivers/video/console/fbcon.c +Auto-merging drivers/tty/serial/samsung.c +Auto-merging drivers/tty/serial/imx.c +Auto-merging arch/parisc/kernel/setup.c +Auto-merging MAINTAINERS +Removing Documentation/serial/stallion.txt +Merge made by the 'recursive' strategy. + Documentation/console/console.txt | 28 +- + .../bindings/tty/serial/fsl-imx-uart.txt | 3 + + Documentation/serial/00-INDEX | 2 - + Documentation/serial/stallion.txt | 392 ------------------ + MAINTAINERS | 2 +- + arch/alpha/kernel/console.c | 4 +- + arch/alpha/kernel/process.c | 4 +- + arch/mips/pci/pci-bcm1480.c | 4 +- + arch/mips/pci/pci-sb1250.c | 4 +- + arch/parisc/kernel/setup.c | 2 +- + arch/powerpc/include/asm/mpc52xx_psc.h | 49 +++ + drivers/char/Kconfig | 12 - + drivers/tty/Makefile | 2 +- + drivers/tty/hvc/hvc_iucv.c | 2 +- + drivers/tty/n_tty.c | 12 +- + drivers/tty/serial/8250/Kconfig | 5 +- + drivers/tty/serial/altera_uart.c | 1 - + drivers/tty/serial/amba-pl011.c | 11 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 4 +- + drivers/tty/serial/imx.c | 21 + + drivers/tty/serial/mpc52xx_uart.c | 421 ++++++++++++++++--- + drivers/tty/serial/of_serial.c | 4 +- + drivers/tty/serial/omap-serial.c | 34 +- + drivers/tty/serial/samsung.c | 8 +- + drivers/tty/serial/sc26xx.c | 5 +- + drivers/tty/serial/serial_core.c | 6 - + drivers/tty/serial/sunhv.c | 6 +- + drivers/tty/serial/sunsab.c | 6 +- + drivers/tty/serial/sunsu.c | 8 +- + drivers/tty/serial/sunzilog.c | 6 +- + drivers/tty/serial/ucc_uart.c | 9 +- + drivers/tty/serial/vt8500_serial.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 36 +- + drivers/tty/sysrq.c | 2 +- + drivers/tty/tty_ldsem.c | 453 +++++++++++++++++++++ + drivers/tty/vt/vt.c | 117 +----- + drivers/usb/misc/sisusbvga/sisusb_con.c | 18 +- + drivers/video/console/fbcon.c | 35 +- + drivers/video/console/mdacon.c | 8 +- + drivers/video/console/newport_con.c | 9 +- + drivers/video/console/sticon.c | 6 +- + include/linux/console.h | 3 - + include/linux/serial_core.h | 7 + + include/linux/tty.h | 2 - + include/linux/tty_ldisc.h | 46 +++ + include/linux/vt_kern.h | 2 - + 46 files changed, 1094 insertions(+), 729 deletions(-) + delete mode 100644 Documentation/serial/stallion.txt + create mode 100644 drivers/tty/tty_ldsem.c +Merging usb/usb-next (0c967e7 USB: serial: pl2303 works at 500kbps) +$ git merge usb/usb-next +Auto-merging drivers/usb/serial/keyspan.c +Auto-merging drivers/usb/musb/musb_host.c +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/usb/core/devio.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/usb3503.txt | 5 + + drivers/usb/Makefile | 1 + + drivers/usb/chipidea/ci13xxx_imx.c | 2 - + drivers/usb/chipidea/ci13xxx_pci.c | 1 - + drivers/usb/class/usbtmc.c | 273 +- + drivers/usb/core/devio.c | 7 +- + drivers/usb/core/hcd.c | 28 + + drivers/usb/core/message.c | 16 +- + drivers/usb/core/usb.c | 33 + + drivers/usb/gadget/mv_u3d_core.c | 3 - + drivers/usb/gadget/pxa27x_udc.c | 1 - + drivers/usb/host/Kconfig | 19 +- + drivers/usb/host/Makefile | 5 + + drivers/usb/host/ehci-fsl.c | 1 + + drivers/usb/host/ehci-grlib.c | 6 +- + drivers/usb/host/ehci-hub.c | 16 + + drivers/usb/host/ehci-mv.c | 16 +- + drivers/usb/host/ehci-mxc.c | 1 - + drivers/usb/host/ehci-octeon.c | 2 - + drivers/usb/host/ehci-omap.c | 2 +- + drivers/usb/host/ehci-orion.c | 2 +- + drivers/usb/host/ehci-platform.c | 3 +- + drivers/usb/host/ehci-ppc-of.c | 6 +- + drivers/usb/host/ehci-s5p.c | 12 + + drivers/usb/host/ehci-sead3.c | 1 - + drivers/usb/host/ehci-sh.c | 1 - + drivers/usb/host/ehci-spear.c | 6 +- + drivers/usb/host/ehci-tilegx.c | 1 - + drivers/usb/host/ehci-xilinx-of.c | 5 +- + drivers/usb/host/fhci-sched.c | 8 +- + drivers/usb/host/fhci.h | 2 +- + drivers/usb/host/fusbh200-hcd.c | 5972 +++++++++++++++++++++ + drivers/usb/host/fusbh200.h | 743 +++ + drivers/usb/host/hwa-hc.c | 2 +- + drivers/usb/host/imx21-hcd.c | 43 +- + drivers/usb/host/isp1760-if.c | 10 +- + drivers/usb/host/ohci-da8xx.c | 1 - + drivers/usb/host/ohci-hcd.c | 140 +- + drivers/usb/host/ohci-hub.c | 1 - + drivers/usb/host/ohci-jz4740.c | 3 - + drivers/usb/host/ohci-nxp.c | 3 - + drivers/usb/host/ohci-octeon.c | 2 - + drivers/usb/host/ohci-omap.c | 1 - + drivers/usb/host/ohci-omap3.c | 2 +- + drivers/usb/host/ohci-pci.c | 151 +- + drivers/usb/host/ohci-platform.c | 89 +- + drivers/usb/host/ohci-ppc-of.c | 5 +- + drivers/usb/host/ohci-pxa27x.c | 1 - + drivers/usb/host/ohci-q.c | 6 +- + drivers/usb/host/ohci-sm501.c | 1 - + drivers/usb/host/ohci-spear.c | 4 +- + drivers/usb/host/ohci-tilegx.c | 1 - + drivers/usb/host/ohci-tmio.c | 2 - + drivers/usb/host/ohci.h | 20 + + drivers/usb/host/oxu210hp-hcd.c | 2 - + drivers/usb/host/pci-quirks.c | 13 + + drivers/usb/host/pci-quirks.h | 2 + + drivers/usb/host/uhci-grlib.c | 6 +- + drivers/usb/host/uhci-platform.c | 5 +- + drivers/usb/host/xhci-plat.c | 2 +- + drivers/usb/misc/adutux.c | 141 +- + drivers/usb/misc/usb3503.c | 41 +- + drivers/usb/musb/musb_host.c | 3 +- + drivers/usb/phy/phy-nop.c | 2 +- + drivers/usb/serial/Kconfig | 10 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/flashloader.c | 39 + + drivers/usb/serial/keyspan.c | 13 +- + drivers/usb/serial/pl2303.c | 8 +- + drivers/usb/serial/quatech2.c | 2 +- + drivers/usb/storage/alauda.c | 6 +- + drivers/usb/storage/sddr09.c | 6 +- + drivers/uwb/drp.c | 4 +- + drivers/uwb/est.c | 7 +- + drivers/uwb/rsv.c | 4 +- + drivers/uwb/whci.c | 14 +- + include/linux/platform_data/usb3503.h | 5 + + include/linux/usb.h | 1 + + include/linux/usb/hcd.h | 1 + + 79 files changed, 7502 insertions(+), 524 deletions(-) + create mode 100644 drivers/usb/host/fusbh200-hcd.c + create mode 100644 drivers/usb/host/fusbh200.h + create mode 100644 drivers/usb/serial/flashloader.c +Merging usb-gadget/next (2d22b42 usb: phy: registering Tegra USB PHY as platform driver) +$ git merge usb-gadget/next +Auto-merging drivers/usb/musb/omap2430.c +Auto-merging drivers/usb/musb/musb_host.h +Auto-merging drivers/usb/musb/musb_host.c +Auto-merging drivers/usb/gadget/mv_u3d_core.c +Merge made by the 'recursive' strategy. + .../bindings/usb/nvidia,tegra20-ehci.txt | 27 +- + .../bindings/usb/nvidia,tegra20-usb-phy.txt | 41 +- + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 6 +- + arch/arm/boot/dts/tegra20-harmony.dts | 15 +- + arch/arm/boot/dts/tegra20-iris-512.dts | 9 +- + arch/arm/boot/dts/tegra20-paz00.dts | 15 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 26 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 4 + + arch/arm/boot/dts/tegra20-trimslice.dts | 25 +- + arch/arm/boot/dts/tegra20-ventana.dts | 15 +- + arch/arm/boot/dts/tegra20-whistler.dts | 28 + + arch/arm/boot/dts/tegra20.dtsi | 49 +- + drivers/usb/gadget/Kconfig | 8 - + drivers/usb/gadget/f_uvc.c | 13 +- + drivers/usb/gadget/fsl_qe_udc.c | 4 +- + drivers/usb/gadget/fusb300_udc.c | 4 +- + drivers/usb/gadget/m66592-udc.c | 4 +- + drivers/usb/gadget/mv_u3d_core.c | 2 +- + drivers/usb/gadget/r8a66597-udc.c | 4 +- + drivers/usb/host/ehci-tegra.c | 105 ++- + drivers/usb/musb/Kconfig | 29 + + drivers/usb/musb/Makefile | 4 +- + drivers/usb/musb/blackfin.c | 18 +- + drivers/usb/musb/da8xx.c | 18 +- + drivers/usb/musb/davinci.c | 18 +- + drivers/usb/musb/musb_core.c | 137 ++-- + drivers/usb/musb/musb_core.h | 27 +- + drivers/usb/musb/musb_gadget.c | 10 - + drivers/usb/musb/musb_gadget.h | 38 +- + drivers/usb/musb/musb_host.c | 90 ++- + drivers/usb/musb/musb_host.h | 57 +- + drivers/usb/musb/musb_virthub.c | 54 +- + drivers/usb/musb/omap2430.c | 20 +- + drivers/usb/musb/tusb6010.c | 18 +- + drivers/usb/musb/ux500.c | 18 +- + drivers/usb/musb/ux500_dma.c | 6 +- + drivers/usb/phy/Kconfig | 2 +- + drivers/usb/phy/phy-ab8500-usb.c | 846 ++++++++++++++++++--- + drivers/usb/phy/phy-samsung-usb.c | 159 ++-- + drivers/usb/phy/phy-samsung-usb.h | 24 +- + drivers/usb/phy/phy-samsung-usb2.c | 62 +- + drivers/usb/phy/phy-samsung-usb3.c | 23 +- + drivers/usb/phy/phy-tegra-usb.c | 318 +++++--- + include/linux/usb/tegra_usb_phy.h | 13 +- + 44 files changed, 1749 insertions(+), 664 deletions(-) +Merging staging/staging-next (ec0ee95 Revert "ozwpan: replace alloc_skb with dev_alloc_skb in ozpd.c") +$ git merge staging/staging-next +Resolved 'drivers/staging/silicom/bpctl_mod.c' using previous resolution. +Auto-merging drivers/thermal/ti-soc-thermal/ti-thermal-common.c +Auto-merging drivers/staging/silicom/bpctl_mod.c +CONFLICT (content): Merge conflict in drivers/staging/silicom/bpctl_mod.c +Auto-merging drivers/staging/dwc2/hcd.c +Auto-merging drivers/staging/csr/netdev.c +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 23ac54a] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/iio/magnetometer/ak8975.txt | 18 + + .../devicetree/bindings/thermal/ti_soc_thermal.txt | 1 + + MAINTAINERS | 2 +- + drivers/iio/Kconfig | 3 + + drivers/iio/Makefile | 1 + + drivers/iio/accel/Kconfig | 1 - + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/exynos_adc.c | 12 +- + drivers/iio/adc/mcp320x.c | 257 ++ + drivers/iio/gyro/Kconfig | 1 - + drivers/iio/industrialio-buffer.c | 10 +- + drivers/iio/light/hid-sensor-als.c | 2 +- + drivers/iio/magnetometer/Kconfig | 1 - + drivers/iio/magnetometer/ak8975.c | 103 +- + drivers/iio/trigger/Kconfig | 17 + + drivers/iio/trigger/Makefile | 5 + + drivers/{staging => }/iio/trigger/iio-trig-sysfs.c | 0 + drivers/staging/Kconfig | 6 + + drivers/staging/Makefile | 3 + + drivers/staging/android/ashmem.c | 3 +- + drivers/staging/android/sw_sync.c | 6 +- + drivers/staging/android/sync.c | 22 +- + drivers/staging/asus_oled/asus_oled.c | 26 +- + drivers/staging/bcm/Bcmchar.c | 2 +- + drivers/staging/bcm/InterfaceIdleMode.c | 199 +- + drivers/staging/bcm/Version.h | 8 +- + drivers/staging/bcm/vendorspecificextn.c | 198 +- + drivers/staging/btmtk_usb/Kconfig | 11 + + drivers/staging/btmtk_usb/Makefile | 1 + + drivers/staging/btmtk_usb/README | 14 + + drivers/staging/btmtk_usb/TODO | 10 + + drivers/staging/btmtk_usb/btmtk_usb.c | 1784 ++++++++ + drivers/staging/btmtk_usb/btmtk_usb.h | 138 + + drivers/staging/ced1401/ced_ioc.c | 665 ++- + drivers/staging/ced1401/ced_ioctl.h | 2 +- + drivers/staging/ced1401/machine.h | 32 +- + drivers/staging/ced1401/usb1401.c | 613 ++- + drivers/staging/ced1401/usb1401.h | 285 +- + drivers/staging/ced1401/use1401.h | 201 +- + drivers/staging/ced1401/use14_ioc.h | 503 ++- + drivers/staging/ced1401/userspace/use1401.c | 152 +- + drivers/staging/comedi/comedi.h | 5 - + drivers/staging/comedi/comedi_buf.c | 4 - + drivers/staging/comedi/comedi_compat32.c | 5 - + drivers/staging/comedi/comedi_compat32.h | 5 - + drivers/staging/comedi/comedi_fops.c | 5 - + drivers/staging/comedi/comedi_pci.c | 4 - + drivers/staging/comedi/comedi_pcmcia.c | 4 - + drivers/staging/comedi/comedi_usb.c | 16 +- + drivers/staging/comedi/comedidev.h | 13 +- + drivers/staging/comedi/comedilib.h | 5 - + drivers/staging/comedi/drivers.c | 38 +- + drivers/staging/comedi/drivers/8253.h | 5 - + drivers/staging/comedi/drivers/8255.c | 5 - + drivers/staging/comedi/drivers/8255.h | 5 - + drivers/staging/comedi/drivers/8255_pci.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 4 - + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Tor.c | 4 - + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 4 - + .../staging/comedi/drivers/addi-data/addi_common.c | 7 - + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 7 - + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci035.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 4 - + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 4 - + drivers/staging/comedi/drivers/addi_apci_1032.c | 7 - + drivers/staging/comedi/drivers/addi_apci_1516.c | 7 - + drivers/staging/comedi/drivers/addi_apci_16xx.c | 7 - + drivers/staging/comedi/drivers/addi_apci_2032.c | 7 - + drivers/staging/comedi/drivers/addi_apci_2200.c | 7 - + drivers/staging/comedi/drivers/addi_apci_3501.c | 7 - + drivers/staging/comedi/drivers/addi_watchdog.c | 4 - + drivers/staging/comedi/drivers/adl_pci6208.c | 4 - + drivers/staging/comedi/drivers/adl_pci7x3x.c | 4 - + drivers/staging/comedi/drivers/adl_pci8164.c | 4 - + drivers/staging/comedi/drivers/adl_pci9111.c | 4 - + drivers/staging/comedi/drivers/adq12b.c | 5 - + drivers/staging/comedi/drivers/adv_pci1723.c | 9 +- + drivers/staging/comedi/drivers/adv_pci1724.c | 7 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 4 - + drivers/staging/comedi/drivers/aio_iiro_16.c | 4 - + drivers/staging/comedi/drivers/amplc_dio200.c | 5 - + drivers/staging/comedi/drivers/amplc_dio200.h | 5 - + .../staging/comedi/drivers/amplc_dio200_common.c | 5 - + drivers/staging/comedi/drivers/amplc_dio200_pci.c | 5 - + drivers/staging/comedi/drivers/amplc_pc236.c | 5 - + drivers/staging/comedi/drivers/amplc_pc263.c | 5 - + drivers/staging/comedi/drivers/amplc_pci224.c | 5 - + drivers/staging/comedi/drivers/amplc_pci230.c | 4 - + drivers/staging/comedi/drivers/amplc_pci263.c | 5 - + drivers/staging/comedi/drivers/c6xdigio.c | 5 - + drivers/staging/comedi/drivers/cb_das16_cs.c | 4 - + drivers/staging/comedi/drivers/cb_pcidas.c | 6 - + drivers/staging/comedi/drivers/cb_pcidas64.c | 7 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 4 - + drivers/staging/comedi/drivers/cb_pcimdas.c | 5 - + drivers/staging/comedi/drivers/cb_pcimdda.c | 5 - + drivers/staging/comedi/drivers/comedi_bond.c | 5 - + drivers/staging/comedi/drivers/comedi_fc.c | 7 +- + drivers/staging/comedi/drivers/comedi_fc.h | 7 +- + drivers/staging/comedi/drivers/comedi_parport.c | 5 - + drivers/staging/comedi/drivers/comedi_test.c | 7 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 5 - + drivers/staging/comedi/drivers/daqboard2000.c | 29 +- + drivers/staging/comedi/drivers/das08.c | 6 - + drivers/staging/comedi/drivers/das08.h | 5 - + drivers/staging/comedi/drivers/das08_cs.c | 7 - + drivers/staging/comedi/drivers/das08_isa.c | 4 - + drivers/staging/comedi/drivers/das08_pci.c | 4 - + drivers/staging/comedi/drivers/das16.c | 6 - + drivers/staging/comedi/drivers/das16m1.c | 6 - + drivers/staging/comedi/drivers/das1800.c | 6 - + drivers/staging/comedi/drivers/das6402.c | 5 - + drivers/staging/comedi/drivers/das800.c | 6 - + drivers/staging/comedi/drivers/dmm32at.c | 5 - + drivers/staging/comedi/drivers/dt2811.c | 4 - + drivers/staging/comedi/drivers/dt2814.c | 5 - + drivers/staging/comedi/drivers/dt2815.c | 5 - + drivers/staging/comedi/drivers/dt2817.c | 5 - + drivers/staging/comedi/drivers/dt282x.c | 5 - + drivers/staging/comedi/drivers/dt3000.c | 5 - + drivers/staging/comedi/drivers/dt9812.c | 1031 ++--- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 4 - + drivers/staging/comedi/drivers/gsc_hpdi.c | 7 +- + drivers/staging/comedi/drivers/icp_multi.c | 5 - + drivers/staging/comedi/drivers/jr3_pci.c | 51 +- + drivers/staging/comedi/drivers/ke_counter.c | 5 - + drivers/staging/comedi/drivers/me4000.c | 5 - + drivers/staging/comedi/drivers/me_daq.c | 28 +- + drivers/staging/comedi/drivers/mite.c | 5 - + drivers/staging/comedi/drivers/mite.h | 5 - + drivers/staging/comedi/drivers/mpc624.c | 5 - + drivers/staging/comedi/drivers/multiq3.c | 5 - + drivers/staging/comedi/drivers/ni_6527.c | 5 - + drivers/staging/comedi/drivers/ni_65xx.c | 5 - + drivers/staging/comedi/drivers/ni_660x.c | 4 - + drivers/staging/comedi/drivers/ni_670x.c | 5 - + drivers/staging/comedi/drivers/ni_at_a2150.c | 6 - + drivers/staging/comedi/drivers/ni_at_ao.c | 5 - + drivers/staging/comedi/drivers/ni_atmio.c | 4 - + drivers/staging/comedi/drivers/ni_atmio16d.c | 5 - + drivers/staging/comedi/drivers/ni_daq_700.c | 5 - + drivers/staging/comedi/drivers/ni_daq_dio24.c | 6 - + drivers/staging/comedi/drivers/ni_labpc.c | 66 +- + drivers/staging/comedi/drivers/ni_labpc.h | 28 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 11 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 10 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 5 - + drivers/staging/comedi/drivers/ni_mio_cs.c | 5 - + drivers/staging/comedi/drivers/ni_pcidio.c | 30 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 4 - + drivers/staging/comedi/drivers/ni_stc.h | 5 - + drivers/staging/comedi/drivers/ni_tio.c | 4 - + drivers/staging/comedi/drivers/ni_tio.h | 5 - + drivers/staging/comedi/drivers/ni_tio_internal.h | 5 - + drivers/staging/comedi/drivers/ni_tiocmd.c | 4 - + drivers/staging/comedi/drivers/pcl711.c | 5 - + drivers/staging/comedi/drivers/pcl726.c | 5 - + drivers/staging/comedi/drivers/pcmad.c | 5 - + drivers/staging/comedi/drivers/pcmda12.c | 4 - + drivers/staging/comedi/drivers/pcmmio.c | 4 - + drivers/staging/comedi/drivers/pcmuio.c | 4 - + drivers/staging/comedi/drivers/plx9052.h | 5 - + drivers/staging/comedi/drivers/poc.c | 4 - + drivers/staging/comedi/drivers/rtd520.c | 4 - + drivers/staging/comedi/drivers/rti800.c | 4 - + drivers/staging/comedi/drivers/rti802.c | 5 - + drivers/staging/comedi/drivers/s526.c | 5 - + drivers/staging/comedi/drivers/s626.c | 5 - + drivers/staging/comedi/drivers/s626.h | 5 - + drivers/staging/comedi/drivers/serial2002.c | 5 - + drivers/staging/comedi/drivers/skel.c | 5 - + drivers/staging/comedi/drivers/ssv_dnp.c | 5 - + drivers/staging/comedi/drivers/unioxx5.c | 4 - + drivers/staging/comedi/drivers/usbdux.c | 236 +- + drivers/staging/comedi/drivers/usbduxfast.c | 1282 ++---- + drivers/staging/comedi/drivers/usbduxsigma.c | 2960 +++++-------- + drivers/staging/comedi/drivers/vmk80xx.c | 88 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 5 - + drivers/staging/comedi/proc.c | 5 - + drivers/staging/comedi/range.c | 5 - + drivers/staging/cptm1217/clearpad_tm1217.c | 4 +- + drivers/staging/crystalhd/bc_dts_glob_lnx.h | 19 +- + drivers/staging/crystalhd/crystalhd_cmds.c | 28 +- + drivers/staging/crystalhd/crystalhd_cmds.h | 19 +- + drivers/staging/crystalhd/crystalhd_fw_if.h | 81 +- + drivers/staging/crystalhd/crystalhd_hw.c | 231 +- + drivers/staging/crystalhd/crystalhd_hw.h | 121 +- + drivers/staging/crystalhd/crystalhd_lnx.c | 33 +- + drivers/staging/crystalhd/crystalhd_lnx.h | 4 +- + drivers/staging/crystalhd/crystalhd_misc.c | 39 +- + drivers/staging/crystalhd/crystalhd_misc.h | 37 +- + drivers/staging/csr/bh.c | 213 +- + drivers/staging/csr/csr_wifi_nme_ap_sef.c | 4 +- + drivers/staging/csr/drv.c | 6 +- + drivers/staging/csr/io.c | 18 +- + drivers/staging/csr/netdev.c | 100 +- + drivers/staging/csr/sdio_mmc.c | 4 +- + drivers/staging/csr/sme_blocking.c | 24 +- + drivers/staging/csr/sme_native.c | 2 +- + drivers/staging/csr/sme_sys.c | 148 +- + drivers/staging/csr/sme_userspace.c | 4 +- + drivers/staging/csr/sme_wext.c | 116 +- + drivers/staging/csr/ul_int.c | 2 +- + drivers/staging/csr/unifi_event.c | 20 +- + drivers/staging/csr/unifi_pdu_processing.c | 490 +-- + drivers/staging/csr/unifi_priv.h | 30 +- + drivers/staging/csr/unifi_sme.c | 24 +- + drivers/staging/csr/unifi_sme.h | 8 +- + drivers/staging/cxt1e1/comet.c | 819 ++-- + drivers/staging/cxt1e1/functions.c | 10 +- + drivers/staging/cxt1e1/hwprobe.c | 6 +- + drivers/staging/cxt1e1/linux.c | 64 +- + drivers/staging/cxt1e1/musycc.c | 42 +- + drivers/staging/cxt1e1/pmcc4.h | 10 +- + drivers/staging/cxt1e1/pmcc4_drv.c | 52 +- + drivers/staging/cxt1e1/sbecom_inline_linux.h | 6 +- + drivers/staging/cxt1e1/sbeid.c | 6 +- + drivers/staging/cxt1e1/sbeproc.h | 4 +- + drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +- + drivers/staging/dgrp/dgrp_net_ops.c | 4 +- + drivers/staging/dgrp/drp.h | 2 +- + drivers/staging/dwc2/core.c | 44 +- + drivers/staging/dwc2/core_intr.c | 15 +- + drivers/staging/dwc2/hcd.c | 17 +- + drivers/staging/dwc2/hcd.h | 12 +- + drivers/staging/dwc2/hcd_intr.c | 26 +- + drivers/staging/dwc2/pci.c | 19 +- + drivers/staging/echo/echo.c | 78 +- + drivers/staging/echo/echo.h | 26 +- + drivers/staging/frontier/alphatrack.c | 49 +- + drivers/staging/frontier/alphatrack.h | 6 +- + drivers/staging/frontier/tranzport.c | 18 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 35 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 439 +- + drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 156 +- + drivers/staging/fwserial/fwserial.c | 135 +- + drivers/staging/fwserial/fwserial.h | 2 - + drivers/staging/gdm72xx/gdm_wimax.c | 3 +- + drivers/staging/goldfish/goldfish_audio.c | 30 +- + drivers/staging/goldfish/goldfish_nand.c | 11 +- + drivers/staging/goldfish/goldfish_nand_reg.h | 35 +- + drivers/staging/iio/adc/ad7192.c | 2 +- + drivers/staging/iio/adc/ad7280a.c | 2 +- + drivers/staging/iio/adc/ad7606_core.c | 12 +- + drivers/staging/iio/adc/ad7816.c | 8 +- + drivers/staging/iio/adc/ad799x_core.c | 4 +- + drivers/staging/iio/adc/mxs-lradc.c | 8 +- + drivers/staging/iio/trigger/Kconfig | 11 - + drivers/staging/iio/trigger/Makefile | 1 - + drivers/staging/imx-drm/imx-drm-core.c | 2 +- + drivers/staging/imx-drm/imx-tve.c | 18 +- + drivers/staging/imx-drm/ipu-v3/ipu-di.c | 13 +- + drivers/staging/imx-drm/parallel-display.c | 10 - + drivers/staging/keucr/init.c | 6 +- + drivers/staging/keucr/scsiglue.c | 16 +- + drivers/staging/keucr/smilmain.c | 1895 ++------- + drivers/staging/keucr/smilsub.c | 25 +- + drivers/staging/keucr/smscsi.c | 32 +- + drivers/staging/keucr/transport.h | 2 +- + drivers/staging/keucr/usb.c | 53 +- + drivers/staging/keucr/usb.h | 83 +- + drivers/staging/lustre/Kconfig | 3 + + drivers/staging/lustre/Makefile | 4 + + drivers/staging/lustre/TODO | 13 + + .../staging/lustre/include/linux/libcfs/bitmap.h | 111 + + .../staging/lustre/include/linux/libcfs/curproc.h | 110 + + .../staging/lustre/include/linux/libcfs/libcfs.h | 234 + + .../lustre/include/linux/libcfs/libcfs_cpu.h | 214 + + .../lustre/include/linux/libcfs/libcfs_crypto.h | 201 + + .../lustre/include/linux/libcfs/libcfs_debug.h | 350 ++ + .../lustre/include/linux/libcfs/libcfs_fail.h | 170 + + .../lustre/include/linux/libcfs/libcfs_hash.h | 851 ++++ + .../lustre/include/linux/libcfs/libcfs_heap.h | 200 + + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 222 + + .../include/linux/libcfs/libcfs_kernelcomm.h | 117 + + .../lustre/include/linux/libcfs/libcfs_prim.h | 101 + + .../lustre/include/linux/libcfs/libcfs_private.h | 568 +++ + .../lustre/include/linux/libcfs/libcfs_string.h | 137 + + .../lustre/include/linux/libcfs/libcfs_time.h | 132 + + .../lustre/include/linux/libcfs/libcfs_workitem.h | 110 + + .../lustre/include/linux/libcfs/linux/kp30.h | 286 ++ + .../lustre/include/linux/libcfs/linux/libcfs.h | 125 + + .../include/linux/libcfs/linux/linux-bitops.h | 38 + + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 175 + + .../include/linux/libcfs/linux/linux-crypto.h | 49 + + .../lustre/include/linux/libcfs/linux/linux-fs.h | 92 + + .../lustre/include/linux/libcfs/linux/linux-lock.h | 204 + + .../lustre/include/linux/libcfs/linux/linux-mem.h | 120 + + .../lustre/include/linux/libcfs/linux/linux-prim.h | 243 ++ + .../include/linux/libcfs/linux/linux-tcpip.h | 87 + + .../lustre/include/linux/libcfs/linux/linux-time.h | 275 ++ + .../include/linux/libcfs/linux/linux-types.h | 36 + + .../include/linux/libcfs/linux/portals_compat25.h | 116 + + .../staging/lustre/include/linux/libcfs/lucache.h | 162 + + .../lustre/include/linux/libcfs/params_tree.h | 166 + + .../lustre/include/linux/lnet/api-support.h | 44 + + drivers/staging/lustre/include/linux/lnet/api.h | 220 + + .../staging/lustre/include/linux/lnet/lib-lnet.h | 874 ++++ + .../staging/lustre/include/linux/lnet/lib-types.h | 765 ++++ + .../lustre/include/linux/lnet/linux/api-support.h | 43 + + .../lustre/include/linux/lnet/linux/lib-lnet.h | 72 + + .../lustre/include/linux/lnet/linux/lib-types.h | 45 + + .../staging/lustre/include/linux/lnet/linux/lnet.h | 56 + + .../lustre/include/linux/lnet/lnet-sysctl.h | 51 + + drivers/staging/lustre/include/linux/lnet/lnet.h | 51 + + .../staging/lustre/include/linux/lnet/lnetctl.h | 80 + + drivers/staging/lustre/include/linux/lnet/lnetst.h | 491 +++ + drivers/staging/lustre/include/linux/lnet/ptllnd.h | 94 + + .../lustre/include/linux/lnet/ptllnd_wire.h | 124 + + .../staging/lustre/include/linux/lnet/socklnd.h | 103 + + drivers/staging/lustre/include/linux/lnet/types.h | 503 +++ + drivers/staging/lustre/lnet/Kconfig | 40 + + drivers/staging/lustre/lnet/Makefile | 1 + + drivers/staging/lustre/lnet/klnds/Makefile | 1 + + drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile | 5 + + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 3257 ++++++++++++++ + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 1057 +++++ + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 3529 +++++++++++++++ + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 493 +++ + drivers/staging/lustre/lnet/klnds/socklnd/Makefile | 7 + + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 2902 +++++++++++++ + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 602 +++ + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 2664 ++++++++++++ + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 1088 +++++ + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h | 91 + + .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 198 + + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 797 ++++ + drivers/staging/lustre/lnet/lnet/Makefile | 8 + + drivers/staging/lustre/lnet/lnet/acceptor.c | 527 +++ + drivers/staging/lustre/lnet/lnet/api-errno.c | 39 + + drivers/staging/lustre/lnet/lnet/api-ni.c | 1941 +++++++++ + drivers/staging/lustre/lnet/lnet/config.c | 1264 ++++++ + drivers/staging/lustre/lnet/lnet/lib-eq.c | 447 ++ + drivers/staging/lustre/lnet/lnet/lib-md.c | 451 ++ + drivers/staging/lustre/lnet/lnet/lib-me.c | 297 ++ + drivers/staging/lustre/lnet/lnet/lib-move.c | 2441 +++++++++++ + drivers/staging/lustre/lnet/lnet/lib-msg.c | 650 +++ + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 938 ++++ + drivers/staging/lustre/lnet/lnet/lo.c | 120 + + drivers/staging/lustre/lnet/lnet/module.c | 154 + + drivers/staging/lustre/lnet/lnet/peer.c | 337 ++ + drivers/staging/lustre/lnet/lnet/router.c | 1694 ++++++++ + drivers/staging/lustre/lnet/lnet/router_proc.c | 950 +++++ + drivers/staging/lustre/lnet/selftest/Makefile | 6 + + drivers/staging/lustre/lnet/selftest/brw_test.c | 499 +++ + drivers/staging/lustre/lnet/selftest/conctl.c | 931 ++++ + drivers/staging/lustre/lnet/selftest/conrpc.c | 1397 ++++++ + drivers/staging/lustre/lnet/selftest/conrpc.h | 146 + + drivers/staging/lustre/lnet/selftest/console.c | 2071 +++++++++ + drivers/staging/lustre/lnet/selftest/console.h | 232 + + drivers/staging/lustre/lnet/selftest/framework.c | 1814 ++++++++ + drivers/staging/lustre/lnet/selftest/module.c | 169 + + drivers/staging/lustre/lnet/selftest/ping_test.c | 229 + + drivers/staging/lustre/lnet/selftest/rpc.c | 1666 ++++++++ + drivers/staging/lustre/lnet/selftest/rpc.h | 302 ++ + drivers/staging/lustre/lnet/selftest/selftest.h | 611 +++ + drivers/staging/lustre/lnet/selftest/timer.c | 253 ++ + drivers/staging/lustre/lnet/selftest/timer.h | 53 + + drivers/staging/lustre/lustre/Kconfig | 33 + + drivers/staging/lustre/lustre/Makefile | 2 + + drivers/staging/lustre/lustre/fid/Makefile | 5 + + drivers/staging/lustre/lustre/fid/fid_handler.c | 661 +++ + drivers/staging/lustre/lustre/fid/fid_internal.h | 84 + + drivers/staging/lustre/lustre/fid/fid_lib.c | 97 + + drivers/staging/lustre/lustre/fid/fid_request.c | 522 +++ + drivers/staging/lustre/lustre/fid/fid_store.c | 259 ++ + drivers/staging/lustre/lustre/fid/lproc_fid.c | 222 + + drivers/staging/lustre/lustre/fld/Makefile | 5 + + drivers/staging/lustre/lustre/fld/fld_cache.c | 566 +++ + drivers/staging/lustre/lustre/fld/fld_handler.c | 447 ++ + drivers/staging/lustre/lustre/fld/fld_index.c | 426 ++ + drivers/staging/lustre/lustre/fld/fld_internal.h | 223 + + drivers/staging/lustre/lustre/fld/fld_request.c | 519 +++ + drivers/staging/lustre/lustre/fld/lproc_fld.c | 373 ++ + drivers/staging/lustre/lustre/include/cl_object.h | 3279 ++++++++++++++ + drivers/staging/lustre/lustre/include/dt_object.h | 1498 +++++++ + .../staging/lustre/lustre/include/interval_tree.h | 124 + + drivers/staging/lustre/lustre/include/ioctl.h | 106 + + drivers/staging/lustre/lustre/include/lclient.h | 437 ++ + .../lustre/lustre/include/linux/lprocfs_status.h | 58 + + .../lustre/lustre/include/linux/lustre_acl.h | 66 + + .../lustre/lustre/include/linux/lustre_common.h | 22 + + .../lustre/lustre/include/linux/lustre_compat25.h | 349 ++ + .../lustre/lustre/include/linux/lustre_debug.h | 47 + + .../lustre/lustre/include/linux/lustre_dlm.h | 46 + + .../lustre/lustre/include/linux/lustre_fsfilt.h | 181 + + .../lustre/lustre/include/linux/lustre_handles.h | 53 + + .../lustre/lustre/include/linux/lustre_intent.h | 62 + + .../lustre/lustre/include/linux/lustre_lib.h | 87 + + .../lustre/lustre/include/linux/lustre_lite.h | 100 + + .../lustre/lustre/include/linux/lustre_log.h | 57 + + .../lustre/lustre/include/linux/lustre_net.h | 50 + + .../lustre/include/linux/lustre_patchless_compat.h | 85 + + .../lustre/lustre/include/linux/lustre_quota.h | 47 + + .../lustre/lustre/include/linux/lustre_user.h | 67 + + drivers/staging/lustre/lustre/include/linux/lvfs.h | 134 + + .../lustre/lustre/include/linux/lvfs_linux.h | 66 + + drivers/staging/lustre/lustre/include/linux/obd.h | 128 + + .../lustre/lustre/include/linux/obd_class.h | 58 + + .../lustre/lustre/include/linux/obd_support.h | 63 + + .../staging/lustre/lustre/include/lprocfs_status.h | 1043 +++++ + drivers/staging/lustre/lustre/include/lu_object.h | 1346 ++++++ + drivers/staging/lustre/lustre/include/lu_ref.h | 170 + + drivers/staging/lustre/lustre/include/lu_target.h | 91 + + .../staging/lustre/lustre/include/lustre/libiam.h | 145 + + .../lustre/lustre/include/lustre/liblustreapi.h | 43 + + .../lustre/lustre/include/lustre/ll_fiemap.h | 121 + + .../lustre/include/lustre/lustre_build_version.h | 2 + + .../lustre/lustre/include/lustre/lustre_idl.h | 3653 ++++++++++++++++ + .../lustre/include/lustre/lustre_lfsck_user.h | 95 + + .../lustre/lustre/include/lustre/lustre_user.h | 1145 +++++ + .../lustre/lustre/include/lustre/lustreapi.h | 310 ++ + drivers/staging/lustre/lustre/include/lustre_acl.h | 42 + + .../staging/lustre/lustre/include/lustre_capa.h | 305 ++ + drivers/staging/lustre/lustre/include/lustre_cfg.h | 299 ++ + .../staging/lustre/lustre/include/lustre_debug.h | 76 + + .../staging/lustre/lustre/include/lustre_disk.h | 543 +++ + drivers/staging/lustre/lustre/include/lustre_dlm.h | 1671 ++++++++ + .../staging/lustre/lustre/include/lustre_eacl.h | 95 + + .../staging/lustre/lustre/include/lustre_export.h | 389 ++ + drivers/staging/lustre/lustre/include/lustre_fid.h | 762 ++++ + drivers/staging/lustre/lustre/include/lustre_fld.h | 202 + + .../staging/lustre/lustre/include/lustre_fsfilt.h | 48 + + drivers/staging/lustre/lustre/include/lustre_ha.h | 67 + + .../staging/lustre/lustre/include/lustre_handles.h | 93 + + .../staging/lustre/lustre/include/lustre_idmap.h | 104 + + .../staging/lustre/lustre/include/lustre_import.h | 367 ++ + drivers/staging/lustre/lustre/include/lustre_lib.h | 667 +++ + .../staging/lustre/lustre/include/lustre_linkea.h | 57 + + .../staging/lustre/lustre/include/lustre_lite.h | 147 + + drivers/staging/lustre/lustre/include/lustre_log.h | 576 +++ + drivers/staging/lustre/lustre/include/lustre_mdc.h | 176 + + drivers/staging/lustre/lustre/include/lustre_mds.h | 81 + + drivers/staging/lustre/lustre/include/lustre_mdt.h | 84 + + drivers/staging/lustre/lustre/include/lustre_net.h | 3451 +++++++++++++++ + .../staging/lustre/lustre/include/lustre_param.h | 121 + + .../staging/lustre/lustre/include/lustre_quota.h | 239 ++ + .../lustre/lustre/include/lustre_req_layout.h | 334 ++ + drivers/staging/lustre/lustre/include/lustre_sec.h | 1145 +++++ + .../staging/lustre/lustre/include/lustre_update.h | 189 + + drivers/staging/lustre/lustre/include/lustre_ver.h | 24 + + drivers/staging/lustre/lustre/include/lvfs.h | 57 + + drivers/staging/lustre/lustre/include/md_object.h | 908 ++++ + drivers/staging/lustre/lustre/include/obd.h | 1677 ++++++++ + drivers/staging/lustre/lustre/include/obd_cache.h | 39 + + drivers/staging/lustre/lustre/include/obd_cksum.h | 176 + + drivers/staging/lustre/lustre/include/obd_class.h | 2281 ++++++++++ + drivers/staging/lustre/lustre/include/obd_lov.h | 126 + + drivers/staging/lustre/lustre/include/obd_ost.h | 96 + + .../staging/lustre/lustre/include/obd_support.h | 851 ++++ + drivers/staging/lustre/lustre/lclient/glimpse.c | 274 ++ + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 1325 ++++++ + .../staging/lustre/lustre/lclient/lcommon_misc.c | 194 + + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 764 ++++ + drivers/staging/lustre/lustre/ldlm/l_lock.c | 76 + + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 242 ++ + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 849 ++++ + .../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 75 + + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 276 ++ + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 868 ++++ + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 2429 +++++++++++ + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 1238 ++++++ + drivers/staging/lustre/lustre/ldlm/ldlm_plain.c | 72 + + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 1384 ++++++ + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2333 ++++++++++ + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1409 ++++++ + drivers/staging/lustre/lustre/libcfs/Makefile | 22 + + .../lustre/lustre/libcfs/crc32-pclmul_asm.S | 360 ++ + drivers/staging/lustre/lustre/libcfs/debug.c | 476 +++ + drivers/staging/lustre/lustre/libcfs/fail.c | 137 + + drivers/staging/lustre/lustre/libcfs/hash.c | 2123 ++++++++++ + drivers/staging/lustre/lustre/libcfs/heap.c | 475 +++ + .../lustre/lustre/libcfs/kernel_user_comm.c | 346 ++ + drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 204 + + drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 192 + + drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 205 + + .../staging/lustre/lustre/libcfs/libcfs_string.c | 647 +++ + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 1085 +++++ + .../lustre/libcfs/linux/linux-crypto-adler.c | 144 + + .../lustre/libcfs/linux/linux-crypto-crc32.c | 149 + + .../lustre/libcfs/linux/linux-crypto-crc32pclmul.c | 193 + + .../lustre/lustre/libcfs/linux/linux-crypto.c | 305 ++ + .../lustre/lustre/libcfs/linux/linux-curproc.c | 339 ++ + .../lustre/lustre/libcfs/linux/linux-debug.c | 264 ++ + .../lustre/lustre/libcfs/linux/linux-module.c | 183 + + .../lustre/lustre/libcfs/linux/linux-prim.c | 259 ++ + .../lustre/lustre/libcfs/linux/linux-proc.c | 580 +++ + .../lustre/lustre/libcfs/linux/linux-tcpip.c | 659 +++ + .../lustre/lustre/libcfs/linux/linux-tracefile.c | 275 ++ + .../lustre/lustre/libcfs/linux/linux-tracefile.h | 48 + + drivers/staging/lustre/lustre/libcfs/lwt.c | 266 ++ + drivers/staging/lustre/lustre/libcfs/module.c | 498 +++ + drivers/staging/lustre/lustre/libcfs/nidstrings.c | 867 ++++ + drivers/staging/lustre/lustre/libcfs/prng.c | 139 + + drivers/staging/lustre/lustre/libcfs/tracefile.c | 1195 ++++++ + drivers/staging/lustre/lustre/libcfs/tracefile.h | 340 ++ + .../staging/lustre/lustre/libcfs/upcall_cache.c | 462 ++ + drivers/staging/lustre/lustre/libcfs/watchdog.c | 516 +++ + drivers/staging/lustre/lustre/libcfs/workitem.c | 475 +++ + drivers/staging/lustre/lustre/llite/Makefile | 13 + + drivers/staging/lustre/lustre/llite/dcache.c | 675 +++ + drivers/staging/lustre/lustre/llite/dir.c | 1978 +++++++++ + drivers/staging/lustre/lustre/llite/file.c | 3198 ++++++++++++++ + drivers/staging/lustre/lustre/llite/llite_capa.c | 661 +++ + drivers/staging/lustre/lustre/llite/llite_close.c | 412 ++ + .../staging/lustre/lustre/llite/llite_internal.h | 1576 +++++++ + drivers/staging/lustre/lustre/llite/llite_lib.c | 2411 +++++++++++ + drivers/staging/lustre/lustre/llite/llite_mmap.c | 507 +++ + drivers/staging/lustre/lustre/llite/llite_nfs.c | 319 ++ + drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 301 ++ + drivers/staging/lustre/lustre/llite/lloop.c | 867 ++++ + drivers/staging/lustre/lustre/llite/lproc_llite.c | 1370 ++++++ + drivers/staging/lustre/lustre/llite/namei.c | 1279 ++++++ + drivers/staging/lustre/lustre/llite/remote_perm.c | 333 ++ + drivers/staging/lustre/lustre/llite/rw.c | 1314 ++++++ + drivers/staging/lustre/lustre/llite/rw26.c | 586 +++ + drivers/staging/lustre/lustre/llite/statahead.c | 1722 ++++++++ + drivers/staging/lustre/lustre/llite/super25.c | 226 + + drivers/staging/lustre/lustre/llite/symlink.c | 192 + + drivers/staging/lustre/lustre/llite/vvp_dev.c | 546 +++ + drivers/staging/lustre/lustre/llite/vvp_internal.h | 62 + + drivers/staging/lustre/lustre/llite/vvp_io.c | 1186 ++++++ + drivers/staging/lustre/lustre/llite/vvp_lock.c | 85 + + drivers/staging/lustre/lustre/llite/vvp_object.c | 186 + + drivers/staging/lustre/lustre/llite/vvp_page.c | 558 +++ + drivers/staging/lustre/lustre/llite/xattr.c | 578 +++ + drivers/staging/lustre/lustre/lmv/Makefile | 5 + + drivers/staging/lustre/lustre/lmv/lmv_fld.c | 88 + + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 328 ++ + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 159 + + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 2727 ++++++++++++ + drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 235 + + drivers/staging/lustre/lustre/lov/Makefile | 9 + + .../staging/lustre/lustre/lov/lov_cl_internal.h | 820 ++++ + drivers/staging/lustre/lustre/lov/lov_dev.c | 533 +++ + drivers/staging/lustre/lustre/lov/lov_ea.c | 333 ++ + drivers/staging/lustre/lustre/lov/lov_internal.h | 323 ++ + drivers/staging/lustre/lustre/lov/lov_io.c | 967 +++++ + drivers/staging/lustre/lustre/lov/lov_lock.c | 1253 ++++++ + drivers/staging/lustre/lustre/lov/lov_log.c | 278 ++ + drivers/staging/lustre/lustre/lov/lov_merge.c | 218 + + drivers/staging/lustre/lustre/lov/lov_obd.c | 2916 +++++++++++++ + drivers/staging/lustre/lustre/lov/lov_object.c | 942 +++++ + drivers/staging/lustre/lustre/lov/lov_offset.c | 267 ++ + drivers/staging/lustre/lustre/lov/lov_pack.c | 678 +++ + drivers/staging/lustre/lustre/lov/lov_page.c | 235 + + drivers/staging/lustre/lustre/lov/lov_pool.c | 681 +++ + drivers/staging/lustre/lustre/lov/lov_request.c | 1551 +++++++ + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 211 + + drivers/staging/lustre/lustre/lov/lovsub_io.c | 55 + + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 485 +++ + drivers/staging/lustre/lustre/lov/lovsub_object.c | 170 + + drivers/staging/lustre/lustre/lov/lovsub_page.c | 72 + + drivers/staging/lustre/lustre/lov/lproc_lov.c | 302 ++ + drivers/staging/lustre/lustre/lvfs/Makefile | 6 + + drivers/staging/lustre/lustre/lvfs/fsfilt.c | 138 + + drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c | 761 ++++ + drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 173 + + drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 295 ++ + drivers/staging/lustre/lustre/mdc/Makefile | 5 + + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 211 + + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 180 + + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 564 +++ + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 1229 ++++++ + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 489 +++ + drivers/staging/lustre/lustre/mdc/mdc_request.c | 2753 ++++++++++++ + drivers/staging/lustre/lustre/mgc/Makefile | 5 + + drivers/staging/lustre/lustre/mgc/libmgc.c | 166 + + drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 84 + + drivers/staging/lustre/lustre/mgc/mgc_internal.h | 73 + + drivers/staging/lustre/lustre/mgc/mgc_request.c | 1860 ++++++++ + drivers/staging/lustre/lustre/obdclass/Makefile | 13 + + drivers/staging/lustre/lustre/obdclass/acl.c | 546 +++ + drivers/staging/lustre/lustre/obdclass/capa.c | 401 ++ + .../staging/lustre/lustre/obdclass/cl_internal.h | 121 + + drivers/staging/lustre/lustre/obdclass/cl_io.c | 1753 ++++++++ + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 2304 ++++++++++ + drivers/staging/lustre/lustre/obdclass/cl_object.c | 1148 +++++ + drivers/staging/lustre/lustre/obdclass/cl_page.c | 1605 +++++++ + drivers/staging/lustre/lustre/obdclass/class_obd.c | 689 +++ + drivers/staging/lustre/lustre/obdclass/debug.c | 124 + + drivers/staging/lustre/lustre/obdclass/dt_object.c | 1055 +++++ + drivers/staging/lustre/lustre/obdclass/genops.c | 1853 ++++++++ + drivers/staging/lustre/lustre/obdclass/idmap.c | 474 +++ + drivers/staging/lustre/lustre/obdclass/linkea.c | 194 + + .../lustre/lustre/obdclass/linux/linux-module.c | 408 ++ + .../lustre/lustre/obdclass/linux/linux-obdo.c | 222 + + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 445 ++ + drivers/staging/lustre/lustre/obdclass/llog.c | 966 +++++ + drivers/staging/lustre/lustre/obdclass/llog_cat.c | 833 ++++ + .../staging/lustre/lustre/obdclass/llog_internal.h | 98 + + .../staging/lustre/lustre/obdclass/llog_ioctl.c | 427 ++ + drivers/staging/lustre/lustre/obdclass/llog_lvfs.c | 862 ++++ + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 319 ++ + drivers/staging/lustre/lustre/obdclass/llog_osd.c | 1323 ++++++ + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 407 ++ + drivers/staging/lustre/lustre/obdclass/llog_test.c | 1087 +++++ + .../staging/lustre/lustre/obdclass/local_storage.c | 903 ++++ + .../staging/lustre/lustre/obdclass/local_storage.h | 88 + + .../lustre/lustre/obdclass/lprocfs_jobstats.c | 562 +++ + .../lustre/lustre/obdclass/lprocfs_status.c | 1985 +++++++++ + drivers/staging/lustre/lustre/obdclass/lu_object.c | 2209 ++++++++++ + drivers/staging/lustre/lustre/obdclass/lu_ref.c | 50 + + drivers/staging/lustre/lustre/obdclass/lu_ucred.c | 107 + + .../lustre/lustre/obdclass/lustre_handles.c | 263 ++ + .../staging/lustre/lustre/obdclass/lustre_peer.c | 218 + + drivers/staging/lustre/lustre/obdclass/md_attrs.c | 202 + + drivers/staging/lustre/lustre/obdclass/mea.c | 112 + + .../staging/lustre/lustre/obdclass/obd_config.c | 1904 +++++++++ + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 1321 ++++++ + drivers/staging/lustre/lustre/obdclass/obdo.c | 362 ++ + .../staging/lustre/lustre/obdclass/statfs_pack.c | 75 + + drivers/staging/lustre/lustre/obdclass/uuid.c | 82 + + drivers/staging/lustre/lustre/obdecho/Makefile | 5 + + drivers/staging/lustre/lustre/obdecho/echo.c | 679 +++ + .../staging/lustre/lustre/obdecho/echo_client.c | 3223 ++++++++++++++ + .../staging/lustre/lustre/obdecho/echo_internal.h | 47 + + drivers/staging/lustre/lustre/obdecho/lproc_echo.c | 57 + + drivers/staging/lustre/lustre/osc/Makefile | 7 + + drivers/staging/lustre/lustre/osc/lproc_osc.c | 728 ++++ + drivers/staging/lustre/lustre/osc/osc_cache.c | 2916 +++++++++++++ + .../staging/lustre/lustre/osc/osc_cl_internal.h | 677 +++ + drivers/staging/lustre/lustre/osc/osc_dev.c | 261 ++ + drivers/staging/lustre/lustre/osc/osc_internal.h | 208 + + drivers/staging/lustre/lustre/osc/osc_io.c | 836 ++++ + drivers/staging/lustre/lustre/osc/osc_lock.c | 1663 ++++++++ + drivers/staging/lustre/lustre/osc/osc_object.c | 275 ++ + drivers/staging/lustre/lustre/osc/osc_page.c | 927 ++++ + drivers/staging/lustre/lustre/osc/osc_quota.c | 332 ++ + drivers/staging/lustre/lustre/osc/osc_request.c | 3708 ++++++++++++++++ + drivers/staging/lustre/lustre/ptlrpc/Makefile | 23 + + drivers/staging/lustre/lustre/ptlrpc/client.c | 3059 +++++++++++++ + drivers/staging/lustre/lustre/ptlrpc/connection.c | 248 ++ + drivers/staging/lustre/lustre/ptlrpc/events.c | 595 +++ + drivers/staging/lustre/lustre/ptlrpc/gss/Makefile | 8 + + drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h | 179 + + .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h | 84 + + .../staging/lustre/lustre/ptlrpc/gss/gss_bulk.c | 512 +++ + .../lustre/lustre/ptlrpc/gss/gss_cli_upcall.c | 447 ++ + drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h | 193 + + .../lustre/lustre/ptlrpc/gss/gss_generic_token.c | 285 ++ + .../lustre/lustre/ptlrpc/gss/gss_internal.h | 526 +++ + .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 1424 +++++++ + .../staging/lustre/lustre/ptlrpc/gss/gss_krb5.h | 163 + + .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 1786 ++++++++ + .../lustre/lustre/ptlrpc/gss/gss_mech_switch.c | 359 ++ + .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c | 1252 ++++++ + .../staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c | 242 ++ + .../lustre/lustre/ptlrpc/gss/gss_svc_upcall.c | 1099 +++++ + .../staging/lustre/lustre/ptlrpc/gss/lproc_gss.c | 219 + + drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 2916 +++++++++++++ + drivers/staging/lustre/lustre/ptlrpc/import.c | 1613 +++++++ + drivers/staging/lustre/lustre/ptlrpc/layout.c | 2396 +++++++++++ + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 354 ++ + drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 75 + + drivers/staging/lustre/lustre/ptlrpc/llog_server.c | 466 ++ + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 1345 ++++++ + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 728 ++++ + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 1790 ++++++++ + drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c | 40 + + drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 270 ++ + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 2575 +++++++++++ + drivers/staging/lustre/lustre/ptlrpc/pers.c | 75 + + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 763 ++++ + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 302 ++ + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 154 + + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 827 ++++ + drivers/staging/lustre/lustre/ptlrpc/recover.c | 357 ++ + drivers/staging/lustre/lustre/ptlrpc/sec.c | 2465 +++++++++++ + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 880 ++++ + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 1233 ++++++ + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 250 ++ + drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 199 + + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 464 ++ + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 1021 +++++ + drivers/staging/lustre/lustre/ptlrpc/service.c | 3129 ++++++++++++++ + drivers/staging/lustre/lustre/ptlrpc/wirehdr.c | 47 + + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 4474 ++++++++++++++++++++ + drivers/staging/nvec/nvec_kbd.c | 10 +- + drivers/staging/octeon-usb/Kconfig | 10 + + drivers/staging/octeon-usb/Makefile | 3 + + drivers/staging/octeon-usb/TODO | 11 + + drivers/staging/octeon-usb/cvmx-usb.c | 3344 +++++++++++++++ + drivers/staging/octeon-usb/cvmx-usb.h | 1085 +++++ + drivers/staging/octeon-usb/cvmx-usbcx-defs.h | 3086 ++++++++++++++ + drivers/staging/octeon-usb/cvmx-usbnx-defs.h | 1596 +++++++ + drivers/staging/octeon-usb/octeon-hcd.c | 854 ++++ + drivers/staging/ozwpan/ozcdev.c | 2 + + drivers/staging/ozwpan/ozhcd.c | 2 +- + drivers/staging/panel/panel.c | 25 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 51 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 +- + drivers/staging/rtl8192e/rtllib_rx.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 5 +- + drivers/staging/rtl8192u/ieee80211/dot11d.c | 14 +- + drivers/staging/rtl8192u/ieee80211/dot11d.h | 10 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 94 +- + .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 4 +- + .../staging/rtl8192u/ieee80211/ieee80211_crypt.h | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 14 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 8 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 34 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 78 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 26 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 106 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 82 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 10 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 30 +- + drivers/staging/rtl8192u/r8180_93cx6.c | 12 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 22 +- + drivers/staging/rtl8192u/r8190_rtl8256.h | 10 +- + drivers/staging/rtl8192u/r8192U.h | 10 +- + drivers/staging/rtl8192u/r8192U_core.c | 1282 +++--- + drivers/staging/rtl8192u/r8192U_dm.c | 102 +- + drivers/staging/rtl8192u/r8192U_wx.c | 34 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 36 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.h | 6 +- + drivers/staging/rtl8192u/r819xU_firmware.c | 46 +- + drivers/staging/rtl8192u/r819xU_phy.c | 90 +- + drivers/staging/rtl8192u/r819xU_phy.h | 30 +- + drivers/staging/rts5139/rts51x_transport.c | 8 +- + drivers/staging/sb105x/sb_pci_mp.c | 34 +- + drivers/staging/sb105x/sb_pci_mp.h | 1 - + drivers/staging/silicom/bpctl_mod.c | 164 +- + drivers/staging/silicom/bypasslib/bp_ioctl.h | 64 +- + drivers/staging/silicom/bypasslib/bplibk.h | 10 +- + drivers/staging/slicoss/slicoss.c | 18 +- + drivers/staging/speakup/Kconfig | 32 +- + drivers/staging/speakup/devsynth.c | 14 +- + drivers/staging/speakup/i18n.c | 12 +- + drivers/staging/speakup/kobjects.c | 48 +- + drivers/staging/speakup/main.c | 79 +- + drivers/staging/speakup/serialio.c | 4 +- + drivers/staging/speakup/speakup_acntpc.c | 22 +- + drivers/staging/speakup/speakup_apollo.c | 20 +- + drivers/staging/speakup/speakup_decext.c | 20 +- + drivers/staging/speakup/speakup_decpc.c | 22 +- + drivers/staging/speakup/speakup_dectlk.c | 20 +- + drivers/staging/speakup/speakup_dtlk.c | 22 +- + drivers/staging/speakup/speakup_keypc.c | 22 +- + drivers/staging/speakup/speakup_soft.c | 34 +- + drivers/staging/speakup/spk_priv.h | 13 - + drivers/staging/speakup/synth.c | 38 +- + drivers/staging/speakup/thread.c | 4 +- + drivers/staging/speakup/varhandlers.c | 19 +- + drivers/staging/tidspbridge/core/_tiomap.h | 6 +- + drivers/staging/tidspbridge/core/_tiomap_pwr.h | 10 +- + drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 10 +- + drivers/staging/tidspbridge/core/ue_deh.c | 2 +- + drivers/staging/tidspbridge/core/wdt.c | 4 +- + drivers/staging/usbip/usbip_event.c | 2 +- + drivers/staging/vme/devices/vme_user.c | 6 +- + drivers/staging/vme/devices/vme_user.h | 12 +- + drivers/staging/vt6655/80211hdr.h | 2 +- + drivers/staging/vt6655/80211mgr.c | 72 +- + drivers/staging/vt6655/80211mgr.h | 107 +- + drivers/staging/vt6655/aes_ccmp.c | 32 +- + drivers/staging/vt6655/aes_ccmp.h | 2 +- + drivers/staging/vt6655/hostap.c | 6 +- + drivers/staging/vt6656/rf.c | 657 ++- + drivers/staging/vt6656/tether.h | 10 - + drivers/staging/vt6656/tmacro.h | 6 - + drivers/staging/winbond/phy_calibration.c | 2 +- + drivers/staging/winbond/reg.c | 25 +- + drivers/staging/winbond/wb35reg.c | 265 +- + drivers/staging/winbond/wb35rx.c | 3 +- + drivers/staging/wlags49_h2/wl_cs.c | 16 +- + drivers/staging/wlags49_h2/wl_cs.h | 4 +- + drivers/staging/wlags49_h2/wl_main.c | 4 +- + drivers/staging/wlan-ng/prism2sta.c | 3 +- + drivers/staging/xgifb/vb_def.h | 5 - + drivers/staging/xgifb/vb_init.c | 92 +- + drivers/staging/xgifb/vb_setmode.c | 433 +- + drivers/staging/xgifb/vb_setmode.h | 1 - + drivers/staging/zram/zram_drv.c | 4 +- + drivers/staging/zsmalloc/zsmalloc-main.c | 7 +- + drivers/staging/zsmalloc/zsmalloc.h | 2 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 30 +- + 789 files changed, 276003 insertions(+), 12228 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ak8975.txt + create mode 100644 drivers/iio/adc/mcp320x.c + create mode 100644 drivers/iio/trigger/Kconfig + create mode 100644 drivers/iio/trigger/Makefile + rename drivers/{staging => }/iio/trigger/iio-trig-sysfs.c (100%) + create mode 100644 drivers/staging/btmtk_usb/Kconfig + create mode 100644 drivers/staging/btmtk_usb/Makefile + create mode 100644 drivers/staging/btmtk_usb/README + create mode 100644 drivers/staging/btmtk_usb/TODO + create mode 100644 drivers/staging/btmtk_usb/btmtk_usb.c + create mode 100644 drivers/staging/btmtk_usb/btmtk_usb.h + create mode 100644 drivers/staging/lustre/Kconfig + create mode 100644 drivers/staging/lustre/Makefile + create mode 100644 drivers/staging/lustre/TODO + create mode 100644 drivers/staging/lustre/include/linux/libcfs/bitmap.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/curproc.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_heap.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_private.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_string.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_workitem.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/kp30.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-crypto.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-lock.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-types.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/lucache.h + create mode 100644 drivers/staging/lustre/include/linux/libcfs/params_tree.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/api-support.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/api.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lib-lnet.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lib-types.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/api-support.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/lib-types.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/linux/lnet.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lnet-sysctl.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lnet.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lnetctl.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/lnetst.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/ptllnd.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/ptllnd_wire.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/socklnd.h + create mode 100644 drivers/staging/lustre/include/linux/lnet/types.h + create mode 100644 drivers/staging/lustre/lnet/Kconfig + create mode 100644 drivers/staging/lustre/lnet/Makefile + create mode 100644 drivers/staging/lustre/lnet/klnds/Makefile + create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile + create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c + create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h + create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c + create mode 100644 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/Makefile + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c + create mode 100644 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c + create mode 100644 drivers/staging/lustre/lnet/lnet/Makefile + create mode 100644 drivers/staging/lustre/lnet/lnet/acceptor.c + create mode 100644 drivers/staging/lustre/lnet/lnet/api-errno.c + create mode 100644 drivers/staging/lustre/lnet/lnet/api-ni.c + create mode 100644 drivers/staging/lustre/lnet/lnet/config.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-eq.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-md.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-me.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-move.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-msg.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lib-ptl.c + create mode 100644 drivers/staging/lustre/lnet/lnet/lo.c + create mode 100644 drivers/staging/lustre/lnet/lnet/module.c + create mode 100644 drivers/staging/lustre/lnet/lnet/peer.c + create mode 100644 drivers/staging/lustre/lnet/lnet/router.c + create mode 100644 drivers/staging/lustre/lnet/lnet/router_proc.c + create mode 100644 drivers/staging/lustre/lnet/selftest/Makefile + create mode 100644 drivers/staging/lustre/lnet/selftest/brw_test.c + create mode 100644 drivers/staging/lustre/lnet/selftest/conctl.c + create mode 100644 drivers/staging/lustre/lnet/selftest/conrpc.c + create mode 100644 drivers/staging/lustre/lnet/selftest/conrpc.h + create mode 100644 drivers/staging/lustre/lnet/selftest/console.c + create mode 100644 drivers/staging/lustre/lnet/selftest/console.h + create mode 100644 drivers/staging/lustre/lnet/selftest/framework.c + create mode 100644 drivers/staging/lustre/lnet/selftest/module.c + create mode 100644 drivers/staging/lustre/lnet/selftest/ping_test.c + create mode 100644 drivers/staging/lustre/lnet/selftest/rpc.c + create mode 100644 drivers/staging/lustre/lnet/selftest/rpc.h + create mode 100644 drivers/staging/lustre/lnet/selftest/selftest.h + create mode 100644 drivers/staging/lustre/lnet/selftest/timer.c + create mode 100644 drivers/staging/lustre/lnet/selftest/timer.h + create mode 100644 drivers/staging/lustre/lustre/Kconfig + create mode 100644 drivers/staging/lustre/lustre/Makefile + create mode 100644 drivers/staging/lustre/lustre/fid/Makefile + create mode 100644 drivers/staging/lustre/lustre/fid/fid_handler.c + create mode 100644 drivers/staging/lustre/lustre/fid/fid_internal.h + create mode 100644 drivers/staging/lustre/lustre/fid/fid_lib.c + create mode 100644 drivers/staging/lustre/lustre/fid/fid_request.c + create mode 100644 drivers/staging/lustre/lustre/fid/fid_store.c + create mode 100644 drivers/staging/lustre/lustre/fid/lproc_fid.c + create mode 100644 drivers/staging/lustre/lustre/fld/Makefile + create mode 100644 drivers/staging/lustre/lustre/fld/fld_cache.c + create mode 100644 drivers/staging/lustre/lustre/fld/fld_handler.c + create mode 100644 drivers/staging/lustre/lustre/fld/fld_index.c + create mode 100644 drivers/staging/lustre/lustre/fld/fld_internal.h + create mode 100644 drivers/staging/lustre/lustre/fld/fld_request.c + create mode 100644 drivers/staging/lustre/lustre/fld/lproc_fld.c + create mode 100644 drivers/staging/lustre/lustre/include/cl_object.h + create mode 100644 drivers/staging/lustre/lustre/include/dt_object.h + create mode 100644 drivers/staging/lustre/lustre/include/interval_tree.h + create mode 100644 drivers/staging/lustre/lustre/include/ioctl.h + create mode 100644 drivers/staging/lustre/lustre/include/lclient.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lprocfs_status.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_acl.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_common.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_compat25.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_debug.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_dlm.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_handles.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_intent.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_lib.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_lite.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_log.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_net.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_quota.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_user.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lvfs.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/lvfs_linux.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/obd.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/obd_class.h + create mode 100644 drivers/staging/lustre/lustre/include/linux/obd_support.h + create mode 100644 drivers/staging/lustre/lustre/include/lprocfs_status.h + create mode 100644 drivers/staging/lustre/lustre/include/lu_object.h + create mode 100644 drivers/staging/lustre/lustre/include/lu_ref.h + create mode 100644 drivers/staging/lustre/lustre/include/lu_target.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/libiam.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/liblustreapi.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_build_version.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_idl.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_lfsck_user.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_user.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre/lustreapi.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_acl.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_capa.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_cfg.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_debug.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_disk.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_dlm.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_eacl.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_export.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_fid.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_fld.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_fsfilt.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_ha.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_handles.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_idmap.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_import.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_lib.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_linkea.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_lite.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_log.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_mdc.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_mds.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_mdt.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_net.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_param.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_quota.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_req_layout.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_sec.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_update.h + create mode 100644 drivers/staging/lustre/lustre/include/lustre_ver.h + create mode 100644 drivers/staging/lustre/lustre/include/lvfs.h + create mode 100644 drivers/staging/lustre/lustre/include/md_object.h + create mode 100644 drivers/staging/lustre/lustre/include/obd.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_cache.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_cksum.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_class.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_lov.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_ost.h + create mode 100644 drivers/staging/lustre/lustre/include/obd_support.h + create mode 100644 drivers/staging/lustre/lustre/lclient/glimpse.c + create mode 100644 drivers/staging/lustre/lustre/lclient/lcommon_cl.c + create mode 100644 drivers/staging/lustre/lustre/lclient/lcommon_misc.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/interval_tree.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/l_lock.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_internal.h + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_plain.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_request.c + create mode 100644 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/Makefile + create mode 100644 drivers/staging/lustre/lustre/libcfs/crc32-pclmul_asm.S + create mode 100644 drivers/staging/lustre/lustre/libcfs/debug.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/fail.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/hash.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/heap.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/kernel_user_comm.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_lock.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_mem.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/libcfs_string.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-crc32.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-crc32pclmul.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-module.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.h + create mode 100644 drivers/staging/lustre/lustre/libcfs/lwt.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/module.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/nidstrings.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/prng.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/tracefile.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/tracefile.h + create mode 100644 drivers/staging/lustre/lustre/libcfs/upcall_cache.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/watchdog.c + create mode 100644 drivers/staging/lustre/lustre/libcfs/workitem.c + create mode 100644 drivers/staging/lustre/lustre/llite/Makefile + create mode 100644 drivers/staging/lustre/lustre/llite/dcache.c + create mode 100644 drivers/staging/lustre/lustre/llite/dir.c + create mode 100644 drivers/staging/lustre/lustre/llite/file.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_capa.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_close.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_internal.h + create mode 100644 drivers/staging/lustre/lustre/llite/llite_lib.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_mmap.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_nfs.c + create mode 100644 drivers/staging/lustre/lustre/llite/llite_rmtacl.c + create mode 100644 drivers/staging/lustre/lustre/llite/lloop.c + create mode 100644 drivers/staging/lustre/lustre/llite/lproc_llite.c + create mode 100644 drivers/staging/lustre/lustre/llite/namei.c + create mode 100644 drivers/staging/lustre/lustre/llite/remote_perm.c + create mode 100644 drivers/staging/lustre/lustre/llite/rw.c + create mode 100644 drivers/staging/lustre/lustre/llite/rw26.c + create mode 100644 drivers/staging/lustre/lustre/llite/statahead.c + create mode 100644 drivers/staging/lustre/lustre/llite/super25.c + create mode 100644 drivers/staging/lustre/lustre/llite/symlink.c + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_dev.c + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_internal.h + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_io.c + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_lock.c + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_object.c + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_page.c + create mode 100644 drivers/staging/lustre/lustre/llite/xattr.c + create mode 100644 drivers/staging/lustre/lustre/lmv/Makefile + create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_fld.c + create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_intent.c + create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_internal.h + create mode 100644 drivers/staging/lustre/lustre/lmv/lmv_obd.c + create mode 100644 drivers/staging/lustre/lustre/lmv/lproc_lmv.c + create mode 100644 drivers/staging/lustre/lustre/lov/Makefile + create mode 100644 drivers/staging/lustre/lustre/lov/lov_cl_internal.h + create mode 100644 drivers/staging/lustre/lustre/lov/lov_dev.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_ea.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_internal.h + create mode 100644 drivers/staging/lustre/lustre/lov/lov_io.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_lock.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_log.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_merge.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_obd.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_object.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_offset.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_pack.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_page.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_pool.c + create mode 100644 drivers/staging/lustre/lustre/lov/lov_request.c + create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_dev.c + create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_io.c + create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_lock.c + create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_object.c + create mode 100644 drivers/staging/lustre/lustre/lov/lovsub_page.c + create mode 100644 drivers/staging/lustre/lustre/lov/lproc_lov.c + create mode 100644 drivers/staging/lustre/lustre/lvfs/Makefile + create mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt.c + create mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c + create mode 100644 drivers/staging/lustre/lustre/lvfs/lvfs_lib.c + create mode 100644 drivers/staging/lustre/lustre/lvfs/lvfs_linux.c + create mode 100644 drivers/staging/lustre/lustre/mdc/Makefile + create mode 100644 drivers/staging/lustre/lustre/mdc/lproc_mdc.c + create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_internal.h + create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_lib.c + create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_locks.c + create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_reint.c + create mode 100644 drivers/staging/lustre/lustre/mdc/mdc_request.c + create mode 100644 drivers/staging/lustre/lustre/mgc/Makefile + create mode 100644 drivers/staging/lustre/lustre/mgc/libmgc.c + create mode 100644 drivers/staging/lustre/lustre/mgc/lproc_mgc.c + create mode 100644 drivers/staging/lustre/lustre/mgc/mgc_internal.h + create mode 100644 drivers/staging/lustre/lustre/mgc/mgc_request.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/Makefile + create mode 100644 drivers/staging/lustre/lustre/obdclass/acl.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/capa.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_internal.h + create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_io.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_lock.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_object.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/cl_page.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/class_obd.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/debug.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/dt_object.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/genops.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/idmap.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/linkea.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-module.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_cat.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_internal.h + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_ioctl.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_lvfs.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_obd.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_osd.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_swab.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/llog_test.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/local_storage.h + create mode 100644 drivers/staging/lustre/lustre/obdclass/lprocfs_jobstats.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lprocfs_status.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lu_object.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ref.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ucred.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lustre_handles.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/lustre_peer.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/md_attrs.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/mea.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/obd_config.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/obd_mount.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/obdo.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/statfs_pack.c + create mode 100644 drivers/staging/lustre/lustre/obdclass/uuid.c + create mode 100644 drivers/staging/lustre/lustre/obdecho/Makefile + create mode 100644 drivers/staging/lustre/lustre/obdecho/echo.c + create mode 100644 drivers/staging/lustre/lustre/obdecho/echo_client.c + create mode 100644 drivers/staging/lustre/lustre/obdecho/echo_internal.h + create mode 100644 drivers/staging/lustre/lustre/obdecho/lproc_echo.c + create mode 100644 drivers/staging/lustre/lustre/osc/Makefile + create mode 100644 drivers/staging/lustre/lustre/osc/lproc_osc.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_cache.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_cl_internal.h + create mode 100644 drivers/staging/lustre/lustre/osc/osc_dev.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_internal.h + create mode 100644 drivers/staging/lustre/lustre/osc/osc_io.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_lock.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_object.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_page.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_quota.c + create mode 100644 drivers/staging/lustre/lustre/osc/osc_request.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/Makefile + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/client.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/connection.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/events.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/Makefile + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_asn1.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_bulk.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_generic_token.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_internal.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5_mech.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_mech_switch.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/lproc_gss.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/import.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/layout.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_client.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_net.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_server.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/niobuf.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/pack_generic.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/pers.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/pinger.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/recover.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_config.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_gc.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_null.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/sec_plain.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/service.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c + create mode 100644 drivers/staging/lustre/lustre/ptlrpc/wiretest.c + create mode 100644 drivers/staging/octeon-usb/Kconfig + create mode 100644 drivers/staging/octeon-usb/Makefile + create mode 100644 drivers/staging/octeon-usb/TODO + create mode 100644 drivers/staging/octeon-usb/cvmx-usb.c + create mode 100644 drivers/staging/octeon-usb/cvmx-usb.h + create mode 100644 drivers/staging/octeon-usb/cvmx-usbcx-defs.h + create mode 100644 drivers/staging/octeon-usb/cvmx-usbnx-defs.h + create mode 100644 drivers/staging/octeon-usb/octeon-hcd.c +$ git am -3 ../patches/0001-staging-lustre-fix-for-invalidatepage-API-change.patch +Applying: staging/lustre: fix for invalidatepage() API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h +M drivers/staging/lustre/lustre/llite/rw26.c +$ git add -A . +$ git commit -v -a --amend +[master ebdcda8] Merge remote-tracking branch 'staging/staging-next' +$ git revert 52f6317528c6877c8c5d4b2ab7a04430af99ed4a +[master 29affd6] Revert "staging/lustre: drop CONFIG_BROKEN dependency" + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging char-misc/char-misc-next (143e9c7 pch_phub: re-use native MAC address parser) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/mvebu-devbus.txt | 156 ++++++++++ + Documentation/w1/w1.generic | 4 +- + drivers/char/mspec.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.h | 10 +- + drivers/hv/channel.c | 50 ++- + drivers/hv/channel_mgmt.c | 119 +++++++- + drivers/hv/connection.c | 14 + + drivers/memory/Kconfig | 10 + + drivers/memory/Makefile | 1 + + drivers/memory/mvebu-devbus.c | 340 +++++++++++++++++++++ + drivers/misc/arm-charlcd.c | 5 +- + drivers/misc/carma/carma-fpga-program.c | 4 +- + drivers/misc/carma/carma-fpga.c | 4 +- + drivers/misc/eeprom/at24.c | 44 +-- + drivers/misc/eeprom/at25.c | 25 +- + drivers/misc/ep93xx_pwm.c | 188 +++--------- + drivers/misc/mei/amthif.c | 6 +- + drivers/misc/mei/client.c | 26 ++ + drivers/misc/mei/client.h | 1 + + drivers/misc/mei/interrupt.c | 158 ++++------ + drivers/misc/mei/main.c | 49 +-- + drivers/misc/mei/mei_dev.h | 19 +- + drivers/misc/mei/pci-me.c | 19 -- + drivers/misc/mei/wd.c | 6 - + drivers/misc/pch_phub.c | 8 +- + drivers/misc/spear13xx_pcie_gadget.c | 12 +- + drivers/misc/sram.c | 7 +- + drivers/misc/ti-st/st_kim.c | 6 +- + drivers/misc/tsl2550.c | 4 +- + drivers/uio/uio_aec.c | 14 +- + drivers/uio/uio_cif.c | 14 +- + drivers/uio/uio_netx.c | 14 +- + drivers/uio/uio_pci_generic.c | 17 +- + drivers/uio/uio_sercos3.c | 14 +- + drivers/w1/masters/w1-gpio.c | 6 - + drivers/w1/slaves/w1_ds2408.c | 1 + + drivers/w1/slaves/w1_ds2413.c | 1 + + drivers/w1/slaves/w1_ds2423.c | 1 + + drivers/w1/slaves/w1_ds2431.c | 1 + + drivers/w1/slaves/w1_ds2433.c | 1 + + drivers/w1/slaves/w1_ds2760.c | 1 + + drivers/w1/slaves/w1_ds2780.c | 1 + + drivers/w1/slaves/w1_ds2781.c | 1 + + drivers/w1/slaves/w1_ds28e04.c | 1 + + drivers/w1/slaves/w1_smem.c | 2 + + drivers/w1/slaves/w1_therm.c | 5 + + drivers/w1/w1.c | 2 + + include/linux/hyperv.h | 70 +++++ + tools/hv/hv_kvp_daemon.c | 29 +- + 49 files changed, 1018 insertions(+), 475 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt + create mode 100644 drivers/memory/mvebu-devbus.c +Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation) +$ git merge bcon/master +Resolved 'drivers/block/Kconfig' using previous resolution. +Auto-merging kernel/printk.c +Auto-merging init/do_mounts.c +Auto-merging include/linux/mount.h +Auto-merging include/linux/console.h +Auto-merging drivers/net/netconsole.c +Auto-merging drivers/block/Makefile +Auto-merging drivers/block/Kconfig +CONFLICT (content): Merge conflict in drivers/block/Kconfig +Auto-merging block/partitions/check.h +Auto-merging block/partitions/check.c +Auto-merging Documentation/networking/netconsole.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2d93d5e] Merge remote-tracking branch 'bcon/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/blockconsole.txt | 94 ++++ + Documentation/block/blockconsole/bcon_tail | 82 ++++ + Documentation/block/blockconsole/mkblockconsole | 29 ++ + Documentation/networking/netconsole.txt | 16 +- + block/partitions/Makefile | 1 + + block/partitions/blockconsole.c | 22 + + block/partitions/check.c | 3 + + block/partitions/check.h | 3 + + drivers/block/Kconfig | 6 + + drivers/block/Makefile | 1 + + drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++ + drivers/net/netconsole.c | 2 +- + include/linux/blockconsole.h | 7 + + include/linux/console.h | 1 + + include/linux/mount.h | 2 +- + init/do_mounts.c | 2 +- + kernel/printk.c | 5 +- + 17 files changed, 885 insertions(+), 9 deletions(-) + create mode 100644 Documentation/block/blockconsole.txt + create mode 100755 Documentation/block/blockconsole/bcon_tail + create mode 100755 Documentation/block/blockconsole/mkblockconsole + create mode 100644 block/partitions/blockconsole.c + create mode 100644 drivers/block/blockconsole.c + create mode 100644 include/linux/blockconsole.h +Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) +$ git merge tmem/linux-next +Already up-to-date. +Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio()) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) +$ git merge arm-dt/devicetree/arm-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (f264441 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/sirf/pinctrl-prima2.c +Auto-merging Documentation/pinctrl.txt +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/fsl,vf610-pinctrl.txt | 41 + + .../bindings/pinctrl/marvell,dove-pinctrl.txt | 49 +- + Documentation/pinctrl.txt | 4 +- + drivers/pinctrl/Kconfig | 8 + + drivers/pinctrl/Makefile | 4 +- + drivers/pinctrl/core.c | 34 +- + drivers/pinctrl/mvebu/pinctrl-dove.c | 244 +++++- + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/pinctrl-abx500.c | 120 ++- + drivers/pinctrl/pinctrl-at91.c | 7 +- + drivers/pinctrl/pinctrl-coh901.c | 1 - + drivers/pinctrl/pinctrl-imx.c | 53 +- + drivers/pinctrl/pinctrl-imx.h | 4 + + drivers/pinctrl/pinctrl-mxs.c | 2 - + drivers/pinctrl/pinctrl-u300.c | 1 - + drivers/pinctrl/pinctrl-vf610.c | 338 ++++++++ + drivers/pinctrl/sirf/Makefile | 5 + + drivers/pinctrl/sirf/pinctrl-atlas6.c | 947 ++++++++++++++++++++ + .../{pinctrl-sirf.c => sirf/pinctrl-prima2.c} | 949 +-------------------- + drivers/pinctrl/sirf/pinctrl-sirf.c | 929 ++++++++++++++++++++ + drivers/pinctrl/sirf/pinctrl-sirf.h | 116 +++ + drivers/pinctrl/spear/pinctrl-plgpio.c | 7 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 6 +- + include/linux/pinctrl/pinconf-generic.h | 6 + + 24 files changed, 2816 insertions(+), 1061 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,vf610-pinctrl.txt + create mode 100644 drivers/pinctrl/pinctrl-vf610.c + create mode 100644 drivers/pinctrl/sirf/Makefile + create mode 100644 drivers/pinctrl/sirf/pinctrl-atlas6.c + rename drivers/pinctrl/{pinctrl-sirf.c => sirf/pinctrl-prima2.c} (50%) + create mode 100644 drivers/pinctrl/sirf/pinctrl-sirf.c + create mode 100644 drivers/pinctrl/sirf/pinctrl-sirf.h +Merging vhost/linux-next (f722406 Linux 3.10-rc1) +$ git merge vhost/linux-next +Already up-to-date. +Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) +$ git merge memblock/memblock-kill-early_node_map +Already up-to-date. +Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq) +$ git merge irqdomain/irqdomain/next +Auto-merging kernel/irq/irqdomain.c +Merge made by the 'recursive' strategy. + kernel/irq/irqdomain.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging gpio/gpio/next (08ffb22 gpio: grgpio: Add irq support) +$ git merge gpio/gpio/next +Already up-to-date. +Merging gpio-lw/for-next (644c8df gpio: sx150x: convert to use devm_* functions) +$ git merge gpio-lw/for-next +Auto-merging drivers/gpio/gpio-langwell.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/gpio/Kconfig | 2 +- + drivers/gpio/gpio-langwell.c | 117 +++++++++++++---------------------------- + drivers/gpio/gpio-lynxpoint.c | 1 - + drivers/gpio/gpio-ml-ioh.c | 1 + + drivers/gpio/gpio-rdc321x.c | 7 +-- + drivers/gpio/gpio-stmpe.c | 7 ++- + drivers/gpio/gpio-sx150x.c | 18 +++---- + drivers/gpio/gpio-tc3589x.c | 1 - + drivers/gpio/gpio-timberdale.c | 2 - + drivers/gpio/gpio-vx855.c | 2 - + 11 files changed, 53 insertions(+), 106 deletions(-) +Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of sizeof in mailbox_msg_send()) +$ git merge mailbox/dbx500-prcmu-mailbox +Auto-merging drivers/staging/tidspbridge/core/tiomap3430_pwr.c +Auto-merging drivers/staging/tidspbridge/core/_tiomap.h +Auto-merging drivers/remoteproc/Kconfig +Auto-merging drivers/mailbox/mailbox-omap2.c +Auto-merging drivers/mailbox/mailbox-omap1.c +Removing arch/arm/plat-omap/mailbox.c +Removing arch/arm/plat-omap/include/plat/mailbox.h +Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_2430_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_2420_data.c +Auto-merging arch/arm/mach-omap2/devices.c +Auto-merging arch/arm/mach-omap2/Makefile +Auto-merging arch/arm/configs/omap1_defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mailbox/dbx500-mailbox.txt | 27 + + arch/arm/configs/omap1_defconfig | 3 +- + arch/arm/mach-omap1/Makefile | 4 - + arch/arm/mach-omap2/Makefile | 3 - + arch/arm/mach-omap2/devices.c | 13 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 12 + + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 11 + + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 11 + + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 + + arch/arm/plat-omap/Kconfig | 16 - + arch/arm/plat-omap/Makefile | 3 - + arch/arm/plat-omap/include/plat/mailbox.h | 105 ---- + arch/arm/plat-omap/mailbox.c | 435 -------------- + drivers/cpufreq/highbank-cpufreq.c | 2 +- + drivers/mailbox/Kconfig | 41 ++ + drivers/mailbox/Makefile | 5 + + drivers/mailbox/mailbox-dbx500.c | 648 +++++++++++++++++++++ + .../mailbox.c => drivers/mailbox/mailbox-omap1.c | 90 ++- + .../mailbox.c => drivers/mailbox/mailbox-omap2.c | 330 +++++------ + drivers/mailbox/mailbox.c | 552 ++++++++++++++++++ + drivers/mailbox/mailbox_internal.h | 70 +++ + drivers/mailbox/pl320-ipc.c | 2 +- + drivers/remoteproc/Kconfig | 3 +- + drivers/remoteproc/omap_remoteproc.c | 36 +- + drivers/staging/tidspbridge/Kconfig | 3 +- + drivers/staging/tidspbridge/core/_tiomap.h | 2 +- + drivers/staging/tidspbridge/core/chnl_sm.c | 8 +- + drivers/staging/tidspbridge/core/io_sm.c | 5 +- + drivers/staging/tidspbridge/core/tiomap3430.c | 6 +- + drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 6 +- + drivers/staging/tidspbridge/core/tiomap_io.c | 9 +- + .../tidspbridge/include/dspbridge/host_os.h | 2 +- + include/linux/mailbox.h | 52 +- + include/linux/pl320-ipc.h | 17 + + include/linux/platform_data/mailbox-dbx500.h | 12 + + include/linux/platform_data/mailbox-omap.h | 53 ++ + 36 files changed, 1766 insertions(+), 844 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/dbx500-mailbox.txt + delete mode 100644 arch/arm/plat-omap/include/plat/mailbox.h + delete mode 100644 arch/arm/plat-omap/mailbox.c + create mode 100644 drivers/mailbox/mailbox-dbx500.c + rename arch/arm/mach-omap1/mailbox.c => drivers/mailbox/mailbox-omap1.c (64%) + rename arch/arm/mach-omap2/mailbox.c => drivers/mailbox/mailbox-omap2.c (50%) + create mode 100644 drivers/mailbox/mailbox.c + create mode 100644 drivers/mailbox/mailbox_internal.h + create mode 100644 include/linux/pl320-ipc.h + create mode 100644 include/linux/platform_data/mailbox-dbx500.h + create mode 100644 include/linux/platform_data/mailbox-omap.h +Merging arm-soc/for-next (050a8ef Merge branch 'next/soc' into for-next) +$ git merge arm-soc/for-next +Removing include/linux/clk/mvebu.h +Auto-merging drivers/pci/Kconfig +Auto-merging drivers/dma/ste_dma40.c +Auto-merging drivers/crypto/ux500/cryp/cryp_core.c +Removing drivers/clk/mvebu/clk.c +Removing drivers/clk/mvebu/clk-gating-ctrl.h +Removing drivers/clk/mvebu/clk-gating-ctrl.c +Removing drivers/clk/mvebu/clk-core.h +Removing drivers/clk/mvebu/clk-core.c +Removing arch/arm/mach-sunxi/sunxi.h +Removing arch/arm/mach-kirkwood/db88f6281-bp-setup.c +Removing arch/arm/mach-kirkwood/board-nsa310.c +Removing arch/arm/mach-at91/board-usb-a926x.c +Auto-merging arch/arm/configs/at91sam9261_9g10_defconfig +Removing arch/arm/configs/at91sam9260_defconfig +Auto-merging arch/arm/configs/at91sam9260_9g20_defconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cci.txt | 172 ++++ + .../devicetree/bindings/arm/rtsm-dcscb.txt | 19 + + .../devicetree/bindings/arm/ste-nomadik.txt | 5 + + .../devicetree/bindings/dma/ste-dma40.txt | 62 ++ + .../devicetree/bindings/pci/mvebu-pci.txt | 221 +++++ + arch/arm/Kconfig | 1 + + arch/arm/arm-soc-for-next-contents.txt | 69 ++ + arch/arm/boot/dts/Makefile | 6 + + arch/arm/boot/dts/aks-cdu.dts | 12 +- + arch/arm/boot/dts/animeo_ip.dts | 18 +- + arch/arm/boot/dts/armada-370-db.dts | 1 + + arch/arm/boot/dts/armada-370-mirabox.dts | 1 + + arch/arm/boot/dts/armada-370-rd.dts | 1 + + arch/arm/boot/dts/armada-370-xp.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-db.dts | 33 + + arch/arm/boot/dts/armada-xp-gp.dts | 10 + + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 9 + + arch/arm/boot/dts/armada-xp.dtsi | 2 +- + arch/arm/boot/dts/at91-ariag25.dts | 27 +- + arch/arm/boot/dts/at91-foxg20.dts | 157 ++++ + arch/arm/boot/dts/at91rm9200.dtsi | 283 ++++--- + arch/arm/boot/dts/at91rm9200ek.dts | 10 +- + arch/arm/boot/dts/at91sam9260.dtsi | 301 ++++--- + arch/arm/boot/dts/at91sam9263.dtsi | 241 +++--- + arch/arm/boot/dts/at91sam9263ek.dts | 28 +- + arch/arm/boot/dts/at91sam9g15.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g15ek.dts | 4 +- + arch/arm/boot/dts/at91sam9g20.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g20ek.dts | 6 +- + arch/arm/boot/dts/at91sam9g20ek_2mmc.dts | 10 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 32 +- + arch/arm/boot/dts/at91sam9g25.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g25ek.dts | 4 +- + arch/arm/boot/dts/at91sam9g35.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g35ek.dts | 4 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 289 ++++--- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 42 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 223 +++-- + arch/arm/boot/dts/at91sam9n12ek.dts | 18 +- + arch/arm/boot/dts/at91sam9x25.dtsi | 22 +- + arch/arm/boot/dts/at91sam9x25ek.dts | 4 +- + arch/arm/boot/dts/at91sam9x35.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x35ek.dts | 4 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 381 +++++---- + arch/arm/boot/dts/at91sam9x5cm.dtsi | 8 +- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 18 +- + arch/arm/boot/dts/bcm2835.dtsi | 1 + + arch/arm/boot/dts/dove-cubox.dts | 51 +- + arch/arm/boot/dts/ethernut5.dts | 6 +- + arch/arm/boot/dts/evk-pro3.dts | 6 +- + arch/arm/boot/dts/ge863-pro3.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-6281.dtsi | 31 + + arch/arm/boot/dts/kirkwood-6282.dtsi | 48 ++ + arch/arm/boot/dts/kirkwood-cloudbox.dts | 10 +- + arch/arm/boot/dts/kirkwood-db-88f6281.dts | 30 + + arch/arm/boot/dts/kirkwood-db-88f6282.dts | 34 + + arch/arm/boot/dts/kirkwood-db.dtsi | 89 ++ + arch/arm/boot/dts/kirkwood-dns320.dts | 7 + + arch/arm/boot/dts/kirkwood-dns325.dts | 5 + + arch/arm/boot/dts/kirkwood-dnskw.dtsi | 32 +- + arch/arm/boot/dts/kirkwood-dockstar.dts | 9 +- + arch/arm/boot/dts/kirkwood-dreamplug.dts | 12 +- + arch/arm/boot/dts/kirkwood-goflexnet.dts | 18 +- + .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 10 +- + arch/arm/boot/dts/kirkwood-ib62x0.dts | 17 +- + arch/arm/boot/dts/kirkwood-iconnect.dts | 44 +- + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 15 +- + arch/arm/boot/dts/kirkwood-is2.dts | 2 + + arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 6 +- + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 26 +- + arch/arm/boot/dts/kirkwood-mplcec4.dts | 33 +- + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 22 +- + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 10 +- + arch/arm/boot/dts/kirkwood-ns2.dts | 2 + + arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 + + arch/arm/boot/dts/kirkwood-ns2max.dts | 2 + + arch/arm/boot/dts/kirkwood-ns2mini.dts | 2 + + arch/arm/boot/dts/kirkwood-nsa310.dts | 37 +- + arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 108 +-- + arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 97 +++ + arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 40 + + arch/arm/boot/dts/kirkwood-sheevaplug.dts | 45 + + arch/arm/boot/dts/kirkwood-topkick.dts | 52 +- + arch/arm/boot/dts/kirkwood-ts219-6281.dts | 11 +- + arch/arm/boot/dts/kirkwood-ts219-6282.dts | 11 +- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 24 +- + arch/arm/boot/dts/kirkwood.dtsi | 5 + + arch/arm/boot/dts/kizbox.dts | 16 +- + arch/arm/boot/dts/mpa1600.dts | 4 +- + arch/arm/boot/dts/pm9g45.dts | 22 +- + arch/arm/boot/dts/sama5d3.dtsi | 520 ++++++------ + arch/arm/boot/dts/sama5d31ek.dts | 6 +- + arch/arm/boot/dts/sama5d33ek.dts | 4 +- + arch/arm/boot/dts/sama5d34ek.dts | 6 +- + arch/arm/boot/dts/sama5d35ek.dts | 4 +- + arch/arm/boot/dts/sama5d3xcm.dtsi | 4 +- + arch/arm/boot/dts/sama5d3xdm.dtsi | 2 +- + arch/arm/boot/dts/sama5d3xmb.dtsi | 26 +- + arch/arm/boot/dts/ste-nomadik-s8815.dts | 63 ++ + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 145 +++- + arch/arm/boot/dts/tny_a9260.dts | 4 +- + arch/arm/boot/dts/tny_a9263.dts | 4 +- + arch/arm/boot/dts/tny_a9g20.dts | 4 +- + arch/arm/boot/dts/usb_a9260.dts | 13 +- + arch/arm/boot/dts/usb_a9260_common.dtsi | 6 +- + arch/arm/boot/dts/usb_a9263.dts | 22 +- + arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi | 22 +- + arch/arm/boot/dts/usb_a9g20.dts | 18 +- + arch/arm/boot/dts/usb_a9g20_common.dtsi | 27 + + arch/arm/boot/dts/usb_a9g20_lpw.dts | 31 + + arch/arm/configs/at91_dt_defconfig | 57 +- + arch/arm/configs/at91rm9200_defconfig | 218 +---- + ...am9g20_defconfig => at91sam9260_9g20_defconfig} | 66 +- + arch/arm/configs/at91sam9260_defconfig | 91 -- + ...am9261_defconfig => at91sam9261_9g10_defconfig} | 19 +- + arch/arm/configs/at91sam9263_defconfig | 40 +- + arch/arm/configs/at91sam9g45_defconfig | 94 +-- + arch/arm/configs/kirkwood_defconfig | 10 +- + arch/arm/configs/mvebu_defconfig | 4 + + arch/arm/configs/nhk8815_defconfig | 6 + + arch/arm/configs/sama5_defconfig | 35 +- + arch/arm/include/asm/cp15.h | 14 + + arch/arm/mach-at91/Kconfig.non_dt | 162 ++-- + arch/arm/mach-at91/Makefile | 5 - + arch/arm/mach-at91/board-sam9261ek.c | 28 +- + arch/arm/mach-at91/board-usb-a926x.c | 384 --------- + arch/arm/mach-dove/Kconfig | 3 +- + arch/arm/mach-dove/board-dt.c | 3 +- + arch/arm/mach-dove/common.c | 1 - + arch/arm/mach-highbank/highbank.c | 1 - + arch/arm/mach-kirkwood/Kconfig | 33 +- + arch/arm/mach-kirkwood/Makefile | 4 +- + arch/arm/mach-kirkwood/board-db88f628x-bp.c | 24 + + arch/arm/mach-kirkwood/board-dt.c | 22 +- + arch/arm/mach-kirkwood/board-iconnect.c | 8 - + arch/arm/mach-kirkwood/board-lsxl.c | 16 - + arch/arm/mach-kirkwood/board-mplcec4.c | 1 - + arch/arm/mach-kirkwood/board-nsa310.c | 25 - + arch/arm/mach-kirkwood/board-sheevaplug.c | 27 + + arch/arm/mach-kirkwood/board-ts219.c | 13 - + arch/arm/mach-kirkwood/common.c | 47 +- + arch/arm/mach-kirkwood/common.h | 13 + + arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 108 --- + arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 2 + + arch/arm/mach-kirkwood/pcie.c | 22 + + arch/arm/mach-mvebu/Kconfig | 7 +- + arch/arm/mach-mvebu/armada-370-xp.c | 12 +- + arch/arm/mach-mvebu/coherency_ll.S | 16 +- + arch/arm/mach-mxs/mach-mxs.c | 1 - + arch/arm/mach-nomadik/Kconfig | 1 + + arch/arm/mach-nomadik/cpu-8815.c | 75 +- + arch/arm/mach-prima2/common.c | 4 - + arch/arm/mach-spear/spear1310.c | 2 - + arch/arm/mach-spear/spear1340.c | 2 - + arch/arm/mach-spear/spear300.c | 2 - + arch/arm/mach-spear/spear310.c | 2 - + arch/arm/mach-spear/spear320.c | 2 - + arch/arm/mach-spear/spear6xx.c | 2 - + arch/arm/mach-sunxi/sunxi.c | 17 - + arch/arm/mach-sunxi/sunxi.h | 20 - + arch/arm/mach-ux500/board-mop500-audio.c | 56 +- + arch/arm/mach-ux500/board-mop500-regulators.c | 3 + + arch/arm/mach-ux500/board-mop500-sdi.c | 40 +- + arch/arm/mach-ux500/board-mop500.c | 63 +- + arch/arm/mach-ux500/board-mop500.h | 1 + + arch/arm/mach-ux500/cpu-db8500.c | 52 +- + arch/arm/mach-ux500/cpuidle.c | 4 + + arch/arm/mach-ux500/devices-db8500.c | 123 +-- + arch/arm/mach-ux500/ste-dma40-db8500.h | 193 ++--- + arch/arm/mach-ux500/usb.c | 18 +- + arch/arm/mach-vexpress/Kconfig | 9 + + arch/arm/mach-vexpress/Makefile | 1 + + arch/arm/mach-vexpress/core.h | 2 + + arch/arm/mach-vexpress/dcscb.c | 253 ++++++ + arch/arm/mach-vexpress/dcscb_setup.S | 38 + + arch/arm/mach-vexpress/platsmp.c | 20 + + arch/arm/mach-vexpress/v2m.c | 3 +- + arch/arm/mach-virt/virt.c | 2 - + arch/arm/mach-vt8500/vt8500.c | 2 - + arch/arm/mm/mmu.c | 2 + + drivers/bus/Kconfig | 7 + + drivers/bus/Makefile | 2 + + drivers/bus/arm-cci.c | 533 ++++++++++++ + drivers/clk/clk-nomadik.c | 41 +- + drivers/clk/mvebu/Kconfig | 25 +- + drivers/clk/mvebu/Makefile | 8 +- + drivers/clk/mvebu/armada-370.c | 176 ++++ + drivers/clk/mvebu/armada-xp.c | 210 +++++ + drivers/clk/mvebu/clk-core.c | 675 --------------- + drivers/clk/mvebu/clk-core.h | 18 - + drivers/clk/mvebu/clk-gating-ctrl.c | 250 ------ + drivers/clk/mvebu/clk-gating-ctrl.h | 22 - + drivers/clk/mvebu/clk.c | 23 - + drivers/clk/mvebu/common.c | 163 ++++ + drivers/clk/mvebu/common.h | 48 ++ + drivers/clk/mvebu/dove.c | 194 +++++ + drivers/clk/mvebu/kirkwood.c | 247 ++++++ + drivers/clocksource/nomadik-mtu.c | 60 +- + drivers/cpuidle/cpuidle-calxeda.c | 14 - + drivers/crypto/ux500/cryp/cryp.h | 7 +- + drivers/crypto/ux500/cryp/cryp_core.c | 31 +- + drivers/crypto/ux500/hash/hash_alg.h | 5 +- + drivers/crypto/ux500/hash/hash_core.c | 24 +- + drivers/dma/ste_dma40.c | 366 +++++---- + drivers/dma/ste_dma40_ll.c | 106 ++- + drivers/dma/ste_dma40_ll.h | 3 +- + drivers/of/address.c | 67 ++ + drivers/of/of_pci.c | 59 +- + drivers/pci/Kconfig | 2 + + drivers/pci/Makefile | 3 + + drivers/pci/host/Kconfig | 8 + + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-mvebu.c | 914 +++++++++++++++++++++ + include/dt-bindings/pinctrl/at91.h | 35 + + include/linux/arm-cci.h | 61 ++ + include/linux/clk/mvebu.h | 22 - + include/linux/of_address.h | 48 ++ + include/linux/of_pci.h | 2 + + include/linux/platform_data/dma-ste-dma40.h | 20 +- + 220 files changed, 7509 insertions(+), 4414 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/cci.txt + create mode 100644 Documentation/devicetree/bindings/arm/rtsm-dcscb.txt + create mode 100644 Documentation/devicetree/bindings/dma/ste-dma40.txt + create mode 100644 Documentation/devicetree/bindings/pci/mvebu-pci.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/at91-foxg20.dts + create mode 100644 arch/arm/boot/dts/kirkwood-db-88f6281.dts + create mode 100644 arch/arm/boot/dts/kirkwood-db-88f6282.dts + create mode 100644 arch/arm/boot/dts/kirkwood-db.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts + create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug.dts + create mode 100644 arch/arm/boot/dts/usb_a9g20_common.dtsi + create mode 100644 arch/arm/boot/dts/usb_a9g20_lpw.dts + rename arch/arm/configs/{at91sam9g20_defconfig => at91sam9260_9g20_defconfig} (67%) + delete mode 100644 arch/arm/configs/at91sam9260_defconfig + rename arch/arm/configs/{at91sam9261_defconfig => at91sam9261_9g10_defconfig} (91%) + delete mode 100644 arch/arm/mach-at91/board-usb-a926x.c + create mode 100644 arch/arm/mach-kirkwood/board-db88f628x-bp.c + delete mode 100644 arch/arm/mach-kirkwood/board-nsa310.c + create mode 100644 arch/arm/mach-kirkwood/board-sheevaplug.c + delete mode 100644 arch/arm/mach-kirkwood/db88f6281-bp-setup.c + delete mode 100644 arch/arm/mach-sunxi/sunxi.h + create mode 100644 arch/arm/mach-vexpress/dcscb.c + create mode 100644 arch/arm/mach-vexpress/dcscb_setup.S + create mode 100644 drivers/bus/arm-cci.c + create mode 100644 drivers/clk/mvebu/armada-370.c + create mode 100644 drivers/clk/mvebu/armada-xp.c + delete mode 100644 drivers/clk/mvebu/clk-core.c + delete mode 100644 drivers/clk/mvebu/clk-core.h + delete mode 100644 drivers/clk/mvebu/clk-gating-ctrl.c + delete mode 100644 drivers/clk/mvebu/clk-gating-ctrl.h + delete mode 100644 drivers/clk/mvebu/clk.c + create mode 100644 drivers/clk/mvebu/common.c + create mode 100644 drivers/clk/mvebu/common.h + create mode 100644 drivers/clk/mvebu/dove.c + create mode 100644 drivers/clk/mvebu/kirkwood.c + create mode 100644 drivers/pci/host/Kconfig + create mode 100644 drivers/pci/host/Makefile + create mode 100644 drivers/pci/host/pci-mvebu.c + create mode 100644 include/dt-bindings/pinctrl/at91.h + create mode 100644 include/linux/arm-cci.h + delete mode 100644 include/linux/clk/mvebu.h +Merging bcm2835/for-next (0f1d8f7 Merge branch 'for-3.11/defconfig' into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm2835-rpi-b.dts | 11 +++++++++++ + arch/arm/configs/bcm2835_defconfig | 19 ++++++++++++++++--- + 2 files changed, 27 insertions(+), 3 deletions(-) +Merging cortex/for-next (6fae9cd ARM: ARMv7-M: implement read_cpuid_ext) +$ git merge cortex/for-next +Already up-to-date. +Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (81426b7 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Resolved 'arch/arm/mach-mxs/mach-mxs.c' using previous resolution. +Auto-merging arch/arm/mach-mxs/mach-mxs.c +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mxs.c +Auto-merging arch/arm/mach-imx/mm-imx3.c +Auto-merging arch/arm/mach-imx/Kconfig +Auto-merging arch/arm/boot/dts/imx28.dtsi +Removing arch/arm/boot/dts/imx27-phytec-phycore.dts +Auto-merging arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3826754] Merge remote-tracking branch 'imx-mxs/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/imx5-clock.txt | 13 + + .../devicetree/bindings/clock/imx6q-clock.txt | 1 + + .../devicetree/bindings/clock/imx6sl-clock.txt | 10 + + .../devicetree/bindings/clock/vf610-clock.txt | 26 + + .../bindings/pinctrl/fsl,imx-pinctrl.txt | 2 +- + arch/arm/Kconfig.debug | 13 +- + arch/arm/boot/dts/Makefile | 8 +- + arch/arm/boot/dts/imx25.dtsi | 12 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 29 + + arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 178 +++++ + arch/arm/boot/dts/imx27-phytec-phycore.dts | 79 -- + arch/arm/boot/dts/imx27.dtsi | 17 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 1 + + arch/arm/boot/dts/imx28-cfa10036.dts | 15 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 4 +- + arch/arm/boot/dts/imx28-m28evk.dts | 14 +- + arch/arm/boot/dts/imx28.dtsi | 33 + + arch/arm/boot/dts/imx51-apf51.dts | 7 + + arch/arm/boot/dts/imx51.dtsi | 25 +- + arch/arm/boot/dts/imx53-m53evk.dts | 259 +++++++ + arch/arm/boot/dts/imx53-qsb.dts | 36 + + arch/arm/boot/dts/imx53-tx53.dtsi | 122 ++++ + arch/arm/boot/dts/imx53.dtsi | 289 +++++++- + arch/arm/boot/dts/imx6dl-sabreauto.dts | 1 + + arch/arm/boot/dts/imx6dl.dtsi | 34 + + arch/arm/boot/dts/imx6q-sabreauto.dts | 1 + + arch/arm/boot/dts/imx6q.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 22 + + arch/arm/boot/dts/imx6qdl.dtsi | 9 +- + arch/arm/boot/dts/imx6sl-evk.dts | 74 ++ + arch/arm/boot/dts/imx6sl.dtsi | 779 ++++++++++++++++++++ + arch/arm/boot/dts/vf610-pinfunc.h | 810 +++++++++++++++++++++ + arch/arm/boot/dts/vf610-twr.dts | 57 ++ + arch/arm/boot/dts/vf610.dtsi | 464 ++++++++++++ + arch/arm/configs/imx_v6_v7_defconfig | 4 + + arch/arm/include/debug/imx-uart.h | 10 + + arch/arm/mach-imx/Kconfig | 34 + + arch/arm/mach-imx/Makefile | 3 + + arch/arm/mach-imx/clk-imx51-imx53.c | 75 +- + arch/arm/mach-imx/clk-imx6q.c | 50 +- + arch/arm/mach-imx/clk-imx6sl.c | 267 +++++++ + arch/arm/mach-imx/clk-pllv3.c | 10 - + arch/arm/mach-imx/clk-vf610.c | 319 ++++++++ + arch/arm/mach-imx/clk.c | 35 + + arch/arm/mach-imx/clk.h | 4 +- + arch/arm/mach-imx/common.h | 2 +- + arch/arm/mach-imx/hardware.h | 1 + + arch/arm/mach-imx/imx25-dt.c | 2 + + arch/arm/mach-imx/imx27-dt.c | 2 + + arch/arm/mach-imx/imx31-dt.c | 2 + + arch/arm/mach-imx/imx51-dt.c | 2 + + arch/arm/mach-imx/irq-common.c | 1 + + arch/arm/mach-imx/mach-imx53.c | 17 +- + arch/arm/mach-imx/mach-imx6q.c | 39 +- + arch/arm/mach-imx/mach-imx6sl.c | 52 ++ + arch/arm/mach-imx/mach-vf610.c | 48 ++ + arch/arm/mach-imx/mm-imx1.c | 2 +- + arch/arm/mach-imx/mm-imx21.c | 2 +- + arch/arm/mach-imx/mm-imx25.c | 2 +- + arch/arm/mach-imx/mm-imx27.c | 2 +- + arch/arm/mach-imx/mm-imx3.c | 4 +- + arch/arm/mach-imx/mm-imx5.c | 3 +- + arch/arm/mach-imx/system.c | 47 +- + arch/arm/mach-mxs/mach-mxs.c | 2 - + drivers/irqchip/irq-mxs.c | 14 +- + include/dt-bindings/clock/imx6sl-clock.h | 148 ++++ + include/dt-bindings/clock/vf610-clock.h | 163 +++++ + 67 files changed, 4576 insertions(+), 238 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx6sl-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/vf610-clock.txt + create mode 100644 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts + create mode 100644 arch/arm/boot/dts/imx27-phytec-phycore-som.dts + delete mode 100644 arch/arm/boot/dts/imx27-phytec-phycore.dts + create mode 100644 arch/arm/boot/dts/imx53-m53evk.dts + create mode 100644 arch/arm/boot/dts/imx53-tx53.dtsi + create mode 100644 arch/arm/boot/dts/imx6sl-evk.dts + create mode 100644 arch/arm/boot/dts/imx6sl.dtsi + create mode 100644 arch/arm/boot/dts/vf610-pinfunc.h + create mode 100644 arch/arm/boot/dts/vf610-twr.dts + create mode 100644 arch/arm/boot/dts/vf610.dtsi + create mode 100644 arch/arm/mach-imx/clk-imx6sl.c + create mode 100644 arch/arm/mach-imx/clk-vf610.c + create mode 100644 arch/arm/mach-imx/mach-imx6sl.c + create mode 100644 arch/arm/mach-imx/mach-vf610.c + create mode 100644 include/dt-bindings/clock/imx6sl-clock.h + create mode 100644 include/dt-bindings/clock/vf610-clock.h +Merging ixp4xx/next (19f949f Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging msm/for-next (d39b156 Merge branch 'msm-fix' into for-next) +$ git merge msm/for-next +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/arm/mach-msm/io.c +Removing arch/arm/mach-msm/gpiomux-v2.h +Removing arch/arm/mach-msm/gpiomux-v2.c +Removing arch/arm/mach-msm/gpiomux-8x60.c +Removing arch/arm/mach-msm/core.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-msm.txt | 26 ++++ + arch/arm/boot/dts/msm8660-surf.dts | 15 +- + arch/arm/boot/dts/msm8960-cdp.dts | 13 +- + arch/arm/mach-msm/Kconfig | 13 +- + arch/arm/mach-msm/Makefile | 6 +- + arch/arm/mach-msm/board-dt-8660.c | 2 - + arch/arm/mach-msm/board-dt-8960.c | 2 - + arch/arm/mach-msm/clock-debug.c | 2 +- + arch/arm/mach-msm/core.h | 2 - + arch/arm/mach-msm/gpiomux-8x60.c | 19 --- + arch/arm/mach-msm/gpiomux-v2.c | 25 --- + arch/arm/mach-msm/gpiomux-v2.h | 61 -------- + arch/arm/mach-msm/gpiomux.c | 15 ++ + arch/arm/mach-msm/gpiomux.h | 5 - + arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 7 - + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 10 -- + arch/arm/mach-msm/include/mach/msm_iomap.h | 2 - + arch/arm/mach-msm/io.c | 4 - + drivers/gpio/Kconfig | 2 +- + drivers/gpio/gpio-msm-v2.c | 170 +++++++++++++-------- + 20 files changed, 180 insertions(+), 221 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt + delete mode 100644 arch/arm/mach-msm/core.h + delete mode 100644 arch/arm/mach-msm/gpiomux-8x60.c + delete mode 100644 arch/arm/mach-msm/gpiomux-v2.c + delete mode 100644 arch/arm/mach-msm/gpiomux-v2.h +$ git am -3 ../patches/0001-restore-dependency-on-ARCH_MSM-to-GPIO_MSM_V2.patch +Applying: restore dependency on ARCH_MSM to GPIO_MSM_V2 +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpio/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 031d613] Merge remote-tracking branch 'msm/for-next' +Merging mvebu/for-next (cddafe7 Merge branch 'mvebu/seb_clk' into for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-370-xp.dtsi | 9 +++-- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 3 +- + arch/arm/boot/dts/armada-xp.dtsi | 6 +++- + arch/arm/boot/dts/kirkwood-6281.dtsi | 28 +++++++++++++++ + arch/arm/boot/dts/kirkwood-6282.dtsi | 28 +++++++++++++++ + arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 7 ++++ + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 8 +++++ + arch/arm/boot/dts/kirkwood-nsa310.dts | 1 + + arch/arm/boot/dts/kirkwood.dtsi | 40 +++++++--------------- + arch/arm/mach-kirkwood/board-readynas.c | 1 - + 10 files changed, 98 insertions(+), 33 deletions(-) +Merging renesas/next (58e3e8a Merge branch 'heads/soc' into next) +$ git merge renesas/next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + .../interrupt-controller/renesas,intc-irqpin.txt | 13 + + arch/arm/Kconfig | 2 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/r8a73a4.dtsi | 6 - + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 45 + + arch/arm/boot/dts/r8a7740.dtsi | 117 + + arch/arm/boot/dts/r8a7779.dtsi | 17 + + arch/arm/boot/dts/r8a7790.dtsi | 6 - + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 86 + + arch/arm/configs/armadillo800eva_defconfig | 2 +- + arch/arm/configs/bockw_defconfig | 16 +- + arch/arm/configs/kzm9g_defconfig | 3 + + arch/arm/mach-shmobile/Kconfig | 19 +- + arch/arm/mach-shmobile/Makefile | 1 + + arch/arm/mach-shmobile/board-ap4evb.c | 132 +- + arch/arm/mach-shmobile/board-ape6evm.c | 15 + + .../board-armadillo800eva-reference.c | 213 ++ + arch/arm/mach-shmobile/board-armadillo800eva.c | 116 +- + arch/arm/mach-shmobile/board-bockw.c | 45 +- + arch/arm/mach-shmobile/board-bonito.c | 47 +- + arch/arm/mach-shmobile/board-kzm9d.c | 2 +- + arch/arm/mach-shmobile/board-kzm9g-reference.c | 1 - + arch/arm/mach-shmobile/board-kzm9g.c | 204 +- + arch/arm/mach-shmobile/board-lager.c | 64 + + arch/arm/mach-shmobile/board-mackerel.c | 171 +- + arch/arm/mach-shmobile/board-marzen.c | 12 +- + arch/arm/mach-shmobile/clock-r8a73a4.c | 375 +- + arch/arm/mach-shmobile/clock-r8a7740.c | 11 +- + arch/arm/mach-shmobile/clock-r8a7778.c | 156 +- + arch/arm/mach-shmobile/clock-r8a7779.c | 4 +- + arch/arm/mach-shmobile/clock-r8a7790.c | 238 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 111 +- + arch/arm/mach-shmobile/include/mach/clock.h | 8 +- + arch/arm/mach-shmobile/include/mach/irqs.h | 5 + + arch/arm/mach-shmobile/include/mach/r8a7740.h | 491 +-- + arch/arm/mach-shmobile/include/mach/r8a7778.h | 3 + + arch/arm/mach-shmobile/include/mach/sh7372.h | 391 -- + arch/arm/mach-shmobile/intc-r8a7740.c | 24 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 78 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 99 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 19 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 36 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 97 +- + drivers/gpio/gpio-rcar.c | 28 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 4 + + drivers/irqchip/irq-renesas-irqc.c | 12 +- + drivers/pinctrl/sh-pfc/Kconfig | 13 +- + drivers/pinctrl/sh-pfc/Makefile | 2 + + drivers/pinctrl/sh-pfc/core.c | 22 +- + drivers/pinctrl/sh-pfc/core.h | 4 + + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 1923 +++++++--- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 2783 ++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 526 ++- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 3835 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-sh7372.c | 1652 ++++++--- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 742 ++-- + drivers/pinctrl/sh-pfc/sh_pfc.h | 4 +- + include/linux/irqchip.h | 4 + + include/linux/platform_data/gpio-rcar.h | 5 +- + 59 files changed, 12088 insertions(+), 2973 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt + create mode 100644 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts + create mode 100644 arch/arm/mach-shmobile/board-armadillo800eva-reference.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7778.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7790.c +Merging samsung/for-next (924fd92 Revert "ARM: SAMSUNG: don't check resource with devm_ioremap_resource") +$ git merge samsung/for-next +Auto-merging drivers/pinctrl/pinctrl-samsung.h +Auto-merging drivers/pinctrl/pinctrl-samsung.c +Auto-merging drivers/pinctrl/Makefile +Auto-merging drivers/pinctrl/Kconfig +Auto-merging drivers/cpufreq/s3c2412-cpufreq.c +Auto-merging drivers/cpufreq/Kconfig.arm +Auto-merging arch/arm/plat-samsung/include/plat/cpu-freq-core.h +Auto-merging arch/arm/mach-exynos/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/media/s5p-mfc.txt | 5 + + .../bindings/pinctrl/samsung-pinctrl.txt | 8 + + .../devicetree/bindings/usb/exynos-usb.txt | 34 ++ + arch/arm/Kconfig | 47 -- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos4.dtsi | 2 + + arch/arm/boot/dts/exynos4210-origen.dts | 147 +++++ + arch/arm/boot/dts/exynos4210.dtsi | 3 + + arch/arm/boot/dts/exynos4412-origen.dts | 62 ++ + arch/arm/boot/dts/exynos4412-smdk4412.dts | 87 +++ + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 56 -- + arch/arm/boot/dts/exynos5250.dtsi | 32 +- + arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 173 ++++++ + arch/arm/boot/dts/s3c2416-smdk2416.dts | 72 +++ + arch/arm/boot/dts/s3c2416.dtsi | 79 +++ + arch/arm/boot/dts/s3c24xx.dtsi | 92 +++ + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-exynos/mach-exynos5-dt.c | 28 + + arch/arm/mach-s3c24xx/Kconfig | 78 +-- + arch/arm/mach-s3c24xx/Makefile | 7 +- + arch/arm/mach-s3c24xx/dma-s3c2412.c | 56 +- + arch/arm/mach-s3c24xx/dma-s3c2443.c | 3 +- + arch/arm/mach-s3c24xx/dma.c | 3 - + arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0 + arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +- + arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 91 +++ + arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 +- + arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +- + arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 5 - + drivers/cpufreq/Kconfig.arm | 58 ++ + drivers/cpufreq/Makefile | 5 + + .../cpufreq/s3c2410-cpufreq.c | 0 + .../cpufreq/s3c2412-cpufreq.c | 3 +- + .../cpufreq/s3c2440-cpufreq.c | 0 + .../cpufreq/s3c24xx-cpufreq-debugfs.c | 0 + .../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0 + drivers/gpio/gpio-samsung.c | 4 + + drivers/pinctrl/Kconfig | 5 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-s3c24xx.c | 652 +++++++++++++++++++++ + drivers/pinctrl/pinctrl-samsung.c | 10 + + drivers/pinctrl/pinctrl-samsung.h | 4 + + 42 files changed, 1722 insertions(+), 210 deletions(-) + create mode 100644 arch/arm/boot/dts/s3c2416-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/s3c2416-smdk2416.dts + create mode 100644 arch/arm/boot/dts/s3c2416.dtsi + create mode 100644 arch/arm/boot/dts/s3c24xx.dtsi + rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%) + create mode 100644 arch/arm/mach-s3c24xx/mach-s3c2416-dt.c + rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => drivers/cpufreq/s3c2410-cpufreq.c (100%) + rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => drivers/cpufreq/s3c2412-cpufreq.c (99%) + rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => drivers/cpufreq/s3c2440-cpufreq.c (100%) + rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%) + rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c (100%) + create mode 100644 drivers/pinctrl/pinctrl-s3c24xx.c +Merging tegra/for-next (f2c3e05 Merge branch 'for-3.11/defconfig' into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/nvidia,tegra114-car.txt | 252 +-------------- + .../bindings/clock/nvidia,tegra20-car.txt | 154 +--------- + .../bindings/clock/nvidia,tegra30-car.txt | 211 +------------ + arch/arm/boot/dts/tegra114-dalmore.dts | 31 +- + arch/arm/boot/dts/tegra114-pluto.dts | 2 +- + arch/arm/boot/dts/tegra114.dtsi | 277 +++++++++++------ + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 27 +- + arch/arm/boot/dts/tegra20-harmony.dts | 56 ++-- + arch/arm/boot/dts/tegra20-iris-512.dts | 4 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 12 +- + arch/arm/boot/dts/tegra20-paz00.dts | 37 ++- + arch/arm/boot/dts/tegra20-plutux.dts | 12 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 47 +-- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 11 +- + arch/arm/boot/dts/tegra20-tec.dts | 13 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 25 +- + arch/arm/boot/dts/tegra20-ventana.dts | 49 +-- + arch/arm/boot/dts/tegra20-whistler.dts | 19 +- + arch/arm/boot/dts/tegra20.dtsi | 258 ++++++++-------- + arch/arm/boot/dts/tegra30-beaver.dts | 39 ++- + arch/arm/boot/dts/tegra30-cardhu-a02.dts | 16 +- + arch/arm/boot/dts/tegra30-cardhu-a04.dts | 18 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 47 +-- + arch/arm/boot/dts/tegra30.dtsi | 288 +++++++++-------- + arch/arm/configs/tegra_defconfig | 22 +- + arch/arm/mach-tegra/Makefile | 1 + + arch/arm/mach-tegra/common.h | 1 + + arch/arm/mach-tegra/flowctrl.h | 1 + + arch/arm/mach-tegra/fuse.h | 22 +- + arch/arm/mach-tegra/hotplug.c | 13 + + arch/arm/mach-tegra/platsmp.c | 26 +- + arch/arm/mach-tegra/reset-handler.S | 51 +-- + arch/arm/mach-tegra/sleep-tegra30.S | 30 +- + arch/arm/mach-tegra/sleep.S | 8 +- + arch/arm/mach-tegra/sleep.h | 35 ++- + arch/arm/mach-tegra/tegra2_emc.c | 2 +- + drivers/clk/tegra/clk-tegra114.c | 23 +- + include/dt-bindings/clock/tegra114-car.h | 342 +++++++++++++++++++++ + include/dt-bindings/clock/tegra20-car.h | 158 ++++++++++ + include/dt-bindings/clock/tegra30-car.h | 265 ++++++++++++++++ + include/dt-bindings/gpio/tegra-gpio.h | 50 +++ + 41 files changed, 1746 insertions(+), 1209 deletions(-) + create mode 100644 include/dt-bindings/clock/tegra114-car.h + create mode 100644 include/dt-bindings/clock/tegra20-car.h + create mode 100644 include/dt-bindings/clock/tegra30-car.h + create mode 100644 include/dt-bindings/gpio/tegra-gpio.h +Merging dma-mapping/dma-mapping-next (c1be5a5 Linux 3.9) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (e792714 pwm: mxs: Let device core handle pinctrl) +$ git merge pwm/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + drivers/pwm/pwm-mxs.c | 6 ------ + 2 files changed, 2 insertions(+), 8 deletions(-) +Merging dma-buf/for-next (b89e356 dma-buf: Add debugfs support) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem) +$ git merge userns/for-next +Auto-merging fs/proc/root.c +Merge made by the 'recursive' strategy. + fs/proc/root.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (061cec9 clk: tegra: Use common of_clk_init function) +$ git merge clk/clk-next +Auto-merging drivers/clk/tegra/clk-tegra114.c +Auto-merging drivers/clk/clk-vt8500.c +Auto-merging drivers/clk/clk-si5351.c +Auto-merging Documentation/devicetree/bindings/clock/silabs,si5351.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/nspire-clock.txt | 24 ++ + .../devicetree/bindings/clock/silabs,si5351.txt | 5 + + Documentation/devicetree/bindings/clock/sunxi.txt | 117 +-------- + .../bindings/clock/sunxi/sun4i-a10-gates.txt | 93 +++++++ + .../bindings/clock/sunxi/sun5i-a13-gates.txt | 58 +++++ + Documentation/devicetree/bindings/clock/vt8500.txt | 2 + + arch/arm/mach-tegra/common.c | 4 +- + arch/powerpc/platforms/Kconfig.cputype | 1 + + drivers/clk/Kconfig | 8 +- + drivers/clk/Makefile | 2 + + drivers/clk/clk-nspire.c | 153 +++++++++++ + drivers/clk/clk-ppc-corenet.c | 280 +++++++++++++++++++++ + drivers/clk/clk-si5351.c | 79 +++++- + drivers/clk/clk-si5351.h | 1 + + drivers/clk/clk-twl6040.c | 4 +- + drivers/clk/clk-vt8500.c | 75 +++++- + drivers/clk/clk-wm831x.c | 14 +- + drivers/clk/clk.c | 91 ++++--- + drivers/clk/samsung/clk-exynos5250.c | 8 +- + drivers/clk/sunxi/clk-sunxi.c | 35 ++- + drivers/clk/tegra/clk-tegra114.c | 10 +- + drivers/clk/tegra/clk-tegra20.c | 3 +- + drivers/clk/tegra/clk-tegra30.c | 7 +- + drivers/clk/tegra/clk.c | 12 - + drivers/clk/tegra/clk.h | 18 -- + drivers/clk/ux500/abx500-clk.c | 8 +- + include/linux/clk-provider.h | 47 +++- + include/linux/clk/tegra.h | 1 - + include/linux/platform_data/si5351.h | 18 ++ + 29 files changed, 944 insertions(+), 234 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nspire-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun4i-a10-gates.txt + create mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun5i-a13-gates.txt + create mode 100644 drivers/clk/clk-nspire.c + create mode 100644 drivers/clk/clk-ppc-corenet.c +Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) +Merging akpm-current/current (bb3ec6b mm: Fix virt_to_page() warning) +$ git merge akpm-current/current +Already up-to-date. +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix +Applying: CPU hotplug: provide a generic helper to disable/enable CPU hotplug +Applying: cpu-hotplug-provide-a-generic-helper-to-disable-enable-cpu-hotplug-v11 +Applying: reboot: rigrate shutdown/reboot to boot cpu +Applying: migrate-shutdown-reboot-to-boot-cpu-v11 +Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg +Applying: kmsg-honor-dmesg_restrict-sysctl-on-dev-kmsg-fix +Applying: kernel/audit_tree.c:audit_add_tree_rule(): protect `rule' from kill_rules() +Applying: sound/soc/codecs/si476x.c: don't use 0bNNN +Applying: x86: make 'mem=' option to work for efi platform +Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record +Applying: kernel/auditfilter.c: fix leak in audit_add_rule() error path +Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress +Applying: drivers/video/smscufx.c: use NULL instead of 0 +Applying: drivers/video/udlfb.c: use NULL instead of 0 +Applying: drivers/video/udlfb.c: make local symbol static +Applying: drivers/video/imxfb.c: make local symbols static +Applying: cyber2000fb: avoid palette corruption at higher clocks +Applying: posix_cpu_timer: consolidate expiry time type +Applying: posix_cpu_timers: consolidate timer list cleanups +Applying: posix_cpu_timers: consolidate expired timers check +Applying: selftests: add basic posix timers selftests +Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule() +Applying: posix_timers: fix racy timer delta caching on task exit +Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic() +Applying: configfs: use capped length for ->store_attribute() +Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max +Applying: fs/ocfs2/namei.c: remove unecessary ERROR when removing non-empty directory +Applying: softirq: use _RET_IP_ +Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros +Applying: lglock: update lockdep annotations to report recursive local locks +Applying: drivers/cdrom/gdrom.c: fix device number leak +Applying: block/compat_ioctl.c: do not leak info to user-space +Applying: block: restore /proc/partitions to not display non-partitionable removable devices +Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic +Applying: clear_refs: sanitize accepted commands declaration +Applying: clear_refs: introduce private struct for mm_walk +Applying: pagemap: introduce pagemap_entry_t without pmshift bits +Applying: pagemap-introduce-pagemap_entry_t-without-pmshift-bits-v4 +Applying: mm: soft-dirty bits for user memory changes tracking +Applying: soft-dirty: call mmu notifiers when write-protecting ptes +Applying: pagemap: prepare to reuse constant bits with page-shift +Applying: mm/thp: use the correct function when updating access flags +Applying: mm, memcg: don't take task_lock in task_in_mem_cgroup +Applying: mm: remove free_area_cache +Applying: mm: remove compressed copy from zram in-memory +Applying: mm-remove-compressed-copy-from-zram-in-memory-fix +Applying: mm/page_alloc.c: fix watermark check in __zone_watermark_ok() +Applying: swap: add a simple detector for inappropriate swapin readahead +Applying: mm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT +Applying: ncpfs: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT +Applying: uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT +Applying: mm/page_alloc: factor out setting of pcp->high and pcp->batch +Applying: mm/page_alloc: prevent concurrent updaters of pcp ->batch and ->high +Applying: mm/page_alloc: insert memory barriers to allow async update of pcp batch and high +Applying: mm/page_alloc: protect pcp->batch accesses with ACCESS_ONCE +Applying: mm/page_alloc: convert zone_pcp_update() to rely on memory barriers instead of stop_machine() +Applying: mm/page_alloc: when handling percpu_pagelist_fraction, don't unneedly recalulate high +Applying: mm/page_alloc: factor setup_pageset() into pageset_init() and pageset_set_batch() +Applying: mm/page_alloc: relocate comment to be directly above code it refers to. +Applying: mm/page_alloc: factor zone_pageset_init() out of setup_zone_pageset() +Applying: mm/page_alloc: in zone_pcp_update(), uze zone_pageset_init() +Applying: mm/page_alloc: rename setup_pagelist_highmark() to match naming of pageset_set_batch() +Applying: mm/THP: add pmd args to pgtable deposit and withdraw APIs +Applying: mm/THP: withdraw the pgtable after pmdp related operations +Applying: mm/THP: don't use HPAGE_SHIFT in transparent hugepage code +Applying: mm/THP: deposit the transpare huge pgtable before set_pmd +Applying: mm: vmscan: limit the number of pages kswapd reclaims at each priority +Applying: mm: vmscan: obey proportional scanning requirements for kswapd +Applying: mm: vmscan: flatten kswapd priority loop +Applying: mm: vmscan: decide whether to compact the pgdat based on reclaim progress +Applying: mm: vmscan: do not allow kswapd to scan at maximum priority +Applying: mm: vmscan: have kswapd writeback pages based on dirty pages encountered, not priority +Applying: mm: vmscan: block kswapd if it is encountering pages under writeback +Applying: mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback-fix +Applying: mm: vmscan: check if kswapd should writepage once per pgdat scan +Applying: mm: vmscan: move logic from balance_pgdat() to kswapd_shrink_zone() +Applying: mm: fix comment referring to non-existent size_seqlock, change to span_seqlock +Applying: mmzone: note that node_size_lock should be manipulated via pgdat_resize_lock() +Applying: memory_hotplug: use pgdat_resize_lock() in online_pages() +Applying: memory_hotplug: use pgdat_resize_lock() in __offline_pages() +Applying: memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix +Applying: include/linux/mmzone.h: cleanups +Applying: include-linux-mmzoneh-cleanups-fix +Applying: mm: memmap_init_zone() performance improvement +Applying: drop_caches: add some documentation and info message +Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev +Applying: mm/dmapool.c: fix null dev in dma_pool_create() +Applying: memcg: debugging facility to access dangling memcgs +Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix +Applying: mm: add vm event counters for balloon pages compaction +Applying: err.h: IS_ERR() can accept __user pointers +Applying: dump_stack: serialize the output from dump_stack() +Applying: dump_stack-serialize-the-output-from-dump_stack-fix +Applying: panic: add cpu/pid to warn_slowpath_common in WARNING printk()s +Applying: panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix +Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq +Applying: backlight: atmel-pwm-bl: remove unnecessary platform_set_drvdata() +Applying: backlight: ep93xx: remove unnecessary platform_set_drvdata() +Applying: backlight: lp8788: remove unnecessary platform_set_drvdata() +Applying: backlight: pcf50633: remove unnecessary platform_set_drvdata() +Applying: rbtree: remove unneeded include +Applying: rbtree-remove-unneeded-include-fix +Applying: checkpatch: change CamelCase test and make it --strict +Applying: checkpatch: warn when using gcc's binary constant ("0b") extension +Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting +Applying: init: remove permanent string buffer from do_one_initcall() +Applying: insert missing space in printk line of root_delay +Applying: autofs4: allow autofs to work outside the initial PID namespace +Applying: autofs4: translate pids to the right namespace for the daemon +Applying: rtc: rtc-88pm80x: remove unnecessary platform_set_drvdata() +Applying: drivers/rtc/rtc-v3020.c: remove redundant goto +Applying: drivers/rtc/interface.c: fix checkpatch errors +Applying: drivers/rtc/rtc-at32ap700x.c: fix checkpatch error +Applying: drivers/rtc/rtc-at91rm9200.c: include <linux/uaccess.h> +Applying: drivers/rtc/rtc-cmos.c: fix whitespace related errors +Applying: drivers/rtc/rtc-davinci.c: fix whitespace warning +Applying: drivers/rtc/rtc-ds1305.c: add missing braces around sizeof +Applying: drivers/rtc/rtc-ds1374.c: fix spacing related issues +Applying: drivers/rtc/rtc-ds1511.c: fix issues related to spaces and braces +Applying: drivers/rtc/rtc-ds3234.c: fix whitespace issue +Applying: drivers/rtc/rtc-fm3130.c: fix whitespace related issue +Applying: drivers/rtc/rtc-m41t80.c: fix spacing related issue +Applying: drivers/rtc/rtc-max6902.c: remove unwanted spaces +Applying: drivers/rtc/rtc-max77686.c: remove space before semicolon +Applying: drivers/rtc/rtc-max8997.c: remove space before semicolon +Applying: drivers/rtc/rtc-mpc5121.c: remove space before tab +Applying: drivers/rtc/rtc-msm6242.c: use pr_warn +Applying: drivers/rtc/rtc-mxc.c: fix checkpatch error +Applying: drivers/rtc/rtc-omap.c: include <linux/io.h> instead of <asm/io.h> +Applying: drivers/rtc/rtc-pcf2123.c: remove space before tabs +Applying: drivers/rtc/rtc-pcf8583.c: move assignment outside if condition +Applying: drivers/rtc/rtc-rs5c313.c: include <linux/io.h> instead of <asm/io.h> +Applying: drivers/rtc/rtc-rs5c313.c: fix spacing related issues +Applying: drivers/rtc/rtc-v3020.c: fix spacing issues +Applying: drivers/rtc/rtc-vr41xx.c: fix spacing issues +Applying: drivers/rtc/rtc-x1205.c: fix checkpatch issues +Applying: rtc: rtc-88pm860x: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-ab3100: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-ab8500: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-at32ap700x: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-at91rm9200: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-at91sam9: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-au1xxx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-bfin: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-bq4802: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-coh901331: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-da9052: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-da9055: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-davinci: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-dm355evm: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-ds1302: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-ep93xx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-jz4740: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-lp8788: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-lpc32xx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-ls1x: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-m48t59: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-max8925: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-max8998: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-mc13xxx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-msm6242: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-mxc: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-nuc900: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-pcap: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-pm8xxx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-s3c: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-sa1100: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-sh: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-spear: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-stmp3xxx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-twl: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-vr41xx: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-vt8500: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-m48t86: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-puv3: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata() +Applying: rtc: rtc-tile: remove unnecessary platform_set_drvdata() +Applying: drivers/rtc/rtc-rv3029c2.c: fix disabling AIE irq +Applying: drivers/rtc/rtc-m48t86.c: remove empty function +Applying: drivers/rtc/rtc-tile.c: remove empty function +Applying: drivers/rtc/rtc-nuc900.c: remove empty function +Applying: drivers/rtc/rtc-msm6242.c: remove empty function +Applying: drivers/rtc/rtc-max8998.c: remove empty function +Applying: drivers/rtc/rtc-max8925.c: remove empty function +Applying: drivers/rtc/rtc-ls1x.c: remove empty function +Applying: drivers/rtc/rtc-lp8788.c: remove empty function +Applying: drivers/rtc/rtc-ds1302.c: remove empty function +Applying: drivers/rtc/rtc-dm355evm.c: remove empty function +Applying: drivers/rtc/rtc-da9055.c: remove empty function +Applying: drivers/rtc/rtc-da9052.c: remove empty function +Applying: drivers/rtc/rtc-bq4802.c: remove empty function +Applying: drivers/rtc/rtc-au1xxx.c: remove empty function +Applying: drivers/rtc/rtc-ab3100.c: remove empty function +Applying: rtc: rtc-hid-sensor-time: allow full years (16bit) in HID reports +Applying: rtc: rtc-hid-sensor-time: allow 16 and 32 bit values for all attributes. +Applying: rtc: rtc-hid-sensor-time: add option hctosys to set time at boot +Applying: rtc: rtc-hid-sensor-time: add support for milliseconds +Applying: rtc: add ability to push out an existing wakealarm using sysfs +Applying: drivers/rtc/rtc-tps6586x.c: device wakeup flags correction +Applying: fs/fat: use fat_msg() to replace printk() in __fat_fs_error() +Applying: fat: additions to support fat_fallocate +Applying: fat-additions-to-support-fat_fallocate-fix +Applying: Documentation/CodingStyle: allow multiple return statements per function +Applying: ptrace/x86: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" +Applying: ptrace/powerpc: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" +Applying: ptrace/arm: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" +Applying: ptrace/sh: revert "hw_breakpoints: Fix racy access to ptrace breakpoints" +Applying: ptrace: revert "Prepare to fix racy accesses on task breakpoints" +Applying: ptrace/x86: simplify the "disable" logic in ptrace_write_dr7() +Applying: ptrace/x86: dont delay "disable" till second pass in ptrace_write_dr7() +Applying: ptrace/x86: introduce ptrace_register_breakpoint() +Applying: ptrace/x86: ptrace_write_dr7() should create bp if !disabled +Applying: ptrace/x86: cleanup ptrace_set_debugreg() +Applying: ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child) +Applying: ptrace/x86: flush_ptrace_hw_breakpoint() shoule clear the virtual debug registers +Applying: x86: kill TIF_DEBUG +Applying: fork: reorder permissions when violating number of processes limits +Applying: idr: print a stack dump after ida_remove warning +Applying: idr-print-a-stack-dump-after-ida_remove-warning-fix +Applying: mwave: fix info leak in mwave_ioctl() +Applying: partitions/msdos.c: end-of-line whitespace and semicolon cleanup +Applying: partitions: add aix lvm partition support files +Applying: partitions-add-aix-lvm-partition-support-files-v2 +Applying: partitions-add-aix-lvm-partition-support-files-checkpatch-fixes +Applying: partitions-add-aix-lvm-partition-support-files: compile aix.c if configured +Applying: partitions-add-aix-lvm-partition-support-files: add the AIX_PARTITION entry +Applying: partitions/msdos: enumerate also AIX LVM partitions +Applying: rapidio/switches: remove tsi500 driver +Applying: drivers/parport/share.c: use kzalloc +Applying: drivers/pps/clients/pps-gpio.c: convert to devm_* helpers +Applying: drivers/pps/clients/pps-gpio.c: convert to module_platform_driver +Applying: drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode +Applying: drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix +Applying: relay: fix timer madness +Applying: lib: add weak clz/ctz functions +Applying: decompressor: add LZ4 decompressor module +Applying: lib: add support for LZ4-compressed kernel +Applying: kbuild: fix for updated LZ4 tool with the new streaming format +Applying: arm: add support for LZ4-compressed kernel +Applying: arm: Remove enforced Os flag for LZ4 decompressor +Applying: x86: add support for LZ4-compressed kernel +Applying: x86, doc: Add LZ4 magic number for the new compression +Applying: lib: add lz4 compressor module +Applying: lib-add-lz4-compressor-module-fix +Applying: crypto: add lz4 Cryptographic API +Applying: crypto-add-lz4-cryptographic-api-fix +Applying: scripts/sortextable.c: fix building on non-Linux systems +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 21000fa...818f354 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (818f354 scripts/sortextable.c: fix building on non-Linux systems) +$ git merge --no-ff akpm/master +Removing drivers/rapidio/switches/tsi500.c +Merge made by the 'recursive' strategy. + Documentation/CodingStyle | 3 +- + Documentation/cgroups/memory.txt | 16 + + Documentation/filesystems/proc.txt | 7 +- + Documentation/rtc.txt | 7 +- + Documentation/sysctl/vm.txt | 33 +- + Documentation/vm/pagemap.txt | 3 +- + Documentation/vm/soft-dirty.txt | 36 ++ + Documentation/x86/boot.txt | 7 +- + arch/Kconfig | 3 + + arch/arm/Kconfig | 1 + + arch/arm/boot/compressed/.gitignore | 1 + + arch/arm/boot/compressed/Makefile | 3 +- + arch/arm/boot/compressed/decompress.c | 4 + + arch/arm/boot/compressed/piggy.lz4.S | 6 + + arch/arm/kernel/ptrace.c | 8 - + arch/arm/mm/mmap.c | 2 - + arch/arm64/mm/mmap.c | 2 - + arch/mips/mm/mmap.c | 2 - + arch/powerpc/kernel/ptrace.c | 20 - + arch/powerpc/mm/mmap_64.c | 2 - + arch/s390/include/asm/pgtable.h | 5 +- + arch/s390/mm/mmap.c | 4 - + arch/s390/mm/pgtable.c | 5 +- + arch/sh/kernel/ptrace_32.c | 4 - + arch/sparc/include/asm/pgtable_64.h | 5 +- + arch/sparc/kernel/sys_sparc_64.c | 2 - + arch/sparc/mm/tlb.c | 5 +- + arch/tile/mm/mmap.c | 2 - + arch/x86/Kconfig | 2 + + arch/x86/boot/compressed/Makefile | 6 +- + arch/x86/boot/compressed/misc.c | 4 + + arch/x86/ia32/ia32_aout.c | 2 - + arch/x86/include/asm/e820.h | 2 + + arch/x86/include/asm/pgtable.h | 24 +- + arch/x86/include/asm/pgtable_types.h | 12 + + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/kernel/e820.c | 72 +++- + arch/x86/kernel/hw_breakpoint.c | 3 + + arch/x86/kernel/ptrace.c | 204 ++++------ + arch/x86/mm/mmap.c | 2 - + arch/x86/platform/efi/efi.c | 15 +- + block/compat_ioctl.c | 1 + + block/genhd.c | 2 +- + block/partitions/Kconfig | 11 + + block/partitions/Makefile | 1 + + block/partitions/aix.c | 293 ++++++++++++++ + block/partitions/aix.h | 1 + + block/partitions/msdos.c | 17 +- + crypto/Kconfig | 16 + + crypto/Makefile | 2 + + crypto/lz4.c | 106 +++++ + crypto/lz4hc.c | 106 +++++ + drivers/cdrom/gdrom.c | 2 +- + drivers/char/mwave/tp3780i.c | 1 + + drivers/gpu/drm/drm_fb_helper.c | 8 + + drivers/infiniband/core/cm.c | 5 +- + drivers/parport/share.c | 3 +- + drivers/pps/clients/pps-gpio.c | 46 +-- + drivers/rapidio/switches/Kconfig | 7 - + drivers/rapidio/switches/Makefile | 1 - + drivers/rapidio/switches/tsi500.c | 78 ---- + drivers/rtc/interface.c | 18 +- + drivers/rtc/rtc-88pm80x.c | 1 - + drivers/rtc/rtc-88pm860x.c | 1 - + drivers/rtc/rtc-ab3100.c | 7 - + drivers/rtc/rtc-ab8500.c | 2 - + drivers/rtc/rtc-at32ap700x.c | 22 +- + drivers/rtc/rtc-at91rm9200.c | 4 +- + drivers/rtc/rtc-at91sam9.c | 19 +- + drivers/rtc/rtc-au1xxx.c | 8 - + drivers/rtc/rtc-bfin.c | 1 - + drivers/rtc/rtc-bq4802.c | 8 - + drivers/rtc/rtc-cmos.c | 6 +- + drivers/rtc/rtc-coh901331.c | 5 +- + drivers/rtc/rtc-da9052.c | 8 - + drivers/rtc/rtc-da9055.c | 8 - + drivers/rtc/rtc-davinci.c | 13 +- + drivers/rtc/rtc-dm355evm.c | 7 - + drivers/rtc/rtc-ds1302.c | 8 - + drivers/rtc/rtc-ds1305.c | 32 +- + drivers/rtc/rtc-ds1374.c | 11 +- + drivers/rtc/rtc-ds1511.c | 93 +++-- + drivers/rtc/rtc-ds3234.c | 2 +- + drivers/rtc/rtc-ep93xx.c | 2 - + drivers/rtc/rtc-fm3130.c | 2 +- + drivers/rtc/rtc-hid-sensor-time.c | 175 ++++++++- + drivers/rtc/rtc-jz4740.c | 3 - + drivers/rtc/rtc-lp8788.c | 8 - + drivers/rtc/rtc-lpc32xx.c | 3 - + drivers/rtc/rtc-ls1x.c | 8 - + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-m48t59.c | 1 - + drivers/rtc/rtc-m48t86.c | 8 - + drivers/rtc/rtc-max6902.c | 6 +- + drivers/rtc/rtc-max77686.c | 2 +- + drivers/rtc/rtc-max8925.c | 13 +- + drivers/rtc/rtc-max8997.c | 2 +- + drivers/rtc/rtc-max8998.c | 12 +- + drivers/rtc/rtc-mc13xxx.c | 4 - + drivers/rtc/rtc-mpc5121.c | 2 +- + drivers/rtc/rtc-msm6242.c | 21 +- + drivers/rtc/rtc-mxc.c | 7 +- + drivers/rtc/rtc-nuc900.c | 8 - + drivers/rtc/rtc-omap.c | 4 +- + drivers/rtc/rtc-pcap.c | 13 +- + drivers/rtc/rtc-pcf2123.c | 10 +- + drivers/rtc/rtc-pcf8583.c | 3 +- + drivers/rtc/rtc-pm8xxx.c | 2 - + drivers/rtc/rtc-puv3.c | 1 - + drivers/rtc/rtc-rp5c01.c | 12 +- + drivers/rtc/rtc-rs5c313.c | 18 +- + drivers/rtc/rtc-rv3029c2.c | 2 +- + drivers/rtc/rtc-s3c.c | 9 +- + drivers/rtc/rtc-sa1100.c | 8 +- + drivers/rtc/rtc-sh.c | 2 - + drivers/rtc/rtc-spear.c | 1 - + drivers/rtc/rtc-stmp3xxx.c | 13 +- + drivers/rtc/rtc-sysfs.c | 20 +- + drivers/rtc/rtc-tile.c | 11 - + drivers/rtc/rtc-tps6586x.c | 3 +- + drivers/rtc/rtc-twl.c | 1 - + drivers/rtc/rtc-v3020.c | 18 +- + drivers/rtc/rtc-vr41xx.c | 12 +- + drivers/rtc/rtc-vt8500.c | 2 - + drivers/rtc/rtc-x1205.c | 33 +- + drivers/uio/uio.c | 2 +- + drivers/usb/gadget/amd5536udc.c | 4 +- + drivers/video/backlight/atmel-pwm-bl.c | 2 - + drivers/video/backlight/ep93xx_bl.c | 1 - + drivers/video/backlight/lp8788_bl.c | 1 - + drivers/video/backlight/pcf50633-backlight.c | 2 - + drivers/video/cyber2000fb.c | 3 + + drivers/video/imxfb.c | 4 +- + drivers/video/smscufx.c | 2 +- + drivers/video/udlfb.c | 12 +- + drivers/w1/slaves/w1_ds2408.c | 30 ++ + fs/autofs4/autofs_i.h | 4 +- + fs/autofs4/dev-ioctl.c | 16 +- + fs/autofs4/inode.c | 33 +- + fs/autofs4/waitq.c | 16 +- + fs/binfmt_aout.c | 2 - + fs/binfmt_elf.c | 23 +- + fs/configfs/file.c | 2 +- + fs/drop_caches.c | 2 + + fs/fat/file.c | 108 +++++- + fs/fat/inode.c | 54 +++ + fs/fat/misc.c | 5 +- + fs/ncpfs/mmap.c | 2 +- + fs/ocfs2/namei.c | 2 +- + fs/proc/kmsg.c | 10 +- + fs/proc/task_mmu.c | 145 +++++-- + include/asm-generic/pgtable.h | 27 +- + include/linux/audit.h | 26 +- + include/linux/balloon_compaction.h | 7 + + include/linux/cpu.h | 4 + + include/linux/decompress/unlz4.h | 10 + + include/linux/err.h | 10 +- + include/linux/hardirq.h | 5 + + include/linux/hid-sensor-ids.h | 1 + + include/linux/huge_mm.h | 10 +- + include/linux/lockdep.h | 92 ++--- + include/linux/lz4.h | 87 +++++ + include/linux/memcontrol.h | 9 +- + include/linux/mm_types.h | 3 - + include/linux/mmzone.h | 42 +- + include/linux/page-flags.h | 4 +- + include/linux/posix-timers.h | 16 +- + include/linux/ptrace.h | 10 - + include/linux/rbtree.h | 1 - + include/linux/sched.h | 5 - + include/linux/syslog.h | 4 +- + include/linux/vm_event_item.h | 7 +- + include/net/ip_vs.h | 8 +- + init/Kconfig | 34 +- + init/do_mounts.c | 2 +- + init/main.c | 3 +- + ipc/mqueue.c | 2 + + ipc/shm.c | 4 +- + kernel/audit.h | 1 + + kernel/audit_tree.c | 1 + + kernel/auditfilter.c | 6 + + kernel/auditsc.c | 12 +- + kernel/cpu.c | 55 ++- + kernel/exit.c | 2 +- + kernel/fork.c | 8 +- + kernel/lglock.c | 12 +- + kernel/panic.c | 5 +- + kernel/posix-cpu-timers.c | 395 +++++++------------ + kernel/printk.c | 91 +++-- + kernel/ptrace.c | 17 +- + kernel/relay.c | 14 +- + kernel/smp.c | 11 +- + kernel/softirq.c | 10 +- + kernel/sys.c | 29 +- + kernel/watchdog.c | 10 +- + lib/Kconfig | 13 + + lib/Makefile | 6 +- + lib/clz_ctz.c | 58 +++ + lib/decompress.c | 5 + + lib/decompress_unlz4.c | 187 +++++++++ + lib/dump_stack.c | 47 ++- + lib/idr.c | 7 +- + lib/interval_tree.c | 1 + + lib/lz4/Makefile | 3 + + lib/lz4/lz4_compress.c | 443 +++++++++++++++++++++ + lib/lz4/lz4_decompress.c | 326 ++++++++++++++++ + lib/lz4/lz4defs.h | 156 ++++++++ + lib/lz4/lz4hc_compress.c | 539 ++++++++++++++++++++++++++ + mm/Kconfig | 12 + + mm/balloon_compaction.c | 2 + + mm/dmapool.c | 5 +- + mm/huge_memory.c | 30 +- + mm/memcontrol.c | 203 +++++++++- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 10 + + mm/migrate.c | 1 + + mm/mmap.c | 34 +- + mm/mremap.c | 2 +- + mm/nommu.c | 4 - + mm/page_alloc.c | 162 +++++--- + mm/page_io.c | 35 ++ + mm/pgtable-generic.c | 5 +- + mm/swap_state.c | 63 ++- + mm/util.c | 1 - + mm/vmscan.c | 452 +++++++++++++-------- + mm/vmstat.c | 9 +- + net/netfilter/ipvs/ip_vs_ctl.c | 4 +- + scripts/Makefile.lib | 5 + + scripts/checkpatch.pl | 22 +- + sound/soc/codecs/si476x.c | 6 +- + tools/include/tools/be_byteshift.h | 34 +- + tools/include/tools/le_byteshift.h | 34 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/timers/Makefile | 8 + + tools/testing/selftests/timers/posix_timers.c | 221 +++++++++++ + usr/Kconfig | 9 + + 236 files changed, 5064 insertions(+), 1730 deletions(-) + create mode 100644 Documentation/vm/soft-dirty.txt + create mode 100644 arch/arm/boot/compressed/piggy.lz4.S + create mode 100644 block/partitions/aix.c + create mode 100644 block/partitions/aix.h + create mode 100644 crypto/lz4.c + create mode 100644 crypto/lz4hc.c + delete mode 100644 drivers/rapidio/switches/tsi500.c + create mode 100644 include/linux/decompress/unlz4.h + create mode 100644 include/linux/lz4.h + create mode 100644 lib/clz_ctz.c + create mode 100644 lib/decompress_unlz4.c + create mode 100644 lib/lz4/Makefile + create mode 100644 lib/lz4/lz4_compress.c + create mode 100644 lib/lz4/lz4_decompress.c + create mode 100644 lib/lz4/lz4defs.h + create mode 100644 lib/lz4/lz4hc_compress.c + create mode 100644 tools/testing/selftests/timers/Makefile + create mode 100644 tools/testing/selftests/timers/posix_timers.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..85139381b1ed --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 1aaf6d3d3d1e95f4be07e32dd84aa1c93855fbbd +Unchanged quilt series jdelvare-hwmon +Importing device-mapper based on v3.10-rc1 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..dc393f9c4025 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20130605 |