diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-07 17:32:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-07 17:32:23 +1000 |
| commit | cd3f062851ac5e7543704a38bf8c778b46cb5025 (patch) | |
| tree | ccabedffa8eecca4893ced91dff3cb31ef42251e | |
| parent | 38fde44da4258f0a2ae975ecc833106c726ad37e (diff) | |
Add linux-next specific files for 20140807next-20140807
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 223 | ||||
| -rw-r--r-- | Next/Trees | 225 | ||||
| -rw-r--r-- | Next/merge.log | 9333 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 9786 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..abc3e65826e1 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,223 @@ +Name SHA1 +---- ---- +origin 85417aef44fc58b08773117ceb1bc6ca5684e973 +fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +kbuild-current dd5a6752ae7df4e0ba6ce3bcd0c3b4489bb3537f +arc-current 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd +arm-current 6bf755db4d5e7ccea61fb17727a183b9bd8945b1 +m68k-current 9117710a5997eb078035052800a31b77d47e0e5a +metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1 +mips-fixes 08a9c3c9afcf6e8975fc1c9a97e871e6a039c25a +powerpc-merge 396a34340cdf7373c00e3977db27d1a20ea65ebc +sparc caa9199b0efda9fb45f6cf5b5dd5d1be79337d7e +net 753a2ad54ef45e3417a9d49537c2b42b04a2e1be +ipsec a0e5ef53aac8e5049f9344857d8ec5237d31e58b +sound-current 68a9edd18c62953db476142c06cb65326aeb0b31 +pci-current bf177a1eb6d106ba195de86734392d43dfbef702 +wireless c01fac1c77a00227f706a1654317023e3f4ac7f0 +driver-core.current c489d98c8c81a898cfed6bec193cca2006f956aa +tty.current c489d98c8c81a898cfed6bec193cca2006f956aa +usb.current c489d98c8c81a898cfed6bec193cca2006f956aa +usb-gadget-fixes a8a85b01d185e3f8b9ec6da8fde8a4587c34c2e8 +usb-serial-fixes 19583ca584d6f574384e17fe7613dfaeadcdc4a6 +staging.current c489d98c8c81a898cfed6bec193cca2006f956aa +char-misc.current c489d98c8c81a898cfed6bec193cca2006f956aa +input-current f62d14a8072b9756db36ba394e2b267470a40240 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current ce5481d01f67ad304908ec2113515440c0fa86eb +ide a53dae49b2fea43d8f4ec5aeca0e288bbc8d6895 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current 5a12a597a8627b91fd9d94365853f9f69a4f399c +rr-fixes 79465d2fd48e68940c2bdecddbdecd45bbba06fe +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +drm-intel-fixes f4be89cecea437aaddd7700d05c6bdb5678041f7 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 3a5d0df211dd92ccdd7441c9becb8ad608f6eedd +arm f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9 +arm-perf 4c834452aad01531db949414f94f817a86348d59 +arm-soc f8aee52350a8a28f9bf7007a29e17db90c901fd1 +bcm2835 fa389e220254c69ffae0d403eac4146171062d08 +berlin 251f72d06c5992f6712d44b1c13b4a3eec15fd92 +cortex-m f0d7515372ff0ea53fd66099533d3c8e0464cbbf +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs c917f091137890be48078bc9ff044f0a48960e73 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 2e11b0361fb0dc5fe03dfc36019b09a461ee2bfc +renesas 883e289aed3ae191cb36d28b7e4d7f2d282eeed1 +samsung d5e49aabb545fbf45f85c0c289440109027d0f24 +sunxi 44b61dc11c6d80104b19854beb7ef6435f7df756 +tegra 9a3c4145af32125c5ee39c0272662b47307a8323 +arm64 ea1719672f59eeb85829073b567495c4f472ac9f +blackfin b76f98236a23f808d6e3a27f7292670bc1d2c21b +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris cd065a010a97e3c330d1ded9af551664c9689b19 +hexagon a9a44fdf329668125042055c569656aa83d8cccb +ia64 6b15075c2c3662dbe1ac41404c6a2013b24efa1d +m68k 9117710a5997eb078035052800a31b77d47e0e5a +m68knommu 9a1a1aea7572179bebb7e9755be4c7d220e05cb4 +metag f93125ae17d1d259b5aba84016db260903822194 +microblaze ef264cf0c490cc9d46edb3b6aa082d23a9506e2d +mips 475d5928b79bb78326a645863d46ff95c5e25e5a +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 64aa90f26c06e1cb2aacfb98a7d0eccfbd6c1a91 +powerpc 2194dc27bd845d69ea169fb95c1536002904967e +fsl 78eb9094ca08a40b8f9d3e113a2b88e0b7dbad1d +mpc5xxx bc75059422338197ce487d338ac9c898761e1e61 +s390 36e7fdaa1a04fcf65b864232e1af56a51c7814d6 +sparc-next 85417aef44fc58b08773117ceb1bc6ca5684e973 +tile ed93567c6fbcd2265ccbf5beea5aacf6c2f83d0f +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 4ed2ad38b3b4c45a5a5999454b02d3c21e75af5a +btrfs c7548af69d9ef71512eb52d8009521eba3e768fd +ceph d1a5fb9fecd4692e78bbf9452b73f4e5c35de4ab +cifs f29ebb47d5bb59ef246966b047356c03629a9705 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 04ec5f5c0022ee941615e304bc75853fe1bc94ba +ext3 4381bdbc0a74ce512b4b55f58cf3e6f57529952d +ext4 86f0afd463215fc3e58020493482faa4ac3a4d69 +f2fs b65ee14818e67127aa242fe1dbd3711b9c095cc0 +fscache fe02fb3ec10932ce07406b1581e28326181fc9d8 +fuse d7afaec0b564f0609e116f562983b8e72fc3e9c9 +gfs2 9a464443aec5173a66dd804dd5da30f641b37e2c +jfs bb5e50aaa80564268f950d1b2f764455afbfea82 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 71a6ec8ac587418ceb6b420def1ca44b334c1ff7 +nfsd 211532d35b3f6f25b3f890596be65257e571d361 +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs 25601a3c9737fed554169759582c690b98ead5d4 +xfs 645f9857213476407d8ed1b59619fdff7128d3e6 +file-private-locks 54ace37e46404e772294bdad29f71a986714386c +vfs cd67b9ac44ea1359c652785d162856404a1584ae +hch-vfs 4f362054689328c63d258f591f291e0bca9daee3 +pci 981c191778a4f92bc82456205a444d522843a630 +hid 71095593b5d890f733c27b150ca0c78ac4696d3a +i2c 0772e4bbcc8a9367ffc110a402982831c9ec29a8 +jdelvare-hwmon c7208164e66f63e3ec1759b98087849286410741 +hwmon-staging fce9626cd93abaf1ef21b361f8a0fa493cc855b2 +v4l-dvb d1352f268415182f9bfc06b142fb50083e5f6479 +kbuild abe88461a2486c8de5d6815e7172d78644490d8c +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata 1824be15f7a41e539bbc34c0b3708100d9aa4825 +pm 7b777942af148e5333d03440f46366b7bc543cfc +idle 5f08abf265fe9b229c5c0c4bda81e616ba930409 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 47d104ba5879790c7c91c3390b0b08399e168efe +ieee1394 d584a66279949561418c82b12bb4c055e6c25836 +dlm 883854c5457a97190f7b0ee20f03bcd9664fc0c2 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma 1141b7e95aa1d5c328c719bc405714d90c167a50 +dmaengine fbeec99ad5c03060ba71c470ac373e24e23a80e0 +net-next 85417aef44fc58b08773117ceb1bc6ca5684e973 +ipsec-next 1759389e8af46d724220785bf710b7bdbebdfa48 +wireless-next dc6be9f54a4ecb0a09765d1f515ed947d86b7528 +bluetooth ba0e2fb34b9b095142b66e2fe58ba0926eae2ea8 +infiniband 18e11d8d330b92b1546aff8e9403818f80c41520 +mtd b6603fe574af289dbe9eb9fb4c540bca04f5a053 +l2-mtd 2a500afe1e0e84c7a126df693dbd01353756dcfa +crypto ce5481d01f67ad304908ec2113515440c0fa86eb +drm 21d70354bba9965a098382fc4d7fb17e138111f3 +drm-panel 77df01dcd3040a7d664d85d085d4a21533824bc1 +drm-intel 96d56d71a3bcd0a0015034a8f3decc46cb9ec855 +drm-tegra ef70728c7a6571a1a7115031e932b811f1740b2e +sound a509574e5ea7b617268943526773ebf7e2d20a9b +sound-asoc 1714b73910eda0a72b8fa5bd5bd83f1bb759e9bc +modules 4982223e51e8ea9d09bb33c8323b5ec1877b2b51 +virtio eeec626366ffe558fc3d5685bd2b49a962acf57d +input 62238f3aadc9bc56da70100e19ec61b9f8d72a5f +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block 69c04606d9855732fc3b947a6af8bb52c734f9b3 +device-mapper 18debb0e53f55165a19be54cad09655a1b0b09cc +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh f25c33724d1512a72554c0ad4cb70b43ba15374e +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 1bdb20e16166240a4ca3b861c48defefaf218874 +mfd 7caa79917ad4c1f91366b11f18e48623554aaa52 +backlight 2188a988bb87db7e2934ed388994e6dd96de4242 +battery 5e37195f30cc31e6a1052cbc282254e127c1b8c7 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 be92abea827b82957450dd4ac7f997d5e8173d60 +regulator 1390d0ecf318f7f50772bfa8bff5c50f243196cf +security 478d085524c57cf4283699f529d5a4c22188ea69 +integrity e27319cdf468ce1dd16d3f754180c15c8efc518a +selinux aa9e0de81b5b257f6dae48efe2ed5f255f066497 +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog 8083baba5e9ca5c3a06dace475307f14498604e3 +iommu 4c5e9d9f0ddf5d4ba9c51eee2ef1a4d6e93ccf56 +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +vfio fd49c81f080a997aad4b0e73541cd42772b6a772 +osd ce5d36aac26cc395fe3bc45525cdbad3644f01e5 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 51a7097426f2243e192df4979c2bf197e6f2ce61 +audit 3efe33f5d2da8bb38f4ca93d12ae4f69fedde32a +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree 6a31c02b33116cf2f06c45ccd94a75332d258f22 +dt-rh 99de64984c3a7c9bf56a50e6dcc51006c9485620 +spi 663f6e70853839f1e231d6356316854553c8824a +tip 9c467de3b4ebdf1621360c121a7ef0f6fd1aeff6 +clockevents 3252a646aa2cf706b2a26433a8bd9cb2e5dce410 +edac 50d1bb93672fa2f42cec6e06ce799fbe864f57e9 +edac-amd eba4bfb34d45a2219d1d7534905c026eea6fcd49 +irqchip c115d15552c011fdf3caf15792ce0c62e8837470 +ftrace 6386b361ccf0f5bd48b8b6adccbdbb5013eccd68 +rcu 1c91efb247998d2a2cb452f812fc4efda6f36506 +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm c77dcacb397519b6ade8f08201a4a90a7f4f751e +kvm-arm dedf97e8ff2c7513b1370e36b56e08b6bd0f0290 +kvm-ppc 8e6afa36e754be84b468d7df9e5aa71cf4003f3b +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip e38230eb3789d9c0ee4e8a32f6638c3036107422 +percpu a46e532a91453662ec13d507a7d1fd37c7f87d55 +workqueues ebb48ccd98d184cc7cd04aace4a64ed46da44ea9 +drivers-x86 f82bdd0d77b6bf0dea08a1d957ab45d503f328b1 +chrome-platform 5502486a2077e4280c618b82e8a77ed35932956f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 19583ca584d6f574384e17fe7613dfaeadcdc4a6 +hsi 3fd276e9c0d75538c3b5ed96d0ce36d227fdca95 +leds e661c8978e4833d4148d08b405a2f3175d6f97d9 +driver-core c489d98c8c81a898cfed6bec193cca2006f956aa +tty c489d98c8c81a898cfed6bec193cca2006f956aa +usb c489d98c8c81a898cfed6bec193cca2006f956aa +usb-gadget 8346b33fad01cfe93f0fd0e64cd32ff40bd4ba41 +usb-serial 5bc9e5933a41888f9e0d77dedc9f8a972fa1f493 +staging c489d98c8c81a898cfed6bec193cca2006f956aa +char-misc c489d98c8c81a898cfed6bec193cca2006f956aa +cgroup abdfd21809f27c20720c10eeffb14b8fcf320ed3 +scsi ae87e8b212eda02503418657530a266ecb4a7180 +target-updates 45f6c5b576b9e36b710344dc32a9122a7e6929c9 +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl e1ee5c578fb1fa24b7ccaf1a11237a2bd70b6f9a +vhost 970379f59d81edf78a319f9cdc1234730bcbe6b2 +remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323 +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio 39b2bbe3d715cf5013b5c48695ccdd25bd3bf120 +dma-mapping f70e3c4f8b6ab61f713e040822ec51f5de498146 +pwm eae266a284f370d40c50dbed7a988a744bab0d44 +dma-buf b23b35445ec82cde8afac8ba86b57a66a5fa1734 +userns 344470cac42e887e68cfb5bdfa6171baf27f1eb5 +ktest 4c16b1d6d5e0ca0612de65596a3d1ead8a3372fb +signal 20b4fb485227404329e41ad15588afad3df23050 +clk b11a6face1b6d5518319f797a74e22bb4309daa9 +random e02b876597777ab26288dd2611a97b597d14d661 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +aio 00fefb9cf2b5493a86912de55ba912bdfae4a207 +llvmlinux 7380100aa7cec1aa2397df27665c8760ff9084ea +powernv-cpuidle 0888839c5b62c44a55ac9d28acc273ba663c65ea +rd-docs da8a7613e7eff3c59a2ee506bff3192e449feee3 +signal-cleanup b9f0fb2d4a7a034ee24f0a3d596fb731eb9bba72 +akpm-current 929c76e4e6292770322822a50e08b8feaa4afbbf +akpm af86fefe413b6b1542e1b0f97be8bc9570c5eaf7 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..febf4f36b742 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,225 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next +berlin git git://github.com/shesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://www.jni.nu/cris.git#for-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +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 +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +omfs git git://github.com/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs.git#for-next +file-private-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +hch-vfs git git://git.infradead.org/users/hch/vfs.git#vfs-for-3.17 +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 +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.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-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/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 +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-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/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/eparis/audit.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/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 +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +uprobes git git://github.com/srikard/linux.git#for-next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://cavan.codon.org.uk/platform-drivers-x86.git#linux-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-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 +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-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 +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +powernv-cpuidle git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#powernv-cpuidle +rd-docs quilt http://www.infradead.org/~rdunlap/Doc/patches/ +signal-cleanup git git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc.git#signal_v4 +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..2fa5917bc395 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9333 @@ +$ date +Thursday 7 August 10:18:13 EST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm +Merging origin/master (85417aef44fc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge origin/master +Updating c489d98c8c81..85417aef44fc +Fast-forward + Documentation/ABI/testing/ima_policy | 4 +- + Documentation/ABI/testing/sysfs-class-iommu | 17 + + .../ABI/testing/sysfs-class-iommu-amd-iommu | 14 + + .../ABI/testing/sysfs-class-iommu-intel-iommu | 32 + + Documentation/ABI/testing/sysfs-class-net | 11 + + Documentation/DocBook/device-drivers.tmpl | 4 +- + Documentation/DocBook/media/Makefile | 2 +- + Documentation/DocBook/media/dvb/dvbproperty.xml | 44 +- + Documentation/DocBook/media/v4l/controls.xml | 408 +- + Documentation/DocBook/media/v4l/dev-raw-vbi.xml | 12 +- + Documentation/DocBook/media/v4l/dev-sdr.xml | 18 +- + Documentation/DocBook/media/v4l/dev-sliced-vbi.xml | 9 +- + Documentation/DocBook/media/v4l/io.xml | 9 +- + .../DocBook/media/v4l/pixfmt-packed-rgb.xml | 418 +- + .../DocBook/media/v4l/pixfmt-sdr-cs08.xml | 44 + + .../DocBook/media/v4l/pixfmt-sdr-cs14le.xml | 47 + + .../DocBook/media/v4l/pixfmt-sdr-ru12le.xml | 40 + + Documentation/DocBook/media/v4l/pixfmt-srggb12.xml | 2 +- + Documentation/DocBook/media/v4l/pixfmt.xml | 61 +- + Documentation/DocBook/media/v4l/selection-api.xml | 95 +- + Documentation/DocBook/media/v4l/v4l2.xml | 8 + + Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 50 + + .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 51 +- + Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml | 12 +- + .../DocBook/media/v4l/vidioc-g-selection.xml | 40 +- + .../DocBook/media/v4l/vidioc-querycap.xml | 6 + + .../DocBook/media/v4l/vidioc-queryctrl.xml | 234 +- + .../DocBook/media/v4l/vidioc-subscribe-event.xml | 8 + + .../devicetree/bindings/arm/omap/crossbar.txt | 36 + + .../devicetree/bindings/hwmon/ibmpowernv.txt | 23 + + .../devicetree/bindings/hwmon/ntc_thermistor.txt | 1 + + .../devicetree/bindings/hwmon/pwm-fan.txt | 12 + + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + .../atmel,aic.txt} | 0 + .../interrupt-controller/opencores,or1k-pic.txt | 23 + + .../devicetree/bindings/iommu/arm,smmu.txt | 6 - + Documentation/devicetree/bindings/iommu/iommu.txt | 182 + + .../devicetree/bindings/media/atmel-isi.txt | 51 + + .../bindings/media/exynos-jpeg-codec.txt | 12 +- + .../devicetree/bindings/media/i2c/mt9m111.txt | 28 + + .../devicetree/bindings/media/pxa-camera.txt | 43 + + .../devicetree/bindings/media/rcar_vin.txt | 86 + + .../devicetree/bindings/media/sunxi-ir.txt | 23 + + Documentation/devicetree/bindings/mfd/palmas.txt | 2 + + .../devicetree/bindings/net/amd-xgbe-phy.txt | 6 + + Documentation/devicetree/bindings/net/amd-xgbe.txt | 17 +- + .../bindings/net/broadcom-systemport.txt | 3 +- + .../devicetree/bindings/net/davinci-mdio.txt | 8 +- + .../devicetree/bindings/net/ieee802154/cc2520.txt | 29 + + .../devicetree/bindings/net/marvell-pp2.txt | 61 + + .../devicetree/bindings/net/nfc/st21nfcb.txt | 33 + + Documentation/devicetree/bindings/net/sh_eth.txt | 1 + + Documentation/devicetree/bindings/net/stmmac.txt | 6 + + .../bindings/net/wireless/brcm,bcm43xx-fmac.txt | 41 + + .../bindings/regulator/act8865-regulator.txt | 7 +- + .../devicetree/bindings/regulator/palmas-pmic.txt | 1 + + .../devicetree/bindings/regulator/tps65218.txt | 23 + + .../devicetree/bindings/spi/efm32-spi.txt | 13 +- + .../devicetree/bindings/spi/qcom,spi-qup.txt | 6 +- + .../devicetree/bindings/spi/snps,dw-apb-ssi.txt | 28 + + .../devicetree/bindings/spi/spi-davinci.txt | 9 +- + .../devicetree/bindings/spi/spi-rockchip.txt | 37 + + .../devicetree/bindings/spi/spi-samsung.txt | 26 +- + .../bindings/timer/cirrus,clps711x-timer.txt | 29 + + .../bindings/timer/mediatek,mtk-timer.txt | 17 + + .../devicetree/bindings/timer/renesas,cmt.txt | 47 + + .../devicetree/bindings/timer/renesas,mtu2.txt | 39 + + .../devicetree/bindings/timer/renesas,tmu.txt | 39 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + Documentation/dvb/get_dvb_firmware | 33 +- + Documentation/filesystems/proc.txt | 19 + + Documentation/hwmon/ibmpowernv | 41 + + Documentation/hwmon/lm75 | 5 +- + Documentation/hwmon/ntc_thermistor | 5 + + Documentation/hwmon/pmbus | 5 +- + Documentation/hwmon/powr1220 | 45 + + Documentation/hwmon/pwm-fan | 17 + + Documentation/hwmon/tmp103 | 28 + + Documentation/hwmon/tmp421 | 26 +- + Documentation/hwmon/tps40422 | 64 + + Documentation/kernel-parameters.txt | 22 + + Documentation/networking/bonding.txt | 31 +- + Documentation/networking/filter.txt | 12 +- + Documentation/networking/i40e.txt | 7 +- + Documentation/networking/ip-sysctl.txt | 38 +- + Documentation/networking/packet_mmap.txt | 18 +- + Documentation/networking/phy.txt | 18 +- + Documentation/networking/pktgen.txt | 28 + + Documentation/networking/timestamping.txt | 16 +- + .../networking/timestamping/timestamping.c | 7 +- + Documentation/power/regulator/consumer.txt | 35 + + Documentation/security/keys.txt | 14 +- + Documentation/timers/00-INDEX | 2 + + Documentation/timers/timekeeping.txt | 179 + + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.em28xx | 2 +- + Documentation/video4linux/v4l2-controls.txt | 63 +- + Documentation/video4linux/v4l2-framework.txt | 8 +- + Documentation/video4linux/v4l2-pci-skeleton.c | 5 - + Documentation/zh_CN/video4linux/v4l2-framework.txt | 7 +- + MAINTAINERS | 101 +- + arch/Kconfig | 1 + + arch/arm/Kconfig | 2 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 2 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- + arch/arm/boot/dts/sama5d3_gmac.dtsi | 2 +- + arch/arm/boot/dts/socfpga.dtsi | 4 + + arch/arm/common/bL_switcher.c | 16 +- + arch/arm/include/uapi/asm/unistd.h | 1 + + arch/arm/kernel/calls.S | 1 + + arch/arm/mach-omap2/omap-iommu.c | 2 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 - + arch/arm/mach-pxa/Makefile | 2 +- + arch/arm/mach-pxa/generic.c | 11 + + arch/arm/mach-pxa/time.c | 162 - + arch/arm/net/bpf_jit_32.c | 8 +- + arch/arm64/kernel/vdso.c | 10 +- + arch/hexagon/Kconfig | 1 - + arch/ia64/kernel/time.c | 4 +- + arch/mips/include/uapi/asm/unistd.h | 15 +- + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/mips/net/bpf_jit.c | 8 +- + arch/openrisc/Kconfig | 1 + + arch/openrisc/include/asm/irq.h | 3 + + arch/openrisc/kernel/irq.c | 146 +- + arch/powerpc/kernel/time.c | 4 +- + arch/powerpc/net/bpf_jit_comp.c | 8 +- + arch/powerpc/platforms/cell/spu_base.c | 11 +- + arch/powerpc/platforms/cell/spufs/context.c | 4 +- + arch/powerpc/platforms/cell/spufs/file.c | 4 +- + arch/powerpc/platforms/cell/spufs/sched.c | 4 +- + arch/s390/Kconfig | 1 - + arch/s390/kernel/time.c | 16 +- + arch/s390/net/bpf_jit_comp.c | 4 +- + arch/sparc/Makefile | 3 + + arch/sparc/boot/Makefile | 4 + + arch/sparc/boot/install.sh | 50 + + arch/sparc/include/asm/io_64.h | 381 +- + arch/sparc/include/asm/tlbflush_64.h | 12 +- + arch/sparc/kernel/ldc.c | 2 +- + arch/sparc/kernel/mdesc.c | 82 +- + arch/sparc/kernel/unaligned_32.c | 2 +- + arch/sparc/lib/PeeCeeI.c | 36 +- + arch/sparc/math-emu/math_32.c | 2 +- + arch/sparc/mm/init_64.c | 96 + + arch/sparc/net/bpf_jit_comp.c | 4 +- + arch/tile/kernel/time.c | 13 +- + arch/tile/kernel/vdso/vgettimeofday.c | 7 +- + arch/x86/Kconfig | 2 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 18 +- + arch/x86/kernel/tsc.c | 21 +- + arch/x86/kernel/vsyscall_gtod.c | 23 +- + arch/x86/kvm/x86.c | 62 +- + arch/x86/net/bpf_jit_comp.c | 16 +- + arch/x86/syscalls/syscall_32.tbl | 2 + + arch/x86/syscalls/syscall_64.tbl | 2 + + crypto/asymmetric_keys/Kconfig | 34 +- + crypto/asymmetric_keys/Makefile | 37 + + crypto/asymmetric_keys/asymmetric_keys.h | 2 + + crypto/asymmetric_keys/asymmetric_type.c | 78 +- + crypto/asymmetric_keys/mscode.asn1 | 28 + + crypto/asymmetric_keys/mscode_parser.c | 126 + + crypto/asymmetric_keys/pkcs7.asn1 | 127 + + crypto/asymmetric_keys/pkcs7_key_type.c | 100 + + crypto/asymmetric_keys/pkcs7_parser.c | 396 ++ + crypto/asymmetric_keys/pkcs7_parser.h | 61 + + crypto/asymmetric_keys/pkcs7_trust.c | 166 + + crypto/asymmetric_keys/pkcs7_verify.c | 321 + + crypto/asymmetric_keys/verify_pefile.c | 457 ++ + crypto/asymmetric_keys/verify_pefile.h | 42 + + crypto/asymmetric_keys/x509.asn1 | 2 +- + crypto/asymmetric_keys/x509_cert_parser.c | 20 + + crypto/asymmetric_keys/x509_parser.h | 13 +- + crypto/asymmetric_keys/x509_public_key.c | 115 +- + drivers/atm/eni.c | 4 +- + drivers/base/firmware_class.c | 30 +- + drivers/base/regmap/regmap.c | 13 + + drivers/bcma/Makefile | 1 + + drivers/bcma/driver_chipcommon_pmu.c | 2 + + drivers/bcma/driver_gpio.c | 1 + + drivers/bcma/driver_pcie2.c | 175 + + drivers/bcma/host_pci.c | 2 + + drivers/bcma/main.c | 8 + + drivers/bcma/scan.c | 22 +- + drivers/bcma/sprom.c | 43 +- + drivers/bluetooth/Kconfig | 12 +- + drivers/bluetooth/ath3k.c | 35 +- + drivers/bluetooth/btmrvl_drv.h | 4 + + drivers/bluetooth/btmrvl_main.c | 73 +- + drivers/bluetooth/btmrvl_sdio.c | 21 +- + drivers/bluetooth/btmrvl_sdio.h | 2 + + drivers/bluetooth/btusb.c | 221 +- + drivers/bluetooth/hci_h5.c | 4 - + drivers/bluetooth/hci_ldisc.c | 25 +- + drivers/bluetooth/hci_uart.h | 1 + + drivers/bluetooth/hci_vhci.c | 34 +- + drivers/char/hangcheck-timer.c | 33 +- + drivers/char/hw_random/core.c | 67 +- + drivers/char/random.c | 315 +- + drivers/char/tpm/tpm-interface.c | 73 +- + drivers/char/tpm/tpm_eventlog.c | 4 +- + drivers/char/tpm/tpm_i2c_stm_st33.c | 1 + + drivers/char/tpm/tpm_tis.c | 31 + + drivers/clocksource/Kconfig | 14 +- + drivers/clocksource/Makefile | 3 + + drivers/clocksource/clps711x-timer.c | 131 + + drivers/clocksource/exynos_mct.c | 63 +- + drivers/clocksource/mtk_timer.c | 261 + + drivers/clocksource/pxa_timer.c | 227 + + drivers/clocksource/sh_cmt.c | 233 +- + drivers/clocksource/sh_mtu2.c | 146 +- + drivers/clocksource/sh_tmu.c | 127 +- + drivers/clocksource/timer-marco.c | 3 + + drivers/clocksource/timer-prima2.c | 3 + + drivers/connector/cn_proc.c | 36 +- + drivers/firewire/core-cdev.c | 6 +- + drivers/firewire/net.c | 3 +- + drivers/gpu/drm/drm_irq.c | 16 +- + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 33 +- + drivers/gpu/drm/i915/intel_pm.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_marker.c | 44 +- + drivers/hid/hid-picolcd_cir.c | 2 +- + drivers/hsi/clients/ssi_protocol.c | 2 +- + drivers/hwmon/Kconfig | 57 +- + drivers/hwmon/Makefile | 4 + + drivers/hwmon/ad7414.c | 57 +- + drivers/hwmon/ad7418.c | 133 +- + drivers/hwmon/adm1021.c | 175 +- + drivers/hwmon/adm1025.c | 231 +- + drivers/hwmon/adm1026.c | 588 +- + drivers/hwmon/adm1029.c | 208 +- + drivers/hwmon/adm1031.c | 349 +- + drivers/hwmon/adm9240.c | 339 +- + drivers/hwmon/ads1015.c | 2 +- + drivers/hwmon/ads7828.c | 52 +- + drivers/hwmon/adt7411.c | 59 +- + drivers/hwmon/adt7462.c | 142 +- + drivers/hwmon/adt7470.c | 163 +- + drivers/hwmon/amc6821.c | 397 +- + drivers/hwmon/asc7621.c | 14 +- + drivers/hwmon/atxp1.c | 76 +- + drivers/hwmon/ds620.c | 60 +- + drivers/hwmon/emc1403.c | 2 +- + drivers/hwmon/emc2103.c | 89 +- + drivers/hwmon/emc6w201.c | 64 +- + drivers/hwmon/fam15h_power.c | 54 +- + drivers/hwmon/g760a.c | 84 +- + drivers/hwmon/g762.c | 78 +- + drivers/hwmon/gl518sm.c | 319 +- + drivers/hwmon/gl520sm.c | 353 +- + drivers/hwmon/gpio-fan.c | 19 +- + drivers/hwmon/hih6130.c | 88 +- + drivers/hwmon/htu21.c | 69 +- + drivers/hwmon/ibmaem.c | 6 +- + drivers/hwmon/ibmpowernv.c | 363 ++ + drivers/hwmon/lineage-pem.c | 66 +- + drivers/hwmon/lm63.c | 27 +- + drivers/hwmon/lm75.c | 8 + + drivers/hwmon/lm77.c | 11 +- + drivers/hwmon/lm78.c | 100 +- + drivers/hwmon/lm85.c | 660 +- + drivers/hwmon/lm93.c | 154 +- + drivers/hwmon/ltc2945.c | 2 +- + drivers/hwmon/ltc4222.c | 2 +- + drivers/hwmon/ltc4260.c | 2 +- + drivers/hwmon/max16065.c | 5 +- + drivers/hwmon/max1668.c | 2 +- + drivers/hwmon/max6639.c | 2 +- + drivers/hwmon/max6697.c | 16 +- + drivers/hwmon/nct6775.c | 14 +- + drivers/hwmon/ntc_thermistor.c | 50 +- + drivers/hwmon/pmbus/Kconfig | 13 +- + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/pmbus.c | 1 - + drivers/hwmon/pmbus/tps40422.c | 64 + + drivers/hwmon/powr1220.c | 391 ++ + drivers/hwmon/pwm-fan.c | 193 + + drivers/hwmon/sht21.c | 82 +- + drivers/hwmon/sis5595.c | 2 +- + drivers/hwmon/smm665.c | 44 +- + drivers/hwmon/smsc47m1.c | 115 +- + drivers/hwmon/smsc47m192.c | 232 +- + drivers/hwmon/thmc50.c | 212 +- + drivers/hwmon/tmp103.c | 206 + + drivers/hwmon/tmp421.c | 39 +- + drivers/hwmon/twl4030-madc-hwmon.c | 38 +- + drivers/hwmon/w83791d.c | 15 +- + drivers/hwmon/w83l786ng.c | 289 +- + drivers/hwmon/wm831x-hwmon.c | 72 +- + drivers/hwmon/wm8350-hwmon.c | 50 +- + drivers/ide/au1xxx-ide.c | 13 +- + drivers/ide/ide_platform.c | 13 +- + drivers/infiniband/hw/amso1100/c2_provider.c | 2 +- + drivers/infiniband/hw/cxgb4/cm.c | 112 +- + drivers/infiniband/hw/cxgb4/cq.c | 14 +- + drivers/infiniband/hw/cxgb4/device.c | 192 +- + drivers/infiniband/hw/cxgb4/ev.c | 55 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 40 +- + drivers/infiniband/hw/cxgb4/provider.c | 14 +- + drivers/infiniband/hw/cxgb4/qp.c | 113 +- + drivers/infiniband/hw/cxgb4/t4.h | 19 +- + drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 1 - + drivers/infiniband/hw/mlx5/cq.c | 48 +- + drivers/infiniband/hw/mlx5/mad.c | 6 +- + drivers/infiniband/hw/mlx5/main.c | 295 +- + drivers/infiniband/hw/mlx5/mem.c | 2 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 14 +- + drivers/infiniband/hw/mlx5/mr.c | 48 +- + drivers/infiniband/hw/mlx5/qp.c | 88 +- + drivers/infiniband/hw/mlx5/srq.c | 26 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +- + drivers/input/evdev.c | 7 +- + drivers/input/misc/sparcspkr.c | 22 +- + drivers/iommu/Kconfig | 13 +- + drivers/iommu/Makefile | 2 +- + drivers/iommu/amd_iommu.c | 224 +- + drivers/iommu/amd_iommu_init.c | 38 + + drivers/iommu/amd_iommu_types.h | 10 +- + drivers/iommu/amd_iommu_v2.c | 107 +- + drivers/iommu/arm-smmu.c | 495 +- + drivers/iommu/dmar.c | 12 +- + drivers/iommu/exynos-iommu.c | 2 +- + drivers/iommu/fsl_pamu.c | 2 +- + drivers/iommu/fsl_pamu_domain.c | 73 +- + drivers/iommu/intel-iommu.c | 874 ++- + drivers/iommu/intel_irq_remapping.c | 60 +- + drivers/iommu/iommu-sysfs.c | 134 + + drivers/iommu/iommu.c | 201 +- + drivers/iommu/ipmmu-vmsa.c | 2 +- + drivers/iommu/msm_iommu.c | 2 +- + drivers/iommu/omap-iommu-debug.c | 114 - + drivers/iommu/omap-iommu.c | 15 +- + drivers/iommu/omap-iommu.h | 8 +- + drivers/iommu/omap-iovmm.c | 791 --- + drivers/iommu/pci.h | 29 - + drivers/iommu/shmobile-iommu.c | 2 +- + drivers/iommu/tegra-gart.c | 2 +- + drivers/iommu/tegra-smmu.c | 2 +- + drivers/irqchip/Kconfig | 18 + + drivers/irqchip/Makefile | 3 + + drivers/irqchip/irq-atmel-aic-common.c | 254 + + drivers/irqchip/irq-atmel-aic-common.h | 39 + + drivers/irqchip/irq-atmel-aic.c | 262 + + drivers/irqchip/irq-atmel-aic5.c | 353 ++ + drivers/irqchip/irq-crossbar.c | 168 +- + drivers/irqchip/irq-nvic.c | 13 +- + drivers/irqchip/irq-or1k-pic.c | 182 + + drivers/irqchip/spear-shirq.c | 304 +- + drivers/isdn/capi/capi.c | 2 +- + drivers/isdn/i4l/isdn_net.c | 7 +- + drivers/isdn/i4l/isdn_ppp.c | 26 +- + drivers/isdn/pcbit/drv.c | 4 +- + drivers/media/Kconfig | 12 +- + drivers/media/common/saa7146/saa7146_fops.c | 14 +- + drivers/media/common/siano/Kconfig | 3 +- + drivers/media/common/siano/smsir.c | 2 +- + drivers/media/dvb-core/dvb-usb-ids.h | 2 + + drivers/media/dvb-core/dvb_frontend.c | 36 +- + drivers/media/dvb-core/dvb_frontend.h | 6 + + drivers/media/dvb-core/dvb_net.c | 3 +- + drivers/media/dvb-core/dvbdev.h | 4 + + drivers/media/dvb-frontends/Kconfig | 18 + + drivers/media/dvb-frontends/Makefile | 7 + + drivers/media/dvb-frontends/af9013.c | 1 - + drivers/media/dvb-frontends/au8522_decoder.c | 180 +- + drivers/media/dvb-frontends/au8522_priv.h | 2 + + drivers/media/dvb-frontends/cxd2820r.h | 6 + + drivers/media/dvb-frontends/cxd2820r_c.c | 1 + + drivers/media/dvb-frontends/cxd2820r_t.c | 1 + + drivers/media/dvb-frontends/cxd2820r_t2.c | 1 + + drivers/media/dvb-frontends/dib0090.c | 15 +- + drivers/media/dvb-frontends/dib7000m.c | 5 +- + drivers/media/dvb-frontends/dib7000p.c | 433 +- + drivers/media/dvb-frontends/dib7000p.h | 131 +- + drivers/media/dvb-frontends/dib8000.c | 732 +-- + drivers/media/dvb-frontends/dib8000.h | 150 +- + drivers/media/dvb-frontends/dib9000.c | 13 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 228 +- + drivers/media/dvb-frontends/drxd.h | 1 - + drivers/media/dvb-frontends/drxd_hard.c | 3 +- + drivers/media/dvb-frontends/m88ds3103.c | 85 +- + drivers/media/dvb-frontends/m88ds3103_priv.h | 2 + + drivers/media/dvb-frontends/mb86a20s.c | 35 +- + .../dvb-frontends}/rtl2832_sdr.c | 100 +- + .../dvb-frontends}/rtl2832_sdr.h | 0 + drivers/media/dvb-frontends/si2165.c | 1040 ++++ + drivers/media/dvb-frontends/si2165.h | 62 + + drivers/media/dvb-frontends/si2165_priv.h | 23 + + drivers/media/dvb-frontends/si2168.c | 266 +- + drivers/media/dvb-frontends/si2168_priv.h | 9 +- + drivers/media/dvb-frontends/stb6100_cfg.h | 42 +- + drivers/media/dvb-frontends/stb6100_proc.h | 34 +- + drivers/media/dvb-frontends/stv0367.c | 9 +- + drivers/media/dvb-frontends/tda18271c2dd.c | 2 +- + drivers/media/dvb-frontends/tda18271c2dd_maps.h | 8 +- + drivers/media/dvb-frontends/tda8261_cfg.h | 30 +- + drivers/media/i2c/Kconfig | 1 + + drivers/media/i2c/adv7180.c | 1 - + drivers/media/i2c/adv7604.c | 5 +- + drivers/media/i2c/ir-kbd-i2c.c | 95 +- + drivers/media/i2c/mt9v032.c | 170 +- + drivers/media/i2c/noon010pc30.c | 1 + + drivers/media/i2c/s5k4ecgx.c | 1 + + drivers/media/i2c/s5k5baf.c | 2 + + drivers/media/i2c/s5k6a3.c | 1 + + drivers/media/i2c/smiapp/smiapp-core.c | 17 +- + drivers/media/i2c/soc_camera/mt9m001.c | 6 +- + drivers/media/i2c/soc_camera/mt9m111.c | 12 + + drivers/media/i2c/soc_camera/mt9t031.c | 6 +- + drivers/media/i2c/soc_camera/mt9v022.c | 4 +- + drivers/media/i2c/tvp5150.c | 35 +- + drivers/media/media-device.c | 2 - + drivers/media/parport/bw-qcam.c | 3 - + drivers/media/parport/c-qcam.c | 1 - + drivers/media/parport/pms.c | 1 - + drivers/media/parport/w9966.c | 1 - + drivers/media/pci/Kconfig | 1 + + drivers/media/pci/Makefile | 1 + + drivers/media/pci/bt8xx/bttv-driver.c | 1 - + drivers/media/pci/bt8xx/bttv-input.c | 78 +- + drivers/media/pci/bt8xx/bttvp.h | 2 - + drivers/media/pci/cx18/cx18-alsa.h | 1 - + drivers/media/pci/cx18/cx18-ioctl.c | 1 - + drivers/media/pci/cx18/cx18-streams.c | 1 - + drivers/media/pci/cx23885/Kconfig | 2 + + drivers/media/pci/cx23885/cx23885-417.c | 8 +- + drivers/media/pci/cx23885/cx23885-cards.c | 61 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 175 +- + drivers/media/pci/cx23885/cx23885-input.c | 2 +- + drivers/media/pci/cx23885/cx23885-video.c | 11 +- + drivers/media/pci/cx23885/cx23885.h | 2 + + drivers/media/pci/cx25821/cx25821-video.c | 4 - + drivers/media/pci/cx88/cx88-core.c | 1 - + drivers/media/pci/cx88/cx88-input.c | 38 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 35 +- + drivers/media/pci/dm1105/dm1105.c | 3 +- + drivers/media/pci/ivtv/ivtv-controls.c | 4 +- + drivers/media/pci/ivtv/ivtv-i2c.c | 9 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 3 - + drivers/media/pci/ivtv/ivtv-streams.c | 1 - + drivers/media/pci/meye/meye.c | 3 - + drivers/media/pci/ngene/ngene-core.c | 7 +- + drivers/media/pci/saa7134/saa7134-core.c | 1 - + drivers/media/pci/saa7134/saa7134-empress.c | 4 - + drivers/media/pci/saa7134/saa7134-input.c | 86 +- + drivers/media/pci/saa7134/saa7134-video.c | 2 - + drivers/media/pci/saa7164/saa7164-dvb.c | 32 +- + .../{staging/media => media/pci}/solo6x10/Kconfig | 3 +- + .../{staging/media => media/pci}/solo6x10/Makefile | 2 +- + .../media => media/pci}/solo6x10/solo6x10-core.c | 6 +- + .../media => media/pci}/solo6x10/solo6x10-disp.c | 20 +- + .../media => media/pci}/solo6x10/solo6x10-eeprom.c | 4 - + .../media => media/pci}/solo6x10/solo6x10-enc.c | 4 - + .../media => media/pci}/solo6x10/solo6x10-g723.c | 4 - + .../media => media/pci}/solo6x10/solo6x10-gpio.c | 4 - + .../media => media/pci}/solo6x10/solo6x10-i2c.c | 4 - + .../media => media/pci}/solo6x10/solo6x10-jpeg.h | 6 +- + .../pci}/solo6x10/solo6x10-offsets.h | 4 - + .../media => media/pci}/solo6x10/solo6x10-p2m.c | 4 - + .../media => media/pci}/solo6x10/solo6x10-regs.h | 4 - + .../media => media/pci}/solo6x10/solo6x10-tw28.c | 5 +- + .../media => media/pci}/solo6x10/solo6x10-tw28.h | 4 - + .../pci}/solo6x10/solo6x10-v4l2-enc.c | 207 +- + .../media => media/pci}/solo6x10/solo6x10-v4l2.c | 9 +- + .../media => media/pci}/solo6x10/solo6x10.h | 30 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 2 - + drivers/media/pci/ttpci/budget-ci.c | 10 +- + drivers/media/pci/zoran/zr36050.h | 1 - + drivers/media/platform/Kconfig | 7 +- + drivers/media/platform/arv.c | 1 - + drivers/media/platform/blackfin/bfin_capture.c | 9 +- + drivers/media/platform/blackfin/ppi.c | 25 +- + drivers/media/platform/coda.c | 1518 +++-- + drivers/media/platform/coda.h | 115 +- + drivers/media/platform/davinci/dm644x_ccdc.c | 5 - + drivers/media/platform/davinci/vpbe_display.c | 1 - + drivers/media/platform/davinci/vpfe_capture.c | 1 - + drivers/media/platform/davinci/vpif_capture.c | 248 +- + drivers/media/platform/davinci/vpif_capture.h | 11 - + drivers/media/platform/davinci/vpif_display.c | 4 +- + drivers/media/platform/m2m-deinterlace.c | 7 +- + drivers/media/platform/mem2mem_testdev.c | 1 - + drivers/media/platform/omap/omap_vout.c | 2 - + drivers/media/platform/s3c-camif/camif-capture.c | 3 +- + drivers/media/platform/s5p-jpeg/Makefile | 2 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 660 +- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 32 +- + .../media/platform/s5p-jpeg/jpeg-hw-exynos3250.c | 487 ++ + .../media/platform/s5p-jpeg/jpeg-hw-exynos3250.h | 60 + + drivers/media/platform/s5p-jpeg/jpeg-regs.h | 247 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 17 +- + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 11 +- + drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 49 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 9 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 24 + + drivers/media/platform/s5p-tv/mixer_video.c | 2 - + drivers/media/platform/sh_veu.c | 2 - + drivers/media/platform/soc_camera/Kconfig | 18 +- + drivers/media/platform/soc_camera/Makefile | 1 - + drivers/media/platform/soc_camera/atmel-isi.c | 90 +- + drivers/media/platform/soc_camera/mx1_camera.c | 866 --- + drivers/media/platform/soc_camera/pxa_camera.c | 81 +- + drivers/media/platform/soc_camera/rcar_vin.c | 82 +- + drivers/media/platform/soc_camera/soc_camera.c | 141 +- + drivers/media/platform/vino.c | 5 - + drivers/media/platform/vivi.c | 11 +- + drivers/media/platform/vsp1/vsp1.h | 14 +- + drivers/media/platform/vsp1/vsp1_bru.c | 85 +- + drivers/media/platform/vsp1/vsp1_bru.h | 9 +- + drivers/media/platform/vsp1/vsp1_drv.c | 22 +- + drivers/media/platform/vsp1/vsp1_entity.c | 42 + + drivers/media/platform/vsp1/vsp1_entity.h | 10 + + drivers/media/platform/vsp1/vsp1_regs.h | 2 + + drivers/media/platform/vsp1/vsp1_rpf.c | 72 +- + drivers/media/platform/vsp1/vsp1_rwpf.h | 2 + + drivers/media/platform/vsp1/vsp1_sru.c | 107 +- + drivers/media/platform/vsp1/vsp1_sru.h | 1 - + drivers/media/platform/vsp1/vsp1_uds.c | 63 +- + drivers/media/platform/vsp1/vsp1_uds.h | 6 +- + drivers/media/platform/vsp1/vsp1_video.c | 219 +- + drivers/media/platform/vsp1/vsp1_video.h | 11 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 72 +- + drivers/media/radio/dsbr100.c | 1 - + drivers/media/radio/radio-cadet.c | 1 - + drivers/media/radio/radio-isa.c | 1 - + drivers/media/radio/radio-keene.c | 3 +- + drivers/media/radio/radio-ma901.c | 1 - + drivers/media/radio/radio-miropcm20.c | 304 +- + drivers/media/radio/radio-mr800.c | 3 +- + drivers/media/radio/radio-raremono.c | 1 - + drivers/media/radio/radio-sf16fmi.c | 1 - + drivers/media/radio/radio-si476x.c | 1 - + drivers/media/radio/radio-tea5764.c | 1 - + drivers/media/radio/radio-tea5777.c | 1 - + drivers/media/radio/radio-timb.c | 1 - + drivers/media/radio/si470x/radio-si470x-usb.c | 1 - + drivers/media/radio/si4713/radio-platform-si4713.c | 1 - + drivers/media/radio/si4713/radio-usb-si4713.c | 1 - + drivers/media/radio/si4713/si4713.c | 80 +- + drivers/media/radio/si4713/si4713.h | 9 + + drivers/media/radio/tea575x.c | 1 - + drivers/media/rc/Kconfig | 32 +- + drivers/media/rc/Makefile | 5 +- + drivers/media/rc/ati_remote.c | 159 +- + drivers/media/rc/ene_ir.c | 2 +- + drivers/media/rc/fintek-cir.c | 6 +- + drivers/media/rc/gpio-ir-recv.c | 4 +- + drivers/media/rc/iguanair.c | 2 +- + drivers/media/rc/img-ir/img-ir-core.c | 5 + + drivers/media/rc/img-ir/img-ir-hw.c | 31 +- + drivers/media/rc/img-ir/img-ir-hw.h | 8 +- + drivers/media/rc/img-ir/img-ir-jvc.c | 9 +- + drivers/media/rc/img-ir/img-ir-nec.c | 9 +- + drivers/media/rc/img-ir/img-ir-raw.c | 5 + + drivers/media/rc/img-ir/img-ir-raw.h | 5 + + drivers/media/rc/img-ir/img-ir-sanyo.c | 9 +- + drivers/media/rc/img-ir/img-ir-sharp.c | 9 +- + drivers/media/rc/img-ir/img-ir-sony.c | 17 +- + drivers/media/rc/img-ir/img-ir.h | 5 + + drivers/media/rc/imon.c | 20 +- + drivers/media/rc/ir-jvc-decoder.c | 4 +- + drivers/media/rc/ir-lirc-codec.c | 2 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 2 +- + drivers/media/rc/ir-nec-decoder.c | 4 +- + drivers/media/rc/ir-rc5-decoder.c | 85 +- + drivers/media/rc/ir-rc5-sz-decoder.c | 154 - + drivers/media/rc/ir-rc6-decoder.c | 43 +- + drivers/media/rc/ir-sanyo-decoder.c | 4 +- + drivers/media/rc/ir-sharp-decoder.c | 4 +- + drivers/media/rc/ir-sony-decoder.c | 16 +- + drivers/media/rc/ir-xmp-decoder.c | 225 + + drivers/media/rc/ite-cir.c | 6 +- + drivers/media/rc/keymaps/rc-ati-x10.c | 92 +- + drivers/media/rc/keymaps/rc-behold.c | 68 +- + drivers/media/rc/keymaps/rc-nebula.c | 112 +- + drivers/media/rc/keymaps/rc-streamzap.c | 4 +- + drivers/media/rc/mceusb.c | 33 +- + drivers/media/rc/nuvoton-cir.c | 6 +- + drivers/media/rc/rc-core-priv.h | 20 +- + drivers/media/rc/{ir-raw.c => rc-ir-raw.c} | 12 +- + drivers/media/rc/rc-loopback.c | 2 +- + drivers/media/rc/rc-main.c | 301 +- + drivers/media/rc/redrat3.c | 2 +- + drivers/media/rc/st_rc.c | 2 +- + drivers/media/rc/streamzap.c | 12 +- + drivers/media/rc/sunxi-cir.c | 318 + + drivers/media/rc/ttusbir.c | 2 +- + drivers/media/rc/winbond-cir.c | 2 +- + drivers/media/tuners/Kconfig | 11 +- + drivers/media/tuners/Makefile | 1 + + .../media/msi3101 => media/tuners}/msi001.c | 2 +- + drivers/media/tuners/r820t.c | 3 +- + drivers/media/tuners/si2157.c | 257 +- + drivers/media/tuners/si2157.h | 7 +- + drivers/media/tuners/si2157_priv.h | 9 +- + drivers/media/tuners/tuner-xc2028.c | 1 - + drivers/media/tuners/xc4000.c | 48 +- + drivers/media/tuners/xc5000.c | 164 +- + drivers/media/usb/Kconfig | 7 + + drivers/media/usb/Makefile | 3 + + drivers/media/usb/airspy/Kconfig | 10 + + drivers/media/usb/airspy/Makefile | 1 + + drivers/media/usb/airspy/airspy.c | 1132 ++++ + drivers/media/usb/au0828/Kconfig | 8 + + drivers/media/usb/au0828/Makefile | 4 + + drivers/media/usb/au0828/au0828-cards.c | 7 +- + drivers/media/usb/au0828/au0828-core.c | 25 +- + drivers/media/usb/au0828/au0828-i2c.c | 37 +- + drivers/media/usb/au0828/au0828-input.c | 386 ++ + drivers/media/usb/au0828/au0828-video.c | 62 +- + drivers/media/usb/au0828/au0828.h | 11 + + drivers/media/usb/cpia2/cpia2_v4l.c | 1 - + drivers/media/usb/cx231xx/Kconfig | 2 + + drivers/media/usb/cx231xx/cx231xx-417.c | 3 - + drivers/media/usb/cx231xx/cx231xx-avcore.c | 1 + + drivers/media/usb/cx231xx/cx231xx-cards.c | 403 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 3 + + drivers/media/usb/cx231xx/cx231xx-dvb.c | 105 + + drivers/media/usb/cx231xx/cx231xx-input.c | 22 +- + drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c | 10 +- + drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 14 +- + drivers/media/usb/cx231xx/cx231xx.h | 2 + + drivers/media/usb/dvb-usb-v2/Kconfig | 1 + + drivers/media/usb/dvb-usb-v2/af9015.c | 18 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 28 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 3 +- + drivers/media/usb/dvb-usb-v2/az6007.c | 25 +- + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 2 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 34 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 2 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 14 +- + drivers/media/usb/dvb-usb/Kconfig | 3 + + drivers/media/usb/dvb-usb/cxusb.c | 233 +- + drivers/media/usb/dvb-usb/cxusb.h | 2 + + drivers/media/usb/dvb-usb/dib0700_core.c | 45 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 636 +- + drivers/media/usb/dvb-usb/dibusb.h | 2 +- + drivers/media/usb/dvb-usb/dvb-usb-remote.c | 2 +- + drivers/media/usb/dvb-usb/dw2102.c | 21 +- + drivers/media/usb/dvb-usb/m920x.c | 2 +- + drivers/media/usb/dvb-usb/pctv452e.c | 8 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +- + drivers/media/usb/dvb-usb/ttusb2.c | 6 +- + drivers/media/usb/em28xx/em28xx-camera.c | 4 +- + drivers/media/usb/em28xx/em28xx-cards.c | 3 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 40 +- + drivers/media/usb/em28xx/em28xx-i2c.c | 6 + + drivers/media/usb/em28xx/em28xx-input.c | 106 +- + drivers/media/usb/em28xx/em28xx-video.c | 116 +- + drivers/media/usb/em28xx/em28xx.h | 8 - + .../{staging/media => media/usb}/go7007/Kconfig | 0 + .../{staging/media => media/usb}/go7007/Makefile | 4 - + .../media => media/usb}/go7007/go7007-driver.c | 133 +- + .../media => media/usb}/go7007/go7007-fw.c | 32 +- + .../media => media/usb}/go7007/go7007-i2c.c | 4 - + .../media => media/usb}/go7007/go7007-loader.c | 4 - + .../media => media/usb}/go7007/go7007-priv.h | 20 +- + .../media => media/usb}/go7007/go7007-usb.c | 4 - + .../media => media/usb}/go7007/go7007-v4l2.c | 322 +- + .../media => media/usb}/go7007/s2250-board.c | 9 +- + .../media => media/usb}/go7007/snd-go7007.c | 4 - + drivers/media/usb/gspca/autogain_functions.c | 4 +- + drivers/media/usb/gspca/gspca.c | 29 +- + drivers/media/usb/gspca/gspca.h | 1 + + drivers/media/usb/gspca/kinect.c | 98 +- + drivers/media/usb/gspca/pac7302.c | 8 +- + drivers/media/usb/gspca/sonixb.c | 2 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 4 +- + drivers/media/usb/msi2500/Kconfig | 5 + + drivers/media/usb/msi2500/Makefile | 1 + + .../sdr-msi3101.c => media/usb/msi2500/msi2500.c} | 818 +-- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 12 +- + drivers/media/usb/pwc/pwc-if.c | 1 - + drivers/media/usb/s2255/s2255drv.c | 1 - + drivers/media/usb/stk1160/stk1160-v4l.c | 1 - + drivers/media/usb/stkwebcam/stk-webcam.c | 3 - + drivers/media/usb/tlg2300/pd-main.c | 2 + + drivers/media/usb/tlg2300/pd-radio.c | 1 - + drivers/media/usb/tlg2300/pd-video.c | 1 - + drivers/media/usb/tm6000/tm6000-input.c | 55 +- + drivers/media/usb/tm6000/tm6000-video.c | 3 - + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 3 +- + drivers/media/usb/usbtv/usbtv-core.c | 2 + + drivers/media/usb/usbtv/usbtv-video.c | 1 - + drivers/media/usb/usbvision/usbvision-core.c | 16 +- + drivers/media/usb/uvc/uvc_driver.c | 1 - + drivers/media/usb/zr364xx/zr364xx.c | 4 - + drivers/media/v4l2-core/v4l2-common.c | 6 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 19 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 971 ++- + drivers/media/v4l2-core/v4l2-dev.c | 14 +- + drivers/media/v4l2-core/v4l2-fh.c | 13 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 239 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 11 +- + drivers/media/v4l2-core/v4l2-subdev.c | 125 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 62 +- + drivers/media/v4l2-core/videobuf2-core.c | 129 +- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 8 + + drivers/mfd/cros_ec_spi.c | 8 +- + drivers/mfd/palmas.c | 233 +- + drivers/misc/ioc4.c | 7 +- + drivers/misc/sgi-xp/xpnet.c | 3 +- + drivers/net/Kconfig | 1 + + drivers/net/Makefile | 10 +- + drivers/net/arcnet/arcnet.c | 3 +- + drivers/net/bonding/bond_3ad.c | 185 +- + drivers/net/bonding/bond_alb.c | 146 +- + drivers/net/bonding/bond_alb.h | 8 + + drivers/net/bonding/bond_debugfs.c | 6 +- + drivers/net/bonding/bond_main.c | 535 +- + drivers/net/bonding/bond_netlink.c | 32 +- + drivers/net/bonding/bond_options.c | 228 +- + drivers/net/bonding/bond_procfs.c | 4 +- + drivers/net/bonding/bond_sysfs.c | 3 +- + drivers/net/bonding/bond_sysfs_slave.c | 4 +- + drivers/net/bonding/bonding.h | 22 +- + drivers/net/caif/caif_serial.c | 3 +- + drivers/net/caif/caif_spi.c | 4 +- + drivers/net/caif/caif_virtio.c | 2 +- + drivers/net/can/c_can/c_can_platform.c | 43 +- + drivers/net/can/dev.c | 2 +- + drivers/net/can/sja1000/sja1000.c | 27 +- + drivers/net/can/slcan.c | 2 +- + drivers/net/cris/eth_v10.c | 1 - + drivers/net/dummy.c | 2 +- + drivers/net/eql.c | 3 +- + drivers/net/ethernet/8390/lib8390.c | 2 +- + drivers/net/ethernet/8390/mac8390.c | 8 - + drivers/net/ethernet/adi/Kconfig | 3 +- + drivers/net/ethernet/adi/bfin_mac.c | 79 +- + drivers/net/ethernet/adi/bfin_mac.h | 3 + + drivers/net/ethernet/allwinner/sun4i-emac.c | 6 +- + drivers/net/ethernet/amd/Kconfig | 13 + + drivers/net/ethernet/amd/amd8111e.c | 363 +- + drivers/net/ethernet/amd/declance.c | 12 +- + drivers/net/ethernet/amd/xgbe/Makefile | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 121 +- + drivers/net/ethernet/amd/xgbe/xgbe-dcb.c | 270 + + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 7 +- + drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 32 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 780 ++- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 728 ++- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 74 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 66 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 107 - + drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 285 + + drivers/net/ethernet/amd/xgbe/xgbe.h | 151 +- + drivers/net/ethernet/arc/emac.h | 4 - + drivers/net/ethernet/arc/emac_main.c | 11 +- + drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 - + drivers/net/ethernet/atheros/atl1e/atl1e_hw.c | 1 - + drivers/net/ethernet/atheros/atlx/atl1.c | 1 - + drivers/net/ethernet/atheros/atlx/atl2.c | 3 - + drivers/net/ethernet/broadcom/Kconfig | 8 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 489 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 14 +- + drivers/net/ethernet/broadcom/bnx2.c | 9 +- + drivers/net/ethernet/broadcom/bnx2.h | 5 +- + drivers/net/ethernet/broadcom/bnx2_fw.h | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 9 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 55 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 4 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 44 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 264 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 35 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 78 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 23 +- + drivers/net/ethernet/broadcom/cnic.c | 10 +- + drivers/net/ethernet/broadcom/cnic.h | 3 +- + drivers/net/ethernet/broadcom/cnic_defs.h | 3 +- + drivers/net/ethernet/broadcom/cnic_if.h | 3 +- + drivers/net/ethernet/broadcom/genet/Makefile | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 573 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 30 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 206 + + drivers/net/ethernet/broadcom/genet/bcmmii.c | 44 +- + drivers/net/ethernet/broadcom/tg3.c | 22 +- + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 6 +- + drivers/net/ethernet/brocade/bna/cna_fwimg.c | 4 - + drivers/net/ethernet/cadence/macb.c | 419 +- + drivers/net/ethernet/cadence/macb.h | 53 +- + drivers/net/ethernet/chelsio/Kconfig | 11 + + drivers/net/ethernet/chelsio/cxgb4/Makefile | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 37 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 971 +++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 141 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 487 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 14 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 37 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 364 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 7 +- + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 17 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 99 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 38 +- + drivers/net/ethernet/cirrus/cs89x0.c | 32 +- + drivers/net/ethernet/cisco/enic/Makefile | 2 +- + drivers/net/ethernet/cisco/enic/enic.h | 40 +- + drivers/net/ethernet/cisco/enic/enic_api.c | 4 +- + drivers/net/ethernet/cisco/enic/enic_clsf.c | 284 + + drivers/net/ethernet/cisco/enic/enic_clsf.h | 37 + + drivers/net/ethernet/cisco/enic/enic_dev.c | 80 +- + drivers/net/ethernet/cisco/enic/enic_dev.h | 4 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 125 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 245 +- + drivers/net/ethernet/cisco/enic/enic_res.c | 1 + + drivers/net/ethernet/cisco/enic/vnic_dev.c | 65 +- + drivers/net/ethernet/cisco/enic/vnic_dev.h | 2 + + drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 5 + + drivers/net/ethernet/cisco/enic/vnic_enet.h | 2 + + drivers/net/ethernet/cisco/enic/vnic_rq.h | 122 + + drivers/net/ethernet/davicom/dm9000.c | 6 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 1 - + drivers/net/ethernet/dnet.c | 46 +- + drivers/net/ethernet/emulex/benet/be.h | 17 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 297 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 54 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 29 +- + drivers/net/ethernet/emulex/benet/be_main.c | 270 +- + drivers/net/ethernet/freescale/fec.h | 10 +- + drivers/net/ethernet/freescale/fec_main.c | 381 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 - + drivers/net/ethernet/freescale/xgmac_mdio.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 - + drivers/net/ethernet/intel/e1000/e1000_hw.c | 2 - + drivers/net/ethernet/intel/e1000e/82571.c | 4 - + drivers/net/ethernet/intel/e1000e/defines.h | 1 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 2 - + drivers/net/ethernet/intel/e1000e/ich8lan.c | 21 +- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 4 + + drivers/net/ethernet/intel/e1000e/mac.c | 1 - + drivers/net/ethernet/intel/e1000e/manage.c | 5 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 55 +- + drivers/net/ethernet/intel/e1000e/nvm.c | 4 +- + drivers/net/ethernet/intel/i40e/Makefile | 1 + + drivers/net/ethernet/intel/i40e/i40e.h | 72 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 132 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 39 + + drivers/net/ethernet/intel/i40e/i40e_common.c | 482 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 29 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 549 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 1561 +++++ + drivers/net/ethernet/intel/i40e/i40e_fcoe.h | 128 + + drivers/net/ethernet/intel/i40e/i40e_hmc.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 249 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 28 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 753 ++- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 520 +- + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 3 + + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 31 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 135 +- + drivers/net/ethernet/intel/i40e/i40e_register.h | 5011 ++++++--------- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 190 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 16 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 213 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 40 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 119 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 39 + + drivers/net/ethernet/intel/i40evf/i40e_common.c | 2 +- + drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 4 +- + drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h | 28 +- + drivers/net/ethernet/intel/i40evf/i40e_register.h | 5011 ++++++--------- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 9 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 7 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 74 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 6 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 86 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 44 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 2 - + drivers/net/ethernet/intel/igb/e1000_regs.h | 1 + + drivers/net/ethernet/intel/igb/igb_main.c | 31 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 213 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 315 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 580 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 39 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 46 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 - + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 24 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 74 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 117 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 582 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 16 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 31 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 20 - + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 216 +- + drivers/net/ethernet/intel/ixgbevf/vf.h | 1 - + drivers/net/ethernet/marvell/Kconfig | 8 + + drivers/net/ethernet/marvell/Makefile | 1 + + drivers/net/ethernet/marvell/mvpp2.c | 6426 ++++++++++++++++++++ + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 57 + + drivers/net/ethernet/mellanox/mlx4/en_main.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 35 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 13 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 28 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 279 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 5 - + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 10 +- + drivers/net/ethernet/mellanox/mlx4/port.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/mad.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 292 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 2 +- + drivers/net/ethernet/micrel/ks8851_mll.c | 59 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 1 - + drivers/net/ethernet/octeon/octeon_mgmt.c | 25 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 4 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 18 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 58 +- + drivers/net/ethernet/realtek/8139cp.c | 36 +- + drivers/net/ethernet/realtek/r8169.c | 220 +- + drivers/net/ethernet/renesas/sh_eth.c | 20 +- + drivers/net/ethernet/sfc/ef10.c | 14 +- + drivers/net/ethernet/sfc/efx.c | 67 +- + drivers/net/ethernet/sfc/efx.h | 5 + + drivers/net/ethernet/sfc/ethtool.c | 59 +- + drivers/net/ethernet/sfc/falcon.c | 9 +- + drivers/net/ethernet/sfc/mcdi_port.c | 11 + + drivers/net/ethernet/sfc/net_driver.h | 154 + + drivers/net/ethernet/sfc/nic.h | 13 +- + drivers/net/ethernet/sfc/rx.c | 12 +- + drivers/net/ethernet/sfc/selftest.c | 5 +- + drivers/net/ethernet/sfc/siena.c | 9 +- + drivers/net/ethernet/sfc/tx.c | 28 +- + drivers/net/ethernet/sis/sis900.c | 1 - + drivers/net/ethernet/smsc/smc911x.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 47 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 69 + + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 3 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 131 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 27 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 42 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 67 + + drivers/net/ethernet/sun/niu.c | 1 - + drivers/net/ethernet/ti/Kconfig | 4 +- + drivers/net/ethernet/ti/cpmac.c | 279 +- + drivers/net/ethernet/ti/cpsw.c | 45 +- + drivers/net/ethernet/ti/cpsw_ale.c | 12 +- + drivers/net/ethernet/ti/cpsw_ale.h | 4 + + drivers/net/ethernet/ti/cpts.c | 24 +- + drivers/net/ethernet/ti/davinci_mdio.c | 21 +- + drivers/net/ethernet/ti/tlan.c | 224 +- + drivers/net/ethernet/ti/tlan.h | 5 +- + drivers/net/ethernet/tile/tilegx.c | 4 +- + drivers/net/ethernet/tile/tilepro.c | 3 +- + drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 10 - + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- + drivers/net/fddi/defxx.c | 142 +- + drivers/net/fddi/defxx.h | 2 +- + drivers/net/hamradio/6pack.c | 3 +- + drivers/net/hamradio/baycom_epp.c | 2 +- + drivers/net/hamradio/bpqether.c | 4 +- + drivers/net/hamradio/dmascc.c | 4 +- + drivers/net/hamradio/hdlcdrv.c | 2 +- + drivers/net/hamradio/mkiss.c | 3 +- + drivers/net/hamradio/scc.c | 2 +- + drivers/net/hamradio/yam.c | 2 +- + drivers/net/hyperv/hyperv_net.h | 5 +- + drivers/net/hyperv/netvsc.c | 11 +- + drivers/net/hyperv/netvsc_drv.c | 41 +- + drivers/net/hyperv/rndis_filter.c | 21 +- + drivers/net/ieee802154/Kconfig | 12 + + drivers/net/ieee802154/Makefile | 1 + + drivers/net/ieee802154/at86rf230.c | 1464 +++-- + drivers/net/ieee802154/cc2520.c | 1039 ++++ + drivers/net/ieee802154/fakehard.c | 3 +- + drivers/net/ieee802154/mrf24j40.c | 115 +- + drivers/net/ifb.c | 4 +- + drivers/net/irda/kingsun-sir.c | 4 +- + drivers/net/loopback.c | 2 +- + drivers/net/macvlan.c | 1 + + drivers/net/phy/amd-xgbe-phy.c | 136 +- + drivers/net/phy/dp83640.c | 239 +- + drivers/net/phy/mdio_bus.c | 1 - + drivers/net/phy/micrel.c | 22 + + drivers/net/phy/phy.c | 83 +- + drivers/net/phy/phy_device.c | 2 + + drivers/net/phy/spi_ks8995.c | 26 +- + drivers/net/ppp/ppp_generic.c | 35 +- + drivers/net/slip/slhc.c | 1 - + drivers/net/slip/slip.c | 2 +- + drivers/net/team/team.c | 8 +- + drivers/net/team/team_mode_loadbalance.c | 18 +- + drivers/net/tun.c | 3 +- + drivers/net/usb/Kconfig | 13 +- + drivers/net/usb/ax88179_178a.c | 264 + + drivers/net/usb/cdc-phonet.c | 2 +- + drivers/net/usb/cdc_subset.c | 27 +- + drivers/net/usb/hso.c | 4 +- + drivers/net/usb/r8152.c | 38 +- + drivers/net/usb/usbnet.c | 8 +- + drivers/net/veth.c | 29 +- + drivers/net/virtio_net.c | 67 +- + drivers/net/vxlan.c | 144 +- + drivers/net/wan/dlci.c | 5 +- + drivers/net/wan/hdlc.c | 3 +- + drivers/net/wan/hdlc_fr.c | 5 +- + drivers/net/wan/lapbether.c | 4 +- + drivers/net/wan/sbni.c | 7 +- + drivers/net/wan/sdla.c | 3 +- + drivers/net/wan/x25_asy.c | 4 +- + drivers/net/wimax/i2400m/usb.c | 2 +- + drivers/net/wireless/airo.c | 6 +- + drivers/net/wireless/at76c50x-usb.c | 3 +- + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath10k/ce.c | 11 +- + drivers/net/wireless/ath/ath10k/core.c | 12 +- + drivers/net/wireless/ath/ath10k/core.h | 3 + + drivers/net/wireless/ath/ath10k/debug.c | 73 + + drivers/net/wireless/ath/ath10k/htc.c | 20 +- + drivers/net/wireless/ath/ath10k/htt.h | 13 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 122 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 52 + + drivers/net/wireless/ath/ath10k/mac.c | 99 +- + drivers/net/wireless/ath/ath10k/mac.h | 4 +- + drivers/net/wireless/ath/ath10k/pci.c | 28 +- + drivers/net/wireless/ath/ath10k/pci.h | 3 +- + drivers/net/wireless/ath/ath10k/txrx.c | 3 +- + drivers/net/wireless/ath/ath10k/txrx.h | 1 + + drivers/net/wireless/ath/ath10k/wmi.c | 8 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 1 + + drivers/net/wireless/ath/ath5k/base.c | 31 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 + + drivers/net/wireless/ath/ath6kl/bmi.h | 3 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 +- + drivers/net/wireless/ath/ath6kl/core.c | 16 + + drivers/net/wireless/ath/ath6kl/core.h | 36 +- + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 32 +- + drivers/net/wireless/ath/ath6kl/init.c | 91 +- + drivers/net/wireless/ath/ath6kl/main.c | 17 +- + drivers/net/wireless/ath/ath6kl/usb.c | 7 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 72 +- + drivers/net/wireless/ath/ath6kl/wmi.h | 2 +- + drivers/net/wireless/ath/ath9k/Makefile | 3 +- + drivers/net/wireless/ath/ath9k/ahb.c | 1 + + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 15 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 +- + drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 201 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 162 +- + drivers/net/wireless/ath/ath9k/beacon.c | 97 +- + drivers/net/wireless/ath/ath9k/channel.c | 685 +++ + drivers/net/wireless/ath/ath9k/common-beacon.c | 5 +- + drivers/net/wireless/ath/ath9k/debug.c | 30 +- + drivers/net/wireless/ath/ath9k/hw.c | 27 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/init.c | 57 +- + drivers/net/wireless/ath/ath9k/link.c | 6 +- + drivers/net/wireless/ath/ath9k/mac.h | 10 +- + drivers/net/wireless/ath/ath9k/main.c | 892 ++- + drivers/net/wireless/ath/ath9k/mci.c | 4 +- + drivers/net/wireless/ath/ath9k/pci.c | 1 + + drivers/net/wireless/ath/ath9k/recv.c | 16 +- + drivers/net/wireless/ath/ath9k/reg.h | 4 + + drivers/net/wireless/ath/ath9k/spectral.c | 8 +- + drivers/net/wireless/ath/ath9k/tx99.c | 2 +- + drivers/net/wireless/ath/ath9k/wow.c | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 135 +- + drivers/net/wireless/ath/carl9170/phy.c | 1 - + drivers/net/wireless/ath/wcn36xx/main.c | 1 - + drivers/net/wireless/ath/wil6210/cfg80211.c | 68 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 361 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 3 + + drivers/net/wireless/ath/wil6210/main.c | 64 +- + drivers/net/wireless/ath/wil6210/netdev.c | 2 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 53 +- + drivers/net/wireless/ath/wil6210/rx_reorder.c | 1 + + drivers/net/wireless/ath/wil6210/txrx.c | 39 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 36 +- + drivers/net/wireless/ath/wil6210/wmi.c | 59 +- + drivers/net/wireless/b43/Kconfig | 31 +- + drivers/net/wireless/b43/Makefile | 6 +- + drivers/net/wireless/b43/main.c | 459 +- + drivers/net/wireless/b43/main.h | 1 + + drivers/net/wireless/b43/phy_a.c | 2 +- + drivers/net/wireless/b43/phy_a.h | 4 - + drivers/net/wireless/b43/phy_common.c | 26 +- + drivers/net/wireless/b43/phy_common.h | 12 +- + drivers/net/wireless/b43/phy_ht.c | 2 +- + drivers/net/wireless/b43/phy_lcn.c | 35 +- + drivers/net/wireless/b43/phy_n.c | 1461 ++++- + drivers/net/wireless/b43/phy_n.h | 15 + + drivers/net/wireless/b43/radio_2057.c | 540 +- + drivers/net/wireless/b43/radio_2057.h | 76 + + drivers/net/wireless/b43/tables_nphy.c | 626 +- + drivers/net/wireless/b43/tables_nphy.h | 4 + + drivers/net/wireless/b43/xmit.c | 7 +- + drivers/net/wireless/brcm80211/Kconfig | 10 + + drivers/net/wireless/brcm80211/brcmfmac/Makefile | 11 +- + drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 20 + + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 43 +- + drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | 38 +- + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 36 +- + .../net/wireless/brcm80211/brcmfmac/commonring.c | 273 + + .../net/wireless/brcm80211/brcmfmac/commonring.h | 69 + + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 22 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 33 + + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 7 + + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 196 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 110 +- + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 25 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 283 +- + drivers/net/wireless/brcm80211/brcmfmac/feature.c | 136 + + drivers/net/wireless/brcm80211/brcmfmac/feature.h | 86 + + drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 5 + + drivers/net/wireless/brcm80211/brcmfmac/firmware.h | 5 + + drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 501 ++ + drivers/net/wireless/brcm80211/brcmfmac/flowring.h | 84 + + drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 6 +- + drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 5 + + drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 100 +- + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 1397 +++++ + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h | 40 + + drivers/net/wireless/brcm80211/brcmfmac/of.c | 56 + + drivers/net/wireless/brcm80211/brcmfmac/of.h | 22 + + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 1846 ++++++ + drivers/net/wireless/brcm80211/brcmfmac/pcie.h | 29 + + drivers/net/wireless/brcm80211/brcmfmac/proto.c | 29 +- + drivers/net/wireless/brcm80211/brcmfmac/proto.h | 31 +- + .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 16 +- + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 251 +- + drivers/net/wireless/brcm80211/brcmfmac/vendor.c | 115 + + drivers/net/wireless/brcm80211/brcmfmac/vendor.h | 64 + + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 1176 ++-- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 2 +- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 37 - + .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 6 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 1 - + .../net/wireless/brcm80211/include/brcm_hw_ids.h | 71 +- + drivers/net/wireless/cw1200/fwio.c | 1 - + drivers/net/wireless/cw1200/scan.c | 3 +- + drivers/net/wireless/cw1200/scan.h | 2 +- + drivers/net/wireless/cw1200/sta.c | 3 +- + drivers/net/wireless/ipw2x00/libipw_module.c | 3 +- + drivers/net/wireless/iwlegacy/common.c | 6 +- + drivers/net/wireless/iwlegacy/common.h | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 25 +- + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 3 +- + drivers/net/wireless/iwlwifi/dvm/power.c | 9 + + drivers/net/wireless/iwlwifi/iwl-8000.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-config.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-drv.c | 15 + + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 1 - + drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 67 +- + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-fw.h | 12 + + drivers/net/wireless/iwlwifi/iwl-modparams.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 99 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 6 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 21 +- + drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/iwlwifi/mvm/coex.c | 513 +- + drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 1257 ++++ + drivers/net/wireless/iwlwifi/mvm/constants.h | 2 + + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 324 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 222 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 2 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 256 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 7 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 30 +- + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 78 +- + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 111 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 792 ++- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 150 +- + drivers/net/wireless/iwlwifi/mvm/nvm.c | 35 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 128 +- + drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 26 + + drivers/net/wireless/iwlwifi/mvm/power.c | 39 +- + drivers/net/wireless/iwlwifi/mvm/quota.c | 38 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 96 +- + drivers/net/wireless/iwlwifi/mvm/rs.h | 19 +- + drivers/net/wireless/iwlwifi/mvm/rx.c | 17 + + drivers/net/wireless/iwlwifi/mvm/scan.c | 540 +- + drivers/net/wireless/iwlwifi/mvm/sta.c | 98 +- + drivers/net/wireless/iwlwifi/mvm/sta.h | 12 + + drivers/net/wireless/iwlwifi/mvm/time-event.c | 162 +- + drivers/net/wireless/iwlwifi/mvm/time-event.h | 29 + + drivers/net/wireless/iwlwifi/mvm/tt.c | 12 +- + drivers/net/wireless/iwlwifi/mvm/tx.c | 35 +- + drivers/net/wireless/iwlwifi/mvm/utils.c | 65 - + drivers/net/wireless/iwlwifi/pcie/internal.h | 7 + + drivers/net/wireless/iwlwifi/pcie/trans.c | 339 +- + drivers/net/wireless/iwlwifi/pcie/tx.c | 1 + + drivers/net/wireless/libertas/Kconfig | 2 +- + drivers/net/wireless/libertas/cmd.c | 1 + + drivers/net/wireless/libertas/main.c | 2 +- + drivers/net/wireless/libertas/mesh.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 83 +- + drivers/net/wireless/mwifiex/11ac.c | 2 +- + drivers/net/wireless/mwifiex/11ac.h | 2 +- + drivers/net/wireless/mwifiex/11h.c | 2 +- + drivers/net/wireless/mwifiex/11n.c | 5 +- + drivers/net/wireless/mwifiex/11n.h | 2 +- + drivers/net/wireless/mwifiex/11n_aggr.c | 2 +- + drivers/net/wireless/mwifiex/11n_aggr.h | 2 +- + drivers/net/wireless/mwifiex/11n_rxreorder.c | 29 +- + drivers/net/wireless/mwifiex/11n_rxreorder.h | 2 +- + drivers/net/wireless/mwifiex/Makefile | 2 +- + drivers/net/wireless/mwifiex/README | 32 +- + drivers/net/wireless/mwifiex/cfg80211.c | 66 +- + drivers/net/wireless/mwifiex/cfg80211.h | 2 +- + drivers/net/wireless/mwifiex/cfp.c | 2 +- + drivers/net/wireless/mwifiex/cmdevt.c | 46 +- + drivers/net/wireless/mwifiex/debugfs.c | 95 +- + drivers/net/wireless/mwifiex/decl.h | 2 +- + drivers/net/wireless/mwifiex/ethtool.c | 85 +- + drivers/net/wireless/mwifiex/fw.h | 4 +- + drivers/net/wireless/mwifiex/ie.c | 2 +- + drivers/net/wireless/mwifiex/init.c | 15 +- + drivers/net/wireless/mwifiex/ioctl.h | 2 +- + drivers/net/wireless/mwifiex/join.c | 10 +- + drivers/net/wireless/mwifiex/main.c | 24 +- + drivers/net/wireless/mwifiex/main.h | 34 +- + drivers/net/wireless/mwifiex/pcie.c | 189 +- + drivers/net/wireless/mwifiex/pcie.h | 12 +- + drivers/net/wireless/mwifiex/scan.c | 2 +- + drivers/net/wireless/mwifiex/sdio.c | 235 +- + drivers/net/wireless/mwifiex/sdio.h | 14 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 4 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 4 +- + drivers/net/wireless/mwifiex/sta_event.c | 2 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 18 +- + drivers/net/wireless/mwifiex/sta_rx.c | 2 +- + drivers/net/wireless/mwifiex/sta_tx.c | 2 +- + drivers/net/wireless/mwifiex/tdls.c | 30 +- + drivers/net/wireless/mwifiex/txrx.c | 2 +- + drivers/net/wireless/mwifiex/uap_cmd.c | 2 +- + drivers/net/wireless/mwifiex/uap_event.c | 2 +- + drivers/net/wireless/mwifiex/uap_txrx.c | 6 +- + drivers/net/wireless/mwifiex/usb.c | 2 +- + drivers/net/wireless/mwifiex/usb.h | 2 +- + drivers/net/wireless/mwifiex/util.c | 2 +- + drivers/net/wireless/mwifiex/util.h | 2 +- + drivers/net/wireless/mwifiex/wmm.c | 11 +- + drivers/net/wireless/mwifiex/wmm.h | 2 +- + drivers/net/wireless/mwl8k.c | 5 - + drivers/net/wireless/orinoco/Kconfig | 4 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 1 - + drivers/net/wireless/p54/p54spi.c | 2 +- + drivers/net/wireless/prism54/oid_mgt.c | 1 - + drivers/net/wireless/rsi/rsi_91x_core.c | 85 +- + drivers/net/wireless/rsi/rsi_91x_debugfs.c | 10 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 143 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 239 +- + drivers/net/wireless/rsi/rsi_91x_pkt.c | 17 + + drivers/net/wireless/rsi/rsi_91x_sdio.c | 6 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 8 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 88 +- + drivers/net/wireless/rsi/rsi_main.h | 12 + + drivers/net/wireless/rsi/rsi_mgmt.h | 25 +- + drivers/net/wireless/rsi/rsi_sdio.h | 8 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 69 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 4 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 20 +- + drivers/net/wireless/rt2x00/rt2x00mmio.c | 8 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 21 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 1 + + drivers/net/wireless/rtl818x/rtl8180/dev.c | 78 +- + drivers/net/wireless/rtl818x/rtl8180/rtl8180.h | 1 + + .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h | 2 +- + drivers/net/wireless/rtlwifi/core.c | 1 - + drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c | 1 - + drivers/net/wireless/rtlwifi/rtl8188ee/reg.h | 1 + + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 3 +- + drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 1 + + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 3 +- + drivers/net/wireless/rtlwifi/rtl8192de/reg.h | 1 + + drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 4 - + drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 1 - + drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 3 +- + drivers/net/wireless/rtlwifi/rtl8723ae/reg.h | 1 + + drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c | 1 - + drivers/net/wireless/rtlwifi/rtl8723be/reg.h | 1 + + drivers/net/wireless/ti/wl1251/main.c | 3 +- + drivers/net/wireless/ti/wl12xx/main.c | 2 +- + drivers/net/wireless/ti/wl12xx/scan.c | 20 +- + drivers/net/wireless/ti/wl12xx/scan.h | 2 +- + drivers/net/wireless/ti/wl18xx/cmd.c | 89 + + drivers/net/wireless/ti/wl18xx/cmd.h | 19 +- + drivers/net/wireless/ti/wl18xx/event.c | 65 + + drivers/net/wireless/ti/wl18xx/event.h | 2 + + drivers/net/wireless/ti/wl18xx/main.c | 34 +- + drivers/net/wireless/ti/wl18xx/scan.c | 16 +- + drivers/net/wireless/ti/wl18xx/scan.h | 2 +- + drivers/net/wireless/ti/wl18xx/tx.c | 7 +- + drivers/net/wireless/ti/wl18xx/wl18xx.h | 2 +- + drivers/net/wireless/ti/wlcore/Makefile | 2 +- + drivers/net/wireless/ti/wlcore/cmd.c | 23 +- + drivers/net/wireless/ti/wlcore/cmd.h | 6 +- + drivers/net/wireless/ti/wlcore/debugfs.c | 2 +- + drivers/net/wireless/ti/wlcore/hw_ops.h | 27 + + drivers/net/wireless/ti/wlcore/main.c | 108 +- + drivers/net/wireless/ti/wlcore/scan.h | 2 +- + drivers/net/wireless/ti/wlcore/tx.c | 2 +- + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 197 + + drivers/net/wireless/ti/wlcore/vendor_cmd.h | 45 + + drivers/net/wireless/ti/wlcore/wlcore.h | 10 +- + drivers/net/wireless/ti/wlcore/wlcore_i.h | 20 +- + drivers/net/wireless/zd1211rw/Kconfig | 4 +- + drivers/net/xen-netback/common.h | 30 +- + drivers/net/xen-netback/interface.c | 74 +- + drivers/net/xen-netback/netback.c | 110 +- + drivers/net/xen-netback/xenbus.c | 178 +- + drivers/net/xen-netfront.c | 74 +- + drivers/nfc/Kconfig | 2 +- + drivers/nfc/Makefile | 3 +- + drivers/nfc/st21nfca/Makefile | 2 +- + drivers/nfc/st21nfca/i2c.c | 9 +- + drivers/nfc/st21nfca/st21nfca.c | 272 +- + drivers/nfc/st21nfca/st21nfca.h | 26 +- + drivers/nfc/st21nfca/st21nfca_dep.c | 661 ++ + drivers/nfc/st21nfca/st21nfca_dep.h | 43 + + drivers/nfc/st21nfcb/Kconfig | 22 + + drivers/nfc/st21nfcb/Makefile | 8 + + drivers/nfc/st21nfcb/i2c.c | 462 ++ + drivers/nfc/st21nfcb/ndlc.c | 298 + + drivers/nfc/st21nfcb/ndlc.h | 55 + + drivers/nfc/st21nfcb/st21nfcb.c | 129 + + drivers/nfc/st21nfcb/st21nfcb.h | 38 + + drivers/of/address.c | 36 + + drivers/ptp/ptp_chardev.c | 9 +- + drivers/regulator/88pm800.c | 1 - + drivers/regulator/Kconfig | 14 +- + drivers/regulator/Makefile | 1 + + drivers/regulator/ab8500.c | 38 +- + drivers/regulator/act8865-regulator.c | 329 +- + drivers/regulator/arizona-ldo1.c | 2 - + drivers/regulator/as3722-regulator.c | 4 +- + drivers/regulator/bcm590xx-regulator.c | 16 +- + drivers/regulator/core.c | 126 +- + drivers/regulator/da9211-regulator.c | 368 ++ + drivers/regulator/da9211-regulator.h | 271 + + drivers/regulator/lp872x.c | 9 - + drivers/regulator/lp8755.c | 23 +- + drivers/regulator/ltc3589.c | 2 +- + drivers/regulator/max8952.c | 34 +- + drivers/regulator/mc13xxx-regulator-core.c | 37 +- + drivers/regulator/mc13xxx.h | 1 - + drivers/regulator/palmas-regulator.c | 1104 +++- + drivers/regulator/s2mps11.c | 2 +- + drivers/regulator/s5m8767.c | 4 +- + drivers/regulator/tps65090-regulator.c | 76 +- + drivers/regulator/tps65217-regulator.c | 4 +- + drivers/regulator/tps65218-regulator.c | 52 +- + drivers/regulator/tps6586x-regulator.c | 129 +- + drivers/regulator/twl-regulator.c | 13 +- + drivers/s390/net/claw.c | 2 +- + drivers/s390/net/ctcm_main.c | 6 +- + drivers/s390/net/netiucv.c | 2 +- + drivers/s390/net/qeth_core.h | 7 + + drivers/s390/net/qeth_core_main.c | 39 + + drivers/s390/net/qeth_core_mpc.h | 17 + + drivers/s390/net/qeth_core_sys.c | 38 +- + drivers/s390/net/qeth_l2_main.c | 6 +- + drivers/s390/net/qeth_l3_main.c | 3 +- + drivers/sbus/char/bbc_envctrl.c | 6 + + drivers/sbus/char/bbc_i2c.c | 11 +- + drivers/sbus/char/display7seg.c | 10 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 363 +- + drivers/scsi/cxgbi/libcxgbi.c | 241 +- + drivers/scsi/cxgbi/libcxgbi.h | 21 +- + drivers/spi/Kconfig | 16 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-adi-v3.c | 5 +- + drivers/spi/spi-atmel.c | 22 +- + drivers/spi/spi-au1550.c | 6 +- + drivers/spi/spi-cadence.c | 37 +- + drivers/spi/spi-clps711x.c | 2 - + drivers/spi/spi-davinci.c | 72 +- + drivers/spi/spi-dw-mmio.c | 19 +- + drivers/spi/spi-efm32.c | 8 +- + drivers/spi/spi-falcon.c | 2 - + drivers/spi/spi-fsl-lib.c | 2 +- + drivers/spi/spi-fsl-spi.c | 2 +- + drivers/spi/spi-omap-100k.c | 2 - + drivers/spi/spi-omap-uwire.c | 11 +- + drivers/spi/spi-omap2-mcspi.c | 14 + + drivers/spi/spi-orion.c | 78 +- + drivers/spi/spi-pl022.c | 2 +- + drivers/spi/spi-qup.c | 36 +- + drivers/spi/spi-rockchip.c | 837 +++ + drivers/spi/spi-rspi.c | 45 +- + drivers/spi/spi-s3c64xx.c | 54 +- + drivers/spi/spi-sh-hspi.c | 2 +- + drivers/spi/spi-sh-msiof.c | 527 +- + drivers/spi/spi-sh.c | 15 +- + drivers/spi/spi-topcliff-pch.c | 12 +- + drivers/spi/spi-xilinx.c | 2 +- + drivers/spi/spi.c | 12 +- + drivers/ssb/pci.c | 113 +- + drivers/staging/gdm724x/gdm_lte.c | 2 +- + drivers/staging/gdm72xx/gdm_wimax.c | 3 +- + drivers/staging/media/Kconfig | 10 - + drivers/staging/media/Makefile | 5 - + drivers/staging/media/bcm2048/radio-bcm2048.c | 22 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 2 + + .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 1 - + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 5 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 4 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 1 - + drivers/staging/media/go7007/README | 137 - + drivers/staging/media/go7007/go7007.h | 40 - + drivers/staging/media/go7007/go7007.txt | 478 -- + drivers/staging/media/go7007/saa7134-go7007.c | 567 -- + drivers/staging/media/lirc/lirc_igorplugusb.c | 6 - + drivers/staging/media/lirc/lirc_imon.c | 9 +- + drivers/staging/media/lirc/lirc_parallel.c | 32 +- + drivers/staging/media/lirc/lirc_serial.c | 37 +- + drivers/staging/media/msi3101/Kconfig | 10 - + drivers/staging/media/msi3101/Makefile | 2 - + drivers/staging/media/omap4iss/iss.c | 86 +- + drivers/staging/media/omap4iss/iss.h | 2 +- + drivers/staging/media/omap4iss/iss_csi2.c | 2 +- + drivers/staging/media/omap4iss/iss_video.c | 22 +- + drivers/staging/media/rtl2832u_sdr/Kconfig | 7 - + drivers/staging/media/rtl2832u_sdr/Makefile | 6 - + drivers/staging/media/sn9c102/Kconfig | 17 - + drivers/staging/media/sn9c102/Makefile | 15 - + drivers/staging/media/sn9c102/sn9c102.h | 214 - + drivers/staging/media/sn9c102/sn9c102.txt | 592 -- + drivers/staging/media/sn9c102/sn9c102_config.h | 86 - + drivers/staging/media/sn9c102/sn9c102_core.c | 3465 ----------- + drivers/staging/media/sn9c102/sn9c102_devtable.h | 145 - + drivers/staging/media/sn9c102/sn9c102_hv7131d.c | 269 - + drivers/staging/media/sn9c102/sn9c102_hv7131r.c | 369 -- + drivers/staging/media/sn9c102/sn9c102_mi0343.c | 352 -- + drivers/staging/media/sn9c102/sn9c102_mi0360.c | 453 -- + drivers/staging/media/sn9c102/sn9c102_mt9v111.c | 260 - + drivers/staging/media/sn9c102/sn9c102_ov7630.c | 634 -- + drivers/staging/media/sn9c102/sn9c102_ov7660.c | 546 -- + drivers/staging/media/sn9c102/sn9c102_pas106b.c | 308 - + drivers/staging/media/sn9c102/sn9c102_pas202bcb.c | 340 -- + drivers/staging/media/sn9c102/sn9c102_sensor.h | 307 - + drivers/staging/media/sn9c102/sn9c102_tas5110c1b.c | 154 - + drivers/staging/media/sn9c102/sn9c102_tas5110d.c | 119 - + drivers/staging/media/sn9c102/sn9c102_tas5130d1b.c | 165 - + drivers/staging/media/solo6x10/TODO | 15 - + drivers/staging/vt6655/wpactl.c | 3 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/tty/n_gsm.c | 5 +- + drivers/tty/serial/sunsab.c | 9 + + drivers/usb/gadget/function/f_phonet.c | 3 +- + fs/compat_ioctl.c | 2 +- + fs/exec.c | 6 +- + fs/lockd/mon.c | 4 +- + fs/nfs/idmap.c | 10 +- + fs/proc/array.c | 18 +- + fs/timerfd.c | 77 +- + include/clocksource/pxa.h | 18 + + include/crypto/pkcs7.h | 36 + + include/crypto/public_key.h | 4 + + include/keys/big_key-type.h | 3 +- + include/keys/system_keyring.h | 10 +- + include/keys/user-type.h | 3 +- + include/linux/amd-iommu.h | 7 + + include/linux/arcdevice.h | 10 +- + include/linux/bcma/bcma.h | 27 +- + include/linux/bcma/bcma_driver_pcie2.h | 158 + + include/linux/capability.h | 5 +- + include/linux/clocksource.h | 2 - + include/linux/crc32.h | 20 +- + include/linux/device.h | 2 +- + include/linux/dmar.h | 50 +- + include/linux/filter.h | 112 +- + include/linux/hrtimer.h | 16 +- + include/linux/hw_random.h | 5 + + include/linux/ieee80211.h | 23 + + include/linux/if_bridge.h | 20 + + include/linux/iio/iio.h | 9 +- + include/linux/ima.h | 6 + + include/linux/intel-iommu.h | 3 + + include/linux/io.h | 2 + + include/linux/iommu.h | 32 +- + include/linux/iova.h | 5 + + include/linux/ipv6.h | 24 +- + include/linux/irq.h | 2 + + include/linux/irqchip/spear-shirq.h | 64 - + include/linux/irqdomain.h | 2 + + include/linux/isdn_ppp.h | 4 +- + include/linux/kernel.h | 2 +- + include/linux/key-type.h | 5 +- + include/linux/key.h | 2 + + include/linux/ktime.h | 228 +- + include/linux/mfd/palmas.h | 837 +++ + include/linux/mlx4/device.h | 18 + + include/linux/mlx5/device.h | 4 - + include/linux/mlx5/driver.h | 31 +- + include/linux/netdev_features.h | 8 + + include/linux/netdevice.h | 421 +- + include/linux/of_address.h | 11 + + include/linux/oid_registry.h | 8 +- + include/linux/omap-iommu.h | 37 +- + include/linux/pe.h | 448 ++ + include/linux/phy.h | 18 + + include/linux/platform_data/iommu-omap.h | 6 - + include/linux/platform_data/ntc_thermistor.h | 1 + + include/linux/platform_data/st21nfcb.h | 32 + + include/linux/ptp_classify.h | 5 +- + include/linux/regmap.h | 7 + + include/linux/regulator/ab8500.h | 14 - + include/linux/regulator/act8865.h | 23 +- + include/linux/regulator/consumer.h | 26 + + include/linux/regulator/da9211.h | 32 + + include/linux/rhashtable.h | 213 + + include/linux/rndis.h | 1 + + include/linux/rtnetlink.h | 1 + + include/linux/sched.h | 26 +- + include/linux/seccomp.h | 8 +- + include/linux/security.h | 17 + + include/linux/seqlock.h | 27 + + include/linux/sh_timer.h | 5 - + include/linux/skbuff.h | 44 +- + include/linux/spi/cc2520.h | 26 + + include/linux/spi/sh_msiof.h | 2 + + include/linux/ssb/ssb_regs.h | 37 + + include/linux/stmmac.h | 2 + + include/linux/syscalls.h | 5 + + include/linux/tcp.h | 3 - + include/linux/time.h | 65 +- + include/linux/time64.h | 190 + + include/linux/timekeeper_internal.h | 150 +- + include/linux/timekeeping.h | 209 + + include/linux/timerfd.h | 5 + + include/linux/tpm.h | 3 + + include/linux/usb/usbnet.h | 3 + + include/linux/verify_pefile.h | 18 + + include/media/atmel-isi.h | 4 + + include/media/blackfin/ppi.h | 4 +- + include/media/ir-kbd-i2c.h | 6 +- + include/media/rc-core.h | 71 +- + include/media/rc-map.h | 16 +- + include/media/v4l2-ctrls.h | 222 +- + include/media/v4l2-dev.h | 2 - + include/media/v4l2-ioctl.h | 2 + + include/media/v4l2-mem2mem.h | 2 + + include/media/videobuf-dma-sg.h | 3 + + include/media/videobuf2-core.h | 19 +- + include/net/6lowpan.h | 50 - + include/net/bluetooth/bluetooth.h | 18 +- + include/net/bluetooth/hci.h | 297 +- + include/net/bluetooth/hci_core.h | 187 +- + include/net/bluetooth/hci_sock.h | 175 + + include/net/bluetooth/l2cap.h | 46 +- + include/net/bluetooth/mgmt.h | 103 +- + include/net/bluetooth/sco.h | 30 - + include/net/cfg80211.h | 38 +- + include/net/dcbnl.h | 4 +- + include/net/flow_keys.h | 15 + + include/net/if_inet6.h | 1 + + include/net/inet_frag.h | 118 +- + include/net/inet_sock.h | 6 +- + include/net/inet_timewait_sock.h | 3 +- + include/net/ip.h | 21 +- + include/net/ip_tunnels.h | 1 + + include/net/ipv6.h | 71 +- + include/net/mac80211.h | 105 +- + include/net/mac802154.h | 19 + + include/net/netfilter/nf_conntrack_ecache.h | 26 +- + include/net/netfilter/nf_log.h | 42 +- + include/net/netfilter/xt_log.h | 54 - + include/net/netlabel.h | 94 +- + include/net/netlink.h | 6 +- + include/net/netns/conntrack.h | 6 +- + include/net/netns/ipv6.h | 1 + + include/net/netns/x_tables.h | 6 - + include/net/nfc/digital.h | 13 + + include/net/nfc/hci.h | 1 + + include/net/rtnetlink.h | 1 + + include/net/sch_generic.h | 2 +- + include/net/sctp/command.h | 39 +- + include/net/sctp/constants.h | 2 +- + include/net/sctp/sctp.h | 24 +- + include/net/sctp/structs.h | 15 +- + include/net/sctp/ulpevent.h | 14 +- + include/net/sock.h | 72 +- + include/net/tcp.h | 63 +- + include/net/udp.h | 29 + + include/net/udp_tunnel.h | 32 + + include/net/vxlan.h | 2 - + include/uapi/asm-generic/unistd.h | 6 +- + include/uapi/linux/can/netlink.h | 3 +- + include/uapi/linux/dcbnl.h | 3 +- + include/uapi/linux/errqueue.h | 20 + + include/uapi/linux/if_link.h | 6 + + include/uapi/linux/if_packet.h | 2 +- + include/uapi/linux/in6.h | 1 + + include/uapi/linux/ipv6.h | 1 + + include/uapi/linux/net_tstamp.h | 10 +- + include/uapi/linux/netdevice.h | 6 + + include/uapi/linux/netfilter/nf_tables.h | 4 + + include/uapi/linux/netfilter/xt_bpf.h | 4 +- + include/uapi/linux/netfilter_bridge/Kbuild | 1 - + include/uapi/linux/netfilter_bridge/ebt_ulog.h | 38 - + include/uapi/linux/netfilter_ipv4/Kbuild | 1 - + include/uapi/linux/netfilter_ipv4/ipt_ULOG.h | 49 - + include/uapi/linux/nl80211.h | 5 + + include/uapi/linux/openvswitch.h | 13 +- + include/uapi/linux/random.h | 9 + + include/uapi/linux/sctp.h | 102 +- + include/uapi/linux/seccomp.h | 7 + + include/uapi/linux/sysctl.h | 1 + + include/uapi/linux/tipc_config.h | 2 +- + include/uapi/linux/v4l2-controls.h | 32 + + include/uapi/linux/videodev2.h | 101 +- + kernel/Makefile | 26 +- + kernel/acct.c | 10 +- + kernel/audit.c | 2 +- + kernel/bpf/Makefile | 1 + + kernel/bpf/core.c | 534 ++ + kernel/capability.c | 4 + + kernel/debug/kdb/kdb_main.c | 2 +- + kernel/delayacct.c | 62 +- + kernel/fork.c | 54 +- + kernel/irq/generic-chip.c | 5 +- + kernel/irq/irqdomain.c | 2 +- + kernel/seccomp.c | 430 +- + kernel/sys.c | 4 +- + kernel/sys_ni.c | 3 + + kernel/sysctl_binary.c | 1 + + kernel/system_keyring.c | 1 + + kernel/time/Kconfig | 9 +- + kernel/time/Makefile | 19 + + kernel/time/clocksource.c | 12 +- + kernel/{ => time}/hrtimer.c | 125 +- + kernel/{ => time}/itimer.c | 0 + kernel/time/ntp.c | 15 +- + kernel/time/ntp_internal.h | 2 +- + kernel/{ => time}/posix-cpu-timers.c | 0 + kernel/{ => time}/posix-timers.c | 2 + + kernel/time/tick-internal.h | 2 + + kernel/{ => time}/time.c | 64 + + kernel/{ => time}/timeconst.bc | 0 + kernel/time/timekeeping.c | 1147 ++-- + kernel/time/timekeeping.h | 20 + + kernel/time/timekeeping_debug.c | 2 +- + kernel/time/timekeeping_internal.h | 17 +- + kernel/{ => time}/timer.c | 34 +- + kernel/time/udelay_test.c | 168 + + kernel/trace/trace.c | 11 +- + kernel/tsacct.c | 19 +- + lib/Kconfig | 3 +- + lib/Kconfig.debug | 17 + + lib/Makefile | 2 +- + lib/crc32.c | 153 +- + lib/devres.c | 2 - + lib/dynamic_debug.c | 8 +- + lib/iovec.c | 4 + + lib/net_utils.c | 10 +- + lib/random32.c | 49 +- + lib/rhashtable.c | 797 +++ + lib/test_bpf.c | 28 +- + net/6lowpan/Kconfig | 6 + + net/6lowpan/Makefile | 3 + + net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} | 296 +- + net/802/fc.c | 2 +- + net/802/fddi.c | 3 +- + net/802/hippi.c | 3 +- + net/8021q/vlan.c | 24 +- + net/8021q/vlan_dev.c | 2 + + net/8021q/vlanproc.c | 2 + + net/9p/client.c | 1 - + net/Kconfig | 1 + + net/Makefile | 3 +- + net/appletalk/ddp.c | 2 +- + net/appletalk/dev.c | 3 +- + net/atm/br2684.c | 4 +- + net/atm/clip.c | 3 +- + net/batman-adv/bat_iv_ogm.c | 13 +- + net/batman-adv/distributed-arp-table.c | 3 +- + net/batman-adv/fragmentation.c | 10 +- + net/batman-adv/hash.c | 6 +- + net/batman-adv/main.h | 22 +- + net/batman-adv/routing.c | 18 +- + net/batman-adv/soft-interface.c | 4 +- + net/batman-adv/sysfs.c | 24 +- + net/bluetooth/6lowpan.c | 857 ++- + net/bluetooth/6lowpan.h | 47 - + net/bluetooth/Kconfig | 7 +- + net/bluetooth/Makefile | 4 +- + net/bluetooth/a2mp.c | 8 +- + net/bluetooth/af_bluetooth.c | 2 +- + net/bluetooth/amp.c | 6 +- + net/bluetooth/bnep/core.c | 5 +- + net/bluetooth/cmtp/capi.c | 6 - + net/bluetooth/hci_conn.c | 191 +- + net/bluetooth/hci_core.c | 1190 ++-- + net/bluetooth/hci_event.c | 815 ++- + net/bluetooth/hci_sock.c | 33 +- + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap_core.c | 174 +- + net/bluetooth/l2cap_sock.c | 53 +- + net/bluetooth/mgmt.c | 1399 ++++- + net/bluetooth/rfcomm/core.c | 10 +- + net/bluetooth/rfcomm/sock.c | 3 +- + net/bluetooth/sco.c | 125 +- + net/bluetooth/smp.c | 246 +- + net/bluetooth/smp.h | 7 + + net/bridge/br_fdb.c | 26 +- + net/bridge/br_if.c | 2 +- + net/bridge/br_multicast.c | 37 + + net/bridge/br_netlink.c | 1 - + net/bridge/br_private.h | 2 +- + net/bridge/br_vlan.c | 6 +- + net/bridge/netfilter/Kconfig | 25 +- + net/bridge/netfilter/Makefile | 5 +- + net/bridge/netfilter/ebt_log.c | 47 +- + net/bridge/netfilter/ebt_ulog.c | 393 -- + net/bridge/netfilter/nf_log_bridge.c | 96 + + net/bridge/netfilter/nft_reject_bridge.c | 67 + + net/caif/caif_socket.c | 3 +- + net/caif/cfctrl.c | 1 - + net/ceph/crypto.c | 26 +- + net/core/dev.c | 53 +- + net/core/drop_monitor.c | 2 - + net/core/filter.c | 728 +-- + net/core/flow_dissector.c | 85 +- + net/core/net-sysfs.c | 154 +- + net/core/netpoll.c | 3 +- + net/core/pktgen.c | 111 +- + net/core/ptp_classifier.c | 70 +- + net/core/request_sock.c | 43 +- + net/core/rtnetlink.c | 107 +- + net/core/skbuff.c | 22 +- + net/core/sock.c | 52 +- + net/core/sock_diag.c | 4 +- + net/core/timestamping.c | 57 +- + net/dcb/dcbnl.c | 13 +- + net/dccp/ipv6.c | 2 +- + net/dccp/minisocks.c | 4 +- + net/dns_resolver/dns_key.c | 43 +- + net/dns_resolver/dns_query.c | 1 + + net/dsa/dsa.c | 3 +- + net/dsa/slave.c | 4 +- + net/ethernet/eth.c | 3 +- + net/hsr/Makefile | 3 +- + net/hsr/hsr_device.c | 580 +- + net/hsr/hsr_device.h | 12 +- + net/hsr/hsr_forward.c | 368 ++ + net/hsr/hsr_forward.h | 20 + + net/hsr/hsr_framereg.c | 477 +- + net/hsr/hsr_framereg.h | 45 +- + net/hsr/hsr_main.c | 425 +- + net/hsr/hsr_main.h | 61 +- + net/hsr/hsr_netlink.c | 102 +- + net/hsr/hsr_netlink.h | 11 +- + net/hsr/hsr_slave.c | 196 + + net/hsr/hsr_slave.h | 38 + + net/ieee802154/6lowpan_rtnl.c | 16 +- + net/ieee802154/Kconfig | 9 +- + net/ieee802154/Makefile | 5 +- + net/ieee802154/af_ieee802154.c | 26 +- + net/ieee802154/dgram.c | 28 +- + net/ieee802154/ieee802154.h | 2 +- + net/ieee802154/netlink.c | 4 +- + net/ieee802154/nl-mac.c | 48 +- + net/ieee802154/nl-phy.c | 23 +- + net/ieee802154/raw.c | 14 +- + net/ieee802154/reassembly.c | 69 +- + net/ieee802154/wpan-class.c | 10 +- + net/ipv4/Kconfig | 4 + + net/ipv4/Makefile | 1 + + net/ipv4/cipso_ipv4.c | 47 +- + net/ipv4/datagram.c | 1 + + net/ipv4/devinet.c | 36 +- + net/ipv4/gre_offload.c | 2 +- + net/ipv4/icmp.c | 6 +- + net/ipv4/igmp.c | 2 +- + net/ipv4/inet_fragment.c | 318 +- + net/ipv4/ip_fragment.c | 87 +- + net/ipv4/ip_output.c | 13 +- + net/ipv4/ip_sockglue.c | 2 +- + net/ipv4/ip_tunnel.c | 31 +- + net/ipv4/ip_vti.c | 54 +- + net/ipv4/ipconfig.c | 5 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/netfilter/Kconfig | 29 +- + net/ipv4/netfilter/Makefile | 5 +- + net/ipv4/netfilter/ipt_ULOG.c | 498 -- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 4 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 8 +- + net/ipv4/netfilter/nf_log_arp.c | 149 + + net/ipv4/netfilter/nf_log_ipv4.c | 385 ++ + net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 4 + + net/ipv4/netfilter/nf_nat_proto_gre.c | 2 +- + net/ipv4/netfilter/nf_nat_proto_icmp.c | 2 +- + net/ipv4/ping.c | 2 +- + net/ipv4/proc.c | 5 +- + net/ipv4/raw.c | 9 +- + net/ipv4/syncookies.c | 3 +- + net/ipv4/tcp.c | 22 +- + net/ipv4/tcp_input.c | 200 +- + net/ipv4/tcp_ipv4.c | 201 +- + net/ipv4/tcp_metrics.c | 1 - + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/tcp_offload.c | 18 + + net/ipv4/tcp_output.c | 18 +- + net/ipv4/tcp_timer.c | 4 +- + net/ipv4/tcp_vegas.c | 3 +- + net/ipv4/tcp_veno.c | 2 +- + net/ipv4/udp.c | 156 +- + net/ipv4/udp_offload.c | 76 + + net/ipv4/udp_tunnel.c | 100 + + net/ipv4/xfrm4_protocol.c | 2 +- + net/ipv6/addrconf.c | 148 +- + net/ipv6/af_inet6.c | 7 +- + net/ipv6/datagram.c | 1 + + net/ipv6/icmp.c | 13 +- + net/ipv6/ip6_gre.c | 13 +- + net/ipv6/ip6_output.c | 32 +- + net/ipv6/ip6_tunnel.c | 8 +- + net/ipv6/ip6_vti.c | 55 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/ipv6_sockglue.c | 13 +- + net/ipv6/ndisc.c | 58 +- + net/ipv6/netfilter/Kconfig | 5 + + net/ipv6/netfilter/Makefile | 3 + + net/ipv6/netfilter/ip6t_ipv6header.c | 1 - + net/ipv6/netfilter/nf_conntrack_reasm.c | 49 +- + net/ipv6/netfilter/nf_log_ipv6.c | 417 ++ + net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 4 + + net/ipv6/proc.c | 4 +- + net/ipv6/raw.c | 14 +- + net/ipv6/reassembly.c | 90 +- + net/ipv6/sit.c | 4 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/sysctl_net_ipv6.c | 9 + + net/ipv6/tcp_ipv6.c | 209 +- + net/ipv6/udp.c | 131 +- + net/irda/af_irda.c | 1 - + net/irda/irda_device.c | 3 +- + net/irda/irlan/irlan_common.c | 1 - + net/irda/irlan/irlan_eth.c | 2 +- + net/irda/irlmp.c | 3 +- + net/iucv/af_iucv.c | 4 +- + net/key/af_key.c | 3 - + net/l2tp/Kconfig | 1 + + net/l2tp/l2tp_core.c | 86 +- + net/l2tp/l2tp_eth.c | 3 +- + net/l2tp/l2tp_ip6.c | 2 +- + net/mac80211/Kconfig | 17 - + net/mac80211/Makefile | 6 +- + net/mac80211/agg-rx.c | 110 +- + net/mac80211/agg-tx.c | 8 +- + net/mac80211/cfg.c | 558 +- + net/mac80211/chan.c | 861 ++- + net/mac80211/debugfs_sta.c | 3 +- + net/mac80211/driver-ops.h | 20 +- + net/mac80211/ethtool.c | 244 + + net/mac80211/ht.c | 10 +- + net/mac80211/ibss.c | 15 +- + net/mac80211/ieee80211_i.h | 116 +- + net/mac80211/iface.c | 46 +- + net/mac80211/key.c | 3 - + net/mac80211/main.c | 10 +- + net/mac80211/mesh.c | 4 +- + net/mac80211/mesh_hwmp.c | 1 - + net/mac80211/mesh_plink.c | 30 +- + net/mac80211/mlme.c | 156 +- + net/mac80211/offchannel.c | 6 +- + net/mac80211/pm.c | 6 +- + net/mac80211/rate.h | 13 - + net/mac80211/rc80211_pid.h | 278 - + net/mac80211/rc80211_pid_algo.c | 478 -- + net/mac80211/rc80211_pid_debugfs.c | 228 - + net/mac80211/rx.c | 67 +- + net/mac80211/scan.c | 118 +- + net/mac80211/sta_info.c | 204 +- + net/mac80211/sta_info.h | 21 +- + net/mac80211/status.c | 7 +- + net/mac80211/tdls.c | 674 +- + net/mac80211/trace.h | 7 + + net/mac80211/tx.c | 170 +- + net/mac80211/util.c | 285 +- + net/mac80211/vht.c | 4 + + net/mac80211/wep.c | 20 - + net/mac80211/wpa.c | 2 +- + net/mac802154/ieee802154_dev.c | 70 +- + net/mac802154/llsec.c | 1 + + net/mac802154/mib.c | 7 +- + net/mac802154/tx.c | 1 + + net/netfilter/Kconfig | 4 + + net/netfilter/Makefile | 3 + + net/netfilter/ipvs/ip_vs_ctl.c | 86 - + net/netfilter/ipvs/ip_vs_sync.c | 3 +- + net/netfilter/ipvs/ip_vs_xmit.c | 2 +- + net/netfilter/nf_conntrack_core.c | 68 +- + net/netfilter/nf_conntrack_ecache.c | 96 +- + net/netfilter/nf_conntrack_netlink.c | 3 +- + net/netfilter/nf_log.c | 155 +- + net/netfilter/nf_log_common.c | 187 + + net/netfilter/nf_nat_core.c | 2 +- + net/netfilter/nf_nat_proto_common.c | 2 +- + net/netfilter/nf_nat_proto_dccp.c | 2 +- + net/netfilter/nf_nat_proto_sctp.c | 2 +- + net/netfilter/nf_nat_proto_tcp.c | 2 +- + net/netfilter/nf_nat_proto_udp.c | 2 +- + net/netfilter/nf_nat_proto_udplite.c | 2 +- + net/netfilter/nf_tables_api.c | 138 +- + net/netfilter/nfnetlink_acct.c | 12 +- + net/netfilter/nfnetlink_log.c | 4 + + net/netfilter/nft_hash.c | 291 +- + net/netfilter/nft_log.c | 98 +- + net/netfilter/x_tables.c | 23 +- + net/netfilter/xt_LED.c | 14 +- + net/netfilter/xt_LOG.c | 884 +-- + net/netfilter/xt_bpf.c | 6 +- + net/netfilter/xt_hashlimit.c | 31 +- + net/netlabel/netlabel_kapi.c | 328 +- + net/netlink/af_netlink.c | 308 +- + net/netlink/af_netlink.h | 18 +- + net/netlink/diag.c | 11 +- + net/netrom/af_netrom.c | 2 +- + net/nfc/digital.h | 3 + + net/nfc/digital_core.c | 27 +- + net/nfc/digital_dep.c | 13 +- + net/nfc/digital_technology.c | 96 +- + net/nfc/hci/core.c | 7 +- + net/nfc/nci/ntf.c | 4 +- + net/openvswitch/actions.c | 50 +- + net/openvswitch/datapath.c | 55 +- + net/openvswitch/datapath.h | 2 +- + net/openvswitch/vport-internal_dev.c | 24 +- + net/openvswitch/vport-internal_dev.h | 2 + + net/openvswitch/vport-vxlan.c | 5 +- + net/openvswitch/vport.c | 101 +- + net/openvswitch/vport.h | 27 +- + net/packet/af_packet.c | 14 +- + net/phonet/pep-gprs.c | 2 +- + net/rose/af_rose.c | 2 +- + net/rxrpc/ar-key.c | 167 +- + net/sched/act_mirred.c | 2 + + net/sched/cls_api.c | 11 +- + net/sched/cls_bpf.c | 12 +- + net/sched/cls_tcindex.c | 2 +- + net/sched/em_canid.c | 7 - + net/sched/sch_generic.c | 4 +- + net/sched/sch_teql.c | 4 +- + net/sctp/Makefile | 2 +- + net/sctp/command.c | 68 - + net/sctp/input.c | 5 - + net/sctp/ipv6.c | 156 +- + net/sctp/output.c | 73 +- + net/sctp/outqueue.c | 5 +- + net/sctp/protocol.c | 12 +- + net/sctp/sm_statefuns.c | 4 - + net/sctp/socket.c | 327 +- + net/sctp/sysctl.c | 5 +- + net/sctp/transport.c | 21 +- + net/sctp/ulpevent.c | 65 +- + net/socket.c | 39 +- + net/tipc/bcast.c | 87 +- + net/tipc/bcast.h | 5 +- + net/tipc/link.c | 794 +-- + net/tipc/link.h | 7 +- + net/tipc/msg.c | 381 +- + net/tipc/msg.h | 35 +- + net/tipc/name_distr.c | 76 +- + net/tipc/name_distr.h | 2 +- + net/tipc/net.c | 63 +- + net/tipc/net.h | 2 - + net/tipc/node.c | 38 +- + net/tipc/node.h | 17 + + net/tipc/node_subscr.c | 6 +- + net/tipc/port.c | 440 +- + net/tipc/port.h | 50 - + net/tipc/socket.c | 551 +- + net/tipc/socket.h | 16 + + net/wireless/Kconfig | 6 + + net/wireless/core.c | 3 - + net/wireless/ethtool.c | 86 +- + net/wireless/ethtool.h | 6 - + net/wireless/genregdb.awk | 35 +- + net/wireless/nl80211.c | 18 +- + net/wireless/rdev-ops.h | 54 +- + net/wireless/trace.h | 59 +- + scripts/selinux/genheaders/Makefile | 1 - + scripts/selinux/mdp/Makefile | 2 +- + security/apparmor/domain.c | 4 +- + security/capability.c | 6 + + security/commoncap.c | 75 +- + security/integrity/digsig.c | 28 + + security/integrity/ima/Kconfig | 10 + + security/integrity/ima/ima.h | 15 +- + security/integrity/ima/ima_appraise.c | 10 +- + security/integrity/ima/ima_crypto.c | 312 +- + security/integrity/ima/ima_main.c | 28 +- + security/integrity/ima/ima_policy.c | 13 +- + security/integrity/integrity.h | 14 +- + security/keys/big_key.c | 41 +- + security/keys/key.c | 49 +- + security/keys/keyctl.c | 21 +- + security/keys/keyring.c | 34 +- + security/keys/request_key_auth.c | 13 + + security/keys/user_defined.c | 41 +- + security/security.c | 11 + + security/selinux/hooks.c | 14 + + security/selinux/include/netif.h | 2 + + security/selinux/include/netnode.h | 2 + + security/selinux/include/netport.h | 2 + + security/selinux/include/security.h | 3 +- + security/selinux/netif.c | 15 +- + security/selinux/netnode.c | 15 +- + security/selinux/netport.c | 15 +- + security/selinux/ss/conditional.c | 11 +- + security/selinux/ss/ebitmap.c | 133 +- + security/selinux/ss/ebitmap.h | 8 +- + security/selinux/ss/policydb.c | 141 +- + security/selinux/ss/services.c | 41 +- + security/smack/smack_access.c | 11 +- + security/smack/smack_lsm.c | 6 +- + security/smack/smackfs.c | 14 +- + security/tomoyo/audit.c | 8 +- + security/tomoyo/common.c | 4 +- + tools/time/udelay_test.sh | 66 + + 2046 files changed, 107577 insertions(+), 58442 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-iommu + create mode 100644 Documentation/ABI/testing/sysfs-class-iommu-amd-iommu + create mode 100644 Documentation/ABI/testing/sysfs-class-iommu-intel-iommu + create mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-cs08.xml + create mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-cs14le.xml + create mode 100644 Documentation/DocBook/media/v4l/pixfmt-sdr-ru12le.xml + create mode 100644 Documentation/devicetree/bindings/hwmon/ibmpowernv.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/pwm-fan.txt + rename Documentation/devicetree/bindings/{arm/atmel-aic.txt => interrupt-controller/atmel,aic.txt} (100%) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/opencores,or1k-pic.txt + create mode 100644 Documentation/devicetree/bindings/iommu/iommu.txt + create mode 100644 Documentation/devicetree/bindings/media/atmel-isi.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9m111.txt + create mode 100644 Documentation/devicetree/bindings/media/pxa-camera.txt + create mode 100644 Documentation/devicetree/bindings/media/rcar_vin.txt + create mode 100644 Documentation/devicetree/bindings/media/sunxi-ir.txt + create mode 100644 Documentation/devicetree/bindings/net/ieee802154/cc2520.txt + create mode 100644 Documentation/devicetree/bindings/net/marvell-pp2.txt + create mode 100644 Documentation/devicetree/bindings/net/nfc/st21nfcb.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt + create mode 100644 Documentation/devicetree/bindings/regulator/tps65218.txt + create mode 100644 Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-rockchip.txt + create mode 100644 Documentation/devicetree/bindings/timer/cirrus,clps711x-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,cmt.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,mtu2.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,tmu.txt + create mode 100644 Documentation/hwmon/ibmpowernv + create mode 100644 Documentation/hwmon/powr1220 + create mode 100644 Documentation/hwmon/pwm-fan + create mode 100644 Documentation/hwmon/tmp103 + create mode 100644 Documentation/hwmon/tps40422 + create mode 100644 Documentation/timers/timekeeping.txt + delete mode 100644 arch/arm/mach-pxa/time.c + create mode 100644 arch/sparc/boot/install.sh + create mode 100644 crypto/asymmetric_keys/mscode.asn1 + create mode 100644 crypto/asymmetric_keys/mscode_parser.c + create mode 100644 crypto/asymmetric_keys/pkcs7.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs7_key_type.c + create mode 100644 crypto/asymmetric_keys/pkcs7_parser.c + create mode 100644 crypto/asymmetric_keys/pkcs7_parser.h + create mode 100644 crypto/asymmetric_keys/pkcs7_trust.c + create mode 100644 crypto/asymmetric_keys/pkcs7_verify.c + create mode 100644 crypto/asymmetric_keys/verify_pefile.c + create mode 100644 crypto/asymmetric_keys/verify_pefile.h + create mode 100644 drivers/bcma/driver_pcie2.c + create mode 100644 drivers/clocksource/clps711x-timer.c + create mode 100644 drivers/clocksource/mtk_timer.c + create mode 100644 drivers/clocksource/pxa_timer.c + create mode 100644 drivers/hwmon/ibmpowernv.c + create mode 100644 drivers/hwmon/pmbus/tps40422.c + create mode 100644 drivers/hwmon/powr1220.c + create mode 100644 drivers/hwmon/pwm-fan.c + create mode 100644 drivers/hwmon/tmp103.c + create mode 100644 drivers/iommu/iommu-sysfs.c + delete mode 100644 drivers/iommu/omap-iovmm.c + delete mode 100644 drivers/iommu/pci.h + create mode 100644 drivers/irqchip/irq-atmel-aic-common.c + create mode 100644 drivers/irqchip/irq-atmel-aic-common.h + create mode 100644 drivers/irqchip/irq-atmel-aic.c + create mode 100644 drivers/irqchip/irq-atmel-aic5.c + create mode 100644 drivers/irqchip/irq-or1k-pic.c + rename drivers/{staging/media/rtl2832u_sdr => media/dvb-frontends}/rtl2832_sdr.c (94%) + rename drivers/{staging/media/rtl2832u_sdr => media/dvb-frontends}/rtl2832_sdr.h (100%) + create mode 100644 drivers/media/dvb-frontends/si2165.c + create mode 100644 drivers/media/dvb-frontends/si2165.h + create mode 100644 drivers/media/dvb-frontends/si2165_priv.h + rename drivers/{staging/media => media/pci}/solo6x10/Kconfig (93%) + rename drivers/{staging/media => media/pci}/solo6x10/Makefile (82%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-core.c (98%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-disp.c (95%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-eeprom.c (94%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-enc.c (97%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-g723.c (98%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-gpio.c (92%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-i2c.c (97%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-jpeg.h (96%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-offsets.h (93%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-p2m.c (97%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-regs.h (99%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.c (99%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-tw28.h (91%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2-enc.c (90%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10-v4l2.c (98%) + rename drivers/{staging/media => media/pci}/solo6x10/solo6x10.h (89%) + create mode 100644 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c + create mode 100644 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h + delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c + delete mode 100644 drivers/media/rc/ir-rc5-sz-decoder.c + create mode 100644 drivers/media/rc/ir-xmp-decoder.c + rename drivers/media/rc/{ir-raw.c => rc-ir-raw.c} (97%) + create mode 100644 drivers/media/rc/sunxi-cir.c + rename drivers/{staging/media/msi3101 => media/tuners}/msi001.c (99%) + create mode 100644 drivers/media/usb/airspy/Kconfig + create mode 100644 drivers/media/usb/airspy/Makefile + create mode 100644 drivers/media/usb/airspy/airspy.c + create mode 100644 drivers/media/usb/au0828/au0828-input.c + rename drivers/{staging/media => media/usb}/go7007/Kconfig (100%) + rename drivers/{staging/media => media/usb}/go7007/Makefile (68%) + rename drivers/{staging/media => media/usb}/go7007/go7007-driver.c (86%) + rename drivers/{staging/media => media/usb}/go7007/go7007-fw.c (97%) + rename drivers/{staging/media => media/usb}/go7007/go7007-i2c.c (96%) + rename drivers/{staging/media => media/usb}/go7007/go7007-loader.c (94%) + rename drivers/{staging/media => media/usb}/go7007/go7007-priv.h (90%) + rename drivers/{staging/media => media/usb}/go7007/go7007-usb.c (99%) + rename drivers/{staging/media => media/usb}/go7007/go7007-v4l2.c (80%) + rename drivers/{staging/media => media/usb}/go7007/s2250-board.c (98%) + rename drivers/{staging/media => media/usb}/go7007/snd-go7007.c (97%) + create mode 100644 drivers/media/usb/msi2500/Kconfig + create mode 100644 drivers/media/usb/msi2500/Makefile + rename drivers/{staging/media/msi3101/sdr-msi3101.c => media/usb/msi2500/msi2500.c} (60%) + create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-dcb.c + create mode 100644 drivers/net/ethernet/amd/xgbe/xgbe-ptp.c + create mode 100644 drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h + create mode 100644 drivers/net/ethernet/cisco/enic/enic_clsf.c + create mode 100644 drivers/net/ethernet/cisco/enic/enic_clsf.h + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_fcoe.c + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_fcoe.h + create mode 100644 drivers/net/ethernet/marvell/mvpp2.c + create mode 100644 drivers/net/ieee802154/cc2520.c + create mode 100644 drivers/net/wireless/ath/ath9k/channel.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/commonring.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/commonring.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/feature.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/feature.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/flowring.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/flowring.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/of.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/of.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/pcie.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/pcie.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/vendor.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/vendor.h + create mode 100644 drivers/net/wireless/iwlwifi/mvm/coex_legacy.c + create mode 100644 drivers/net/wireless/ti/wlcore/vendor_cmd.c + create mode 100644 drivers/net/wireless/ti/wlcore/vendor_cmd.h + create mode 100644 drivers/nfc/st21nfca/st21nfca_dep.c + create mode 100644 drivers/nfc/st21nfca/st21nfca_dep.h + create mode 100644 drivers/nfc/st21nfcb/Kconfig + create mode 100644 drivers/nfc/st21nfcb/Makefile + create mode 100644 drivers/nfc/st21nfcb/i2c.c + create mode 100644 drivers/nfc/st21nfcb/ndlc.c + create mode 100644 drivers/nfc/st21nfcb/ndlc.h + create mode 100644 drivers/nfc/st21nfcb/st21nfcb.c + create mode 100644 drivers/nfc/st21nfcb/st21nfcb.h + create mode 100644 drivers/regulator/da9211-regulator.c + create mode 100644 drivers/regulator/da9211-regulator.h + create mode 100644 drivers/spi/spi-rockchip.c + delete mode 100644 drivers/staging/media/go7007/README + delete mode 100644 drivers/staging/media/go7007/go7007.h + delete mode 100644 drivers/staging/media/go7007/go7007.txt + delete mode 100644 drivers/staging/media/go7007/saa7134-go7007.c + delete mode 100644 drivers/staging/media/msi3101/Kconfig + delete mode 100644 drivers/staging/media/msi3101/Makefile + delete mode 100644 drivers/staging/media/rtl2832u_sdr/Kconfig + delete mode 100644 drivers/staging/media/rtl2832u_sdr/Makefile + delete mode 100644 drivers/staging/media/sn9c102/Kconfig + delete mode 100644 drivers/staging/media/sn9c102/Makefile + delete mode 100644 drivers/staging/media/sn9c102/sn9c102.h + delete mode 100644 drivers/staging/media/sn9c102/sn9c102.txt + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_config.h + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_core.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_devtable.h + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_hv7131d.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_hv7131r.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_mi0343.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_mi0360.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_mt9v111.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_ov7630.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_ov7660.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_pas106b.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_pas202bcb.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_sensor.h + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_tas5110c1b.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_tas5110d.c + delete mode 100644 drivers/staging/media/sn9c102/sn9c102_tas5130d1b.c + delete mode 100644 drivers/staging/media/solo6x10/TODO + create mode 100644 include/clocksource/pxa.h + create mode 100644 include/crypto/pkcs7.h + create mode 100644 include/linux/bcma/bcma_driver_pcie2.h + delete mode 100644 include/linux/irqchip/spear-shirq.h + create mode 100644 include/linux/pe.h + create mode 100644 include/linux/platform_data/st21nfcb.h + create mode 100644 include/linux/regulator/da9211.h + create mode 100644 include/linux/rhashtable.h + create mode 100644 include/linux/spi/cc2520.h + create mode 100644 include/linux/time64.h + create mode 100644 include/linux/timekeeping.h + create mode 100644 include/linux/verify_pefile.h + create mode 100644 include/net/bluetooth/hci_sock.h + delete mode 100644 include/net/netfilter/xt_log.h + create mode 100644 include/net/udp_tunnel.h + delete mode 100644 include/uapi/linux/netfilter_bridge/ebt_ulog.h + delete mode 100644 include/uapi/linux/netfilter_ipv4/ipt_ULOG.h + create mode 100644 kernel/bpf/Makefile + create mode 100644 kernel/bpf/core.c + rename kernel/{ => time}/hrtimer.c (94%) + rename kernel/{ => time}/itimer.c (100%) + rename kernel/{ => time}/posix-cpu-timers.c (100%) + rename kernel/{ => time}/posix-timers.c (99%) + rename kernel/{ => time}/time.c (92%) + rename kernel/{ => time}/timeconst.bc (100%) + create mode 100644 kernel/time/timekeeping.h + rename kernel/{ => time}/timer.c (99%) + create mode 100644 kernel/time/udelay_test.c + create mode 100644 lib/rhashtable.c + create mode 100644 net/6lowpan/Kconfig + create mode 100644 net/6lowpan/Makefile + rename net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} (74%) + delete mode 100644 net/bluetooth/6lowpan.h + delete mode 100644 net/bridge/netfilter/ebt_ulog.c + create mode 100644 net/bridge/netfilter/nf_log_bridge.c + create mode 100644 net/bridge/netfilter/nft_reject_bridge.c + create mode 100644 net/hsr/hsr_forward.c + create mode 100644 net/hsr/hsr_forward.h + create mode 100644 net/hsr/hsr_slave.c + create mode 100644 net/hsr/hsr_slave.h + delete mode 100644 net/ipv4/netfilter/ipt_ULOG.c + create mode 100644 net/ipv4/netfilter/nf_log_arp.c + create mode 100644 net/ipv4/netfilter/nf_log_ipv4.c + create mode 100644 net/ipv4/udp_tunnel.c + create mode 100644 net/ipv6/netfilter/nf_log_ipv6.c + create mode 100644 net/mac80211/ethtool.c + delete mode 100644 net/mac80211/rc80211_pid.h + delete mode 100644 net/mac80211/rc80211_pid_algo.c + delete mode 100644 net/mac80211/rc80211_pid_debugfs.c + create mode 100644 net/netfilter/nf_log_common.c + delete mode 100644 net/sctp/command.c + delete mode 100644 net/wireless/ethtool.h + create mode 100755 tools/time/udelay_test.sh +Merging fixes/master (1795cd9b3a91 Linux 3.16-rc5) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (dd5a6752ae7d firmware: Create directories for external firmware) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (6bf755db4d5e ARM: 8124/1: don't enter kgdb when userspace executes a kgdb break instruction) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (9117710a5997 m68k/sun3: Remove define statement no longer needed) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging mips-fixes/mips-fixes (08a9c3c9afcf MIPS: OCTEON: make get_system_type() thread-safe) +$ git merge mips-fixes/mips-fixes +Auto-merging arch/mips/kernel/scall64-o32.S +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/setup.c | 18 ++++++--- + arch/mips/include/asm/eva.h | 43 ++++++++++++++++++++++ + .../include/asm/mach-malta/kernel-entry-init.h | 22 ++++++++--- + arch/mips/include/asm/syscall.h | 8 ++-- + arch/mips/kernel/cps-vec.S | 4 ++ + arch/mips/kernel/ptrace.c | 3 +- + arch/mips/kernel/scall64-o32.S | 12 ++++-- + arch/mips/math-emu/cp1emu.c | 2 +- + 8 files changed, 92 insertions(+), 20 deletions(-) + create mode 100644 arch/mips/include/asm/eva.h +Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (caa9199b0efd sparc: Hook up seccomp and getrandom system calls.) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/uapi/asm/unistd.h | 4 +++- + arch/sparc/kernel/smp_32.c | 2 +- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 ++-- + 4 files changed, 7 insertions(+), 5 deletions(-) +Merging net/master (753a2ad54ef4 net: reallocate new socket option number for IPV6_AUTOFLOWLABEL) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 7 +++---- + drivers/net/hyperv/hyperv_net.h | 2 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- + include/net/sock.h | 6 ++++-- + include/uapi/linux/in6.h | 2 +- + net/ipv4/tcp.c | 12 +++++++----- + net/ipv4/tcp_offload.c | 8 ++++---- + net/socket.c | 20 +++++++++++++------- + 8 files changed, 34 insertions(+), 25 deletions(-) +Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (68a9edd18c62 sound: oss: Remove typedefs wanc_info and wavnc_port_info) +$ git merge sound-current/for-linus +Removing sound/soc/samsung/dma.c +Removing sound/soc/kirkwood/kirkwood-t5325.c +Removing sound/soc/kirkwood/kirkwood-openrd.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak5386.txt | 4 + + Documentation/devicetree/bindings/sound/cs4265.txt | 29 + + .../devicetree/bindings/sound/fsl,asrc.txt | 60 + + .../devicetree/bindings/sound/max98090.txt | 2 +- + .../devicetree/bindings/sound/renesas,rsnd.txt | 9 + + .../devicetree/bindings/sound/rockchip-i2s.txt | 37 + + .../bindings/sound/samsung,odroidx2-max98090.txt | 35 + + .../devicetree/bindings/sound/sirf-usp.txt | 27 + + Documentation/devicetree/bindings/sound/snow.txt | 5 + + .../devicetree/bindings/sound/tas2552.txt | 26 + + .../devicetree/bindings/sound/ti,tas5086.txt | 5 + + Documentation/devicetree/bindings/sound/wm8904.txt | 33 + + Documentation/sound/alsa/ALSA-Configuration.txt | 4 +- + Documentation/sound/alsa/HD-Audio-Models.txt | 5 + + MAINTAINERS | 7 + + arch/arm/mach-shmobile/board-armadillo800eva.c | 4 + + arch/arm/mach-shmobile/board-kzm9g.c | 2 + + arch/arm/mach-shmobile/board-mackerel.c | 4 + + arch/sh/boards/mach-ecovec24/setup.c | 2 + + arch/x86/include/asm/platform_sst_audio.h | 78 + + drivers/dma/edma.c | 1 + + drivers/misc/atmel-ssc.c | 13 + + include/linux/atmel-ssc.h | 13 + + include/linux/dmaengine.h | 1 + + include/linux/mfd/arizona/core.h | 6 + + include/linux/platform_data/asoc-s3c.h | 9 - + include/linux/platform_data/dma-imx.h | 1 + + include/sound/control.h | 7 +- + include/sound/pcm.h | 11 +- + include/sound/rcar_snd.h | 1 + + include/sound/rt286.h | 19 + + include/sound/rt5670.h | 27 + + include/sound/soc-dai.h | 5 +- + include/sound/soc-dapm.h | 8 +- + include/sound/soc.h | 94 +- + include/sound/tas2552-plat.h | 25 + + include/sound/wm8962.h | 1 + + include/trace/events/asoc.h | 6 +- + include/uapi/sound/asound.h | 9 +- + sound/aoa/soundbus/i2sbus/core.c | 12 +- + sound/arm/pxa2xx-ac97-lib.c | 12 +- + sound/core/compress_offload.c | 2 +- + sound/core/control.c | 6 +- + sound/core/pcm_compat.c | 8 +- + sound/core/pcm_dmaengine.c | 4 +- + sound/core/pcm_native.c | 9 +- + sound/core/seq/seq_memory.c | 4 +- + sound/firewire/Kconfig | 14 +- + sound/firewire/fireworks/fireworks_proc.c | 4 +- + sound/oss/mpu401.c | 2 +- + sound/oss/opl3.c | 4 +- + sound/oss/pss.c | 46 +- + sound/oss/uart401.c | 40 +- + sound/oss/waveartist.c | 157 +- + sound/pci/Kconfig | 4 +- + sound/pci/echoaudio/echoaudio.c | 6 - + sound/pci/hda/dell_wmi_helper.c | 76 + + sound/pci/hda/hda_auto_parser.c | 17 +- + sound/pci/hda/hda_codec.c | 45 +- + sound/pci/hda/hda_codec.h | 4 +- + sound/pci/hda/hda_controller.c | 203 +- + sound/pci/hda/hda_controller.h | 9 +- + sound/pci/hda/hda_eld.c | 46 +- + sound/pci/hda/hda_generic.c | 22 +- + sound/pci/hda/hda_i915.c | 4 +- + sound/pci/hda/hda_intel.c | 372 ++- + sound/pci/hda/hda_local.h | 9 +- + sound/pci/hda/hda_priv.h | 253 +- + sound/pci/hda/hda_tegra.c | 36 +- + sound/pci/hda/patch_ca0132.c | 6 +- + sound/pci/hda/patch_cirrus.c | 4 +- + sound/pci/hda/patch_cmedia.c | 624 +---- + sound/pci/hda/patch_conexant.c | 2715 +------------------- + sound/pci/hda/patch_hdmi.c | 13 +- + sound/pci/hda/patch_realtek.c | 170 +- + sound/pci/hda/patch_sigmatel.c | 29 +- + sound/pci/ice1712/ice1712.h | 15 +- + sound/pci/mixart/mixart_core.c | 4 +- + sound/pci/oxygen/virtuoso.c | 1 + + sound/pci/oxygen/xonar_pcm179x.c | 12 +- + sound/pci/riptide/riptide.c | 4 +- + sound/pci/trident/trident_main.c | 2 - + sound/pci/trident/trident_memory.c | 3 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/atmel/atmel_ssc_dai.c | 34 +- + sound/soc/atmel/atmel_wm8904.c | 50 - + sound/soc/blackfin/bf5xx-i2s-pcm.c | 8 +- + sound/soc/codecs/88pm860x-codec.c | 12 +- + sound/soc/codecs/Kconfig | 27 +- + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ac97.c | 4 +- + sound/soc/codecs/adau1701.c | 6 +- + sound/soc/codecs/adau17x1.c | 8 +- + sound/soc/codecs/adau1977.c | 2 +- + sound/soc/codecs/ak4642.c | 4 +- + sound/soc/codecs/ak5386.c | 50 + + sound/soc/codecs/arizona.c | 288 ++- + sound/soc/codecs/arizona.h | 1 + + sound/soc/codecs/cs4265.c | 682 +++++ + sound/soc/codecs/cs4265.h | 64 + + sound/soc/codecs/cs4270.c | 4 +- + sound/soc/codecs/cs42l52.c | 14 +- + sound/soc/codecs/cs42l56.c | 76 +- + sound/soc/codecs/cs42l73.c | 6 +- + sound/soc/codecs/cs42xx8.c | 5 +- + sound/soc/codecs/cs42xx8.h | 8 +- + sound/soc/codecs/cx20442.c | 10 +- + sound/soc/codecs/max98088.c | 6 +- + sound/soc/codecs/max98090.c | 44 +- + sound/soc/codecs/max98095.c | 12 +- + sound/soc/codecs/mc13783.c | 6 +- + sound/soc/codecs/pcm1792a.c | 3 + + sound/soc/codecs/pcm1792a.h | 3 +- + sound/soc/codecs/rl6231.c | 19 - + sound/soc/codecs/rt286.c | 1222 +++++++++ + sound/soc/codecs/rt286.h | 198 ++ + sound/soc/codecs/rt5631.c | 10 +- + sound/soc/codecs/rt5640.c | 10 +- + sound/soc/codecs/rt5645.c | 10 +- + sound/soc/codecs/rt5651.c | 10 +- + sound/soc/codecs/rt5670-dsp.h | 54 + + sound/soc/codecs/rt5670.c | 2657 +++++++++++++++++++ + sound/soc/codecs/rt5670.h | 2000 ++++++++++++++ + sound/soc/codecs/rt5677.c | 272 +- + sound/soc/codecs/rt5677.h | 15 - + sound/soc/codecs/sgtl5000.c | 25 +- + sound/soc/codecs/si476x.c | 10 +- + sound/soc/codecs/sirf-audio-codec.c | 4 +- + sound/soc/codecs/sn95031.c | 6 +- + sound/soc/codecs/spdif_transmitter.c | 2 +- + sound/soc/codecs/ssm2518.c | 6 +- + sound/soc/codecs/ssm2602.c | 10 +- + sound/soc/codecs/sta32x.c | 19 +- + sound/soc/codecs/sta529.c | 12 +- + sound/soc/codecs/tas2552.c | 544 ++++ + sound/soc/codecs/tas2552.h | 129 + + sound/soc/codecs/tas5086.c | 75 +- + sound/soc/codecs/tlv320aic23.c | 10 +- + sound/soc/codecs/tlv320aic26.c | 14 +- + sound/soc/codecs/tlv320aic31xx.c | 40 +- + sound/soc/codecs/tlv320aic32x4.c | 31 +- + sound/soc/codecs/tlv320aic3x.c | 21 +- + sound/soc/codecs/tlv320dac33.c | 12 +- + sound/soc/codecs/tpa6130a2.c | 4 +- + sound/soc/codecs/twl4030.c | 19 +- + sound/soc/codecs/uda134x.c | 10 +- + sound/soc/codecs/wl1273.c | 9 +- + sound/soc/codecs/wm0010.c | 14 +- + sound/soc/codecs/wm1250-ev1.c | 1 - + sound/soc/codecs/wm2000.c | 4 +- + sound/soc/codecs/wm5100.c | 3 +- + sound/soc/codecs/wm5102.c | 65 + + sound/soc/codecs/wm5110.c | 4 + + sound/soc/codecs/wm8350.c | 13 +- + sound/soc/codecs/wm8400.c | 10 +- + sound/soc/codecs/wm8510.c | 10 +- + sound/soc/codecs/wm8523.c | 10 +- + sound/soc/codecs/wm8580.c | 10 +- + sound/soc/codecs/wm8711.c | 8 +- + sound/soc/codecs/wm8728.c | 8 +- + sound/soc/codecs/wm8731.c | 8 +- + sound/soc/codecs/wm8737.c | 10 +- + sound/soc/codecs/wm8741.c | 14 +- + sound/soc/codecs/wm8750.c | 10 +- + sound/soc/codecs/wm8753.c | 20 +- + sound/soc/codecs/wm8770.c | 10 +- + sound/soc/codecs/wm8804.c | 10 +- + sound/soc/codecs/wm8900.c | 10 +- + sound/soc/codecs/wm8903.c | 13 +- + sound/soc/codecs/wm8904.c | 27 +- + sound/soc/codecs/wm8940.c | 12 +- + sound/soc/codecs/wm8955.c | 10 +- + sound/soc/codecs/wm8958-dsp2.c | 24 +- + sound/soc/codecs/wm8960.c | 17 +- + sound/soc/codecs/wm8961.c | 10 +- + sound/soc/codecs/wm8962.c | 29 +- + sound/soc/codecs/wm8971.c | 10 +- + sound/soc/codecs/wm8974.c | 10 +- + sound/soc/codecs/wm8978.c | 14 +- + sound/soc/codecs/wm8983.c | 12 +- + sound/soc/codecs/wm8985.c | 15 +- + sound/soc/codecs/wm8988.c | 10 +- + sound/soc/codecs/wm8990.c | 10 +- + sound/soc/codecs/wm8991.c | 10 +- + sound/soc/codecs/wm8993.c | 10 +- + sound/soc/codecs/wm8994.c | 35 +- + sound/soc/codecs/wm8995.c | 12 +- + sound/soc/codecs/wm8996.c | 6 +- + sound/soc/codecs/wm8997.c | 2 + + sound/soc/codecs/wm9081.c | 10 +- + sound/soc/codecs/wm9090.c | 4 +- + sound/soc/codecs/wm9713.c | 10 +- + sound/soc/codecs/wm_adsp.c | 6 +- + sound/soc/codecs/wm_hubs.c | 4 +- + sound/soc/davinci/Kconfig | 25 +- + sound/soc/davinci/Makefile | 2 + + sound/soc/davinci/davinci-mcasp.c | 93 +- + sound/soc/davinci/edma-pcm.c | 2 +- + sound/soc/davinci/edma-pcm.h | 7 + + sound/soc/fsl/Kconfig | 16 +- + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/fsl_asrc.c | 995 +++++++ + sound/soc/fsl/fsl_asrc.h | 461 ++++ + sound/soc/fsl/fsl_asrc_dma.c | 391 +++ + sound/soc/fsl/fsl_esai.c | 2 + + sound/soc/fsl/fsl_sai.c | 39 +- + sound/soc/fsl/fsl_spdif.c | 88 +- + sound/soc/fsl/fsl_spdif.h | 10 +- + sound/soc/fsl/fsl_ssi.c | 6 +- + sound/soc/fsl/imx-audmux.c | 8 +- + sound/soc/generic/simple-card.c | 13 +- + sound/soc/intel/Kconfig | 12 + + sound/soc/intel/Makefile | 2 + + sound/soc/intel/broadwell.c | 251 ++ + sound/soc/intel/byt-max98090.c | 27 +- + sound/soc/intel/byt-rt5640.c | 1 + + sound/soc/intel/sst-atom-controls.h | 30 + + sound/soc/intel/sst-baytrail-ipc.c | 30 + + sound/soc/intel/sst-baytrail-pcm.c | 2 +- + sound/soc/intel/sst-dsp.c | 10 +- + sound/soc/intel/sst-dsp.h | 39 +- + sound/soc/intel/sst-haswell-dsp.c | 70 +- + sound/soc/intel/sst-haswell-ipc.c | 40 +- + sound/soc/intel/sst-haswell-pcm.c | 27 +- + sound/soc/intel/sst-mfld-dsp.h | 429 +++- + sound/soc/intel/sst-mfld-platform-compress.c | 11 +- + sound/soc/intel/sst-mfld-platform-pcm.c | 319 ++- + sound/soc/intel/sst-mfld-platform.h | 29 +- + sound/soc/kirkwood/Kconfig | 19 +- + sound/soc/kirkwood/Makefile | 4 - + sound/soc/kirkwood/kirkwood-dma.c | 11 +- + sound/soc/kirkwood/kirkwood-i2s.c | 33 +- + sound/soc/kirkwood/kirkwood-openrd.c | 109 - + sound/soc/kirkwood/kirkwood-t5325.c | 116 - + sound/soc/kirkwood/kirkwood.h | 7 +- + sound/soc/omap/ams-delta.c | 2 +- + sound/soc/omap/omap-dmic.c | 35 +- + sound/soc/omap/omap-mcbsp.c | 7 +- + sound/soc/omap/omap-pcm.c | 1 + + sound/soc/pxa/pxa-ssp.c | 3 +- + sound/soc/rockchip/Kconfig | 12 + + sound/soc/rockchip/Makefile | 4 + + sound/soc/rockchip/rockchip_i2s.c | 529 ++++ + sound/soc/rockchip/rockchip_i2s.h | 223 ++ + sound/soc/s6000/Kconfig | 13 +- + sound/soc/s6000/Makefile | 2 +- + sound/soc/s6000/s6000-i2s.c | 4 +- + sound/soc/s6000/s6105-ipcam.c | 17 +- + sound/soc/samsung/Kconfig | 40 +- + sound/soc/samsung/Makefile | 6 +- + sound/soc/samsung/ac97.c | 32 - + sound/soc/samsung/dma.c | 454 ---- + sound/soc/samsung/dma.h | 7 - + sound/soc/samsung/dmaengine.c | 3 + + sound/soc/samsung/i2s.c | 35 +- + sound/soc/samsung/idma.c | 3 +- + sound/soc/samsung/odroidx2_max98090.c | 177 ++ + sound/soc/samsung/pcm.c | 12 - + sound/soc/samsung/s3c-i2s-v2.c | 19 +- + sound/soc/samsung/s3c2412-i2s.c | 43 +- + sound/soc/samsung/s3c24xx-i2s.c | 58 +- + sound/soc/samsung/smdk_wm8580pcm.c | 2 +- + sound/soc/samsung/snow.c | 4 + + sound/soc/samsung/spdif.c | 5 - + sound/soc/sh/Kconfig | 2 +- + sound/soc/sh/fsi.c | 201 +- + sound/soc/sh/rcar/core.c | 247 +- + sound/soc/sh/rcar/dvc.c | 135 +- + sound/soc/sh/rcar/gen.c | 554 ++-- + sound/soc/sh/rcar/rsnd.h | 26 +- + sound/soc/sh/rcar/src.c | 86 +- + sound/soc/sh/rcar/ssi.c | 33 +- + sound/soc/sirf/Kconfig | 6 + + sound/soc/sirf/Makefile | 2 + + sound/soc/sirf/sirf-usp.c | 415 +++ + sound/soc/sirf/sirf-usp.h | 293 +++ + sound/soc/soc-cache.c | 7 +- + sound/soc/soc-compress.c | 13 +- + sound/soc/soc-core.c | 900 ++++--- + sound/soc/soc-dapm.c | 279 +- + sound/soc/soc-generic-dmaengine-pcm.c | 37 +- + sound/soc/soc-jack.c | 4 +- + sound/soc/soc-pcm.c | 581 +++-- + sound/soc/tegra/tegra_alc5632.c | 5 +- + sound/soc/tegra/tegra_max98090.c | 5 +- + sound/soc/tegra/tegra_rt5640.c | 5 +- + sound/soc/tegra/tegra_wm8753.c | 3 +- + sound/soc/tegra/tegra_wm8903.c | 5 +- + sound/soc/tegra/trimslice.c | 3 +- + sound/sparc/dbri.c | 6 +- + sound/usb/card.c | 9 + + sound/usb/midi.c | 401 +-- + sound/usb/midi.h | 6 +- + sound/usb/mixer.c | 9 +- + sound/usb/quirks.c | 2 +- + 296 files changed, 17416 insertions(+), 7591 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cs4265.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,asrc.txt + create mode 100644 Documentation/devicetree/bindings/sound/rockchip-i2s.txt + create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt + create mode 100644 Documentation/devicetree/bindings/sound/sirf-usp.txt + create mode 100644 Documentation/devicetree/bindings/sound/tas2552.txt + create mode 100644 Documentation/devicetree/bindings/sound/wm8904.txt + create mode 100644 arch/x86/include/asm/platform_sst_audio.h + create mode 100644 include/sound/rt286.h + create mode 100644 include/sound/rt5670.h + create mode 100644 include/sound/tas2552-plat.h + create mode 100644 sound/pci/hda/dell_wmi_helper.c + create mode 100644 sound/soc/codecs/cs4265.c + create mode 100644 sound/soc/codecs/cs4265.h + create mode 100644 sound/soc/codecs/rt286.c + create mode 100644 sound/soc/codecs/rt286.h + create mode 100644 sound/soc/codecs/rt5670-dsp.h + create mode 100644 sound/soc/codecs/rt5670.c + create mode 100644 sound/soc/codecs/rt5670.h + create mode 100644 sound/soc/codecs/tas2552.c + create mode 100644 sound/soc/codecs/tas2552.h + create mode 100644 sound/soc/fsl/fsl_asrc.c + create mode 100644 sound/soc/fsl/fsl_asrc.h + create mode 100644 sound/soc/fsl/fsl_asrc_dma.c + create mode 100644 sound/soc/intel/broadwell.c + create mode 100644 sound/soc/intel/sst-atom-controls.h + delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c + delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c + create mode 100644 sound/soc/rockchip/Kconfig + create mode 100644 sound/soc/rockchip/Makefile + create mode 100644 sound/soc/rockchip/rockchip_i2s.c + create mode 100644 sound/soc/rockchip/rockchip_i2s.h + delete mode 100644 sound/soc/samsung/dma.c + create mode 100644 sound/soc/samsung/odroidx2_max98090.c + create mode 100644 sound/soc/sirf/sirf-usp.c + create mode 100644 sound/soc/sirf/sirf-usp.h +Merging pci-current/for-linus (bf177a1eb6d1 MAINTAINERS: Update mx6 PCI driver maintainer's email) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (c01fac1c77a0 ath9k: fix aggregation session lockup) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (a8a85b01d185 usb: musb/cppi41: call musb_ep_select() before accessing an endpoint's CSR) +$ git merge usb-gadget-fixes/fixes +Resolved 'drivers/usb/musb/musb_host.c' using previous resolution. +Auto-merging drivers/usb/musb/musb_host.c +CONFLICT (content): Merge conflict in drivers/usb/musb/musb_host.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 88cc377bfd9b] Merge remote-tracking branch 'usb-gadget-fixes/fixes' +$ git diff -M --stat --summary HEAD^.. +Merging usb-serial-fixes/usb-linus (19583ca584d6 Linux 3.16) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (f62d14a8072b Input: document INPUT_PROP_TOPBUTTONPAD) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) +$ git merge md-current/for-linus +Already up-to-date. +Merging crypto-current/master (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (a53dae49b2fe ide: use module_platform_driver()) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree fixup machine function) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (f4be89cecea4 drm/i915: Fix crash when failing to parse MIPI VBT) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_bios.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (3a5d0df211dd mm, arc: remove obsolete pagefault oom killer comment) +$ git merge arc/for-next +Auto-merging arch/arc/plat-arcfpga/platform.c +Removing arch/arc/plat-arcfpga/irq.c +Merge made by the 'recursive' strategy. + arch/arc/include/asm/arcregs.h | 2 +- + arch/arc/include/asm/irq.h | 4 + + arch/arc/include/asm/irqflags.h | 18 ---- + arch/arc/kernel/irq.c | 53 +++++++--- + arch/arc/kernel/signal.c | 47 ++++----- + arch/arc/kernel/smp.c | 23 +---- + arch/arc/kernel/time.c | 28 ++---- + arch/arc/mm/cache_arc700.c | 168 ++++++++++++++++++------------- + arch/arc/mm/fault.c | 1 - + arch/arc/mm/tlbex.S | 4 +- + arch/arc/plat-arcfpga/Makefile | 2 +- + arch/arc/plat-arcfpga/include/plat/irq.h | 2 - + arch/arc/plat-arcfpga/irq.c | 25 ----- + arch/arc/plat-arcfpga/platform.c | 3 - + 14 files changed, 176 insertions(+), 204 deletions(-) + delete mode 100644 arch/arc/plat-arcfpga/irq.c +Merging arm/for-next (f15bdfe4fb26 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (4c834452aad0 Linux 3.16-rc3) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (f8aee52350a8 Merge branch 'next/defconfig' into for-next) +$ git merge arm-soc/for-next +Auto-merging include/soc/tegra/pmc.h +Auto-merging include/soc/tegra/cpuidle.h +Auto-merging include/soc/tegra/common.h +Auto-merging include/soc/tegra/ahb.h +Removing include/linux/tegra-soc.h +Removing include/linux/platform_data/usb-imx_udc.h +Removing include/linux/platform_data/camera-mx1.h +Removing include/linux/atmel_pwm.h +Removing include/linux/atmel-pwm-bl.h +Auto-merging drivers/video/fbdev/amba-clcd-versatile.c +Removing drivers/video/backlight/atmel-pwm-bl.c +Auto-merging drivers/tty/serial/samsung.c +Auto-merging drivers/spi/spi-s3c64xx.c +Auto-merging drivers/soc/tegra/fuse/speedo-tegra30.c +Auto-merging drivers/soc/tegra/fuse/speedo-tegra20.c +Auto-merging drivers/soc/tegra/fuse/speedo-tegra114.c +Auto-merging drivers/phy/phy-samsung-usb2.h +CONFLICT (content): Merge conflict in drivers/phy/phy-samsung-usb2.h +Auto-merging drivers/phy/phy-samsung-usb2.c +CONFLICT (content): Merge conflict in drivers/phy/phy-samsung-usb2.c +Auto-merging drivers/phy/Makefile +CONFLICT (content): Merge conflict in drivers/phy/Makefile +Auto-merging drivers/phy/Kconfig +CONFLICT (content): Merge conflict in drivers/phy/Kconfig +Auto-merging drivers/pci/host/pci-tegra.c +Removing drivers/misc/atmel_pwm.c +Removing drivers/mailbox/omap-mbox.h +Removing drivers/mailbox/mailbox-omap2.c +Removing drivers/mailbox/mailbox-omap1.c +Removing drivers/leds/leds-atmel-pwm.c +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/iommu/tegra-smmu.c +Removing drivers/cpuidle/cpuidle-armada-370-xp.c +Auto-merging drivers/clk/versatile/clk-versatile.c +Auto-merging drivers/clk/tegra/clk.c +Auto-merging drivers/clk/samsung/Makefile +Removing arch/arm/plat-versatile/include/plat/clcd.h +Removing arch/arm/plat-samsung/s5p-pm.c +Removing arch/arm/plat-samsung/s5p-irq.c +Removing arch/arm/plat-samsung/s5p-irq-pm.c +Removing arch/arm/plat-samsung/s5p-irq-gpioint.c +Removing arch/arm/plat-samsung/s5p-irq-eint.c +Removing arch/arm/plat-samsung/s5p-dev-uart.c +Removing arch/arm/plat-samsung/s5p-clock.c +Removing arch/arm/plat-samsung/include/plat/tv-core.h +Removing arch/arm/plat-samsung/include/plat/s5p-clock.h +Removing arch/arm/plat-samsung/include/plat/pll.h +Removing arch/arm/plat-samsung/include/plat/mfc.h +Removing arch/arm/plat-samsung/include/plat/irqs.h +Removing arch/arm/plat-samsung/include/plat/hdmi.h +Removing arch/arm/plat-samsung/include/plat/fimc-core.h +Removing arch/arm/plat-samsung/include/plat/clock.h +Removing arch/arm/plat-samsung/include/plat/clock-clksrc.h +Removing arch/arm/plat-samsung/include/plat/camport.h +Removing arch/arm/plat-samsung/clock.c +Removing arch/arm/plat-samsung/clock-clksrc.c +Auto-merging arch/arm/plat-omap/dma.c +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm/mach-tegra/sleep-tegra30.S +Removing arch/arm/mach-tegra/powergate.c +Removing arch/arm/mach-tegra/pmc.h +Removing arch/arm/mach-tegra/pmc.c +Removing arch/arm/mach-tegra/fuse.h +Removing arch/arm/mach-tegra/fuse.c +Removing arch/arm/mach-tegra/apbio.h +Removing arch/arm/mach-tegra/apbio.c +Auto-merging arch/arm/mach-shmobile/sh7372.h +Auto-merging arch/arm/mach-shmobile/setup-r8a7791.c +Auto-merging arch/arm/mach-shmobile/setup-r8a7790.c +Auto-merging arch/arm/mach-shmobile/setup-r8a7779.c +Auto-merging arch/arm/mach-shmobile/setup-r8a7778.c +Auto-merging arch/arm/mach-shmobile/setup-r8a73a4.c +Auto-merging arch/arm/mach-shmobile/setup-r7s72100.c +Auto-merging arch/arm/mach-shmobile/rcar-gen2.h +Auto-merging arch/arm/mach-shmobile/r8a7791.h +Auto-merging arch/arm/mach-shmobile/r8a7790.h +Auto-merging arch/arm/mach-shmobile/r8a7779.h +Auto-merging arch/arm/mach-shmobile/r8a7740.h +Auto-merging arch/arm/mach-shmobile/r7s72100.h +Auto-merging arch/arm/mach-shmobile/headsmp.S +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/headsmp.S +Auto-merging arch/arm/mach-shmobile/common.h +Auto-merging arch/arm/mach-shmobile/board-marzen.c +Auto-merging arch/arm/mach-shmobile/board-mackerel.c +Auto-merging arch/arm/mach-shmobile/board-lager.c +Auto-merging arch/arm/mach-shmobile/board-kzm9g.c +Auto-merging arch/arm/mach-shmobile/board-koelsch.c +Auto-merging arch/arm/mach-shmobile/board-genmai.c +Auto-merging arch/arm/mach-shmobile/board-bockw.c +Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c +Auto-merging arch/arm/mach-shmobile/board-ape6evm.c +Auto-merging arch/arm/mach-s5pv210/sleep.S +Removing arch/arm/mach-s5pv210/setup-usb-phy.c +Removing arch/arm/mach-s5pv210/setup-spi.c +Removing arch/arm/mach-s5pv210/setup-sdhci-gpio.c +Removing arch/arm/mach-s5pv210/setup-keypad.c +Removing arch/arm/mach-s5pv210/setup-ide.c +Removing arch/arm/mach-s5pv210/setup-i2c2.c +Removing arch/arm/mach-s5pv210/setup-i2c1.c +Removing arch/arm/mach-s5pv210/setup-i2c0.c +Removing arch/arm/mach-s5pv210/setup-fimc.c +Removing arch/arm/mach-s5pv210/setup-fb-24bpp.c +Removing arch/arm/mach-s5pv210/mach-torbreck.c +Removing arch/arm/mach-s5pv210/mach-smdkv210.c +Removing arch/arm/mach-s5pv210/mach-smdkc110.c +Removing arch/arm/mach-s5pv210/mach-goni.c +Removing arch/arm/mach-s5pv210/mach-aquila.c +Removing arch/arm/mach-s5pv210/include/mach/regs-irq.h +Removing arch/arm/mach-s5pv210/include/mach/regs-gpio.h +Removing arch/arm/mach-s5pv210/include/mach/pm-core.h +CONFLICT (modify/delete): arch/arm/mach-s5pv210/include/mach/memory.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/include/mach/memory.h left in tree. +Removing arch/arm/mach-s5pv210/include/mach/map.h +Removing arch/arm/mach-s5pv210/include/mach/irqs.h +Removing arch/arm/mach-s5pv210/include/mach/hardware.h +Removing arch/arm/mach-s5pv210/include/mach/gpio.h +Removing arch/arm/mach-s5pv210/dma.c +Removing arch/arm/mach-s5pv210/dev-audio.c +Removing arch/arm/mach-s5pv210/common.c +Removing arch/arm/mach-s5pv210/clock.c +Removing arch/arm/mach-s5pv210/Makefile.boot +Removing arch/arm/mach-s5pc100/setup-spi.c +Removing arch/arm/mach-s5pc100/setup-sdhci-gpio.c +Removing arch/arm/mach-s5pc100/setup-keypad.c +Removing arch/arm/mach-s5pc100/setup-ide.c +Removing arch/arm/mach-s5pc100/setup-i2c1.c +Removing arch/arm/mach-s5pc100/setup-i2c0.c +Removing arch/arm/mach-s5pc100/setup-fb-24bpp.c +Removing arch/arm/mach-s5pc100/mach-smdkc100.c +Removing arch/arm/mach-s5pc100/include/mach/regs-irq.h +Removing arch/arm/mach-s5pc100/include/mach/regs-gpio.h +Removing arch/arm/mach-s5pc100/include/mach/regs-clock.h +Removing arch/arm/mach-s5pc100/include/mach/map.h +Removing arch/arm/mach-s5pc100/include/mach/irqs.h +Removing arch/arm/mach-s5pc100/include/mach/hardware.h +Removing arch/arm/mach-s5pc100/include/mach/gpio.h +Removing arch/arm/mach-s5pc100/include/mach/entry-macro.S +Removing arch/arm/mach-s5pc100/include/mach/debug-macro.S +Removing arch/arm/mach-s5pc100/dma.c +Removing arch/arm/mach-s5pc100/dev-audio.c +Removing arch/arm/mach-s5pc100/common.h +Removing arch/arm/mach-s5pc100/common.c +Removing arch/arm/mach-s5pc100/clock.c +Removing arch/arm/mach-s5pc100/Makefile.boot +Removing arch/arm/mach-s5pc100/Makefile +Removing arch/arm/mach-s5pc100/Kconfig +Removing arch/arm/mach-s5p64x0/setup-spi.c +Removing arch/arm/mach-s5p64x0/setup-sdhci-gpio.c +Removing arch/arm/mach-s5p64x0/setup-i2c1.c +Removing arch/arm/mach-s5p64x0/setup-i2c0.c +Removing arch/arm/mach-s5p64x0/setup-fb-24bpp.c +Removing arch/arm/mach-s5p64x0/pm.c +Removing arch/arm/mach-s5p64x0/mach-smdk6450.c +Removing arch/arm/mach-s5p64x0/mach-smdk6440.c +Removing arch/arm/mach-s5p64x0/irq-pm.c +Removing arch/arm/mach-s5p64x0/include/mach/regs-irq.h +Removing arch/arm/mach-s5p64x0/include/mach/regs-gpio.h +Removing arch/arm/mach-s5p64x0/include/mach/regs-clock.h +Removing arch/arm/mach-s5p64x0/include/mach/pm-core.h +Removing arch/arm/mach-s5p64x0/include/mach/map.h +Removing arch/arm/mach-s5p64x0/include/mach/irqs.h +Removing arch/arm/mach-s5p64x0/include/mach/hardware.h +Removing arch/arm/mach-s5p64x0/include/mach/gpio.h +Removing arch/arm/mach-s5p64x0/include/mach/debug-macro.S +Removing arch/arm/mach-s5p64x0/i2c.h +Removing arch/arm/mach-s5p64x0/dma.c +Removing arch/arm/mach-s5p64x0/dev-audio.c +Removing arch/arm/mach-s5p64x0/common.h +Removing arch/arm/mach-s5p64x0/common.c +Removing arch/arm/mach-s5p64x0/clock.h +Removing arch/arm/mach-s5p64x0/clock.c +Removing arch/arm/mach-s5p64x0/clock-s5p6450.c +Removing arch/arm/mach-s5p64x0/clock-s5p6440.c +Removing arch/arm/mach-s5p64x0/Makefile.boot +Removing arch/arm/mach-s5p64x0/Makefile +Removing arch/arm/mach-s5p64x0/Kconfig +Auto-merging arch/arm/mach-pxa/generic.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c +Removing arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h +Removing arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h +Removing arch/arm/mach-omap2/ctrl_module_core_44xx.h +Removing arch/arm/mach-omap2/clkt2xxx_sys.c +Removing arch/arm/mach-omap2/clkt2xxx_osc.c +Removing arch/arm/mach-omap2/cclock2430_data.c +Removing arch/arm/mach-omap2/cclock2420_data.c +Auto-merging arch/arm/mach-omap2/Makefile +Removing arch/arm/mach-mvebu/hotplug.c +Auto-merging arch/arm/mach-mvebu/headsmp-a9.S +CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/headsmp-a9.S +Auto-merging arch/arm/mach-mediatek/mediatek.c +Removing arch/arm/mach-kirkwood/tsx1x-common.h +Removing arch/arm/mach-kirkwood/tsx1x-common.c +Removing arch/arm/mach-kirkwood/ts41x-setup.c +Removing arch/arm/mach-kirkwood/ts219-setup.c +Removing arch/arm/mach-kirkwood/t5325-setup.c +Removing arch/arm/mach-kirkwood/rd88f6281-setup.c +Removing arch/arm/mach-kirkwood/rd88f6192-nas-setup.c +Removing arch/arm/mach-kirkwood/pm.h +Removing arch/arm/mach-kirkwood/pm.c +Removing arch/arm/mach-kirkwood/pcie.c +Removing arch/arm/mach-kirkwood/openrd-setup.c +Removing arch/arm/mach-kirkwood/netxbig_v2-setup.c +Removing arch/arm/mach-kirkwood/mpp.h +Removing arch/arm/mach-kirkwood/mpp.c +Removing arch/arm/mach-kirkwood/lacie_v2-common.h +Removing arch/arm/mach-kirkwood/lacie_v2-common.c +Removing arch/arm/mach-kirkwood/irq.c +Removing arch/arm/mach-kirkwood/include/mach/uncompress.h +Removing arch/arm/mach-kirkwood/include/mach/kirkwood.h +Removing arch/arm/mach-kirkwood/include/mach/irqs.h +Removing arch/arm/mach-kirkwood/include/mach/entry-macro.S +Removing arch/arm/mach-kirkwood/include/mach/bridge-regs.h +Removing arch/arm/mach-kirkwood/d2net_v2-setup.c +Removing arch/arm/mach-kirkwood/common.h +Removing arch/arm/mach-kirkwood/common.c +Removing arch/arm/mach-kirkwood/board-dt.c +Removing arch/arm/mach-kirkwood/Makefile.boot +Removing arch/arm/mach-kirkwood/Makefile +Removing arch/arm/mach-kirkwood/Kconfig +CONFLICT (modify/delete): arch/arm/mach-integrator/include/mach/memory.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-integrator/include/mach/memory.h left in tree. +Removing arch/arm/mach-imx/mx53.h +Removing arch/arm/mach-imx/mx51.h +Removing arch/arm/mach-imx/mx1-camera-fiq.S +Removing arch/arm/mach-imx/mx1-camera-fiq-ksym.c +Removing arch/arm/mach-imx/mm-imx5.c +Auto-merging arch/arm/mach-imx/mach-imx51.c +Removing arch/arm/mach-imx/mach-imx27lite.c +Removing arch/arm/mach-imx/mach-imx27ipcam.c +Removing arch/arm/mach-imx/iomux-mx51.h +Removing arch/arm/mach-imx/ehci-imx5.c +Removing arch/arm/mach-imx/devices/platform-mx1-camera.c +Removing arch/arm/mach-imx/devices/platform-imx_udc.c +Removing arch/arm/mach-imx/devices-imx51.h +Removing arch/arm/mach-imx/crm-regs-imx5.h +Auto-merging arch/arm/mach-exynos/pm.c +Auto-merging arch/arm/mach-exynos/platsmp.c +Auto-merging arch/arm/mach-exynos/mcpm-exynos.c +Auto-merging arch/arm/mach-exynos/exynos.c +Removing arch/arm/mach-clps711x/include/mach/debug-macro.S +Auto-merging arch/arm/mach-clps711x/board-p720t.c +Auto-merging arch/arm/mach-clps711x/board-edb7211.c +Auto-merging arch/arm/include/debug/s5pv210.S +Removing arch/arm/configs/s5pc100_defconfig +Removing arch/arm/configs/s5p64x0_defconfig +Removing arch/arm/configs/kirkwood_defconfig +Removing arch/arm/configs/genmai_defconfig +Auto-merging arch/arm/boot/dts/tegra30.dtsi +Auto-merging arch/arm/boot/dts/tegra20.dtsi +Auto-merging arch/arm/boot/dts/tegra124.dtsi +Auto-merging arch/arm/boot/dts/tegra114.dtsi +Auto-merging arch/arm/boot/dts/socfpga.dtsi +Auto-merging arch/arm/boot/dts/rk3288-evb-rk808.dts +Removing arch/arm/boot/dts/rk3188-clocks.dtsi +Removing arch/arm/boot/dts/rk3066a-clocks.dtsi +Removing arch/arm/boot/dts/r8a7779-marzen-reference.dts +Auto-merging arch/arm/boot/dts/mt6589-aquaris5.dts +Auto-merging arch/arm/boot/dts/exynos5420.dtsi +Auto-merging arch/arm/boot/dts/exynos5410.dtsi +Auto-merging arch/arm/boot/dts/exResolved 'Documentation/devicetree/bindings/phy/samsung-phy.txt' using previous resolution. +Resolved 'arch/arm/mach-mvebu/headsmp-a9.S' using previous resolution. +Resolved 'arch/arm/mach-shmobile/headsmp.S' using previous resolution. +Resolved 'drivers/phy/Kconfig' using previous resolution. +Resolved 'drivers/phy/Makefile' using previous resolution. +Resolved 'drivers/phy/phy-samsung-usb2.c' using previous resolution. +Resolved 'drivers/phy/phy-samsung-usb2.h' using previous resolution. +ynos5260.dtsi +Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts +Auto-merging arch/arm/boot/dts/exynos4x12.dtsi +Auto-merging arch/arm/boot/dts/exynos4210.dtsi +Auto-merging arch/arm/boot/dts/exynos4.dtsi +Auto-merging arch/arm/boot/dts/exynos3250.dtsi +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/spi/spi-samsung.txt +Auto-merging Documentation/devicetree/bindings/phy/samsung-phy.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/samsung-phy.txt +Auto-merging Documentation/devicetree/bindings/arm/samsung/pmu.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-integrator/include/mach/memory.h arch/arm/mach-s5pv210/include/mach/memory.h +arch/arm/mach-integrator/include/mach/memory.h: needs merge +arch/arm/mach-s5pv210/include/mach/memory.h: needs merge +rm 'arch/arm/mach-integrator/include/mach/memory.h' +rm 'arch/arm/mach-s5pv210/include/mach/memory.h' +$ git commit -v -a +[master 7026ebd707db] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-tegra-fuse | 11 + + Documentation/arm/CCN.txt | 52 + + Documentation/arm/Marvell/README | 23 +- + Documentation/arm/Samsung/Overview.txt | 11 - + .../arm/Samsung/clksrc-change-registers.awk | 1 - + Documentation/devicetree/bindings/arm/adapteva.txt | 7 + + Documentation/devicetree/bindings/arm/arm-boards | 6 + + .../bindings/arm/armada-380-mpcore-soc-ctrl.txt | 14 + + .../devicetree/bindings/arm/atmel-pmc.txt | 5 +- + .../bindings/arm/bcm/brcm,bcm11351-cpu-method | 36 + + .../devicetree/bindings/arm/brcm-brcmstb.txt | 95 + + Documentation/devicetree/bindings/arm/ccn.txt | 21 + + .../arm/cpu-enable-method/marvell,berlin-smp | 41 + + Documentation/devicetree/bindings/arm/cpus.txt | 4 + + Documentation/devicetree/bindings/arm/gic.txt | 1 + + .../bindings/arm/hisilicon/hisilicon.txt | 11 + + .../devicetree/bindings/arm/marvell,berlin.txt | 16 + + Documentation/devicetree/bindings/arm/mediatek.txt | 8 + + .../devicetree/bindings/arm/omap/omap.txt | 3 + + .../devicetree/bindings/arm/omap/prcm.txt | 65 + + .../devicetree/bindings/arm/samsung/pmu.txt | 2 + + .../devicetree/bindings/arm/spear-misc.txt | 9 + + Documentation/devicetree/bindings/arm/tegra.txt | 2 + + Documentation/devicetree/bindings/arm/xilinx.txt | 8 +- + .../devicetree/bindings/clock/arm-integrator.txt | 4 +- + .../bindings/clock/clk-s5pv210-audss.txt | 53 + + .../devicetree/bindings/clock/imx1-clock.txt | 26 + + .../devicetree/bindings/clock/imx21-clock.txt | 28 + + .../devicetree/bindings/clock/imx27-clock.txt | 127 +- + .../devicetree/bindings/clock/imx6q-clock.txt | 220 +-- + .../devicetree/bindings/clock/mvebu-cpu-clock.txt | 5 +- + .../bindings/clock/samsung,s5pv210-clock.txt | 78 + + .../bindings/fuse/nvidia,tegra20-fuse.txt | 40 + + .../devicetree/bindings/gpu/nvidia,gk20a.txt | 43 + + .../bindings/misc/nvidia,tegra20-apbmisc.txt | 13 + + .../bindings/pci/nvidia,tegra20-pcie.txt | 30 +- + .../devicetree/bindings/pci/spear13xx-pcie.txt | 14 + + .../devicetree/bindings/phy/samsung-phy.txt | 1 + + .../devicetree/bindings/phy/st-spear-miphy.txt | 15 + + .../pinctrl/nvidia,tegra124-xusb-padctl.txt | 127 ++ + .../devicetree/bindings/serial/cdns,uart.txt | 20 + + .../devicetree/bindings/spi/spi-samsung.txt | 1 - + .../devicetree/bindings/vendor-prefixes.txt | 3 + + .../devicetree/bindings/video/samsung-fimd.txt | 2 - + MAINTAINERS | 26 +- + arch/arm/Kconfig | 95 +- + arch/arm/Kconfig.debug | 80 +- + arch/arm/Makefile | 10 +- + arch/arm/arm-soc-for-next-contents.txt | 268 +++ + arch/arm/boot/dts/Makefile | 66 +- + arch/arm/boot/dts/aks-cdu.dts | 6 + + arch/arm/boot/dts/am335x-evmsk.dts | 105 + + arch/arm/boot/dts/am335x-pepper.dts | 653 +++++++ + arch/arm/boot/dts/am33xx.dtsi | 9 + + arch/arm/boot/dts/am4372.dtsi | 11 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 71 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 613 ++++++ + arch/arm/boot/dts/am43x-epos-evm.dts | 59 + + arch/arm/boot/dts/animeo_ip.dts | 8 + + arch/arm/boot/dts/armada-375-db.dts | 26 + + arch/arm/boot/dts/armada-375.dtsi | 34 + + arch/arm/boot/dts/armada-38x.dtsi | 5 + + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 284 +++ + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 2 + + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 2 + + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 4 + + arch/arm/boot/dts/armada-xp.dtsi | 2 +- + arch/arm/boot/dts/at91-ariag25.dts | 8 + + arch/arm/boot/dts/at91-cosino.dtsi | 8 + + arch/arm/boot/dts/at91-foxg20.dts | 8 + + arch/arm/boot/dts/at91-qil_a9260.dts | 8 + + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 12 +- + arch/arm/boot/dts/at91rm9200.dtsi | 304 +++ + arch/arm/boot/dts/at91rm9200ek.dts | 8 + + arch/arm/boot/dts/at91sam9260.dtsi | 314 ++- + arch/arm/boot/dts/at91sam9261.dtsi | 20 +- + arch/arm/boot/dts/at91sam9261ek.dts | 16 +- + arch/arm/boot/dts/at91sam9263.dtsi | 311 +++ + arch/arm/boot/dts/at91sam9263ek.dts | 8 + + arch/arm/boot/dts/at91sam9g20.dtsi | 24 + + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 8 + + arch/arm/boot/dts/at91sam9g45.dtsi | 342 +++- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 8 + + arch/arm/boot/dts/at91sam9n12.dtsi | 20 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 18 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 32 +- + arch/arm/boot/dts/at91sam9rlek.dts | 17 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 30 +- + arch/arm/boot/dts/at91sam9x5cm.dtsi | 12 +- + arch/arm/boot/dts/bcm11351.dtsi | 19 + + arch/arm/boot/dts/bcm21664.dtsi | 19 + + arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 14 + + arch/arm/boot/dts/bcm7445.dtsi | 111 ++ + arch/arm/boot/dts/berlin2.dtsi | 6 + + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 8 + + arch/arm/boot/dts/berlin2q.dtsi | 80 + + arch/arm/boot/dts/cros-ec-keyboard.dtsi | 105 + + arch/arm/boot/dts/dove-cubox-es.dts | 12 + + arch/arm/boot/dts/dove-cubox.dts | 3 - + arch/arm/boot/dts/dove.dtsi | 14 + + arch/arm/boot/dts/dra7-evm.dts | 8 + + arch/arm/boot/dts/dra7.dtsi | 382 +++- + arch/arm/boot/dts/dra7xx-clocks.dtsi | 39 +- + arch/arm/boot/dts/emev2.dtsi | 2 + + arch/arm/boot/dts/ethernut5.dts | 10 + + arch/arm/boot/dts/evk-pro3.dts | 6 + + arch/arm/boot/dts/exynos3250.dtsi | 28 +- + arch/arm/boot/dts/exynos4.dtsi | 30 + + arch/arm/boot/dts/exynos4210.dtsi | 6 - + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 371 ++++ + arch/arm/boot/dts/exynos4412-odroidu3.dts | 61 + + arch/arm/boot/dts/exynos4412-odroidx.dts | 279 +-- + arch/arm/boot/dts/exynos4412-odroidx2.dts | 32 + + arch/arm/boot/dts/exynos4412.dtsi | 4 + + arch/arm/boot/dts/exynos4x12.dtsi | 6 - + arch/arm/boot/dts/exynos5250-cros-common.dtsi | 159 -- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 + + arch/arm/boot/dts/exynos5250-snow.dts | 259 ++- + arch/arm/boot/dts/exynos5260.dtsi | 5 + + arch/arm/boot/dts/exynos5410.dtsi | 9 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 392 ++-- + arch/arm/boot/dts/exynos5420.dtsi | 6 - + arch/arm/boot/dts/exynos5800-peach-pi.dts | 374 +++- + arch/arm/boot/dts/ge863-pro3.dtsi | 4 + + arch/arm/boot/dts/hi3620.dtsi | 1 + + arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 53 + + arch/arm/boot/dts/hisi-x5hd2.dtsi | 170 ++ + .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 73 + + .../imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts | 45 + + .../imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts | 45 + + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 1 - + arch/arm/boot/dts/imx25-pdk.dts | 8 +- + arch/arm/boot/dts/imx25.dtsi | 8 +- + arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 296 +++ + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 273 +++ + arch/arm/boot/dts/imx27-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 3 +- + arch/arm/boot/dts/imx27.dtsi | 115 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 22 + + arch/arm/boot/dts/imx28-m28.dtsi | 87 + + arch/arm/boot/dts/imx28-m28evk.dts | 62 +- + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 1 - + arch/arm/boot/dts/imx35.dtsi | 8 + + arch/arm/boot/dts/imx50.dtsi | 8 +- + arch/arm/boot/dts/imx51-babbage.dts | 2 +- + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 - + arch/arm/boot/dts/imx51.dtsi | 3 - + arch/arm/boot/dts/imx53-m53.dtsi | 140 ++ + arch/arm/boot/dts/imx53-m53evk.dts | 113 +- + arch/arm/boot/dts/imx53-mba53.dts | 1 - + arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 - + arch/arm/boot/dts/imx53-tx53.dtsi | 1 - + arch/arm/boot/dts/imx53-voipac-bsb.dts | 1 - + arch/arm/boot/dts/imx53.dtsi | 15 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 85 + + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 74 + + arch/arm/boot/dts/imx6dl-gw51xx.dts | 2 +- + arch/arm/boot/dts/imx6dl-gw52xx.dts | 2 +- + arch/arm/boot/dts/imx6dl-gw53xx.dts | 2 +- + arch/arm/boot/dts/imx6dl-gw54xx.dts | 2 +- + arch/arm/boot/dts/imx6dl-rex-basic.dts | 30 + + arch/arm/boot/dts/imx6dl-riotboard.dts | 33 +- + arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts | 103 + + arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 177 ++ + arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 150 ++ + arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 22 + + arch/arm/boot/dts/imx6dl-wandboard.dts | 2 +- + arch/arm/boot/dts/imx6dl.dtsi | 17 +- + arch/arm/boot/dts/imx6q-cubox-i.dts | 4 + + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 54 + + arch/arm/boot/dts/imx6q-gw51xx.dts | 2 +- + arch/arm/boot/dts/imx6q-gw52xx.dts | 2 +- + arch/arm/boot/dts/imx6q-gw53xx.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 5 +- + arch/arm/boot/dts/imx6q-gw54xx.dts | 2 +- + arch/arm/boot/dts/imx6q-rex-pro.dts | 34 + + arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 103 + + arch/arm/boot/dts/imx6q-tx6q-1010.dts | 177 ++ + arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts | 136 ++ + arch/arm/boot/dts/imx6q-tx6q-1020.dts | 210 ++ + arch/arm/boot/dts/imx6q-tx6q-1110.dts | 154 ++ + arch/arm/boot/dts/imx6q-udoo.dts | 32 + + arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 26 + + arch/arm/boot/dts/imx6q-wandboard.dts | 2 +- + arch/arm/boot/dts/imx6q.dtsi | 35 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 418 ++++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-rex.dtsi | 357 ++++ + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 696 +++++++ + arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 42 + + arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi | 41 + + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 22 - + arch/arm/boot/dts/imx6qdl.dtsi | 161 +- + arch/arm/boot/dts/imx6sl-evk.dts | 17 +- + arch/arm/boot/dts/imx6sl.dtsi | 12 +- + arch/arm/boot/dts/imx6sx-pinfunc.h | 1544 +++++++++++++++ + arch/arm/boot/dts/imx6sx-sdb.dts | 479 +++++ + arch/arm/boot/dts/imx6sx.dtsi | 1208 ++++++++++++ + arch/arm/boot/dts/integratorap.dts | 1 + + arch/arm/boot/dts/k2e-clocks.dtsi | 2 +- + arch/arm/boot/dts/k2hk-clocks.dtsi | 2 +- + arch/arm/boot/dts/k2hk-evm.dts | 12 + + arch/arm/boot/dts/k2l-clocks.dtsi | 2 +- + arch/arm/boot/dts/keystone-clocks.dtsi | 2 +- + arch/arm/boot/dts/keystone.dtsi | 11 + + arch/arm/boot/dts/kirkwood-d2net.dts | 42 + + arch/arm/boot/dts/kirkwood-net2big.dts | 60 + + arch/arm/boot/dts/kirkwood-net5big.dts | 111 ++ + arch/arm/boot/dts/kirkwood-netxbig.dtsi | 154 ++ + arch/arm/boot/dts/kizbox.dts | 4 + + arch/arm/boot/dts/mpa1600.dts | 8 + + .../mach/dma.h => boot/dts/mt6589-aquaris5.dts} | 21 +- + arch/arm/boot/dts/mt6589.dtsi | 94 + + arch/arm/boot/dts/omap2420.dtsi | 5 + + arch/arm/boot/dts/omap2430.dtsi | 5 + + arch/arm/boot/dts/omap3.dtsi | 2 + + arch/arm/boot/dts/omap4.dtsi | 9 + + arch/arm/boot/dts/omap5-uevm.dts | 68 +- + arch/arm/boot/dts/omap5.dtsi | 62 + + arch/arm/boot/dts/pm9g45.dts | 8 + + arch/arm/boot/dts/r7s72100-genmai.dts | 10 + + arch/arm/boot/dts/r7s72100.dtsi | 1 + + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 14 +- + arch/arm/boot/dts/r8a73a4.dtsi | 42 + + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 28 +- + arch/arm/boot/dts/r8a7740.dtsi | 63 + + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 14 +- + arch/arm/boot/dts/r8a7778.dtsi | 42 + + arch/arm/boot/dts/r8a7779-marzen-reference.dts | 121 -- + arch/arm/boot/dts/r8a7779-marzen.dts | 116 +- + arch/arm/boot/dts/r8a7779.dtsi | 234 ++- + arch/arm/boot/dts/r8a7790-lager.dts | 88 +- + arch/arm/boot/dts/r8a7790.dtsi | 207 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 45 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 89 +- + arch/arm/boot/dts/r8a7791.dtsi | 218 ++- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 214 +- + arch/arm/boot/dts/rk3066a-clocks.dtsi | 299 --- + arch/arm/boot/dts/rk3066a.dtsi | 519 +++-- + arch/arm/boot/dts/rk3188-clocks.dtsi | 289 --- + arch/arm/boot/dts/rk3188-radxarock.dts | 218 ++- + arch/arm/boot/dts/rk3188.dtsi | 446 +++-- + arch/arm/boot/dts/rk3288-evb-act8846.dts | 134 ++ + .../mach/dma.h => boot/dts/rk3288-evb-rk808.dts} | 18 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 96 + + arch/arm/boot/dts/rk3288.dtsi | 595 ++++++ + arch/arm/boot/dts/rk3xxx.dtsi | 356 ++-- + arch/arm/boot/dts/s5pv210-aquila.dts | 392 ++++ + arch/arm/boot/dts/s5pv210-goni.dts | 449 +++++ + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 839 ++++++++ + arch/arm/boot/dts/s5pv210-smdkc110.dts | 78 + + arch/arm/boot/dts/s5pv210-smdkv210.dts | 238 +++ + arch/arm/boot/dts/s5pv210-torbreck.dts | 92 + + arch/arm/boot/dts/s5pv210.dtsi | 633 ++++++ + arch/arm/boot/dts/sama5d3.dtsi | 22 +- + arch/arm/boot/dts/sama5d3xcm.dtsi | 12 +- + arch/arm/boot/dts/sama5d3xmb.dtsi | 2 + + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 16 +- + arch/arm/boot/dts/sh73a0.dtsi | 72 + + arch/arm/boot/dts/socfpga.dtsi | 1 + + arch/arm/boot/dts/spear1310-evb.dts | 4 + + arch/arm/boot/dts/spear1310.dtsi | 93 +- + arch/arm/boot/dts/spear1340-evb.dts | 4 + + arch/arm/boot/dts/spear1340.dtsi | 30 +- + arch/arm/boot/dts/spear13xx.dtsi | 9 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 10 + + arch/arm/boot/dts/ste-href-stuib.dtsi | 2 + + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 59 + + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 24 - + arch/arm/boot/dts/ste-snowball.dts | 38 +- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 15 + + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 110 ++ + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 15 + + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 21 + + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 21 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 28 + + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 15 + + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 9 + + arch/arm/boot/dts/sun4i-a10.dtsi | 34 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 119 ++ + arch/arm/boot/dts/sun6i-a31.dtsi | 92 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 16 + + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 16 + + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 22 + + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 10 + + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 173 ++ + arch/arm/boot/dts/sun7i-a20.dtsi | 34 +- + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 30 + + arch/arm/boot/dts/sun8i-a23.dtsi | 343 ++++ + arch/arm/boot/dts/tegra114-roth.dts | 32 +- + arch/arm/boot/dts/tegra114.dtsi | 15 + + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 33 +- + arch/arm/boot/dts/tegra124-venice2.dts | 128 +- + arch/arm/boot/dts/tegra124.dtsi | 55 + + arch/arm/boot/dts/tegra20-harmony.dts | 8 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 61 +- + arch/arm/boot/dts/tegra20-paz00.dts | 6 +- + arch/arm/boot/dts/tegra20-plutux.dts | 41 + + arch/arm/boot/dts/tegra20-tamonten.dtsi | 17 +- + arch/arm/boot/dts/tegra20-tec.dts | 41 + + arch/arm/boot/dts/tegra20-trimslice.dts | 8 +- + arch/arm/boot/dts/tegra20.dtsi | 15 + + arch/arm/boot/dts/tegra30-apalis-eval.dts | 260 +++ + arch/arm/boot/dts/tegra30-apalis.dtsi | 678 +++++++ + arch/arm/boot/dts/tegra30-beaver.dts | 12 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 11 +- + arch/arm/boot/dts/tegra30.dtsi | 15 + + arch/arm/boot/dts/tny_a9260_common.dtsi | 8 + + arch/arm/boot/dts/tny_a9263.dts | 8 + + arch/arm/boot/dts/usb_a9260_common.dtsi | 8 + + arch/arm/boot/dts/usb_a9263.dts | 8 + + arch/arm/boot/dts/versatile-ab.dts | 81 +- + arch/arm/boot/dts/versatile-pb.dts | 12 +- + arch/arm/boot/dts/vf610.dtsi | 25 +- + arch/arm/boot/dts/zynq-7000.dtsi | 90 +- + arch/arm/boot/dts/zynq-parallella.dts | 64 + + arch/arm/boot/dts/zynq-zc702.dts | 4 + + arch/arm/common/timer-sp.c | 4 +- + arch/arm/configs/armadillo800eva_defconfig | 4 + + arch/arm/configs/bcm_defconfig | 1 + + arch/arm/configs/exynos_defconfig | 56 +- + arch/arm/configs/genmai_defconfig | 122 -- + arch/arm/configs/hi3xxx_defconfig | 2 + + arch/arm/configs/imx_v4_v5_defconfig | 5 +- + arch/arm/configs/imx_v6_v7_defconfig | 9 +- + arch/arm/configs/kirkwood_defconfig | 181 -- + arch/arm/configs/multi_v5_defconfig | 2 + + arch/arm/configs/multi_v7_defconfig | 23 +- + arch/arm/configs/mvebu_v5_defconfig | 6 + + arch/arm/configs/mvebu_v7_defconfig | 5 + + arch/arm/configs/mxs_defconfig | 1 + + arch/arm/configs/omap1_defconfig | 2 - + arch/arm/configs/omap2plus_defconfig | 2 + + arch/arm/configs/s5p64x0_defconfig | 68 - + arch/arm/configs/s5pc100_defconfig | 49 - + arch/arm/configs/shmobile_defconfig | 23 +- + arch/arm/configs/socfpga_defconfig | 35 + + arch/arm/configs/spear13xx_defconfig | 16 + + arch/arm/configs/tegra_defconfig | 16 +- + arch/arm/include/asm/gpio.h | 7 - + arch/arm/include/debug/clps711x.S | 38 + + .../mach/debug-macro.S => include/debug/s5pv210.S} | 23 +- + arch/arm/lib/delay.c | 26 +- + arch/arm/mach-at91/Kconfig | 4 - + arch/arm/mach-at91/at91rm9200.c | 6 +- + arch/arm/mach-at91/at91sam9260.c | 6 +- + arch/arm/mach-at91/at91sam9263.c | 7 +- + arch/arm/mach-at91/at91sam9263_devices.c | 11 +- + arch/arm/mach-at91/at91sam9g45.c | 7 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 11 +- + arch/arm/mach-at91/at91sam9rl.c | 1 + + arch/arm/mach-at91/at91sam9rl_devices.c | 11 +- + arch/arm/mach-at91/board-sam9263ek.c | 55 +- + arch/arm/mach-at91/board-sam9m10g45ek.c | 42 +- + arch/arm/mach-at91/board.h | 1 - + arch/arm/mach-at91/leds.c | 37 - + arch/arm/mach-bcm/Kconfig | 34 +- + arch/arm/mach-bcm/Makefile | 8 + + arch/arm/mach-bcm/brcmstb.c | 28 + + arch/arm/mach-bcm/brcmstb.h | 19 + + arch/arm/mach-bcm/headsmp-brcmstb.S | 33 + + arch/arm/mach-bcm/kona_smp.c | 202 ++ + arch/arm/mach-bcm/platsmp-brcmstb.c | 363 ++++ + arch/arm/mach-berlin/Kconfig | 3 + + arch/arm/mach-berlin/Makefile | 3 +- + arch/arm/mach-berlin/headsmp.S | 30 + + arch/arm/mach-berlin/platsmp.c | 99 + + arch/arm/mach-clps711x/board-autcpu12.c | 1 - + arch/arm/mach-clps711x/board-cdb89712.c | 1 - + arch/arm/mach-clps711x/board-clep7312.c | 3 +- + arch/arm/mach-clps711x/board-edb7211.c | 8 +- + arch/arm/mach-clps711x/board-p720t.c | 1 - + arch/arm/mach-clps711x/common.c | 12 - + arch/arm/mach-clps711x/common.h | 1 - + arch/arm/mach-clps711x/devices.c | 10 + + arch/arm/mach-clps711x/include/mach/debug-macro.S | 38 - + arch/arm/mach-clps711x/include/mach/hardware.h | 5 +- + arch/arm/mach-exynos/common.h | 27 +- + arch/arm/mach-exynos/exynos.c | 76 +- + arch/arm/mach-exynos/headsmp.S | 1 - + arch/arm/mach-exynos/hotplug.c | 3 +- + arch/arm/mach-exynos/include/mach/map.h | 6 +- + arch/arm/mach-exynos/include/mach/memory.h | 3 +- + arch/arm/mach-exynos/mcpm-exynos.c | 106 +- + arch/arm/mach-exynos/platsmp.c | 73 +- + arch/arm/mach-exynos/pm.c | 128 +- + arch/arm/mach-exynos/pm_domains.c | 9 +- + arch/arm/mach-exynos/pmu.c | 41 +- + arch/arm/mach-exynos/regs-pmu.h | 525 ++--- + arch/arm/mach-exynos/regs-sys.h | 22 + + arch/arm/mach-hisi/Kconfig | 30 +- + arch/arm/mach-hisi/Makefile | 2 +- + arch/arm/mach-hisi/core.h | 5 + + arch/arm/mach-hisi/headsmp.S | 16 + + arch/arm/mach-hisi/hisilicon.c | 43 +- + arch/arm/mach-hisi/hotplug.c | 58 + + arch/arm/mach-hisi/platsmp.c | 53 +- + arch/arm/mach-imx/Kconfig | 59 +- + arch/arm/mach-imx/Makefile | 11 +- + arch/arm/mach-imx/clk-imx1.c | 151 +- + arch/arm/mach-imx/clk-imx21.c | 299 ++- + arch/arm/mach-imx/clk-imx25.c | 47 +- + arch/arm/mach-imx/clk-imx27.c | 452 ++--- + arch/arm/mach-imx/clk-imx31.c | 6 +- + arch/arm/mach-imx/clk-imx35.c | 6 +- + arch/arm/mach-imx/clk-imx51-imx53.c | 256 ++- + arch/arm/mach-imx/clk-imx6q.c | 540 +++--- + arch/arm/mach-imx/clk-imx6sl.c | 11 +- + arch/arm/mach-imx/clk-imx6sx.c | 25 +- + arch/arm/mach-imx/clk-vf610.c | 8 +- + arch/arm/mach-imx/clk.c | 10 + + arch/arm/mach-imx/clk.h | 9 + + arch/arm/mach-imx/common.h | 32 +- + arch/arm/mach-imx/cpu-imx5.c | 25 +- + arch/arm/mach-imx/cpu.c | 13 + + arch/arm/mach-imx/cpuidle-imx6q.c | 6 +- + arch/arm/mach-imx/crm-regs-imx5.h | 600 ------ + arch/arm/mach-imx/devices-imx51.h | 66 - + arch/arm/mach-imx/devices/Kconfig | 9 +- + arch/arm/mach-imx/devices/Makefile | 2 - + arch/arm/mach-imx/devices/devices-common.h | 26 - + arch/arm/mach-imx/devices/platform-fec.c | 12 - + arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 5 - + arch/arm/mach-imx/devices/platform-imx-i2c.c | 26 - + arch/arm/mach-imx/devices/platform-imx-keypad.c | 10 - + arch/arm/mach-imx/devices/platform-imx-ssi.c | 20 - + arch/arm/mach-imx/devices/platform-imx-uart.c | 22 - + arch/arm/mach-imx/devices/platform-imx2-wdt.c | 18 - + arch/arm/mach-imx/devices/platform-imx_udc.c | 75 - + arch/arm/mach-imx/devices/platform-mx1-camera.c | 42 - + arch/arm/mach-imx/devices/platform-mxc-ehci.c | 9 - + arch/arm/mach-imx/devices/platform-mxc_nand.c | 5 - + arch/arm/mach-imx/devices/platform-mxc_rnga.c | 5 +- + arch/arm/mach-imx/devices/platform-pata_imx.c | 10 - + .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 24 - + arch/arm/mach-imx/devices/platform-spi_imx.c | 27 - + arch/arm/mach-imx/ehci-imx25.c | 1 + + arch/arm/mach-imx/ehci-imx27.c | 1 + + arch/arm/mach-imx/ehci-imx31.c | 1 + + arch/arm/mach-imx/ehci-imx35.c | 1 + + arch/arm/mach-imx/ehci-imx5.c | 171 -- + arch/arm/mach-imx/ehci.h | 43 + + arch/arm/mach-imx/gpc.c | 5 +- + arch/arm/mach-imx/hardware.h | 2 - + arch/arm/mach-imx/imx25-dt.c | 6 - + arch/arm/mach-imx/imx27-dt.c | 6 - + arch/arm/mach-imx/imx31-dt.c | 2 +- + arch/arm/mach-imx/imx35-dt.c | 2 +- + arch/arm/mach-imx/iomux-mx51.h | 827 -------- + arch/arm/mach-imx/mach-armadillo5x0.c | 1 + + arch/arm/mach-imx/mach-cpuimx27.c | 1 + + arch/arm/mach-imx/mach-cpuimx35.c | 1 + + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 + + arch/arm/mach-imx/mach-imx27ipcam.c | 77 - + arch/arm/mach-imx/mach-imx27lite.c | 83 - + arch/arm/mach-imx/mach-imx50.c | 5 +- + arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} | 45 +- + arch/arm/mach-imx/mach-imx53.c | 19 +- + arch/arm/mach-imx/mach-imx6q.c | 4 +- + arch/arm/mach-imx/mach-imx6sl.c | 2 +- + arch/arm/mach-imx/mach-imx6sx.c | 10 +- + arch/arm/mach-imx/mach-mx25_3ds.c | 1 + + arch/arm/mach-imx/mach-mx27_3ds.c | 1 + + arch/arm/mach-imx/mach-mx31_3ds.c | 1 + + arch/arm/mach-imx/mach-mx31lilly.c | 1 + + arch/arm/mach-imx/mach-mx31lite.c | 1 + + arch/arm/mach-imx/mach-mx31moboard.c | 5 +- + arch/arm/mach-imx/mach-mx35_3ds.c | 1 + + arch/arm/mach-imx/mach-pca100.c | 1 + + arch/arm/mach-imx/mach-pcm037.c | 1 + + arch/arm/mach-imx/mach-pcm038.c | 1 + + arch/arm/mach-imx/mach-pcm043.c | 1 + + arch/arm/mach-imx/mach-vf610.c | 2 +- + arch/arm/mach-imx/mach-vpr200.c | 1 + + arch/arm/mach-imx/mm-imx5.c | 155 -- + arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 18 - + arch/arm/mach-imx/mx1-camera-fiq.S | 35 - + arch/arm/mach-imx/mx31moboard-devboard.c | 5 +- + arch/arm/mach-imx/mx31moboard-marxbot.c | 5 +- + arch/arm/mach-imx/mx31moboard-smartbot.c | 5 +- + arch/arm/mach-imx/mx51.h | 346 ---- + arch/arm/mach-imx/mx53.h | 342 ---- + arch/arm/mach-imx/mxc.h | 7 + + arch/arm/mach-imx/pm-imx5.c | 98 +- + arch/arm/mach-imx/pm-imx6.c | 67 +- + arch/arm/mach-imx/system.c | 24 +- + arch/arm/mach-imx/time.c | 55 +- + arch/arm/mach-imx/tzic.c | 9 +- + arch/arm/mach-integrator/Kconfig | 1 - + arch/arm/mach-integrator/include/mach/memory.h | 29 - + arch/arm/mach-integrator/integrator_ap.c | 10 +- + arch/arm/mach-integrator/integrator_cp.c | 13 +- + arch/arm/mach-kirkwood/Kconfig | 111 -- + arch/arm/mach-kirkwood/Makefile | 14 - + arch/arm/mach-kirkwood/Makefile.boot | 3 - + arch/arm/mach-kirkwood/board-dt.c | 223 --- + arch/arm/mach-kirkwood/common.c | 746 ------- + arch/arm/mach-kirkwood/common.h | 74 - + arch/arm/mach-kirkwood/d2net_v2-setup.c | 231 --- + arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 86 - + arch/arm/mach-kirkwood/include/mach/entry-macro.S | 34 - + arch/arm/mach-kirkwood/include/mach/irqs.h | 65 - + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 142 -- + arch/arm/mach-kirkwood/include/mach/uncompress.h | 46 - + arch/arm/mach-kirkwood/irq.c | 82 - + arch/arm/mach-kirkwood/lacie_v2-common.c | 114 -- + arch/arm/mach-kirkwood/lacie_v2-common.h | 16 - + arch/arm/mach-kirkwood/mpp.c | 43 - + arch/arm/mach-kirkwood/mpp.h | 348 ---- + arch/arm/mach-kirkwood/netxbig_v2-setup.c | 422 ---- + arch/arm/mach-kirkwood/openrd-setup.c | 255 --- + arch/arm/mach-kirkwood/pcie.c | 296 --- + arch/arm/mach-kirkwood/pm.c | 76 - + arch/arm/mach-kirkwood/pm.h | 26 - + arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 89 - + arch/arm/mach-kirkwood/rd88f6281-setup.c | 128 -- + arch/arm/mach-kirkwood/t5325-setup.c | 216 --- + arch/arm/mach-kirkwood/ts219-setup.c | 142 -- + arch/arm/mach-kirkwood/ts41x-setup.c | 186 -- + arch/arm/mach-kirkwood/tsx1x-common.c | 113 -- + arch/arm/mach-kirkwood/tsx1x-common.h | 7 - + arch/arm/mach-mediatek/Kconfig | 6 + + arch/arm/mach-mediatek/Makefile | 1 + + .../mach/dma.h => mach-mediatek/mediatek.c} | 25 +- + arch/arm/mach-mmp/include/mach/mfp-pxa910.h | 1 - + arch/arm/mach-mvebu/Kconfig | 13 + + arch/arm/mach-mvebu/Makefile | 4 +- + arch/arm/mach-mvebu/armada-370-xp.h | 2 + + arch/arm/mach-mvebu/board-v7.c | 22 +- + arch/arm/mach-mvebu/board.h | 5 + + arch/arm/mach-mvebu/common.h | 3 +- + arch/arm/mach-mvebu/cpu-reset.c | 2 +- + arch/arm/mach-mvebu/headsmp-a9.S | 15 - + arch/arm/mach-mvebu/hotplug.c | 31 - + arch/arm/mach-mvebu/kirkwood.c | 3 + + arch/arm/mach-mvebu/mvebu-soc-id.c | 21 +- + arch/arm/mach-mvebu/netxbig.c | 191 ++ + arch/arm/mach-mvebu/platsmp-a9.c | 45 +- + arch/arm/mach-mvebu/platsmp.c | 49 + + arch/arm/mach-mvebu/pmsu.c | 438 ++++- + arch/arm/mach-mvebu/pmsu.h | 5 + + arch/arm/mach-mvebu/pmsu_ll.S | 36 + + arch/arm/mach-mvebu/system-controller.c | 50 + + arch/arm/mach-omap1/ocpi.c | 1 - + arch/arm/mach-omap2/Makefile | 7 +- + arch/arm/mach-omap2/cclock2420_data.c | 1931 ------------------ + arch/arm/mach-omap2/cclock2430_data.c | 2048 -------------------- + arch/arm/mach-omap2/clkt2xxx_osc.c | 69 - + arch/arm/mach-omap2/clkt2xxx_sys.c | 47 - + arch/arm/mach-omap2/clkt_dpll.c | 98 +- + arch/arm/mach-omap2/clkt_iclk.c | 8 +- + arch/arm/mach-omap2/clock.c | 97 +- + arch/arm/mach-omap2/clock.h | 47 +- + arch/arm/mach-omap2/clock2xxx.h | 2 - + arch/arm/mach-omap2/cm-regbits-24xx.h | 1 + + arch/arm/mach-omap2/cm2_7xx.h | 4 + + arch/arm/mach-omap2/control.c | 60 +- + arch/arm/mach-omap2/control.h | 40 +- + arch/arm/mach-omap2/ctrl_module_core_44xx.h | 392 ---- + arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h | 1409 -------------- + arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h | 236 --- + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/dma.c | 3 + + arch/arm/mach-omap2/dpll3xxx.c | 7 +- + arch/arm/mach-omap2/dpll44xx.c | 19 +- + arch/arm/mach-omap2/gpmc-nand.c | 79 +- + arch/arm/mach-omap2/io.c | 9 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 14 - + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 13 - + .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 9 - + .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 40 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 10 - + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 100 + + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 - + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 574 +++++- + arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 - + .../mach-omap2/omap_hwmod_common_ipblock_data.c | 55 + + arch/arm/mach-omap2/pm24xx.c | 35 +- + arch/arm/mach-omap2/pm34xx.c | 218 +-- + arch/arm/mach-omap2/prcm43xx.h | 1 + + arch/arm/mach-omap2/prm2xxx.c | 18 + + arch/arm/mach-omap2/prm2xxx.h | 1 + + arch/arm/mach-omap2/prm3xxx.c | 233 +++ + arch/arm/mach-omap2/prm3xxx.h | 6 + + arch/arm/mach-omap2/prm7xx.h | 4 + + arch/arm/mach-omap2/prm_common.c | 2 + + arch/arm/mach-omap2/usb-tusb6010.c | 1 - + arch/arm/mach-pxa/corgi.c | 2 +- + arch/arm/mach-pxa/generic.c | 12 +- + arch/arm/mach-pxa/include/mach/hardware.h | 4 +- + arch/arm/mach-pxa/pxa25x.c | 7 +- + arch/arm/mach-pxa/pxa27x.c | 10 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/sleep.S | 2 +- + arch/arm/mach-realview/core.c | 2 +- + arch/arm/mach-rockchip/Kconfig | 1 + + arch/arm/mach-rockchip/Makefile | 2 + + arch/arm/mach-rockchip/platsmp.c | 20 + + arch/arm/mach-rockchip/rockchip.c | 1 + + arch/arm/mach-s3c24xx/common.c | 2 - + arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 1 - + arch/arm/mach-s3c24xx/mach-h1940.c | 5 +- + arch/arm/mach-s3c24xx/mach-jive.c | 1 - + arch/arm/mach-s3c24xx/mach-smdk2413.c | 1 - + arch/arm/mach-s3c24xx/mach-smdk2416.c | 1 - + arch/arm/mach-s3c24xx/mach-smdk2443.c | 1 - + arch/arm/mach-s3c24xx/mach-vstms.c | 1 - + arch/arm/mach-s3c24xx/s3c2410.c | 6 - + arch/arm/mach-s3c24xx/s3c2412.c | 6 - + arch/arm/mach-s3c24xx/s3c2442.c | 1 - + arch/arm/mach-s3c24xx/s3c244x.c | 6 - + arch/arm/mach-s3c64xx/mach-anw6410.c | 1 - + arch/arm/mach-s3c64xx/mach-crag6410.c | 1 - + arch/arm/mach-s3c64xx/mach-hmt.c | 1 - + arch/arm/mach-s3c64xx/mach-ncp.c | 1 - + arch/arm/mach-s3c64xx/mach-smartq.c | 1 - + arch/arm/mach-s3c64xx/mach-smdk6400.c | 1 - + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 - + arch/arm/mach-s3c64xx/s3c6400.c | 1 - + arch/arm/mach-s3c64xx/s3c6410.c | 1 - + arch/arm/mach-s5p64x0/Kconfig | 102 - + arch/arm/mach-s5p64x0/Makefile | 36 - + arch/arm/mach-s5p64x0/Makefile.boot | 2 - + arch/arm/mach-s5p64x0/clock-s5p6440.c | 632 ------ + arch/arm/mach-s5p64x0/clock-s5p6450.c | 701 ------- + arch/arm/mach-s5p64x0/clock.c | 236 --- + arch/arm/mach-s5p64x0/clock.h | 38 - + arch/arm/mach-s5p64x0/common.c | 490 ----- + arch/arm/mach-s5p64x0/common.h | 56 - + arch/arm/mach-s5p64x0/dev-audio.c | 176 -- + arch/arm/mach-s5p64x0/dma.c | 128 -- + arch/arm/mach-s5p64x0/i2c.h | 16 - + arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 32 - + arch/arm/mach-s5p64x0/include/mach/gpio.h | 132 -- + arch/arm/mach-s5p64x0/include/mach/hardware.h | 18 - + arch/arm/mach-s5p64x0/include/mach/irqs.h | 148 -- + arch/arm/mach-s5p64x0/include/mach/map.h | 96 - + arch/arm/mach-s5p64x0/include/mach/pm-core.h | 119 -- + arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 98 - + arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 68 - + arch/arm/mach-s5p64x0/include/mach/regs-irq.h | 18 - + arch/arm/mach-s5p64x0/irq-pm.c | 98 - + arch/arm/mach-s5p64x0/mach-smdk6440.c | 280 --- + arch/arm/mach-s5p64x0/mach-smdk6450.c | 299 --- + arch/arm/mach-s5p64x0/pm.c | 202 -- + arch/arm/mach-s5p64x0/setup-fb-24bpp.c | 29 - + arch/arm/mach-s5p64x0/setup-i2c0.c | 38 - + arch/arm/mach-s5p64x0/setup-i2c1.c | 38 - + arch/arm/mach-s5p64x0/setup-sdhci-gpio.c | 104 - + arch/arm/mach-s5p64x0/setup-spi.c | 38 - + arch/arm/mach-s5pc100/Kconfig | 81 - + arch/arm/mach-s5pc100/Makefile | 32 - + arch/arm/mach-s5pc100/Makefile.boot | 2 - + arch/arm/mach-s5pc100/clock.c | 1361 ------------- + arch/arm/mach-s5pc100/common.c | 255 --- + arch/arm/mach-s5pc100/common.h | 30 - + arch/arm/mach-s5pc100/dev-audio.c | 239 --- + arch/arm/mach-s5pc100/dma.c | 130 -- + arch/arm/mach-s5pc100/include/mach/debug-macro.S | 39 - + arch/arm/mach-s5pc100/include/mach/entry-macro.S | 19 - + arch/arm/mach-s5pc100/include/mach/gpio.h | 144 -- + arch/arm/mach-s5pc100/include/mach/hardware.h | 14 - + arch/arm/mach-s5pc100/include/mach/irqs.h | 115 -- + arch/arm/mach-s5pc100/include/mach/map.h | 137 -- + arch/arm/mach-s5pc100/include/mach/regs-clock.h | 80 - + arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 38 - + arch/arm/mach-s5pc100/include/mach/regs-irq.h | 18 - + arch/arm/mach-s5pc100/mach-smdkc100.c | 264 --- + arch/arm/mach-s5pc100/setup-fb-24bpp.c | 35 - + arch/arm/mach-s5pc100/setup-i2c0.c | 28 - + arch/arm/mach-s5pc100/setup-i2c1.c | 28 - + arch/arm/mach-s5pc100/setup-ide.c | 57 - + arch/arm/mach-s5pc100/setup-keypad.c | 23 - + arch/arm/mach-s5pc100/setup-sdhci-gpio.c | 70 - + arch/arm/mach-s5pc100/setup-spi.c | 41 - + arch/arm/mach-s5pv210/Kconfig | 197 +- + arch/arm/mach-s5pv210/Makefile | 29 +- + arch/arm/mach-s5pv210/Makefile.boot | 2 - + arch/arm/mach-s5pv210/clock.c | 1365 ------------- + arch/arm/mach-s5pv210/common.c | 279 --- + arch/arm/mach-s5pv210/common.h | 21 +- + arch/arm/mach-s5pv210/dev-audio.c | 246 --- + arch/arm/mach-s5pv210/dma.c | 130 -- + arch/arm/mach-s5pv210/include/mach/gpio.h | 140 -- + arch/arm/mach-s5pv210/include/mach/hardware.h | 18 - + arch/arm/mach-s5pv210/include/mach/irqs.h | 137 -- + arch/arm/mach-s5pv210/include/mach/map.h | 158 -- + arch/arm/mach-s5pv210/include/mach/memory.h | 25 - + arch/arm/mach-s5pv210/include/mach/pm-core.h | 46 - + arch/arm/mach-s5pv210/include/mach/regs-clock.h | 2 +- + arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 41 - + arch/arm/mach-s5pv210/include/mach/regs-irq.h | 18 - + arch/arm/mach-s5pv210/mach-aquila.c | 687 ------- + arch/arm/mach-s5pv210/mach-goni.c | 916 --------- + arch/arm/mach-s5pv210/mach-smdkc110.c | 159 -- + arch/arm/mach-s5pv210/mach-smdkv210.c | 337 ---- + arch/arm/mach-s5pv210/mach-torbreck.c | 135 -- + arch/arm/mach-s5pv210/pm.c | 147 +- + arch/arm/mach-s5pv210/s5pv210.c | 77 + + arch/arm/mach-s5pv210/setup-fb-24bpp.c | 49 - + arch/arm/mach-s5pv210/setup-fimc.c | 43 - + arch/arm/mach-s5pv210/setup-i2c0.c | 28 - + arch/arm/mach-s5pv210/setup-i2c1.c | 28 - + arch/arm/mach-s5pv210/setup-i2c2.c | 28 - + arch/arm/mach-s5pv210/setup-ide.c | 39 - + arch/arm/mach-s5pv210/setup-keypad.c | 24 - + arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 103 - + arch/arm/mach-s5pv210/setup-spi.c | 34 - + arch/arm/mach-s5pv210/setup-usb-phy.c | 95 - + .../s5p-sleep.S => mach-s5pv210/sleep.S} | 19 +- + arch/arm/mach-shmobile/Kconfig | 24 +- + arch/arm/mach-shmobile/Makefile | 23 +- + arch/arm/mach-shmobile/Makefile.boot | 1 - + arch/arm/mach-shmobile/board-ape6evm-reference.c | 6 +- + arch/arm/mach-shmobile/board-ape6evm.c | 8 +- + .../board-armadillo800eva-reference.c | 14 +- + arch/arm/mach-shmobile/board-armadillo800eva.c | 43 +- + arch/arm/mach-shmobile/board-bockw-reference.c | 6 +- + arch/arm/mach-shmobile/board-bockw.c | 8 +- + arch/arm/mach-shmobile/board-genmai-reference.c | 10 +- + arch/arm/mach-shmobile/board-genmai.c | 10 +- + arch/arm/mach-shmobile/board-koelsch-reference.c | 28 +- + arch/arm/mach-shmobile/board-koelsch.c | 11 +- + arch/arm/mach-shmobile/board-kzm9g-reference.c | 6 +- + arch/arm/mach-shmobile/board-kzm9g.c | 8 +- + arch/arm/mach-shmobile/board-lager-reference.c | 29 +- + arch/arm/mach-shmobile/board-lager.c | 22 +- + arch/arm/mach-shmobile/board-mackerel.c | 12 +- + arch/arm/mach-shmobile/board-marzen-reference.c | 32 +- + arch/arm/mach-shmobile/board-marzen.c | 8 +- + arch/arm/mach-shmobile/clock-r7s72100.c | 5 +- + arch/arm/mach-shmobile/clock-r8a73a4.c | 11 +- + arch/arm/mach-shmobile/clock-r8a7740.c | 28 +- + arch/arm/mach-shmobile/clock-r8a7778.c | 12 +- + arch/arm/mach-shmobile/clock-r8a7779.c | 27 +- + arch/arm/mach-shmobile/clock-r8a7790.c | 8 +- + arch/arm/mach-shmobile/clock-r8a7791.c | 6 +- + arch/arm/mach-shmobile/clock-sh7372.c | 4 +- + arch/arm/mach-shmobile/clock-sh73a0.c | 14 +- + arch/arm/mach-shmobile/clock.c | 6 +- + arch/arm/mach-shmobile/{include/mach => }/clock.h | 0 + arch/arm/mach-shmobile/{include/mach => }/common.h | 9 + + arch/arm/mach-shmobile/console.c | 2 +- + arch/arm/mach-shmobile/cpufreq.c | 17 + + .../{include/mach => }/dma-register.h | 0 + arch/arm/mach-shmobile/headsmp.S | 13 +- + arch/arm/mach-shmobile/include/mach/irqs.h | 16 +- + arch/arm/mach-shmobile/intc-sh7372.c | 5 +- + arch/arm/mach-shmobile/intc-sh73a0.c | 9 +- + arch/arm/mach-shmobile/{include/mach => }/intc.h | 0 + arch/arm/mach-shmobile/irqs.h | 21 + + arch/arm/mach-shmobile/platsmp-apmu.c | 71 +- + arch/arm/mach-shmobile/platsmp-scu.c | 2 +- + arch/arm/mach-shmobile/platsmp.c | 2 +- + arch/arm/mach-shmobile/pm-r8a7740.c | 4 +- + arch/arm/mach-shmobile/pm-r8a7779.c | 19 +- + arch/arm/mach-shmobile/pm-r8a7790.c | 45 +- + arch/arm/mach-shmobile/pm-r8a7791.c | 73 + + arch/arm/mach-shmobile/pm-rcar.c | 2 +- + .../arm/mach-shmobile/{include/mach => }/pm-rcar.h | 0 + arch/arm/mach-shmobile/pm-rmobile.c | 2 +- + .../mach-shmobile/{include/mach => }/pm-rmobile.h | 0 + arch/arm/mach-shmobile/pm-sh7372.c | 8 +- + arch/arm/mach-shmobile/pm-sh73a0.c | 2 +- + .../mach-shmobile/{include/mach => }/r7s72100.h | 1 - + .../arm/mach-shmobile/{include/mach => }/r8a73a4.h | 0 + .../arm/mach-shmobile/{include/mach => }/r8a7740.h | 2 - + .../arm/mach-shmobile/{include/mach => }/r8a7778.h | 0 + .../arm/mach-shmobile/{include/mach => }/r8a7779.h | 14 +- + .../arm/mach-shmobile/{include/mach => }/r8a7790.h | 3 - + .../arm/mach-shmobile/{include/mach => }/r8a7791.h | 1 + + .../mach-shmobile/{include/mach => }/rcar-gen2.h | 1 + + arch/arm/mach-shmobile/setup-emev2.c | 19 +- + arch/arm/mach-shmobile/setup-r7s72100.c | 15 +- + arch/arm/mach-shmobile/setup-r8a73a4.c | 22 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 20 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 20 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 53 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 22 +- + arch/arm/mach-shmobile/setup-r8a7791.c | 12 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 76 +- + arch/arm/mach-shmobile/setup-sh7372.c | 12 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 19 +- + arch/arm/mach-shmobile/{include/mach => }/sh7372.h | 4 - + arch/arm/mach-shmobile/{include/mach => }/sh73a0.h | 0 + arch/arm/mach-shmobile/smp-emev2.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 8 +- + arch/arm/mach-shmobile/smp-r8a7790.c | 36 +- + arch/arm/mach-shmobile/smp-r8a7791.c | 30 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 6 +- + arch/arm/mach-shmobile/timer.c | 50 +- + arch/arm/mach-spear/Kconfig | 4 + + arch/arm/mach-spear/include/mach/spear.h | 4 +- + arch/arm/mach-spear/spear1310.c | 2 +- + arch/arm/mach-spear/spear1340.c | 125 +- + arch/arm/mach-spear/spear13xx.c | 4 +- + arch/arm/mach-sti/platsmp.c | 6 +- + arch/arm/mach-sunxi/Kconfig | 8 + + arch/arm/mach-sunxi/sunxi.c | 9 + + arch/arm/mach-tegra/Makefile | 7 - + arch/arm/mach-tegra/apbio.c | 206 -- + arch/arm/mach-tegra/apbio.h | 22 - + arch/arm/mach-tegra/board-paz00.c | 3 +- + arch/arm/mach-tegra/board.h | 7 - + arch/arm/mach-tegra/cpuidle-tegra114.c | 10 +- + arch/arm/mach-tegra/cpuidle-tegra20.c | 16 +- + arch/arm/mach-tegra/cpuidle-tegra30.c | 10 +- + arch/arm/mach-tegra/cpuidle.c | 7 +- + arch/arm/mach-tegra/flowctrl.c | 11 +- + arch/arm/mach-tegra/fuse.c | 252 --- + arch/arm/mach-tegra/fuse.h | 79 - + arch/arm/mach-tegra/hotplug.c | 30 +- + arch/arm/mach-tegra/io.c | 8 +- + arch/arm/mach-tegra/irq.c | 8 +- + arch/arm/mach-tegra/platsmp.c | 29 +- + arch/arm/mach-tegra/pm-tegra20.c | 1 + + arch/arm/mach-tegra/pm-tegra30.c | 1 + + arch/arm/mach-tegra/pm.c | 63 +- + arch/arm/mach-tegra/pm.h | 10 +- + arch/arm/mach-tegra/pmc.c | 413 ---- + arch/arm/mach-tegra/pmc.h | 49 - + arch/arm/mach-tegra/powergate.c | 515 ----- + arch/arm/mach-tegra/reset-handler.S | 7 +- + arch/arm/mach-tegra/reset.c | 19 +- + arch/arm/mach-tegra/sleep-tegra30.S | 7 +- + arch/arm/mach-tegra/sleep.h | 3 - + arch/arm/mach-tegra/tegra.c | 37 +- + arch/arm/mach-ux500/board-mop500-regulators.c | 2 +- + arch/arm/mach-ux500/cache-l2x0.c | 18 +- + arch/arm/mach-ux500/cpu-db8500.c | 8 +- + arch/arm/mach-ux500/cpu.c | 2 +- + arch/arm/mach-ux500/timer.c | 2 +- + arch/arm/mach-versatile/core.c | 2 +- + arch/arm/mach-versatile/versatile_dt.c | 1 - + arch/arm/mach-vexpress/Kconfig | 1 - + arch/arm/mach-vexpress/ct-ca9x4.c | 3 +- + arch/arm/mach-vt8500/vt8500.c | 6 +- + arch/arm/mm/Kconfig | 2 +- + arch/arm/plat-omap/dma.c | 5 +- + arch/arm/plat-samsung/Kconfig | 163 +- + arch/arm/plat-samsung/Makefile | 15 - + arch/arm/plat-samsung/adc.c | 2 +- + arch/arm/plat-samsung/clock-clksrc.c | 212 -- + arch/arm/plat-samsung/clock.c | 539 ------ + arch/arm/plat-samsung/cpu.c | 3 +- + arch/arm/plat-samsung/devs.c | 330 ---- + arch/arm/plat-samsung/include/plat/camport.h | 28 - + arch/arm/plat-samsung/include/plat/clock-clksrc.h | 83 - + arch/arm/plat-samsung/include/plat/clock.h | 152 -- + arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 3 - + arch/arm/plat-samsung/include/plat/cpu.h | 42 - + arch/arm/plat-samsung/include/plat/devs.h | 59 - + arch/arm/plat-samsung/include/plat/fb-core.h | 15 - + arch/arm/plat-samsung/include/plat/fb.h | 36 - + arch/arm/plat-samsung/include/plat/fimc-core.h | 51 - + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 64 - + arch/arm/plat-samsung/include/plat/gpio-core.h | 3 + + arch/arm/plat-samsung/include/plat/hdmi.h | 16 - + arch/arm/plat-samsung/include/plat/irqs.h | 72 - + arch/arm/plat-samsung/include/plat/map-s5p.h | 1 - + arch/arm/plat-samsung/include/plat/mfc.h | 35 - + arch/arm/plat-samsung/include/plat/pll.h | 323 --- + arch/arm/plat-samsung/include/plat/s5p-clock.h | 65 - + arch/arm/plat-samsung/include/plat/sdhci.h | 124 -- + arch/arm/plat-samsung/include/plat/tv-core.h | 44 - + arch/arm/plat-samsung/init.c | 1 - + arch/arm/plat-samsung/pm-gpio.c | 6 +- + arch/arm/plat-samsung/s5p-clock.c | 294 --- + arch/arm/plat-samsung/s5p-dev-mfc.c | 81 +- + arch/arm/plat-samsung/s5p-dev-uart.c | 88 - + arch/arm/plat-samsung/s5p-irq-eint.c | 221 --- + arch/arm/plat-samsung/s5p-irq-gpioint.c | 218 --- + arch/arm/plat-samsung/s5p-irq-pm.c | 92 - + arch/arm/plat-samsung/s5p-irq.c | 31 - + arch/arm/plat-samsung/s5p-pm.c | 40 - + arch/arm/plat-versatile/Kconfig | 3 - + arch/arm/plat-versatile/Makefile | 1 - + arch/arm/plat-versatile/include/plat/clcd.h | 9 - + arch/avr32/boards/atngw100/mrmt.c | 34 +- + arch/avr32/boards/favr-32/setup.c | 48 +- + arch/avr32/boards/merisc/setup.c | 34 +- + arch/avr32/configs/atngw100_mrmt_defconfig | 5 +- + arch/avr32/configs/atstk1002_defconfig | 5 +- + arch/avr32/configs/atstk1003_defconfig | 5 +- + arch/avr32/configs/atstk1004_defconfig | 5 +- + arch/avr32/configs/atstk1006_defconfig | 5 +- + arch/avr32/configs/favr-32_defconfig | 6 +- + arch/avr32/configs/merisc_defconfig | 5 +- + arch/avr32/mach-at32ap/at32ap700x.c | 7 +- + drivers/amba/tegra-ahb.c | 3 +- + drivers/bus/Kconfig | 8 + + drivers/bus/Makefile | 4 +- + drivers/bus/arm-cci.c | 3 +- + drivers/bus/arm-ccn.c | 1391 +++++++++++++ + drivers/bus/imx-weim.c | 4 +- + drivers/clk/mvebu/clk-cpu.c | 80 +- + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-s5pv210-audss.c | 241 +++ + drivers/clk/samsung/clk-s5pv210.c | 856 ++++++++ + drivers/clk/tegra/clk-periph-gate.c | 3 +- + drivers/clk/tegra/clk-tegra30.c | 5 +- + drivers/clk/tegra/clk.c | 3 +- + drivers/clk/versatile/Makefile | 3 +- + .../{clk-integrator.c => clk-versatile.c} | 38 +- + drivers/clocksource/tegra20_timer.c | 13 + + drivers/cpufreq/s3c2410-cpufreq.c | 2 - + drivers/cpufreq/s3c2412-cpufreq.c | 3 - + drivers/cpufreq/s3c2440-cpufreq.c | 3 - + drivers/cpufreq/s3c24xx-cpufreq.c | 1 - + drivers/cpufreq/s5pv210-cpufreq.c | 131 +- + drivers/cpuidle/Kconfig.arm | 14 +- + drivers/cpuidle/Makefile | 2 +- + drivers/cpuidle/cpuidle-armada-370-xp.c | 93 - + drivers/cpuidle/cpuidle-big_little.c | 12 +- + drivers/cpuidle/cpuidle-mvebu-v7.c | 150 ++ + drivers/gpio/gpio-samsung.c | 965 --------- + drivers/gpu/drm/tegra/gr3d.c | 3 +- + drivers/gpu/drm/tegra/sor.c | 3 +- + drivers/iommu/tegra-smmu.c | 3 +- + drivers/irqchip/Kconfig | 1 - + drivers/irqchip/irq-versatile-fpga.c | 18 +- + drivers/leds/Kconfig | 8 - + drivers/leds/Makefile | 1 - + drivers/leds/leds-atmel-pwm.c | 149 -- + drivers/mailbox/Kconfig | 19 +- + drivers/mailbox/Makefile | 6 +- + drivers/mailbox/mailbox-omap1.c | 203 -- + drivers/mailbox/mailbox-omap2.c | 357 ---- + drivers/mailbox/omap-mailbox.c | 444 ++++- + drivers/mailbox/omap-mbox.h | 67 - + drivers/misc/Kconfig | 10 - + drivers/misc/Makefile | 1 - + drivers/misc/atmel_pwm.c | 402 ---- + drivers/misc/fuse/Makefile | 1 + + drivers/mtd/onenand/Kconfig | 4 +- + drivers/mtd/onenand/samsung.c | 25 +- + drivers/pci/host/Kconfig | 8 + + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-tegra.c | 227 ++- + drivers/pci/host/pcie-spear13xx.c | 393 ++++ + drivers/phy/Kconfig | 22 + + drivers/phy/Makefile | 3 + + drivers/phy/phy-s5pv210-usb2.c | 187 ++ + drivers/phy/phy-samsung-usb2.c | 6 + + drivers/phy/phy-samsung-usb2.h | 1 + + drivers/phy/phy-spear1310-miphy.c | 274 +++ + drivers/phy/phy-spear1340-miphy.c | 307 +++ + drivers/pinctrl/Kconfig | 6 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-tegra-xusb.c | 973 ++++++++++ + drivers/power/reset/Kconfig | 6 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/hisi-reboot.c | 67 + + drivers/pwm/Kconfig | 2 +- + drivers/soc/Makefile | 1 + + drivers/soc/tegra/Makefile | 4 + + drivers/soc/tegra/common.c | 30 + + drivers/soc/tegra/fuse/Makefile | 8 + + drivers/soc/tegra/fuse/fuse-tegra.c | 163 ++ + drivers/soc/tegra/fuse/fuse-tegra20.c | 215 ++ + drivers/soc/tegra/fuse/fuse-tegra30.c | 224 +++ + drivers/soc/tegra/fuse/fuse.h | 71 + + .../soc/tegra/fuse/speedo-tegra114.c | 56 +- + drivers/soc/tegra/fuse/speedo-tegra124.c | 168 ++ + .../soc/tegra/fuse/speedo-tegra20.c | 45 +- + .../soc/tegra/fuse/speedo-tegra30.c | 176 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 115 ++ + drivers/soc/tegra/pmc.c | 957 +++++++++ + drivers/spi/spi-s3c64xx.c | 22 - + drivers/tty/serial/samsung.c | 4 - + drivers/video/backlight/Kconfig | 11 - + drivers/video/backlight/Makefile | 1 - + drivers/video/backlight/atmel-pwm-bl.c | 223 --- + drivers/video/fbdev/Kconfig | 10 +- + drivers/video/fbdev/Makefile | 1 + + .../video/fbdev/amba-clcd-versatile.c | 2 +- + drivers/video/fbdev/s3c-fb.c | 65 - + include/dt-bindings/clock/imx1-clock.h | 40 + + include/dt-bindings/clock/imx21-clock.h | 80 + + include/dt-bindings/clock/imx27-clock.h | 108 ++ + include/dt-bindings/clock/imx6qdl-clock.h | 224 +++ + include/dt-bindings/clock/r8a7790-clock.h | 27 + + include/dt-bindings/clock/r8a7791-clock.h | 27 + + include/dt-bindings/clock/s5pv210-audss.h | 34 + + include/dt-bindings/clock/s5pv210.h | 239 +++ + include/dt-bindings/clock/vf610-clock.h | 4 +- + include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h | 7 + + include/linux/atmel-pwm-bl.h | 43 - + include/linux/atmel_pwm.h | 70 - + include/linux/mvebu-pmsu.h | 20 + + include/linux/omap-dma.h | 1 + + include/linux/platform_data/camera-mx1.h | 35 - + include/linux/platform_data/usb-ehci-mxc.h | 46 - + include/linux/platform_data/usb-imx_udc.h | 23 - + include/linux/platform_data/video-clcd-versatile.h | 27 + + include/linux/tegra-soc.h | 22 - + include/{linux/tegra-ahb.h => soc/tegra/ahb.h} | 6 +- + .../mach/hardware.h => include/soc/tegra/common.h | 10 +- + .../{linux/tegra-cpuidle.h => soc/tegra/cpuidle.h} | 6 +- + include/soc/tegra/fuse.h | 65 + + include/soc/tegra/pm.h | 38 + + .../{linux/tegra-powergate.h => soc/tegra/pmc.h} | 31 +- + include/video/samsung_fimd.h | 2 +- + init/calibrate.c | 11 + + sound/soc/samsung/goni_wm8994.c | 2 +- + 1015 files changed, 39715 insertions(+), 42420 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-tegra-fuse + create mode 100644 Documentation/arm/CCN.txt + create mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt + create mode 100644 Documentation/devicetree/bindings/arm/armada-380-mpcore-soc-ctrl.txt + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method + create mode 100644 Documentation/devicetree/bindings/arm/brcm-brcmstb.txt + create mode 100644 Documentation/devicetree/bindings/arm/ccn.txt + create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/marvell,berlin-smp + create mode 100644 Documentation/devicetree/bindings/arm/mediatek.txt + create mode 100644 Documentation/devicetree/bindings/arm/omap/prcm.txt + create mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt + create mode 100644 Documentation/devicetree/bindings/clock/clk-s5pv210-audss.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx1-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/imx21-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s5pv210-clock.txt + create mode 100644 Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt + create mode 100644 Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt + create mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt + create mode 100644 Documentation/devicetree/bindings/pci/spear13xx-pcie.txt + create mode 100644 Documentation/devicetree/bindings/phy/st-spear-miphy.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt + create mode 100644 Documentation/devicetree/bindings/serial/cdns,uart.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-pepper.dts + create mode 100644 arch/arm/boot/dts/am437x-sk-evm.dts + create mode 100644 arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts + create mode 100644 arch/arm/boot/dts/bcm7445-bcm97445svmb.dts + create mode 100644 arch/arm/boot/dts/bcm7445.dtsi + create mode 100644 arch/arm/boot/dts/cros-ec-keyboard.dtsi + create mode 100644 arch/arm/boot/dts/dove-cubox-es.dts + create mode 100644 arch/arm/boot/dts/exynos4412-odroid-common.dtsi + create mode 100644 arch/arm/boot/dts/exynos4412-odroidu3.dts + create mode 100644 arch/arm/boot/dts/exynos4412-odroidx2.dts + create mode 100644 arch/arm/boot/dts/hisi-x5hd2-dkb.dts + create mode 100644 arch/arm/boot/dts/hisi-x5hd2.dtsi + create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts + create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts + create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts + create mode 100644 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi + create mode 100644 arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts + create mode 100644 arch/arm/boot/dts/imx28-m28.dtsi + create mode 100644 arch/arm/boot/dts/imx53-m53.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos_4.dts + create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos_7.dts + create mode 100644 arch/arm/boot/dts/imx6dl-rex-basic.dts + create mode 100644 arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts + create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-801x.dts + create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-811x.dts + create mode 100644 arch/arm/boot/dts/imx6dl-wandboard-revb1.dts + create mode 100644 arch/arm/boot/dts/imx6q-rex-pro.dts + create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts + create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010.dts + create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts + create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1020.dts + create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1110.dts + create mode 100644 arch/arm/boot/dts/imx6q-wandboard-revb1.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-rex.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-tx6.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi + create mode 100644 arch/arm/boot/dts/imx6sx-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dts + create mode 100644 arch/arm/boot/dts/imx6sx.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-d2net.dts + create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts + create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts + create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi + rename arch/arm/{mach-s5pc100/include/mach/dma.h => boot/dts/mt6589-aquaris5.dts} (53%) + create mode 100644 arch/arm/boot/dts/mt6589.dtsi + delete mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts + delete mode 100644 arch/arm/boot/dts/rk3066a-clocks.dtsi + delete mode 100644 arch/arm/boot/dts/rk3188-clocks.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-evb-act8846.dts + rename arch/arm/{mach-s5p64x0/include/mach/dma.h => boot/dts/rk3288-evb-rk808.dts} (52%) + create mode 100644 arch/arm/boot/dts/rk3288-evb.dtsi + create mode 100644 arch/arm/boot/dts/rk3288.dtsi + create mode 100644 arch/arm/boot/dts/s5pv210-aquila.dts + create mode 100644 arch/arm/boot/dts/s5pv210-goni.dts + create mode 100644 arch/arm/boot/dts/s5pv210-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/s5pv210-smdkc110.dts + create mode 100644 arch/arm/boot/dts/s5pv210-smdkv210.dts + create mode 100644 arch/arm/boot/dts/s5pv210-torbreck.dts + create mode 100644 arch/arm/boot/dts/s5pv210.dtsi + create mode 100644 arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts + create mode 100644 arch/arm/boot/dts/sun6i-a31-hummingbird.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3.dts + create mode 100644 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts + create mode 100644 arch/arm/boot/dts/sun8i-a23.dtsi + create mode 100644 arch/arm/boot/dts/tegra30-apalis-eval.dts + create mode 100644 arch/arm/boot/dts/tegra30-apalis.dtsi + create mode 100644 arch/arm/boot/dts/zynq-parallella.dts + delete mode 100644 arch/arm/configs/genmai_defconfig + delete mode 100644 arch/arm/configs/kirkwood_defconfig + delete mode 100644 arch/arm/configs/s5p64x0_defconfig + delete mode 100644 arch/arm/configs/s5pc100_defconfig + create mode 100644 arch/arm/include/debug/clps711x.S + rename arch/arm/{mach-s5pv210/include/mach/debug-macro.S => include/debug/s5pv210.S} (62%) + create mode 100644 arch/arm/mach-bcm/brcmstb.c + create mode 100644 arch/arm/mach-bcm/brcmstb.h + create mode 100644 arch/arm/mach-bcm/headsmp-brcmstb.S + create mode 100644 arch/arm/mach-bcm/kona_smp.c + create mode 100644 arch/arm/mach-bcm/platsmp-brcmstb.c + create mode 100644 arch/arm/mach-berlin/headsmp.S + create mode 100644 arch/arm/mach-berlin/platsmp.c + delete mode 100644 arch/arm/mach-clps711x/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-exynos/regs-sys.h + create mode 100644 arch/arm/mach-hisi/headsmp.S + delete mode 100644 arch/arm/mach-imx/crm-regs-imx5.h + delete mode 100644 arch/arm/mach-imx/devices-imx51.h + delete mode 100644 arch/arm/mach-imx/devices/platform-imx_udc.c + delete mode 100644 arch/arm/mach-imx/devices/platform-mx1-camera.c + delete mode 100644 arch/arm/mach-imx/ehci-imx5.c + create mode 100644 arch/arm/mach-imx/ehci.h + delete mode 100644 arch/arm/mach-imx/iomux-mx51.h + delete mode 100644 arch/arm/mach-imx/mach-imx27ipcam.c + delete mode 100644 arch/arm/mach-imx/mach-imx27lite.c + rename arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} (51%) + delete mode 100644 arch/arm/mach-imx/mm-imx5.c + delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq-ksym.c + delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq.S + delete mode 100644 arch/arm/mach-imx/mx51.h + delete mode 100644 arch/arm/mach-imx/mx53.h + delete mode 100644 arch/arm/mach-integrator/include/mach/memory.h + delete mode 100644 arch/arm/mach-kirkwood/Kconfig + delete mode 100644 arch/arm/mach-kirkwood/Makefile + delete mode 100644 arch/arm/mach-kirkwood/Makefile.boot + delete mode 100644 arch/arm/mach-kirkwood/board-dt.c + delete mode 100644 arch/arm/mach-kirkwood/common.c + delete mode 100644 arch/arm/mach-kirkwood/common.h + delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c + delete mode 100644 arch/arm/mach-kirkwood/include/mach/bridge-regs.h + delete mode 100644 arch/arm/mach-kirkwood/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-kirkwood/include/mach/irqs.h + delete mode 100644 arch/arm/mach-kirkwood/include/mach/kirkwood.h + delete mode 100644 arch/arm/mach-kirkwood/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-kirkwood/irq.c + delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c + delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h + delete mode 100644 arch/arm/mach-kirkwood/mpp.c + delete mode 100644 arch/arm/mach-kirkwood/mpp.h + delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c + delete mode 100644 arch/arm/mach-kirkwood/openrd-setup.c + delete mode 100644 arch/arm/mach-kirkwood/pcie.c + delete mode 100644 arch/arm/mach-kirkwood/pm.c + delete mode 100644 arch/arm/mach-kirkwood/pm.h + delete mode 100644 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c + delete mode 100644 arch/arm/mach-kirkwood/rd88f6281-setup.c + delete mode 100644 arch/arm/mach-kirkwood/t5325-setup.c + delete mode 100644 arch/arm/mach-kirkwood/ts219-setup.c + delete mode 100644 arch/arm/mach-kirkwood/ts41x-setup.c + delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.c + delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.h + create mode 100644 arch/arm/mach-mediatek/Kconfig + create mode 100644 arch/arm/mach-mediatek/Makefile + rename arch/arm/{mach-s5pv210/include/mach/dma.h => mach-mediatek/mediatek.c} (53%) + delete mode 100644 arch/arm/mach-mvebu/hotplug.c + create mode 100644 arch/arm/mach-mvebu/netxbig.c + delete mode 100644 arch/arm/mach-omap2/cclock2420_data.c + delete mode 100644 arch/arm/mach-omap2/cclock2430_data.c + delete mode 100644 arch/arm/mach-omap2/clkt2xxx_osc.c + delete mode 100644 arch/arm/mach-omap2/clkt2xxx_sys.c + delete mode 100644 arch/arm/mach-omap2/ctrl_module_core_44xx.h + delete mode 100644 arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h + delete mode 100644 arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h + create mode 100644 arch/arm/mach-omap2/omap_hwmod_common_ipblock_data.c + delete mode 100644 arch/arm/mach-s5p64x0/Kconfig + delete mode 100644 arch/arm/mach-s5p64x0/Makefile + delete mode 100644 arch/arm/mach-s5p64x0/Makefile.boot + delete mode 100644 arch/arm/mach-s5p64x0/clock-s5p6440.c + delete mode 100644 arch/arm/mach-s5p64x0/clock-s5p6450.c + delete mode 100644 arch/arm/mach-s5p64x0/clock.c + delete mode 100644 arch/arm/mach-s5p64x0/clock.h + delete mode 100644 arch/arm/mach-s5p64x0/common.c + delete mode 100644 arch/arm/mach-s5p64x0/common.h + delete mode 100644 arch/arm/mach-s5p64x0/dev-audio.c + delete mode 100644 arch/arm/mach-s5p64x0/dma.c + delete mode 100644 arch/arm/mach-s5p64x0/i2c.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/gpio.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/hardware.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/irqs.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/map.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/pm-core.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-clock.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-gpio.h + delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-irq.h + delete mode 100644 arch/arm/mach-s5p64x0/irq-pm.c + delete mode 100644 arch/arm/mach-s5p64x0/mach-smdk6440.c + delete mode 100644 arch/arm/mach-s5p64x0/mach-smdk6450.c + delete mode 100644 arch/arm/mach-s5p64x0/pm.c + delete mode 100644 arch/arm/mach-s5p64x0/setup-fb-24bpp.c + delete mode 100644 arch/arm/mach-s5p64x0/setup-i2c0.c + delete mode 100644 arch/arm/mach-s5p64x0/setup-i2c1.c + delete mode 100644 arch/arm/mach-s5p64x0/setup-sdhci-gpio.c + delete mode 100644 arch/arm/mach-s5p64x0/setup-spi.c + delete mode 100644 arch/arm/mach-s5pc100/Kconfig + delete mode 100644 arch/arm/mach-s5pc100/Makefile + delete mode 100644 arch/arm/mach-s5pc100/Makefile.boot + delete mode 100644 arch/arm/mach-s5pc100/clock.c + delete mode 100644 arch/arm/mach-s5pc100/common.c + delete mode 100644 arch/arm/mach-s5pc100/common.h + delete mode 100644 arch/arm/mach-s5pc100/dev-audio.c + delete mode 100644 arch/arm/mach-s5pc100/dma.c + delete mode 100644 arch/arm/mach-s5pc100/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-s5pc100/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-s5pc100/include/mach/gpio.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/hardware.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/irqs.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/map.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-clock.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-gpio.h + delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-irq.h + delete mode 100644 arch/arm/mach-s5pc100/mach-smdkc100.c + delete mode 100644 arch/arm/mach-s5pc100/setup-fb-24bpp.c + delete mode 100644 arch/arm/mach-s5pc100/setup-i2c0.c + delete mode 100644 arch/arm/mach-s5pc100/setup-i2c1.c + delete mode 100644 arch/arm/mach-s5pc100/setup-ide.c + delete mode 100644 arch/arm/mach-s5pc100/setup-keypad.c + delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci-gpio.c + delete mode 100644 arch/arm/mach-s5pc100/setup-spi.c + delete mode 100644 arch/arm/mach-s5pv210/Makefile.boot + delete mode 100644 arch/arm/mach-s5pv210/clock.c + delete mode 100644 arch/arm/mach-s5pv210/common.c + delete mode 100644 arch/arm/mach-s5pv210/dev-audio.c + delete mode 100644 arch/arm/mach-s5pv210/dma.c + delete mode 100644 arch/arm/mach-s5pv210/include/mach/gpio.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/hardware.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/irqs.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/map.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/memory.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/pm-core.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/regs-gpio.h + delete mode 100644 arch/arm/mach-s5pv210/include/mach/regs-irq.h + delete mode 100644 arch/arm/mach-s5pv210/mach-aquila.c + delete mode 100644 arch/arm/mach-s5pv210/mach-goni.c + delete mode 100644 arch/arm/mach-s5pv210/mach-smdkc110.c + delete mode 100644 arch/arm/mach-s5pv210/mach-smdkv210.c + delete mode 100644 arch/arm/mach-s5pv210/mach-torbreck.c + create mode 100644 arch/arm/mach-s5pv210/s5pv210.c + delete mode 100644 arch/arm/mach-s5pv210/setup-fb-24bpp.c + delete mode 100644 arch/arm/mach-s5pv210/setup-fimc.c + delete mode 100644 arch/arm/mach-s5pv210/setup-i2c0.c + delete mode 100644 arch/arm/mach-s5pv210/setup-i2c1.c + delete mode 100644 arch/arm/mach-s5pv210/setup-i2c2.c + delete mode 100644 arch/arm/mach-s5pv210/setup-ide.c + delete mode 100644 arch/arm/mach-s5pv210/setup-keypad.c + delete mode 100644 arch/arm/mach-s5pv210/setup-sdhci-gpio.c + delete mode 100644 arch/arm/mach-s5pv210/setup-spi.c + delete mode 100644 arch/arm/mach-s5pv210/setup-usb-phy.c + rename arch/arm/{plat-samsung/s5p-sleep.S => mach-s5pv210/sleep.S} (53%) + rename arch/arm/mach-shmobile/{include/mach => }/clock.h (100%) + rename arch/arm/mach-shmobile/{include/mach => }/common.h (88%) + create mode 100644 arch/arm/mach-shmobile/cpufreq.c + rename arch/arm/mach-shmobile/{include/mach => }/dma-register.h (100%) + rename arch/arm/mach-shmobile/{include/mach => }/intc.h (100%) + create mode 100644 arch/arm/mach-shmobile/irqs.h + create mode 100644 arch/arm/mach-shmobile/pm-r8a7791.c + rename arch/arm/mach-shmobile/{include/mach => }/pm-rcar.h (100%) + rename arch/arm/mach-shmobile/{include/mach => }/pm-rmobile.h (100%) + rename arch/arm/mach-shmobile/{include/mach => }/r7s72100.h (82%) + rename arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h (100%) + rename arch/arm/mach-shmobile/{include/mach => }/r8a7740.h (98%) + rename arch/arm/mach-shmobile/{include/mach => }/r8a7778.h (100%) + rename arch/arm/mach-shmobile/{include/mach => }/r8a7779.h (74%) + rename arch/arm/mach-shmobile/{include/mach => }/r8a7790.h (93%) + rename arch/arm/mach-shmobile/{include/mach => }/r8a7791.h (90%) + rename arch/arm/mach-shmobile/{include/mach => }/rcar-gen2.h (85%) + rename arch/arm/mach-shmobile/{include/mach => }/sh7372.h (96%) + rename arch/arm/mach-shmobile/{include/mach => }/sh73a0.h (100%) + delete mode 100644 arch/arm/mach-tegra/apbio.c + delete mode 100644 arch/arm/mach-tegra/apbio.h + delete mode 100644 arch/arm/mach-tegra/fuse.c + delete mode 100644 arch/arm/mach-tegra/fuse.h + delete mode 100644 arch/arm/mach-tegra/pmc.c + delete mode 100644 arch/arm/mach-tegra/pmc.h + delete mode 100644 arch/arm/mach-tegra/powergate.c + delete mode 100644 arch/arm/plat-samsung/clock-clksrc.c + delete mode 100644 arch/arm/plat-samsung/clock.c + delete mode 100644 arch/arm/plat-samsung/include/plat/camport.h + delete mode 100644 arch/arm/plat-samsung/include/plat/clock-clksrc.h + delete mode 100644 arch/arm/plat-samsung/include/plat/clock.h + delete mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h + delete mode 100644 arch/arm/plat-samsung/include/plat/hdmi.h + delete mode 100644 arch/arm/plat-samsung/include/plat/irqs.h + delete mode 100644 arch/arm/plat-samsung/include/plat/mfc.h + delete mode 100644 arch/arm/plat-samsung/include/plat/pll.h + delete mode 100644 arch/arm/plat-samsung/include/plat/s5p-clock.h + delete mode 100644 arch/arm/plat-samsung/include/plat/tv-core.h + delete mode 100644 arch/arm/plat-samsung/s5p-clock.c + delete mode 100644 arch/arm/plat-samsung/s5p-dev-uart.c + delete mode 100644 arch/arm/plat-samsung/s5p-irq-eint.c + delete mode 100644 arch/arm/plat-samsung/s5p-irq-gpioint.c + delete mode 100644 arch/arm/plat-samsung/s5p-irq-pm.c + delete mode 100644 arch/arm/plat-samsung/s5p-irq.c + delete mode 100644 arch/arm/plat-samsung/s5p-pm.c + delete mode 100644 arch/arm/plat-versatile/include/plat/clcd.h + create mode 100644 drivers/bus/arm-ccn.c + create mode 100644 drivers/clk/samsung/clk-s5pv210-audss.c + create mode 100644 drivers/clk/samsung/clk-s5pv210.c + rename drivers/clk/versatile/{clk-integrator.c => clk-versatile.c} (63%) + delete mode 100644 drivers/cpuidle/cpuidle-armada-370-xp.c + create mode 100644 drivers/cpuidle/cpuidle-mvebu-v7.c + delete mode 100644 drivers/leds/leds-atmel-pwm.c + delete mode 100644 drivers/mailbox/mailbox-omap1.c + delete mode 100644 drivers/mailbox/mailbox-omap2.c + delete mode 100644 drivers/mailbox/omap-mbox.h + delete mode 100644 drivers/misc/atmel_pwm.c + create mode 100644 drivers/misc/fuse/Makefile + create mode 100644 drivers/pci/host/pcie-spear13xx.c + create mode 100644 drivers/phy/phy-s5pv210-usb2.c + create mode 100644 drivers/phy/phy-spear1310-miphy.c + create mode 100644 drivers/phy/phy-spear1340-miphy.c + create mode 100644 drivers/pinctrl/pinctrl-tegra-xusb.c + create mode 100644 drivers/power/reset/hisi-reboot.c + create mode 100644 drivers/soc/tegra/Makefile + create mode 100644 drivers/soc/tegra/common.c + create mode 100644 drivers/soc/tegra/fuse/Makefile + create mode 100644 drivers/soc/tegra/fuse/fuse-tegra.c + create mode 100644 drivers/soc/tegra/fuse/fuse-tegra20.c + create mode 100644 drivers/soc/tegra/fuse/fuse-tegra30.c + create mode 100644 drivers/soc/tegra/fuse/fuse.h + rename arch/arm/mach-tegra/tegra114_speedo.c => drivers/soc/tegra/fuse/speedo-tegra114.c (55%) + create mode 100644 drivers/soc/tegra/fuse/speedo-tegra124.c + rename arch/arm/mach-tegra/tegra20_speedo.c => drivers/soc/tegra/fuse/speedo-tegra20.c (67%) + rename arch/arm/mach-tegra/tegra30_speedo.c => drivers/soc/tegra/fuse/speedo-tegra30.c (52%) + create mode 100644 drivers/soc/tegra/fuse/tegra-apbmisc.c + create mode 100644 drivers/soc/tegra/pmc.c + delete mode 100644 drivers/video/backlight/atmel-pwm-bl.c + rename arch/arm/plat-versatile/clcd.c => drivers/video/fbdev/amba-clcd-versatile.c (98%) + create mode 100644 include/dt-bindings/clock/imx1-clock.h + create mode 100644 include/dt-bindings/clock/imx21-clock.h + create mode 100644 include/dt-bindings/clock/imx27-clock.h + create mode 100644 include/dt-bindings/clock/imx6qdl-clock.h + create mode 100644 include/dt-bindings/clock/s5pv210-audss.h + create mode 100644 include/dt-bindings/clock/s5pv210.h + create mode 100644 include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h + delete mode 100644 include/linux/atmel-pwm-bl.h + delete mode 100644 include/linux/atmel_pwm.h + create mode 100644 include/linux/mvebu-pmsu.h + delete mode 100644 include/linux/platform_data/camera-mx1.h + delete mode 100644 include/linux/platform_data/usb-imx_udc.h + create mode 100644 include/linux/platform_data/video-clcd-versatile.h + delete mode 100644 include/linux/tegra-soc.h + rename include/{linux/tegra-ahb.h => soc/tegra/ahb.h} (86%) + rename arch/arm/mach-kirkwood/include/mach/hardware.h => include/soc/tegra/common.h (54%) + rename include/{linux/tegra-cpuidle.h => soc/tegra/cpuidle.h} (86%) + create mode 100644 include/soc/tegra/fuse.h + create mode 100644 include/soc/tegra/pm.h + rename include/{linux/tegra-powergate.h => soc/tegra/pmc.h} (82%) +$ git am -3 ../patches/0001-phy-fix-up-for-devm_phy_create-api-change.patch +Applying: phy: fix up for devm_phy_create api change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/phy/phy-spear1310-miphy.c +M drivers/phy/phy-spear1340-miphy.c +M drivers/pinctrl/pinctrl-tegra-xusb.c +$ git add -A . +$ git commit -v -a --amend +[master 981aef2f8c48] Merge remote-tracking branch 'arm-soc/for-next' +Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (251f72d06c59 Merge branch 'berlin/soc' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) +$ git merge cortex-m/for-next +Already up-to-date. +Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (c917f0911378 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/mach-imx/suspend-imx6.S +Removing arch/arm/mach-imx/mach-cpuimx27.c +Removing arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +Auto-merging arch/arm/boot/dts/vf610-colibri.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 +- + arch/arm/boot/dts/imx1-pinfunc.h | 302 ++++++++++++++++++ + arch/arm/boot/dts/imx1.dtsi | 266 ++++++++++++++++ + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 33 ++ + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 ++ + arch/arm/boot/dts/imx6sl.dtsi | 10 +- + arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 46 +++ + .../dts/{vf610-colibri.dts => vf610-colibri.dtsi} | 14 +- + arch/arm/boot/dts/vf610-twr.dts | 17 +- + arch/arm/configs/imx_v4_v5_defconfig | 3 - + arch/arm/mach-imx/Kconfig | 60 +--- + arch/arm/mach-imx/Makefile | 5 +- + arch/arm/mach-imx/anatop.c | 13 + + arch/arm/mach-imx/clk-vf610.c | 9 + + arch/arm/mach-imx/eukrea-baseboards.h | 10 +- + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 351 --------------------- + arch/arm/mach-imx/imx1-dt.c | 26 ++ + arch/arm/mach-imx/iomux-imx31.c | 7 - + arch/arm/mach-imx/iomux-v1.c | 2 - + arch/arm/mach-imx/iomux-v3.c | 2 - + arch/arm/mach-imx/mach-cpuimx27.c | 321 ------------------- + arch/arm/mach-imx/mxc.h | 2 + + arch/arm/mach-imx/suspend-imx6.S | 2 + + 23 files changed, 756 insertions(+), 766 deletions(-) + create mode 100644 arch/arm/boot/dts/imx1-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx1.dtsi + create mode 100644 arch/arm/boot/dts/vf610-colibri-eval-v3.dts + rename arch/arm/boot/dts/{vf610-colibri.dts => vf610-colibri.dtsi} (90%) + delete mode 100644 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c + create mode 100644 arch/arm/mach-imx/imx1-dt.c + delete mode 100644 arch/arm/mach-imx/mach-cpuimx27.c +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (c9eaa447e77e Linux 3.15-rc1) +$ git merge keystone/next +Already up-to-date. +Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) +$ git merge msm/for-next +Already up-to-date. +Merging mvebu/for-next (2e11b0361fb0 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging renesas/next (883e289aed3a Merge branch 'heads/dt-timers-for-v3.17' into next) +$ git merge renesas/next +Resolved 'arch/arm/mach-shmobile/setup-r7s72100.c' using previous resolution. +Auto-merging arch/arm/mach-shmobile/setup-r8a7791.c +Auto-merging arch/arm/mach-shmobile/setup-r8a7790.c +Auto-merging arch/arm/mach-shmobile/setup-r8a7779.c +Auto-merging arch/arm/mach-shmobile/setup-r7s72100.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r7s72100.c +Auto-merging arch/arm/mach-shmobile/board-genmai.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c2a92b445ec5] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/rcar-audmapp.txt | 29 ++++++ + arch/arm/boot/dts/r7s72100-genmai.dts | 4 + + arch/arm/boot/dts/r7s72100.dtsi | 10 ++ + arch/arm/boot/dts/r8a7779-marzen.dts | 4 + + arch/arm/boot/dts/r8a7779.dtsi | 42 ++++++++ + arch/arm/boot/dts/r8a7790-lager.dts | 4 + + arch/arm/boot/dts/r8a7790.dtsi | 32 ++++++ + arch/arm/boot/dts/r8a7791-koelsch.dts | 4 + + arch/arm/boot/dts/r8a7791.dtsi | 32 ++++++ + arch/arm/mach-shmobile/board-genmai-reference.c | 20 ---- + arch/arm/mach-shmobile/board-genmai.c | 14 ++- + arch/arm/mach-shmobile/board-koelsch-reference.c | 2 - + arch/arm/mach-shmobile/board-lager-reference.c | 2 - + arch/arm/mach-shmobile/board-marzen-reference.c | 10 -- + arch/arm/mach-shmobile/r7s72100.h | 1 - + arch/arm/mach-shmobile/r8a7779.h | 1 - + arch/arm/mach-shmobile/r8a7790.h | 1 - + arch/arm/mach-shmobile/r8a7791.h | 1 - + arch/arm/mach-shmobile/setup-r7s72100.c | 21 ---- + arch/arm/mach-shmobile/setup-r8a7779.c | 17 +-- + arch/arm/mach-shmobile/setup-r8a7790.c | 7 +- + arch/arm/mach-shmobile/setup-r8a7791.c | 7 +- + arch/sh/drivers/dma/dma-sh.c | 2 +- + arch/sh/include/asm/dma-register.h | 36 ++++--- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 24 ++--- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 48 ++++----- + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 64 ++++++------ + drivers/dma/sh/rcar-audmapp.c | 114 +++++++++++++++------ + drivers/dma/sh/shdma-arm.h | 4 +- + drivers/dma/sh/shdmac.c | 15 ++- + include/linux/sh_dma.h | 24 +++-- + 31 files changed, 375 insertions(+), 221 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt +Merging samsung/for-next (d5e49aabb545 Merge branch 'v3.17-next/dt-samsung-2' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/mach-s5pv210/regs-clock.h +Removing arch/arm/mach-exynos/include/mach/memory.h +Merge made by the 'recursive' strategy. + arch/arm/mach-exynos/include/mach/memory.h | 26 ---------------------- + arch/arm/mach-s5pv210/pm.c | 3 +-- + .../mach-s5pv210/{include/mach => }/regs-clock.h | 3 +-- + arch/arm/mach-s5pv210/s5pv210.c | 2 +- + 4 files changed, 3 insertions(+), 31 deletions(-) + delete mode 100644 arch/arm/mach-exynos/include/mach/memory.h + rename arch/arm/mach-s5pv210/{include/mach => }/regs-clock.h (99%) +Merging sunxi/sunxi/for-next (44b61dc11c6d Merge branch 'sunxi/dt-for-3.17' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (9a3c4145af32 Linux 3.16-rc6) +$ git merge tegra/for-next +Already up-to-date. +Merging arm64/for-next/core (ea1719672f59 arm64: add newline to I-cache policy string) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (b76f98236a23 blackfin: vmlinux.lds.S: reserve 32 bytes space at the end of data section for XIP kernel) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (6b15075c2c36 [IA64] sn: Do not needlessly convert between pointers and integers) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (9117710a5997 m68k/sun3: Remove define statement no longer needed) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (9a1a1aea7572 m68knommu: Remove unnecessary prototype for kobjsize()) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Merge made by the 'recursive' strategy. + arch/metag/kernel/cachepart.c | 4 ++-- + arch/metag/mm/hugetlbpage.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging microblaze/next (ef264cf0c490 microblaze: Change libgcc-style functions from lib-y to obj-y) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/delay.h | 28 ++++++++++++++++++++++------ + arch/microblaze/include/uapi/asm/unistd.h | 1 + + arch/microblaze/kernel/syscall_table.S | 3 ++- + arch/microblaze/lib/Makefile | 14 +++----------- + 4 files changed, 28 insertions(+), 18 deletions(-) +Merging mips/mips-for-linux-next (475d5928b79b Merge branch '3.16-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Auto-merging drivers/spi/spi-au1550.c +Auto-merging arch/mips/kernel/scall64-o32.S +Auto-merging arch/mips/kernel/scall64-n32.S +Auto-merging arch/mips/kernel/scall64-64.S +Auto-merging arch/mips/kernel/scall32-o32.S +Auto-merging arch/mips/kernel/ptrace.c +Auto-merging arch/mips/kernel/mcount.S +Auto-merging arch/mips/kernel/ftrace.c +Removing arch/mips/include/asm/user.h +Auto-merging arch/mips/include/asm/processor.h +Removing arch/mips/alchemy/common/clocks.c +Auto-merging arch/mips/Kconfig +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 27668b36ee94] Merge remote-tracking branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 6 + + arch/mips/Kconfig | 9 +- + arch/mips/Makefile | 4 +- + arch/mips/alchemy/board-mtx1.c | 4 +- + arch/mips/alchemy/board-xxs1500.c | 4 +- + arch/mips/alchemy/common/Makefile | 4 +- + arch/mips/alchemy/common/clock.c | 1094 +++++++++ + arch/mips/alchemy/common/clocks.c | 105 - + arch/mips/alchemy/common/dbdma.c | 22 +- + arch/mips/alchemy/common/dma.c | 15 +- + arch/mips/alchemy/common/irq.c | 5 +- + arch/mips/alchemy/common/platform.c | 15 +- + arch/mips/alchemy/common/power.c | 74 +- + arch/mips/alchemy/common/setup.c | 15 - + arch/mips/alchemy/common/time.c | 23 +- + arch/mips/alchemy/common/usb.c | 47 +- + arch/mips/alchemy/devboards/db1000.c | 19 +- + arch/mips/alchemy/devboards/db1200.c | 61 +- + arch/mips/alchemy/devboards/db1300.c | 9 +- + arch/mips/alchemy/devboards/db1550.c | 27 +- + arch/mips/alchemy/devboards/pm.c | 39 +- + arch/mips/bcm47xx/Kconfig | 5 +- + arch/mips/bcm47xx/bcm47xx_private.h | 3 + + arch/mips/bcm47xx/board.c | 26 +- + arch/mips/bcm47xx/buttons.c | 38 +- + arch/mips/bcm47xx/leds.c | 92 +- + arch/mips/bcm47xx/prom.c | 68 +- + arch/mips/bcm47xx/setup.c | 7 +- + arch/mips/bcm47xx/sprom.c | 48 + + arch/mips/bcm63xx/cpu.c | 11 +- + arch/mips/bcm63xx/dev-enet.c | 4 - + arch/mips/bcm63xx/dev-spi.c | 4 - + arch/mips/bcm63xx/gpio.c | 14 - + arch/mips/bcm63xx/irq.c | 558 +++-- + arch/mips/bcm63xx/reset.c | 60 - + arch/mips/boot/compressed/decompress.c | 14 + + .../cavium-octeon/executive/cvmx-helper-board.c | 22 + + arch/mips/cavium-octeon/oct_ilm.c | 3 +- + arch/mips/cavium-octeon/smp.c | 23 +- + arch/mips/configs/loongson3_defconfig | 2 +- + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/addrspace.h | 2 +- + arch/mips/include/asm/asmmacro.h | 31 + + arch/mips/include/asm/bitops.h | 8 +- + arch/mips/include/asm/cop2.h | 8 + + arch/mips/include/asm/cpu-features.h | 9 + + arch/mips/include/asm/cpu-info.h | 5 +- + arch/mips/include/asm/cpu.h | 61 +- + arch/mips/include/asm/elf.h | 17 - + arch/mips/include/asm/fpu.h | 19 +- + arch/mips/include/asm/gic.h | 41 +- + arch/mips/include/asm/maar.h | 109 + + arch/mips/include/asm/mach-au1x00/au1000.h | 2515 +++++++++----------- + arch/mips/include/asm/mach-au1x00/au1000_dma.h | 50 +- + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 56 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 7 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 198 +- + .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h | 46 - + .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h | 31 - + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 16 +- + .../asm/mach-bcm63xx/cpu-feature-overrides.h | 2 +- + arch/mips/include/asm/mach-loongson/boot_param.h | 4 + + .../include/asm/mach-loongson/kernel-entry-init.h | 52 + + arch/mips/include/asm/mach-loongson/loongson.h | 11 +- + arch/mips/include/asm/mach-loongson/machine.h | 4 +- + arch/mips/include/asm/mach-loongson/mmzone.h | 53 + + arch/mips/include/asm/mach-loongson/topology.h | 23 + + arch/mips/include/asm/mach-malta/irq.h | 1 + + arch/mips/include/asm/mach-sead3/irq.h | 1 + + arch/mips/include/asm/mips-boards/bonito64.h | 1 - + arch/mips/include/asm/mipsregs.h | 58 +- + arch/mips/include/asm/mmu_context.h | 10 + + arch/mips/include/asm/msa.h | 31 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 + + arch/mips/include/asm/pgtable-32.h | 12 + + arch/mips/include/asm/pgtable.h | 27 + + arch/mips/include/asm/processor.h | 10 +- + arch/mips/include/asm/ptrace.h | 8 +- + arch/mips/include/asm/reg.h | 129 +- + arch/mips/include/asm/smp-cps.h | 12 +- + arch/mips/include/asm/smp.h | 6 + + arch/mips/include/asm/sparsemem.h | 2 +- + arch/mips/include/asm/user.h | 58 - + arch/mips/include/uapi/asm/ptrace.h | 25 +- + arch/mips/include/uapi/asm/reg.h | 206 ++ + arch/mips/jz4740/clock-debugfs.c | 3 +- + arch/mips/jz4740/platform.c | 2 +- + arch/mips/kernel/asm-offsets.c | 1 + + arch/mips/kernel/binfmt_elfo32.c | 38 - + arch/mips/kernel/cpu-probe.c | 45 +- + arch/mips/kernel/ftrace.c | 56 +- + arch/mips/kernel/irq-gic.c | 38 +- + arch/mips/kernel/mcount.S | 13 + + arch/mips/kernel/perf_event_mipsxx.c | 42 +- + arch/mips/kernel/pm-cps.c | 10 +- + arch/mips/kernel/proc.c | 2 + + arch/mips/kernel/process.c | 60 +- + arch/mips/kernel/ptrace.c | 220 +- + arch/mips/kernel/ptrace32.c | 10 +- + arch/mips/kernel/r4k_switch.S | 9 +- + arch/mips/kernel/rtlx-cmp.c | 3 + + arch/mips/kernel/rtlx-mt.c | 3 + + arch/mips/kernel/scall32-o32.S | 6 +- + arch/mips/kernel/scall64-64.S | 4 +- + arch/mips/kernel/scall64-n32.S | 12 +- + arch/mips/kernel/scall64-o32.S | 8 +- + arch/mips/kernel/setup.c | 22 +- + arch/mips/kernel/smp-cps.c | 12 +- + arch/mips/kernel/smp-mt.c | 2 + + arch/mips/kernel/smp.c | 26 +- + arch/mips/kernel/traps.c | 61 +- + arch/mips/kernel/unaligned.c | 1 - + arch/mips/loongson/Kconfig | 9 +- + arch/mips/loongson/Platform | 2 +- + arch/mips/loongson/common/env.c | 49 +- + arch/mips/loongson/common/init.c | 4 + + arch/mips/loongson/common/pm.c | 8 +- + arch/mips/loongson/lemote-2f/clock.c | 4 +- + arch/mips/loongson/lemote-2f/reset.c | 2 +- + arch/mips/loongson/loongson-3/Makefile | 4 +- + arch/mips/loongson/loongson-3/cop2-ex.c | 63 + + arch/mips/loongson/loongson-3/irq.c | 26 +- + arch/mips/loongson/loongson-3/numa.c | 291 +++ + arch/mips/loongson/loongson-3/smp.c | 387 ++- + arch/mips/loongson/loongson-3/smp.h | 37 +- + arch/mips/mm/c-r4k.c | 8 +- + arch/mips/mm/init.c | 33 + + arch/mips/mm/tlb-r3k.c | 2 +- + arch/mips/mm/tlb-r4k.c | 59 + + arch/mips/mm/tlbex.c | 98 +- + arch/mips/mti-malta/malta-int.c | 27 +- + arch/mips/mti-malta/malta-memory.c | 26 + + arch/mips/pci/Makefile | 2 +- + arch/mips/pci/ops-tx4927.c | 2 - + arch/mips/pci/pci-alchemy.c | 24 +- + arch/mips/ralink/of.c | 2 +- + arch/mips/rb532/devices.c | 28 +- + arch/mips/sgi-ip22/ip22-gio.c | 10 +- + arch/mips/txx9/generic/7segled.c | 14 +- + arch/mips/txx9/generic/pci.c | 4 +- + arch/mips/txx9/generic/setup.c | 29 +- + drivers/cpufreq/loongson2_cpufreq.c | 6 +- + drivers/mmc/host/au1xmmc.c | 198 +- + drivers/mtd/nand/au1550nd.c | 29 +- + drivers/net/ethernet/amd/au1000_eth.c | 149 +- + drivers/net/irda/au1k_ir.c | 48 +- + drivers/rtc/rtc-au1xxx.c | 18 +- + drivers/spi/spi-au1550.c | 66 +- + drivers/video/fbdev/au1100fb.c | 39 +- + drivers/video/fbdev/au1100fb.h | 1 + + drivers/video/fbdev/au1200fb.c | 81 +- + drivers/watchdog/octeon-wdt-main.c | 62 +- + sound/soc/au1x/psc-ac97.c | 140 +- + sound/soc/au1x/psc-i2s.c | 100 +- + sound/soc/au1x/psc.h | 22 +- + 155 files changed, 5976 insertions(+), 3527 deletions(-) + create mode 100644 arch/mips/alchemy/common/clock.c + delete mode 100644 arch/mips/alchemy/common/clocks.c + create mode 100644 arch/mips/include/asm/maar.h + create mode 100644 arch/mips/include/asm/mach-loongson/kernel-entry-init.h + create mode 100644 arch/mips/include/asm/mach-loongson/mmzone.h + create mode 100644 arch/mips/include/asm/mach-loongson/topology.h + delete mode 100644 arch/mips/include/asm/user.h + create mode 100644 arch/mips/include/uapi/asm/reg.h + create mode 100644 arch/mips/loongson/loongson-3/cop2-ex.c + create mode 100644 arch/mips/loongson/loongson-3/numa.c +Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (64aa90f26c06 Linux 3.16-rc7) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (2194dc27bd84 powerpc/eeh: Add missing #ifdef CONFIG_IOMMU_API) +$ git merge powerpc/next +Removing drivers/pcmcia/m8xx_pcmcia.c +Auto-merging drivers/pcmcia/Makefile +Auto-merging drivers/pcmcia/Kconfig +Removing arch/powerpc/oprofile/op_model_rs64.c +Removing arch/powerpc/mm/stab.c +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Removing arch/powerpc/include/asm/mpc8xx.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/powerpc/fsl/board.txt | 16 + + Documentation/vfio.txt | 87 +- + MAINTAINERS | 4 +- + arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 1 + + arch/powerpc/boot/dts/fsl/t2080si-post.dtsi | 69 ++ + arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 435 ++++++++ + arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi | 99 ++ + arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 1 + + arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 1 + + arch/powerpc/boot/dts/t2080qds.dts | 57 + + arch/powerpc/boot/dts/t2080rdb.dts | 57 + + arch/powerpc/boot/dts/t2081qds.dts | 46 + + arch/powerpc/boot/dts/t208xqds.dtsi | 239 ++++ + arch/powerpc/boot/dts/t208xrdb.dtsi | 184 +++ + arch/powerpc/boot/dts/t4240rdb.dts | 186 ++++ + arch/powerpc/boot/io.h | 2 +- + arch/powerpc/configs/corenet32_smp_defconfig | 4 +- + arch/powerpc/configs/corenet64_smp_defconfig | 5 + + arch/powerpc/configs/mpc85xx_defconfig | 3 + + arch/powerpc/configs/mpc85xx_smp_defconfig | 3 + + arch/powerpc/include/asm/cputable.h | 31 +- + arch/powerpc/include/asm/eeh.h | 62 +- + arch/powerpc/include/asm/exception-64s.h | 14 +- + arch/powerpc/include/asm/fs_pd.h | 1 - + arch/powerpc/include/asm/hardirq.h | 1 + + arch/powerpc/include/asm/hw_irq.h | 1 + + arch/powerpc/include/asm/irqflags.h | 8 +- + arch/powerpc/include/asm/jump_label.h | 9 + + arch/powerpc/include/asm/kvm_asm.h | 1 + + arch/powerpc/include/asm/machdep.h | 5 + + arch/powerpc/include/asm/mmu-hash64.h | 22 - + arch/powerpc/include/asm/mmu.h | 8 +- + arch/powerpc/include/asm/mmu_context.h | 6 +- + arch/powerpc/include/asm/mpc85xx.h | 2 + + arch/powerpc/include/asm/mpc8xx.h | 12 - + arch/powerpc/include/asm/opal.h | 194 ++-- + arch/powerpc/include/asm/oprofile_impl.h | 1 - + arch/powerpc/include/asm/paca.h | 5 +- + arch/powerpc/include/asm/perf_event_server.h | 5 +- + arch/powerpc/include/asm/ppc-opcode.h | 9 + + arch/powerpc/include/asm/pte-fsl-booke.h | 2 + + arch/powerpc/include/asm/pte-hash64-64k.h | 5 +- + arch/powerpc/include/asm/reg.h | 2 +- + arch/powerpc/include/asm/reg_booke.h | 57 +- + arch/powerpc/include/asm/systbl.h | 4 +- + arch/powerpc/include/asm/trace.h | 45 + + arch/powerpc/kernel/asm-offsets.c | 2 - + arch/powerpc/kernel/cputable.c | 94 +- + arch/powerpc/kernel/eeh.c | 365 +++++- + arch/powerpc/kernel/eeh_cache.c | 9 +- + arch/powerpc/kernel/eeh_dev.c | 3 +- + arch/powerpc/kernel/eeh_driver.c | 16 +- + arch/powerpc/kernel/eeh_pe.c | 86 +- + arch/powerpc/kernel/entry_64.S | 13 +- + arch/powerpc/kernel/exceptions-64s.S | 361 +++--- + arch/powerpc/kernel/head_64.S | 30 +- + arch/powerpc/kernel/idle_power7.S | 69 +- + arch/powerpc/kernel/iommu.c | 4 +- + arch/powerpc/kernel/irq.c | 14 + + arch/powerpc/kernel/process.c | 34 +- + arch/powerpc/kernel/prom.c | 11 +- + arch/powerpc/kernel/setup-common.c | 6 +- + arch/powerpc/kernel/setup_64.c | 15 +- + arch/powerpc/kernel/systbl.S | 3 - + arch/powerpc/kernel/traps.c | 26 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 6 + + arch/powerpc/lib/copyuser_64.S | 3 +- + arch/powerpc/mm/Makefile | 4 +- + arch/powerpc/mm/hash_utils_64.c | 26 +- + arch/powerpc/mm/init_64.c | 132 ++- + arch/powerpc/mm/mmu_context_hash32.c | 2 +- + arch/powerpc/mm/numa.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/powerpc/mm/pgtable_64.c | 2 +- + arch/powerpc/mm/ppc_mmu_32.c | 2 +- + arch/powerpc/mm/stab.c | 286 ----- + arch/powerpc/mm/tlb_low_64e.S | 69 +- + arch/powerpc/oprofile/Makefile | 2 +- + arch/powerpc/oprofile/common.c | 3 - + arch/powerpc/oprofile/op_model_rs64.c | 222 ---- + arch/powerpc/perf/core-book3s.c | 73 +- + arch/powerpc/perf/mpc7450-pmu.c | 5 +- + arch/powerpc/perf/power4-pmu.c | 2 +- + arch/powerpc/perf/power5+-pmu.c | 2 +- + arch/powerpc/perf/power5-pmu.c | 2 +- + arch/powerpc/perf/power6-pmu.c | 2 +- + arch/powerpc/perf/power7-pmu.c | 2 +- + arch/powerpc/perf/power8-pmu.c | 27 +- + arch/powerpc/perf/ppc970-pmu.c | 2 +- + arch/powerpc/platforms/85xx/Kconfig | 2 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 53 +- + arch/powerpc/platforms/85xx/smp.c | 44 + + arch/powerpc/platforms/8xx/m8xx_setup.c | 3 - + arch/powerpc/platforms/8xx/mpc885ads_setup.c | 62 -- + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 - + arch/powerpc/platforms/Kconfig.cputype | 18 +- + arch/powerpc/platforms/powermac/Kconfig | 2 +- + arch/powerpc/platforms/powermac/feature.c | 42 +- + arch/powerpc/platforms/powernv/Makefile | 3 +- + arch/powerpc/platforms/powernv/eeh-ioda.c | 393 ++++--- + arch/powerpc/platforms/powernv/eeh-powernv.c | 55 +- + arch/powerpc/platforms/powernv/opal-async.c | 3 +- + arch/powerpc/platforms/powernv/opal-hmi.c | 188 ++++ + arch/powerpc/platforms/powernv/opal-lpc.c | 2 +- + .../powerpc/platforms/powernv/opal-memory-errors.c | 3 +- + arch/powerpc/platforms/powernv/opal-tracepoints.c | 84 ++ + arch/powerpc/platforms/powernv/opal-wrappers.S | 117 +- + arch/powerpc/platforms/powernv/opal-xscom.c | 2 +- + arch/powerpc/platforms/powernv/opal.c | 52 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 499 ++++++++- + arch/powerpc/platforms/powernv/pci-p5ioc2.c | 3 +- + arch/powerpc/platforms/powernv/pci.c | 169 ++- + arch/powerpc/platforms/powernv/pci.h | 25 +- + arch/powerpc/platforms/powernv/rng.c | 2 +- + arch/powerpc/platforms/powernv/setup.c | 2 + + arch/powerpc/platforms/pseries/dtl.c | 3 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 40 +- + arch/powerpc/platforms/pseries/hvCall.S | 172 ++- + arch/powerpc/platforms/pseries/hvCall_inst.c | 3 +- + arch/powerpc/platforms/pseries/lpar.c | 30 +- + arch/powerpc/platforms/pseries/mobility.c | 3 +- + arch/powerpc/platforms/pseries/msi.c | 4 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 4 +- + arch/powerpc/platforms/pseries/power.c | 5 +- + arch/powerpc/platforms/pseries/ras.c | 2 +- + arch/powerpc/platforms/pseries/reconfig.c | 5 +- + arch/powerpc/platforms/pseries/rng.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 2 +- + arch/powerpc/platforms/pseries/suspend.c | 5 +- + arch/powerpc/sysdev/fsl_pci.c | 4 +- + arch/powerpc/sysdev/micropatch.c | 1 - + arch/powerpc/sysdev/mpic_msgr.c | 2 +- + arch/powerpc/xmon/xmon.c | 34 +- + drivers/cpufreq/powernv-cpufreq.c | 18 +- + drivers/cpuidle/cpuidle-powernv.c | 16 +- + drivers/memory/Kconfig | 10 + + drivers/memory/Makefile | 1 + + drivers/memory/fsl-corenet-cf.c | 251 +++++ + drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 1 - + drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 1 - + drivers/pcmcia/Kconfig | 10 - + drivers/pcmcia/Makefile | 1 - + drivers/pcmcia/m8xx_pcmcia.c | 1168 -------------------- + drivers/vfio/Makefile | 1 + + drivers/vfio/pci/vfio_pci.c | 18 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 17 +- + drivers/vfio/vfio_spapr_eeh.c | 87 ++ + include/linux/vfio.h | 23 + + include/uapi/linux/vfio.h | 34 + + tools/testing/selftests/powerpc/Makefile | 10 +- + tools/testing/selftests/powerpc/pmu/Makefile | 19 +- + .../selftests/powerpc/pmu/count_instructions.c | 30 +- + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 5 +- + .../testing/selftests/powerpc/pmu/ebb/busy_loop.S | 271 +++++ + .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 91 ++ + tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 261 +---- + tools/testing/selftests/powerpc/pmu/ebb/ebb.h | 1 - + tools/testing/selftests/powerpc/pmu/l3_bank_test.c | 48 + + tools/testing/selftests/powerpc/pmu/lib.c | 50 +- + tools/testing/selftests/powerpc/pmu/lib.h | 1 + + .../selftests/powerpc/pmu/per_event_excludes.c | 114 ++ + 161 files changed, 5476 insertions(+), 3284 deletions(-) + create mode 100644 arch/powerpc/boot/dts/fsl/t2080si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/t2081si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/t2080qds.dts + create mode 100644 arch/powerpc/boot/dts/t2080rdb.dts + create mode 100644 arch/powerpc/boot/dts/t2081qds.dts + create mode 100644 arch/powerpc/boot/dts/t208xqds.dtsi + create mode 100644 arch/powerpc/boot/dts/t208xrdb.dtsi + create mode 100644 arch/powerpc/boot/dts/t4240rdb.dts + delete mode 100644 arch/powerpc/include/asm/mpc8xx.h + delete mode 100644 arch/powerpc/mm/stab.c + delete mode 100644 arch/powerpc/oprofile/op_model_rs64.c + create mode 100644 arch/powerpc/platforms/powernv/opal-hmi.c + create mode 100644 arch/powerpc/platforms/powernv/opal-tracepoints.c + create mode 100644 drivers/memory/fsl-corenet-cf.c + delete mode 100644 drivers/pcmcia/m8xx_pcmcia.c + create mode 100644 drivers/vfio/vfio_spapr_eeh.c + create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/busy_loop.S + create mode 100644 tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/l3_bank_test.c + create mode 100644 tools/testing/selftests/powerpc/pmu/per_event_excludes.c +Merging fsl/next (78eb9094ca08 powerpc/t2080rdb: Add T2080RDB board support) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (36e7fdaa1a04 s390/locking: Reenable optimistic spinning) +$ git merge s390/features +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/s390/net/qeth_core.h +Auto-merging arch/s390/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 7 ++ + arch/s390/Kconfig | 1 + + arch/s390/include/asm/pgtable.h | 197 ++++++++++++++++++++---------------- + arch/s390/include/asm/qdio.h | 4 + + arch/s390/include/asm/syscall.h | 2 +- + arch/s390/kernel/irq.c | 95 +++++++++-------- + arch/s390/kernel/setup.c | 2 + + arch/s390/mm/hugetlbpage.c | 103 +++++++++---------- + arch/s390/mm/pgtable.c | 8 +- + arch/s390/pci/pci.c | 4 +- + arch/s390/pci/pci_clp.c | 4 +- + arch/s390/pci/pci_debug.c | 4 +- + arch/s390/pci/pci_dma.c | 50 ++++++--- + arch/s390/pci/pci_event.c | 4 +- + arch/s390/pci/pci_sysfs.c | 4 +- + drivers/pci/hotplug/s390_pci_hpc.c | 4 +- + drivers/s390/block/dasd.c | 196 ++++++++++++++++++----------------- + drivers/s390/block/dasd_eckd.c | 30 ++++-- + drivers/s390/block/dasd_int.h | 5 +- + drivers/s390/block/dasd_ioctl.c | 33 ++++-- + drivers/s390/char/con3215.c | 32 +++--- + drivers/s390/cio/qdio_setup.c | 53 ++++++++++ + drivers/s390/net/qeth_core.h | 8 +- + drivers/s390/net/qeth_core_main.c | 161 +++++++++++++++++------------ + drivers/s390/scsi/zfcp_qdio.c | 49 ++++----- + drivers/watchdog/Kconfig | 2 +- + 26 files changed, 619 insertions(+), 443 deletions(-) +Merging sparc-next/master (85417aef44fc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (ed93567c6fbc tile: Remove tile-specific _sinitdata and _einitdata) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/asm/sections.h | 3 --- + arch/tile/kernel/traps.c | 2 +- + arch/tile/kernel/vmlinux.lds.S | 2 -- + arch/tile/mm/init.c | 12 ++++++------ + 4 files changed, 7 insertions(+), 12 deletions(-) +Merging uml/next (989e59fa41c5 um: Include generic barrier.h) +$ git merge uml/next +Resolved 'arch/um/include/asm/Kbuild' using previous resolution. +Removing arch/x86/um/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ia64/sysdep/skas_ptrace.h +Auto-merging arch/um/os-Linux/skas/process.c +Auto-merging arch/um/kernel/trap.c +Removing arch/um/include/shared/skas_ptrace.h +Removing arch/um/include/shared/skas/proc_mm.h +Auto-merging arch/um/include/shared/os.h +Auto-merging arch/um/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 930f374c8825] Merge remote-tracking branch 'uml/next' +$ git diff -M --stat --summary HEAD^.. + arch/um/include/shared/os.h | 2 - + arch/um/include/shared/skas/proc_mm.h | 44 ------ + arch/um/include/shared/skas/skas.h | 3 - + arch/um/include/shared/skas_ptrace.h | 14 -- + arch/um/kernel/ptrace.c | 32 ---- + arch/um/kernel/reboot.c | 35 ++--- + arch/um/kernel/skas/mmu.c | 68 +++------ + arch/um/kernel/skas/process.c | 27 ---- + arch/um/kernel/trap.c | 2 +- + arch/um/kernel/um_arch.c | 10 -- + arch/um/os-Linux/process.c | 16 -- + arch/um/os-Linux/skas/mem.c | 100 ++---------- + arch/um/os-Linux/skas/process.c | 200 ++++++------------------ + arch/um/os-Linux/start_up.c | 154 ------------------- + arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 --- + arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 --- + arch/x86/um/ldt.c | 227 ++++++---------------------- + arch/x86/um/shared/sysdep/faultinfo_32.h | 3 - + arch/x86/um/shared/sysdep/faultinfo_64.h | 3 - + arch/x86/um/shared/sysdep/skas_ptrace.h | 22 --- + 20 files changed, 148 insertions(+), 858 deletions(-) + delete mode 100644 arch/um/include/shared/skas/proc_mm.h + delete mode 100644 arch/um/include/shared/skas_ptrace.h + delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h + delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h + delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (4ed2ad38b3b4 Merge tag 'xtensa-for-next-20140715' of git://github.com/jcmvbkbc/linux-xtensa into for_next) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (c7548af69d9e Btrfs: convert smp_mb__{before,after}_clear_bit) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (d1a5fb9fecd4 rbd: remove extra newlines from rbd_warn() messages) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-rbd | 4 +- + drivers/block/rbd.c | 497 ++++++++++++++++---------------- + fs/ceph/acl.c | 14 +- + fs/ceph/caps.c | 2 +- + fs/ceph/file.c | 24 +- + fs/ceph/mds_client.c | 11 +- + fs/ceph/xattr.c | 4 +- + include/linux/ceph/messenger.h | 14 +- + include/linux/ceph/osd_client.h | 18 +- + net/ceph/messenger.c | 45 ++- + net/ceph/osd_client.c | 129 ++++++--- + 11 files changed, 417 insertions(+), 345 deletions(-) +Merging cifs/for-next (f29ebb47d5bb Add worker function to set allocation size) +$ git merge cifs/for-next +Auto-merging fs/cifs/misc.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/connect.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/cifs/AUTHORS | 1 + + Documentation/filesystems/cifs/TODO | 97 +-- + fs/cifs/cifs_debug.c | 2 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 19 + + fs/cifs/cifsproto.h | 4 + + fs/cifs/cifssmb.c | 119 ++-- + fs/cifs/connect.c | 8 +- + fs/cifs/file.c | 872 ++++++++++++++--------- + fs/cifs/misc.c | 13 +- + fs/cifs/sess.c | 1192 ++++++++++++++++++++++---------- + fs/cifs/smb1ops.c | 8 + + fs/cifs/smb2inode.c | 2 +- + fs/cifs/smb2maperror.c | 2 +- + fs/cifs/smb2misc.c | 6 +- + fs/cifs/smb2ops.c | 73 +- + fs/cifs/smb2pdu.c | 94 ++- + fs/cifs/smb2proto.h | 2 +- + fs/cifs/smb2transport.c | 5 + + fs/cifs/transport.c | 25 +- + 20 files changed, 1702 insertions(+), 844 deletions(-) +Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (04ec5f5c0022 ecryptfs: remove unnecessary break after goto) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/file.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/file.c | 4 ++-- + fs/ecryptfs/inode.c | 16 +++++++--------- + fs/ecryptfs/keystore.c | 2 -- + fs/ecryptfs/messaging.c | 3 +-- + 4 files changed, 10 insertions(+), 15 deletions(-) +Merging ext3/for_next (4381bdbc0a74 reiserfs: fix corruption introduced by balance_leaf refactor) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 2 +- + fs/quota/dquot.c | 180 ++++++++++++++++++++++--------------------------- + fs/quota/kqid.c | 2 +- + fs/quota/netlink.c | 3 +- + fs/quota/quota.c | 6 +- + fs/reiserfs/do_balan.c | 111 +++++++++++++++++------------- + fs/reiserfs/lbalance.c | 5 +- + fs/reiserfs/reiserfs.h | 9 +-- + fs/super.c | 1 - + fs/udf/file.c | 22 +----- + fs/udf/lowlevel.c | 2 +- + fs/udf/super.c | 2 +- + fs/udf/symlink.c | 2 +- + fs/udf/unicode.c | 9 ++- + include/linux/quota.h | 1 - + 15 files changed, 168 insertions(+), 189 deletions(-) +Merging ext4/dev (86f0afd46321 ext4: fix ext4_discard_allocated_blocks() if we can't allocate the pa struct) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (b65ee14818e6 f2fs: use for_each_set_bit to simplify the code) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (9a464443aec5 GFS2: Change maxlen variables to size_t) +$ git merge gfs2/master +Auto-merging fs/gfs2/super.c +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 9 +++++---- + fs/gfs2/super.c | 20 ++++++++++---------- + 2 files changed, 15 insertions(+), 14 deletions(-) +Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr) +$ git merge jfs/jfs-next +Already up-to-date. +Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (71a6ec8ac587 nfs: reject changes to resvport and sharecache during remount) +$ git merge nfs/linux-next +Resolved 'fs/nfs/pagelist.c' using previous resolution. +Auto-merging fs/nfs/write.c +Auto-merging fs/nfs/pnfs.c +Auto-merging fs/nfs/pagelist.c +CONFLICT (content): Merge conflict in fs/nfs/pagelist.c +Auto-merging fs/nfs/nfs4state.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/filelayout/filelayoutdev.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 44caf0e2d803] Merge remote-tracking branch 'nfs/linux-next' +$ git diff -M --stat --summary HEAD^.. + fs/nfs/blocklayout/blocklayout.c | 101 +++-- + fs/nfs/callback.c | 12 + + fs/nfs/client.c | 18 +- + fs/nfs/delegation.c | 34 +- + fs/nfs/delegation.h | 1 + + fs/nfs/dir.c | 208 ++++++++-- + fs/nfs/direct.c | 33 +- + fs/nfs/filelayout/filelayout.c | 298 ++++++++------ + fs/nfs/filelayout/filelayoutdev.c | 2 +- + fs/nfs/inode.c | 9 + + fs/nfs/internal.h | 11 +- + fs/nfs/nfs3acl.c | 2 +- + fs/nfs/nfs3proc.c | 21 +- + fs/nfs/nfs4_fs.h | 32 +- + fs/nfs/nfs4client.c | 5 + + fs/nfs/nfs4proc.c | 248 ++++++++---- + fs/nfs/nfs4state.c | 69 ++-- + fs/nfs/nfs4trace.h | 28 +- + fs/nfs/nfs4xdr.c | 2 +- + fs/nfs/objlayout/objio_osd.c | 24 +- + fs/nfs/objlayout/objlayout.c | 81 ++-- + fs/nfs/objlayout/objlayout.h | 8 +- + fs/nfs/pagelist.c | 276 ++++++------- + fs/nfs/pnfs.c | 178 +++----- + fs/nfs/pnfs.h | 45 ++- + fs/nfs/proc.c | 27 +- + fs/nfs/read.c | 54 ++- + fs/nfs/super.c | 12 +- + fs/nfs/write.c | 150 +++---- + fs/nfs_common/nfsacl.c | 5 +- + include/linux/nfs_fs.h | 2 + + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_page.h | 19 +- + include/linux/nfs_xdr.h | 34 +- + include/linux/sunrpc/auth.h | 4 + + include/linux/sunrpc/auth_gss.h | 3 +- + include/linux/sunrpc/gss_krb5.h | 4 +- + include/linux/sunrpc/xprtrdma.h | 2 - + net/sunrpc/addr.c | 16 +- + net/sunrpc/auth.c | 68 +++- + net/sunrpc/auth_generic.c | 6 + + net/sunrpc/auth_gss/auth_gss.c | 126 ++++-- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 9 +- + net/sunrpc/auth_gss/gss_krb5_seal.c | 28 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 20 +- + net/sunrpc/auth_null.c | 2 + + net/sunrpc/clnt.c | 5 + + net/sunrpc/rpc_pipe.c | 2 +- + net/sunrpc/xprt.c | 1 + + net/sunrpc/xprtrdma/rpc_rdma.c | 83 ++-- + net/sunrpc/xprtrdma/transport.c | 17 +- + net/sunrpc/xprtrdma/verbs.c | 739 +++++++++++++++++++++++----------- + net/sunrpc/xprtrdma/xprt_rdma.h | 61 ++- + net/sunrpc/xprtsock.c | 9 +- + 54 files changed, 1967 insertions(+), 1288 deletions(-) +Merging nfsd/nfsd-next (211532d35b3f nfsd: allow turning off nfsv3 readdir_plus) +$ git merge nfsd/nfsd-next +Resolved 'fs/nfsd/nfs4xdr.c' using previous resolution. +Auto-merging net/sunrpc/xprt.c +Auto-merging fs/nfsd/nfs4xdr.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfs4proc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aa9840c92e86] Merge remote-tracking branch 'nfsd/nfsd-next' +$ git diff -M --stat --summary HEAD^.. + fs/nfsd/acl.h | 2 +- + fs/nfsd/auth.c | 2 +- + fs/nfsd/export.c | 7 +- + fs/nfsd/export.h | 3 +- + fs/nfsd/fault_inject.c | 138 +- + fs/nfsd/netns.h | 23 +- + fs/nfsd/nfs2acl.c | 8 +- + fs/nfsd/nfs3acl.c | 8 +- + fs/nfsd/nfs3proc.c | 17 +- + fs/nfsd/nfs3xdr.c | 30 +- + fs/nfsd/nfs4acl.c | 39 +- + fs/nfsd/nfs4callback.c | 32 +- + fs/nfsd/nfs4proc.c | 53 +- + fs/nfsd/nfs4state.c | 3100 ++++++++++++++++++++---------- + fs/nfsd/nfs4xdr.c | 128 +- + fs/nfsd/nfscache.c | 13 +- + fs/nfsd/nfsctl.c | 51 +- + fs/nfsd/nfsfh.c | 12 +- + fs/nfsd/nfsfh.h | 15 +- + fs/nfsd/nfsproc.c | 13 +- + fs/nfsd/nfssvc.c | 21 +- + fs/nfsd/nfsxdr.c | 14 +- + fs/nfsd/state.h | 220 ++- + fs/nfsd/vfs.c | 48 +- + fs/nfsd/vfs.h | 8 +- + fs/nfsd/xdr4.h | 30 +- + include/linux/cred.h | 9 + + include/linux/sunrpc/svc.h | 4 +- + include/linux/sunrpc/svc_rdma.h | 3 +- + include/linux/sunrpc/svc_xprt.h | 2 + + include/uapi/linux/nfsd/export.h | 5 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/svc.c | 4 +- + net/sunrpc/svc_xprt.c | 27 +- + net/sunrpc/svcsock.c | 50 +- + net/sunrpc/xdr.c | 3 +- + net/sunrpc/xprt.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 28 + + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 39 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 20 +- + 40 files changed, 2763 insertions(+), 1470 deletions(-) +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (25601a3c9737 UBIFS: Add log overlap assertions) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/block.c | 18 ++++++++++++------ + drivers/mtd/ubi/vtbl.c | 2 +- + drivers/mtd/ubi/wl.c | 4 ++-- + fs/ubifs/commit.c | 2 -- + fs/ubifs/io.c | 2 +- + fs/ubifs/log.c | 12 ++++++------ + fs/ubifs/lpt.c | 5 ++--- + fs/ubifs/lpt_commit.c | 7 +++++-- + fs/ubifs/master.c | 7 +++---- + fs/ubifs/orphan.c | 1 - + fs/ubifs/recovery.c | 5 ++--- + fs/ubifs/sb.c | 4 +++- + fs/ubifs/scan.c | 14 +++++++------- + fs/ubifs/super.c | 19 +++++++++---------- + fs/ubifs/tnc.c | 1 - + fs/ubifs/tnc_commit.c | 1 - + fs/ubifs/ubifs.h | 4 ---- + 17 files changed, 53 insertions(+), 55 deletions(-) +Merging xfs/for-next (645f98572134 Merge branch 'xfs-misc-fixes-3.17-2' into for-next) +$ git merge xfs/for-next +Removing fs/xfs/xfs_vnode.h +Auto-merging fs/xfs/libxfs/xfs_symlink_remote.c +Auto-merging fs/xfs/libxfs/xfs_sb.h +Auto-merging fs/xfs/libxfs/xfs_sb.c +Auto-merging fs/xfs/libxfs/xfs_quota_defs.h +Auto-merging fs/xfs/libxfs/xfs_log_format.h +Auto-merging fs/xfs/libxfs/xfs_inum.h +Auto-merging fs/xfs/libxfs/xfs_inode_fork.c +Auto-merging fs/xfs/libxfs/xfs_inode_buf.c +Auto-merging fs/xfs/libxfs/xfs_ialloc_btree.c +Auto-merging fs/xfs/libxfs/xfs_ialloc.c +Auto-merging fs/xfs/libxfs/xfs_format.h +Auto-merging fs/xfs/libxfs/xfs_dquot_buf.c +Auto-merging fs/xfs/libxfs/xfs_dir2_sf.c +Auto-merging fs/xfs/libxfs/xfs_dir2_node.c +Auto-merging fs/xfs/libxfs/xfs_dir2_leaf.c +Auto-merging fs/xfs/libxfs/xfs_dir2_data.c +Auto-merging fs/xfs/libxfs/xfs_dir2_block.c +Auto-merging fs/xfs/libxfs/xfs_dir2.c +Auto-merging fs/xfs/libxfs/xfs_da_btree.c +Auto-merging fs/xfs/libxfs/xfs_btree.h +Auto-merging fs/xfs/libxfs/xfs_btree.c +Auto-merging fs/xfs/libxfs/xfs_bmap_btree.c +Auto-merging fs/xfs/libxfs/xfs_bmap.c +Auto-merging fs/xfs/libxfs/xfs_attr_remote.c +Auto-merging fs/xfs/libxfs/xfs_attr_leaf.c +Auto-merging fs/xfs/libxfs/xfs_attr.c +Auto-merging fs/xfs/libxfs/xfs_alloc_btree.c +Auto-merging fs/xfs/libxfs/xfs_alloc.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-xfs | 39 +++ + fs/xfs/Kconfig | 1 + + fs/xfs/Makefile | 71 ++-- + fs/xfs/{ => libxfs}/xfs_ag.h | 0 + fs/xfs/{ => libxfs}/xfs_alloc.c | 20 +- + fs/xfs/{ => libxfs}/xfs_alloc.h | 0 + fs/xfs/{ => libxfs}/xfs_alloc_btree.c | 6 +- + fs/xfs/{ => libxfs}/xfs_alloc_btree.h | 0 + fs/xfs/{ => libxfs}/xfs_attr.c | 92 ++--- + fs/xfs/{ => libxfs}/xfs_attr_leaf.c | 78 ++--- + fs/xfs/{ => libxfs}/xfs_attr_leaf.h | 0 + fs/xfs/{ => libxfs}/xfs_attr_remote.c | 22 +- + fs/xfs/{ => libxfs}/xfs_attr_remote.h | 0 + fs/xfs/{ => libxfs}/xfs_attr_sf.h | 0 + fs/xfs/{ => libxfs}/xfs_bit.h | 0 + fs/xfs/{ => libxfs}/xfs_bmap.c | 60 ++-- + fs/xfs/{ => libxfs}/xfs_bmap.h | 0 + fs/xfs/{ => libxfs}/xfs_bmap_btree.c | 99 +----- + fs/xfs/{ => libxfs}/xfs_bmap_btree.h | 0 + fs/xfs/{ => libxfs}/xfs_btree.c | 46 +-- + fs/xfs/{ => libxfs}/xfs_btree.h | 2 +- + fs/xfs/{ => libxfs}/xfs_cksum.h | 0 + fs/xfs/{ => libxfs}/xfs_da_btree.c | 112 +++--- + fs/xfs/{ => libxfs}/xfs_da_btree.h | 0 + fs/xfs/{ => libxfs}/xfs_da_format.c | 0 + fs/xfs/{ => libxfs}/xfs_da_format.h | 0 + fs/xfs/{ => libxfs}/xfs_dinode.h | 0 + fs/xfs/{ => libxfs}/xfs_dir2.c | 24 +- + fs/xfs/{ => libxfs}/xfs_dir2.h | 0 + fs/xfs/{ => libxfs}/xfs_dir2_block.c | 18 +- + fs/xfs/{ => libxfs}/xfs_dir2_data.c | 10 +- + fs/xfs/{ => libxfs}/xfs_dir2_leaf.c | 24 +- + fs/xfs/{ => libxfs}/xfs_dir2_node.c | 40 +-- + fs/xfs/{ => libxfs}/xfs_dir2_priv.h | 0 + fs/xfs/{ => libxfs}/xfs_dir2_sf.c | 75 ++-- + fs/xfs/{ => libxfs}/xfs_dquot_buf.c | 6 +- + fs/xfs/{ => libxfs}/xfs_format.h | 14 +- + fs/xfs/{ => libxfs}/xfs_ialloc.c | 34 +- + fs/xfs/{ => libxfs}/xfs_ialloc.h | 0 + fs/xfs/{ => libxfs}/xfs_ialloc_btree.c | 6 +- + fs/xfs/{ => libxfs}/xfs_ialloc_btree.h | 0 + fs/xfs/{ => libxfs}/xfs_inode_buf.c | 10 +- + fs/xfs/{ => libxfs}/xfs_inode_buf.h | 0 + fs/xfs/{ => libxfs}/xfs_inode_fork.c | 36 +- + fs/xfs/{ => libxfs}/xfs_inode_fork.h | 0 + fs/xfs/{ => libxfs}/xfs_inum.h | 4 - + fs/xfs/{ => libxfs}/xfs_log_format.h | 4 +- + fs/xfs/{ => libxfs}/xfs_log_recover.h | 0 + fs/xfs/{ => libxfs}/xfs_log_rlimit.c | 0 + fs/xfs/{ => libxfs}/xfs_quota_defs.h | 2 - + fs/xfs/{ => libxfs}/xfs_rtbitmap.c | 0 + fs/xfs/{ => libxfs}/xfs_sb.c | 56 +-- + fs/xfs/{ => libxfs}/xfs_sb.h | 8 +- + fs/xfs/{ => libxfs}/xfs_shared.h | 0 + fs/xfs/{ => libxfs}/xfs_symlink_remote.c | 6 +- + fs/xfs/{ => libxfs}/xfs_trans_resv.c | 0 + fs/xfs/{ => libxfs}/xfs_trans_resv.h | 0 + fs/xfs/{ => libxfs}/xfs_trans_space.h | 0 + fs/xfs/xfs_acl.c | 8 +- + fs/xfs/xfs_aops.c | 18 +- + fs/xfs/xfs_attr_inactive.c | 22 +- + fs/xfs/xfs_attr_list.c | 38 +- + fs/xfs/xfs_bmap_util.c | 174 +++++----- + fs/xfs/xfs_buf.c | 40 ++- + fs/xfs/xfs_buf.h | 2 +- + fs/xfs/xfs_buf_item.c | 4 +- + fs/xfs/xfs_dir2_readdir.c | 4 +- + fs/xfs/xfs_discard.c | 18 +- + fs/xfs/xfs_dquot.c | 41 +-- + fs/xfs/xfs_dquot.h | 15 + + fs/xfs/xfs_error.c | 25 +- + fs/xfs/xfs_error.h | 13 +- + fs/xfs/xfs_export.c | 10 +- + fs/xfs/xfs_extfree_item.c | 2 +- + fs/xfs/xfs_file.c | 75 ++-- + fs/xfs/xfs_filestream.c | 4 +- + fs/xfs/xfs_fs.h | 7 +- + fs/xfs/xfs_fsops.c | 42 +-- + fs/xfs/xfs_icache.c | 148 ++++++-- + fs/xfs/xfs_icache.h | 13 +- + fs/xfs/xfs_inode.c | 68 ++-- + fs/xfs/xfs_inode.h | 10 + + fs/xfs/xfs_inode_item.c | 2 +- + fs/xfs/xfs_ioctl.c | 266 +++++++------- + fs/xfs/xfs_ioctl32.c | 111 +++--- + fs/xfs/xfs_iomap.c | 54 +-- + fs/xfs/xfs_iops.c | 72 ++-- + fs/xfs/xfs_itable.c | 579 ++++++++++++++----------------- + fs/xfs/xfs_itable.h | 23 +- + fs/xfs/xfs_linux.h | 27 +- + fs/xfs/xfs_log.c | 69 ++-- + fs/xfs/xfs_log_cil.c | 8 +- + fs/xfs/xfs_log_priv.h | 2 + + fs/xfs/xfs_log_recover.c | 284 ++++++++------- + fs/xfs/xfs_mount.c | 97 +++--- + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_mru_cache.c | 14 +- + fs/xfs/xfs_qm.c | 229 ++++++------ + fs/xfs/xfs_qm.h | 1 - + fs/xfs/xfs_qm_bhv.c | 2 +- + fs/xfs/xfs_qm_syscalls.c | 46 +-- + fs/xfs/xfs_quotaops.c | 20 +- + fs/xfs/xfs_rtalloc.c | 24 +- + fs/xfs/xfs_rtalloc.h | 2 +- + fs/xfs/xfs_super.c | 132 +++---- + fs/xfs/xfs_super.h | 15 +- + fs/xfs/xfs_symlink.c | 30 +- + fs/xfs/xfs_sysfs.c | 165 +++++++++ + fs/xfs/xfs_sysfs.h | 59 ++++ + fs/xfs/xfs_trans.c | 10 +- + fs/xfs/xfs_trans_ail.c | 4 +- + fs/xfs/xfs_trans_buf.c | 37 +- + fs/xfs/xfs_trans_dquot.c | 4 +- + fs/xfs/xfs_types.h | 29 +- + fs/xfs/xfs_vnode.h | 46 --- + fs/xfs/xfs_xattr.c | 6 +- + 116 files changed, 2252 insertions(+), 2044 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-fs-xfs + rename fs/xfs/{ => libxfs}/xfs_ag.h (100%) + rename fs/xfs/{ => libxfs}/xfs_alloc.c (99%) + rename fs/xfs/{ => libxfs}/xfs_alloc.h (100%) + rename fs/xfs/{ => libxfs}/xfs_alloc_btree.c (99%) + rename fs/xfs/{ => libxfs}/xfs_alloc_btree.h (100%) + rename fs/xfs/{ => libxfs}/xfs_attr.c (97%) + rename fs/xfs/{ => libxfs}/xfs_attr_leaf.c (98%) + rename fs/xfs/{ => libxfs}/xfs_attr_leaf.h (100%) + rename fs/xfs/{ => libxfs}/xfs_attr_remote.c (98%) + rename fs/xfs/{ => libxfs}/xfs_attr_remote.h (100%) + rename fs/xfs/{ => libxfs}/xfs_attr_sf.h (100%) + rename fs/xfs/{ => libxfs}/xfs_bit.h (100%) + rename fs/xfs/{ => libxfs}/xfs_bmap.c (99%) + rename fs/xfs/{ => libxfs}/xfs_bmap.h (100%) + rename fs/xfs/{ => libxfs}/xfs_bmap_btree.c (88%) + rename fs/xfs/{ => libxfs}/xfs_bmap_btree.h (100%) + rename fs/xfs/{ => libxfs}/xfs_btree.c (99%) + rename fs/xfs/{ => libxfs}/xfs_btree.h (99%) + rename fs/xfs/{ => libxfs}/xfs_cksum.h (100%) + rename fs/xfs/{ => libxfs}/xfs_da_btree.c (97%) + rename fs/xfs/{ => libxfs}/xfs_da_btree.h (100%) + rename fs/xfs/{ => libxfs}/xfs_da_format.c (100%) + rename fs/xfs/{ => libxfs}/xfs_da_format.h (100%) + rename fs/xfs/{ => libxfs}/xfs_dinode.h (100%) + rename fs/xfs/{ => libxfs}/xfs_dir2.c (98%) + rename fs/xfs/{ => libxfs}/xfs_dir2.h (100%) + rename fs/xfs/{ => libxfs}/xfs_dir2_block.c (99%) + rename fs/xfs/{ => libxfs}/xfs_dir2_data.c (99%) + rename fs/xfs/{ => libxfs}/xfs_dir2_leaf.c (99%) + rename fs/xfs/{ => libxfs}/xfs_dir2_node.c (98%) + rename fs/xfs/{ => libxfs}/xfs_dir2_priv.h (100%) + rename fs/xfs/{ => libxfs}/xfs_dir2_sf.c (97%) + rename fs/xfs/{ => libxfs}/xfs_dquot_buf.c (98%) + rename fs/xfs/{ => libxfs}/xfs_format.h (97%) + rename fs/xfs/{ => libxfs}/xfs_ialloc.c (99%) + rename fs/xfs/{ => libxfs}/xfs_ialloc.h (100%) + rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.c (98%) + rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.h (100%) + rename fs/xfs/{ => libxfs}/xfs_inode_buf.c (98%) + rename fs/xfs/{ => libxfs}/xfs_inode_buf.h (100%) + rename fs/xfs/{ => libxfs}/xfs_inode_fork.c (98%) + rename fs/xfs/{ => libxfs}/xfs_inode_fork.h (100%) + rename fs/xfs/{ => libxfs}/xfs_inum.h (96%) + rename fs/xfs/{ => libxfs}/xfs_log_format.h (99%) + rename fs/xfs/{ => libxfs}/xfs_log_recover.h (100%) + rename fs/xfs/{ => libxfs}/xfs_log_rlimit.c (100%) + rename fs/xfs/{ => libxfs}/xfs_quota_defs.h (98%) + rename fs/xfs/{ => libxfs}/xfs_rtbitmap.c (100%) + rename fs/xfs/{ => libxfs}/xfs_sb.c (96%) + rename fs/xfs/{ => libxfs}/xfs_sb.h (98%) + rename fs/xfs/{ => libxfs}/xfs_shared.h (100%) + rename fs/xfs/{ => libxfs}/xfs_symlink_remote.c (97%) + rename fs/xfs/{ => libxfs}/xfs_trans_resv.c (100%) + rename fs/xfs/{ => libxfs}/xfs_trans_resv.h (100%) + rename fs/xfs/{ => libxfs}/xfs_trans_space.h (100%) + create mode 100644 fs/xfs/xfs_sysfs.c + create mode 100644 fs/xfs/xfs_sysfs.h + delete mode 100644 fs/xfs/xfs_vnode.h +Merging file-private-locks/linux-next (54ace37e4640 locks: show delegations as "DELEG" in /proc/locks) +$ git merge file-private-locks/linux-next +Merge made by the 'recursive' strategy. + fs/locks.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging vfs/for-next (cd67b9ac44ea switch iov_iter_get_pages() to passing maximal number of pages) +$ git merge vfs/for-next +Auto-merging include/linux/uio.h +Auto-merging fs/fuse/file.c +Auto-merging fs/direct-io.c +Merge made by the 'recursive' strategy. + fs/direct-io.c | 2 +- + fs/fuse/file.c | 4 ++-- + include/linux/uio.h | 2 +- + mm/iov_iter.c | 17 ++++++++--------- + 4 files changed, 12 insertions(+), 13 deletions(-) +Merging hch-vfs/vfs-for-3.17 (4f3620546893 fs: mark __d_obtain_alias static) +$ git merge hch-vfs/vfs-for-3.17 +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/cifsfs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/Exporting | 38 ++++--- + Documentation/filesystems/vfs.txt | 3 +- + fs/bad_inode.c | 7 +- + fs/btrfs/inode.c | 12 +- + fs/btrfs/super.c | 9 +- + fs/ceph/super.c | 2 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsfs.h | 4 +- + fs/cifs/inode.c | 14 ++- + fs/dcache.c | 196 +++++++++++++++++++------------- + fs/ext4/namei.c | 1 - + fs/fuse/dir.c | 7 -- + fs/hostfs/hostfs.h | 1 + + fs/hostfs/hostfs_kern.c | 30 +++-- + fs/hostfs/hostfs_user.c | 28 +++++ + fs/namei.c | 32 +++--- + fs/nfs/getroot.c | 2 +- + fs/nilfs2/super.c | 2 +- + include/linux/dcache.h | 1 + + mm/shmem.c | 32 +++++- + 20 files changed, 275 insertions(+), 148 deletions(-) +Merging pci/next (981c191778a4 Merge branches 'pci/host-designware', 'pci/host-mvebu' and 'pci/host-tegra' into next) +$ git merge pci/next +Auto-merging drivers/pci/host/pci-tegra.c +Auto-merging drivers/pci/host/Makefile +Auto-merging drivers/pci/host/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/designware-pcie.txt | 4 + + Documentation/devicetree/bindings/pci/ti-pci.txt | 59 +++ + MAINTAINERS | 8 + + drivers/pci/host/Kconfig | 11 +- + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-dra7xx.c | 458 +++++++++++++++++++++ + drivers/pci/host/pci-tegra.c | 118 ++++++ + drivers/pci/host/pcie-designware.c | 134 ++++-- + drivers/pci/host/pcie-designware.h | 11 + + 9 files changed, 771 insertions(+), 33 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/ti-pci.txt + create mode 100644 drivers/pci/host/pci-dra7xx.c +Merging hid/for-next (71095593b5d8 Merge branch 'for-3.17/hyperv' into for-next) +$ git merge hid/for-next +Removing drivers/hid/hid-lenovo-tpkbd.c +Auto-merging Documentation/ABI/testing/sysfs-driver-hid-lenovo +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-hid-driver-gt683r | 14 + + ...er-hid-lenovo-tpkbd => sysfs-driver-hid-lenovo} | 12 + + drivers/hid/Kconfig | 32 +- + drivers/hid/Makefile | 3 +- + drivers/hid/hid-core.c | 12 +- + drivers/hid/hid-cp2112.c | 111 +++- + drivers/hid/hid-gt683r.c | 309 +++++++++ + drivers/hid/hid-huion.c | 265 +++++--- + drivers/hid/hid-hyperv.c | 6 + + drivers/hid/hid-ids.h | 8 +- + drivers/hid/hid-lenovo-tpkbd.c | 462 -------------- + drivers/hid/hid-lenovo.c | 708 +++++++++++++++++++++ + drivers/hid/hid-picolcd_debugfs.c | 9 +- + drivers/hid/hid-rmi.c | 67 +- + drivers/hid/hid-roccat-lua.c | 2 +- + drivers/hid/hid-sony.c | 132 ++-- + drivers/hid/i2c-hid/i2c-hid.c | 15 +- + drivers/hid/usbhid/hid-core.c | 8 +- + drivers/hid/usbhid/hid-quirks.c | 3 +- + include/linux/hid.h | 1 + + 20 files changed, 1535 insertions(+), 644 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r + rename Documentation/ABI/testing/{sysfs-driver-hid-lenovo-tpkbd => sysfs-driver-hid-lenovo} (75%) + create mode 100644 drivers/hid/hid-gt683r.c + delete mode 100644 drivers/hid/hid-lenovo-tpkbd.c + create mode 100644 drivers/hid/hid-lenovo.c +Merging i2c/i2c/for-next (0772e4bbcc8a Merge branch 'i2c/for-3.17' into i2c/for-next) +$ git merge i2c/i2c/for-next +Removing include/linux/i2c/s6000.h +Auto-merging drivers/i2c/i2c-core.c +Removing drivers/i2c/busses/scx200_i2c.c +Removing drivers/i2c/busses/i2c-s6000.h +Removing drivers/i2c/busses/i2c-s6000.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-efm32.txt | 4 +- + Documentation/i2c/busses/i2c-i801 | 1 + + Documentation/i2c/i2c-stub | 23 +- + drivers/i2c/Kconfig | 18 +- + drivers/i2c/Makefile | 5 +- + drivers/i2c/busses/Kconfig | 46 +-- + drivers/i2c/busses/Makefile | 2 - + drivers/i2c/busses/i2c-at91.c | 6 +- + drivers/i2c/busses/i2c-bcm2835.c | 2 +- + drivers/i2c/busses/i2c-bfin-twi.c | 2 +- + drivers/i2c/busses/i2c-davinci.c | 2 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 9 + + drivers/i2c/busses/i2c-designware-platdrv.c | 3 +- + drivers/i2c/busses/i2c-efm32.c | 8 +- + drivers/i2c/busses/i2c-exynos5.c | 16 +- + drivers/i2c/busses/i2c-gpio.c | 2 - + drivers/i2c/busses/i2c-i801.c | 139 +++---- + drivers/i2c/busses/i2c-imx.c | 5 +- + drivers/i2c/busses/i2c-mv64xxx.c | 2 +- + drivers/i2c/busses/i2c-nomadik.c | 8 +- + drivers/i2c/busses/i2c-ocores.c | 12 +- + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/i2c/busses/i2c-qup.c | 12 +- + drivers/i2c/busses/i2c-rcar.c | 14 +- + drivers/i2c/busses/i2c-s3c2410.c | 16 +- + drivers/i2c/busses/i2c-s6000.c | 404 --------------------- + drivers/i2c/busses/i2c-s6000.h | 79 ---- + drivers/i2c/busses/i2c-sirf.c | 2 +- + drivers/i2c/busses/i2c-st.c | 34 +- + drivers/i2c/busses/i2c-stu300.c | 2 +- + drivers/i2c/busses/i2c-taos-evm.c | 13 +- + drivers/i2c/busses/i2c-tegra.c | 2 +- + drivers/i2c/busses/i2c-xiic.c | 12 +- + drivers/i2c/busses/scx200_i2c.c | 129 ------- + drivers/i2c/i2c-acpi.c | 362 ++++++++++++++++++ + drivers/i2c/i2c-core.c | 107 +----- + drivers/i2c/i2c-stub.c | 237 +++++++++++- + drivers/i2c/muxes/i2c-mux-pca954x.c | 15 + + include/linux/acpi.h | 11 + + include/linux/i2c.h | 12 + + include/linux/i2c/s6000.h | 10 - + 41 files changed, 851 insertions(+), 939 deletions(-) + delete mode 100644 drivers/i2c/busses/i2c-s6000.c + delete mode 100644 drivers/i2c/busses/i2c-s6000.h + delete mode 100644 drivers/i2c/busses/scx200_i2c.c + create mode 100644 drivers/i2c/i2c-acpi.c + delete mode 100644 include/linux/i2c/s6000.h +Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (fce9626cd93a hwmon: (g762) Use of_property_read_u32 at appropriate place) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (d1352f268415 Merge two fixes from branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/dvb-frontends/si2168.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kbuild/for-next (abe88461a248 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging scripts/coccinelle/misc/bugon.cocci +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + .gitignore | 1 + + Documentation/kbuild/00-INDEX | 2 + + Documentation/{make => kbuild}/headers_install.txt | 0 + Documentation/kbuild/makefiles.txt | 39 +---- + Documentation/lto-build | 173 +++++++++++++++++++++ + Makefile | 37 ++++- + arch/ia64/Makefile | 2 +- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 +++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 26 +++- + scripts/Makefile.clean | 4 +- + scripts/Makefile.extrawarn | 21 +-- + scripts/Makefile.host | 61 ++------ + scripts/Makefile.lto | 84 ++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/coccinelle/api/alloc/alloc_cast.cocci | 72 +++++++++ + scripts/coccinelle/misc/array_size.cocci | 87 +++++++++++ + scripts/coccinelle/misc/badty.cocci | 76 +++++++++ + .../drop_kmalloc_cast.cocci => misc/bugon.cocci} | 47 +++--- + scripts/coccinelle/null/badzero.cocci | 3 +- + scripts/link-vmlinux.sh | 2 +- + 22 files changed, 686 insertions(+), 135 deletions(-) + rename Documentation/{make => kbuild}/headers_install.txt (100%) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto + create mode 100644 scripts/coccinelle/api/alloc/alloc_cast.cocci + create mode 100644 scripts/coccinelle/misc/array_size.cocci + create mode 100644 scripts/coccinelle/misc/badty.cocci + rename scripts/coccinelle/{api/alloc/drop_kmalloc_cast.cocci => misc/bugon.cocci} (50%) +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (1824be15f7a4 Merge branch 'for-3.17' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (7b777942af14 Merge branch 'acpi-lpss') +$ git merge pm/linux-next +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'drivers/acpi/acpi_extlog.c' using previous resolution. +Resolved 'drivers/cpuidle/Kconfig.arm' using previous resolution. +Auto-merging kernel/sched/idle.c +Auto-merging kernel/power/suspend.c +Auto-merging include/linux/acpi.h +Auto-merging drivers/iommu/dmar.c +Auto-merging drivers/firmware/efi/cper.c +Auto-merging drivers/cpuidle/Kconfig.arm +CONFLICT (content): Merge conflict in drivers/cpuidle/Kconfig.arm +Auto-merging drivers/acpi/apei/ghes.c +Auto-merging drivers/acpi/acpi_extlog.c +CONFLICT (content): Merge conflict in drivers/acpi/acpi_extlog.c +Auto-merging drivers/acpi/Kconfig +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/arm/mach-vexpress/Kconfig +Auto-merging arch/arm/mach-shmobile/Kconfig +Auto-merging arch/arm/mach-imx/Kconfig +Auto-merging arch/arm/mach-exynos/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b334f483a11f] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/power/opp.txt | 3 - + MAINTAINERS | 4 +- + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-highbank/Kconfig | 1 - + arch/arm/mach-imx/Kconfig | 1 - + arch/arm/mach-omap2/Kconfig | 1 - + arch/arm/mach-shmobile/Kconfig | 2 - + arch/arm/mach-vexpress/Kconfig | 1 - + arch/arm/mach-zynq/Kconfig | 1 - + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/acenv.h | 4 - + arch/ia64/include/asm/acpi.h | 5 + + arch/x86/Kconfig | 2 + + arch/x86/include/asm/acenv.h | 4 - + arch/x86/include/asm/acpi.h | 5 + + drivers/acpi/Kconfig | 6 + + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_extlog.c | 18 +- + drivers/acpi/acpi_lpss.c | 10 + + drivers/acpi/acpi_pnp.c | 8 +- + drivers/acpi/acpi_processor.c | 2 +- + drivers/acpi/acpica/Makefile | 10 +- + drivers/acpi/acpica/acapps.h | 9 +- + drivers/acpi/acpica/acdebug.h | 3 - + drivers/acpi/acpica/acglobal.h | 8 +- + drivers/acpi/acpica/aclocal.h | 18 +- + drivers/acpi/acpica/acpredef.h | 16 +- + drivers/acpi/acpica/acutils.h | 48 +- + drivers/acpi/acpica/evgpe.c | 32 +- + drivers/acpi/acpica/evxfgpe.c | 61 +- + drivers/acpi/acpica/exdebug.c | 11 +- + drivers/acpi/acpica/exdump.c | 6 +- + drivers/acpi/acpica/exfield.c | 26 +- + drivers/acpi/acpica/hwregs.c | 3 +- + drivers/acpi/acpica/nsobject.c | 10 + + drivers/acpi/acpica/utbuffer.c | 128 ++ + drivers/acpi/acpica/utcopy.c | 6 + + drivers/acpi/acpica/utdebug.c | 26 + + drivers/acpi/acpica/utdecode.c | 32 +- + drivers/acpi/acpica/utfileio.c | 331 +++++ + drivers/acpi/acpica/utglobal.c | 146 --- + drivers/acpi/acpica/uthex.c | 100 ++ + drivers/acpi/acpica/utinit.c | 145 +++ + drivers/acpi/acpica/utprint.c | 664 ++++++++++ + drivers/acpi/acpica/utuuid.c | 96 ++ + drivers/acpi/apei/apei-internal.h | 10 +- + drivers/acpi/apei/ghes.c | 32 +- + drivers/acpi/battery.c | 1 - + drivers/acpi/blacklist.c | 68 +- + drivers/acpi/bus.c | 3 - + drivers/acpi/button.c | 25 +- + drivers/acpi/device_pm.c | 148 ++- + drivers/acpi/internal.h | 7 +- + drivers/acpi/osl.c | 4 +- + drivers/acpi/pci_root.c | 2 +- + drivers/acpi/processor_core.c | 200 +-- + drivers/acpi/processor_pdc.c | 206 +++ + drivers/acpi/scan.c | 33 +- + drivers/acpi/sleep.c | 5 + + drivers/acpi/video.c | 121 +- + drivers/base/power/main.c | 5 + + drivers/cpufreq/cpufreq.c | 74 +- + drivers/cpufreq/cpufreq_ondemand.c | 11 +- + drivers/cpufreq/freq_table.c | 12 +- + drivers/cpufreq/imx6q-cpufreq.c | 35 +- + drivers/cpufreq/intel_pstate.c | 131 +- + drivers/cpufreq/powernow-k6.c | 1 + + drivers/cpuidle/Kconfig | 7 +- + drivers/cpuidle/Kconfig.arm | 1 + + drivers/cpuidle/cpuidle.c | 2 + + drivers/cpuidle/driver.c | 11 - + drivers/cpuidle/governors/ladder.c | 4 +- + drivers/cpuidle/governors/menu.c | 1 - + drivers/cpuidle/sysfs.c | 2 +- + drivers/devfreq/Kconfig | 1 - + drivers/firmware/efi/cper.c | 20 +- + drivers/iommu/dmar.c | 28 +- + drivers/pci/hotplug/acpiphp_glue.c | 33 +- + drivers/pci/pci-acpi.c | 76 +- + drivers/pnp/pnpacpi/core.c | 91 +- + include/acpi/acconfig.h | 18 + + include/acpi/acnames.h | 1 + + include/acpi/acpi_bus.h | 42 +- + include/acpi/acpiosxf.h | 31 + + include/acpi/acpixf.h | 54 +- + include/acpi/actbl.h | 12 +- + include/acpi/actbl1.h | 58 +- + include/acpi/actbl2.h | 14 +- + include/acpi/actbl3.h | 118 +- + include/acpi/actypes.h | 19 +- + include/acpi/ghes.h | 2 +- + include/acpi/platform/acenv.h | 53 +- + include/acpi/platform/aclinux.h | 12 + + include/acpi/platform/aclinuxex.h | 22 + + include/linux/acpi.h | 6 +- + include/linux/cpufreq.h | 1 + + include/linux/pci-acpi.h | 13 +- + include/linux/pm_runtime.h | 11 +- + include/linux/sfi_acpi.h | 3 - + kernel/power/Kconfig | 3 - + kernel/power/main.c | 25 +- + kernel/power/power.h | 7 +- + kernel/power/snapshot.c | 494 ++++++-- + kernel/power/suspend.c | 152 ++- + kernel/power/suspend_test.c | 12 +- + kernel/sched/idle.c | 4 - + tools/power/acpi/Makefile | 5 + + tools/power/acpi/common/cmfsize.c | 20 +- + tools/power/acpi/common/getopt.c | 14 +- + .../acpi/os_specific/service_layers/oslibcfs.c | 214 ++++ + .../acpi/os_specific/service_layers/oslinuxtbl.c | 48 +- + .../acpi/os_specific/service_layers/osunixxf.c | 1311 ++++++++++++++++++++ + tools/power/acpi/tools/acpidump/acpidump.h | 3 +- + tools/power/acpi/tools/acpidump/apdump.c | 108 +- + tools/power/acpi/tools/acpidump/apfiles.c | 92 +- + tools/power/acpi/tools/acpidump/apmain.c | 96 +- + tools/power/cpupower/bench/parse.c | 39 +- + tools/power/cpupower/utils/cpufreq-set.c | 11 +- + tools/power/cpupower/utils/helpers/sysfs.c | 2 +- + .../cpupower/utils/idle_monitor/mperf_monitor.c | 2 +- + 120 files changed, 5084 insertions(+), 1495 deletions(-) + create mode 100644 drivers/acpi/acpica/utfileio.c + create mode 100644 drivers/acpi/acpica/uthex.c + create mode 100644 drivers/acpi/acpica/utprint.c + create mode 100644 drivers/acpi/acpica/utuuid.c + create mode 100644 drivers/acpi/processor_pdc.c + create mode 100644 tools/power/acpi/os_specific/service_layers/oslibcfs.c + create mode 100644 tools/power/acpi/os_specific/service_layers/osunixxf.c +Merging idle/next (5f08abf265fe intel_idle: Disable Baytrail Core and Module C6 auto-demotion) +$ git merge idle/next +Auto-merging arch/x86/include/uapi/asm/msr-index.h +Merge made by the 'recursive' strategy. + arch/x86/include/uapi/asm/msr-index.h | 3 +++ + drivers/idle/intel_idle.c | 12 +++++++++++- + 2 files changed, 14 insertions(+), 1 deletion(-) +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (47d104ba5879 Merge branches 'exynos-fix', 'for-rc', 'int3403-fix', 'misc', 'rcar-thermal' and 'sti-thermal' of .git into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/exynos-thermal.txt | 1 + + .../devicetree/bindings/thermal/rcar-thermal.txt | 18 +- + .../devicetree/bindings/thermal/st-thermal.txt | 42 +++ + drivers/thermal/Kconfig | 7 +- + drivers/thermal/Makefile | 1 + + drivers/thermal/cpu_cooling.c | 2 +- + drivers/thermal/int3403_thermal.c | 67 ++++- + drivers/thermal/samsung/exynos_tmu.c | 11 +- + drivers/thermal/samsung/exynos_tmu.h | 3 +- + drivers/thermal/samsung/exynos_tmu_data.c | 89 ++++++ + drivers/thermal/samsung/exynos_tmu_data.h | 7 + + drivers/thermal/st/Kconfig | 12 + + drivers/thermal/st/Makefile | 3 + + drivers/thermal/st/st_thermal.c | 313 +++++++++++++++++++++ + drivers/thermal/st/st_thermal.h | 104 +++++++ + drivers/thermal/st/st_thermal_memmap.c | 209 ++++++++++++++ + drivers/thermal/st/st_thermal_syscfg.c | 179 ++++++++++++ + include/linux/thermal.h | 46 ++- + 18 files changed, 1093 insertions(+), 21 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/st-thermal.txt + create mode 100644 drivers/thermal/st/Kconfig + create mode 100644 drivers/thermal/st/Makefile + create mode 100644 drivers/thermal/st/st_thermal.c + create mode 100644 drivers/thermal/st/st_thermal.h + create mode 100644 drivers/thermal/st/st_thermal_memmap.c + create mode 100644 drivers/thermal/st/st_thermal_syscfg.c +Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (1141b7e95aa1 dmaengine: nbpf_error_get_channel() can be static) +$ git merge slave-dma/next +Resolved 'drivers/dma/Makefile' using previous resolution. +Auto-merging include/linux/platform_data/dma-imx.h +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/dma/edma.c +Auto-merging drivers/dma/Makefile +CONFLICT (content): Merge conflict in drivers/dma/Makefile +Auto-merging drivers/dma/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0f43330cd2c2] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + + .../devicetree/bindings/dma/mpc512x-dma.txt | 29 + + Documentation/devicetree/bindings/dma/nbpfaxi.txt | 61 + + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 98 ++ + .../devicetree/bindings/dma/ste-dma40.txt | 74 +- + .../devicetree/bindings/dma/sun6i-dma.txt | 45 + + Documentation/dmaengine.txt | 17 +- + arch/arm/common/edma.c | 31 +- + arch/powerpc/boot/dts/mpc5121.dtsi | 1 + + drivers/dma/Kconfig | 15 + + drivers/dma/Makefile | 6 +- + drivers/dma/TODO | 1 - + drivers/dma/amba-pl08x.c | 6 +- + drivers/dma/at_hdmac.c | 3 +- + drivers/dma/bcm2835-dma.c | 2 +- + drivers/dma/dma-jz4740.c | 4 +- + drivers/dma/dw/core.c | 42 +- + drivers/dma/edma.c | 23 +- + drivers/dma/ep93xx_dma.c | 4 +- + drivers/dma/fsl-edma.c | 8 +- + drivers/dma/fsldma.c | 297 +++- + drivers/dma/fsldma.h | 32 +- + drivers/dma/imx-dma.c | 2 +- + drivers/dma/imx-sdma.c | 17 +- + drivers/dma/ipu/ipu_idmac.c | 14 +- + drivers/dma/mmp_pdma.c | 2 +- + drivers/dma/mmp_tdma.c | 2 +- + drivers/dma/mpc512x_dma.c | 13 +- + drivers/dma/mxs-dma.c | 10 +- + drivers/dma/nbpfaxi.c | 1517 ++++++++++++++++++++ + drivers/dma/of-dma.c | 35 + + drivers/dma/omap-dma.c | 3 +- + drivers/dma/pl330.c | 964 +++++-------- + drivers/dma/qcom_bam_dma.c | 20 +- + drivers/dma/s3c24xx-dma.c | 3 +- + drivers/dma/sa11x0-dma.c | 2 +- + drivers/dma/sh/Kconfig | 24 +- + drivers/dma/sh/Makefile | 16 +- + drivers/dma/sh/shdma-base.c | 103 +- + drivers/dma/sh/shdma.h | 2 +- + drivers/dma/sirf-dma.c | 2 +- + drivers/dma/ste_dma40.c | 3 +- + drivers/dma/sun6i-dma.c | 1053 ++++++++++++++ + drivers/dma/tegra20-apb-dma.c | 2 +- + include/dt-bindings/dma/nbpfaxi.h | 20 + + include/linux/dmaengine.h | 5 +- + include/linux/of_dma.h | 4 + + include/linux/platform_data/dma-imx.h | 1 + + include/linux/platform_data/edma.h | 2 + + 49 files changed, 3799 insertions(+), 842 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/mpc512x-dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/nbpfaxi.txt + create mode 100644 Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt + create mode 100644 Documentation/devicetree/bindings/dma/sun6i-dma.txt + create mode 100644 drivers/dma/nbpfaxi.c + create mode 100644 drivers/dma/sun6i-dma.c + create mode 100644 include/dt-bindings/dma/nbpfaxi.h +Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()) +$ git merge dmaengine/next +Auto-merging drivers/dma/mv_xor.c +Merge made by the 'recursive' strategy. + drivers/dma/ioat/dca.c | 13 ++++---- + drivers/dma/ioat/dma.c | 2 +- + drivers/dma/ioat/dma_v3.c | 6 ++-- + drivers/dma/mv_xor.c | 80 +++++++++++++++++++++++++++++++++++++---------- + 4 files changed, 74 insertions(+), 27 deletions(-) +Merging net-next/master (85417aef44fc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (1759389e8af4 xfrm4: Remove duplicate semicolon) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (dc6be9f54a4e bcma: use NS prefix for names of Northstar specific cores) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (ba0e2fb34b9b Bluetooth: Disable page scan if all whitelisted devices are connected) +$ git merge bluetooth/master +Auto-merging net/bluetooth/hci_core.c +Merge made by the 'recursive' strategy. + include/net/bluetooth/hci_core.h | 6 ++ + net/bluetooth/hci_core.c | 49 ++++++++++++++++ + net/bluetooth/hci_event.c | 11 +++- + net/bluetooth/mgmt.c | 124 +++++++++++++-------------------------- + 4 files changed, 103 insertions(+), 87 deletions(-) +Merging infiniband/for-next (18e11d8d330b Merge branches 'ipoib', 'iwcm' and 'mlx4' into for-next) +$ git merge infiniband/for-next +Resolved 'include/linux/mlx4/device.h' using previous resolution. +Auto-merging include/linux/mlx4/device.h +CONFLICT (content): Merge conflict in include/linux/mlx4/device.h +Auto-merging drivers/net/ethernet/mellanox/mlx4/mlx4.h +Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c +Auto-merging drivers/net/ethernet/emulex/benet/be_main.c +Auto-merging drivers/net/ethernet/emulex/benet/be.h +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging drivers/infiniband/hw/cxgb4/t4.h +Auto-merging drivers/infiniband/hw/cxgb4/qp.c +Auto-merging drivers/infiniband/hw/cxgb4/ev.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0be9ad1abd8d] Merge remote-tracking branch 'infiniband/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/iwcm.c | 27 ++ + drivers/infiniband/core/uverbs.h | 1 + + drivers/infiniband/core/uverbs_cmd.c | 93 +++++++ + drivers/infiniband/core/uverbs_main.c | 1 + + drivers/infiniband/hw/cxgb4/ev.c | 1 + + drivers/infiniband/hw/cxgb4/qp.c | 37 ++- + drivers/infiniband/hw/cxgb4/t4.h | 11 + + drivers/infiniband/hw/ipath/ipath_mad.c | 14 +- + drivers/infiniband/hw/mlx4/main.c | 2 + + drivers/infiniband/hw/mlx4/mlx4_ib.h | 4 + + drivers/infiniband/hw/mlx4/mr.c | 88 +++++- + drivers/infiniband/hw/ocrdma/ocrdma.h | 26 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 227 ++++++++++++++-- + drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 2 + + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 83 +++++- + drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 295 ++++++++++++++++----- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 36 ++- + drivers/infiniband/ulp/ipoib/ipoib.h | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 81 ++---- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 47 ++-- + drivers/infiniband/ulp/iser/iscsi_iser.h | 8 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 128 ++++++--- + drivers/infiniband/ulp/srp/ib_srp.c | 48 +++- + drivers/net/ethernet/emulex/benet/be.h | 1 + + drivers/net/ethernet/emulex/benet/be_main.c | 1 + + drivers/net/ethernet/emulex/benet/be_roce.c | 18 +- + drivers/net/ethernet/emulex/benet/be_roce.h | 3 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 9 + + drivers/net/ethernet/mellanox/mlx4/fw.c | 91 ++++++- + drivers/net/ethernet/mellanox/mlx4/main.c | 5 + + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 3 + + drivers/net/ethernet/mellanox/mlx4/mr.c | 160 +++++++++++ + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 26 +- + drivers/scsi/scsi_transport_srp.c | 3 +- + include/linux/mlx4/cmd.h | 7 + + include/linux/mlx4/device.h | 17 ++ + include/rdma/ib_verbs.h | 10 +- + include/uapi/rdma/ib_user_verbs.h | 16 ++ + 40 files changed, 1382 insertions(+), 270 deletions(-) +Merging mtd/master (b6603fe574af Merge tag 'for-linus-20140716' of git://git.infradead.org/linux-mtd) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (2a500afe1e0e mtd: gpmi: make blockmark swapping optional) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-mtd | 38 +++ + .../devicetree/bindings/mtd/gpmi-nand.txt | 10 + + drivers/mtd/chips/cfi_cmdset_0002.c | 375 +++++++++++++++++++-- + drivers/mtd/cmdlinepart.c | 2 +- + drivers/mtd/devices/phram.c | 7 +- + drivers/mtd/ftl.c | 4 - + drivers/mtd/maps/rbtx4939-flash.c | 2 - + drivers/mtd/mtdcore.c | 59 +++- + drivers/mtd/mtdpart.c | 13 +- + drivers/mtd/nand/Makefile | 2 +- + drivers/mtd/nand/atmel_nand.c | 142 ++++++-- + drivers/mtd/nand/atmel_nand_nfc.h | 4 + + drivers/mtd/nand/bf5xx_nand.c | 24 -- + drivers/mtd/nand/denali.c | 6 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 71 ++-- + drivers/mtd/nand/lpc32xx_mlc.c | 6 - + drivers/mtd/nand/lpc32xx_slc.c | 6 - + drivers/mtd/nand/nand_base.c | 18 + + drivers/mtd/nand/nand_bbt.c | 14 + + drivers/mtd/nand/nand_timings.c | 253 ++++++++++++++ + drivers/mtd/nand/s3c2410.c | 4 +- + drivers/mtd/spi-nor/spi-nor.c | 53 +++ + fs/jffs2/acl.c | 3 +- + fs/jffs2/xattr.c | 3 +- + include/linux/mtd/mtd.h | 2 + + include/linux/mtd/nand.h | 53 +++ + include/linux/mtd/spi-nor.h | 4 + + 27 files changed, 1032 insertions(+), 146 deletions(-) + create mode 100644 drivers/mtd/nand/nand_timings.c +Merging crypto/master (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (21d70354bba9 drm: move drm_stub.c to drm_drv.c) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/armada/armada_crtc.c' using previous resolution. +Auto-merging include/video/samsung_fimd.h +Auto-merging include/drm/drmP.h +Auto-merging drivers/staging/imx-drm/imx-drm-core.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +Auto-merging drivers/gpu/drm/radeon/radeon_prime.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Removing drivers/gpu/drm/drm_stub.c +Auto-merging drivers/gpu/drm/armada/armada_crtc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/armada/armada_crtc.c +Auto-merging arch/arm/boot/dts/exynos5420.dtsi +Auto-merging arch/arm/boot/dts/exynos5.dtsi +Auto-merging arch/arm/boot/dts/exynos4.dtsi +Auto-merging Documentation/devicetree/bindings/video/samsung-fimd.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a6da8a9d71aa] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 89 +- + .../bindings/drm/armada/marvell,dove-lcd.txt | 30 + + .../devicetree/bindings/drm/i2c/tda998x.txt | 2 + + Documentation/devicetree/bindings/drm/msm/gpu.txt | 52 + + Documentation/devicetree/bindings/drm/msm/hdmi.txt | 46 + + Documentation/devicetree/bindings/drm/msm/mdp.txt | 48 + + .../devicetree/bindings/gpu/st,stih4xx.txt | 189 ++ + .../devicetree/bindings/video/exynos_dsim.txt | 4 +- + .../devicetree/bindings/video/exynos_mixer.txt | 5 +- + .../devicetree/bindings/video/samsung-fimd.txt | 28 + + arch/arm/boot/dts/exynos4.dtsi | 1 + + arch/arm/boot/dts/exynos5.dtsi | 1 + + arch/arm/boot/dts/exynos5420.dtsi | 20 + + drivers/char/agp/frontend.c | 15 - + drivers/gpu/drm/Kconfig | 3 + + drivers/gpu/drm/Makefile | 8 +- + drivers/gpu/drm/armada/armada_510.c | 23 +- + drivers/gpu/drm/armada/armada_crtc.c | 187 +- + drivers/gpu/drm/armada/armada_crtc.h | 11 +- + drivers/gpu/drm/armada/armada_drm.h | 13 +- + drivers/gpu/drm/armada/armada_drv.c | 245 +- + drivers/gpu/drm/armada/armada_fbdev.c | 4 +- + drivers/gpu/drm/armada/armada_output.c | 4 +- + drivers/gpu/drm/ast/ast_drv.h | 2 +- + drivers/gpu/drm/ast/ast_fb.c | 6 +- + drivers/gpu/drm/ast/ast_mode.c | 16 +- + drivers/gpu/drm/bochs/bochs_drv.c | 2 + + drivers/gpu/drm/bochs/bochs_fbdev.c | 7 +- + drivers/gpu/drm/bochs/bochs_kms.c | 17 +- + drivers/gpu/drm/bochs/bochs_mm.c | 2 +- + drivers/gpu/drm/bridge/ptn3460.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 + + drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 6 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 14 +- + drivers/gpu/drm/drm_buffer.c | 6 +- + drivers/gpu/drm/drm_bufs.c | 17 +- + drivers/gpu/drm/drm_context.c | 102 +- + drivers/gpu/drm/drm_crtc.c | 606 ++++- + drivers/gpu/drm/drm_crtc_helper.c | 1 + + drivers/gpu/drm/drm_debugfs.c | 182 ++ + drivers/gpu/drm/drm_dp_mst_topology.c | 2715 ++++++++++++++++++++ + drivers/gpu/drm/drm_drv.c | 1186 ++++++--- + drivers/gpu/drm/drm_edid.c | 11 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 5 +- + drivers/gpu/drm/drm_fb_helper.c | 115 +- + drivers/gpu/drm/drm_fops.c | 89 +- + drivers/gpu/drm/drm_gem.c | 29 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- + drivers/gpu/drm/drm_info.c | 2 +- + drivers/gpu/drm/drm_ioctl.c | 372 ++- + drivers/gpu/drm/drm_legacy.h | 51 + + drivers/gpu/drm/drm_lock.c | 3 +- + drivers/gpu/drm/drm_of.c | 67 + + drivers/gpu/drm/drm_plane_helper.c | 7 +- + drivers/gpu/drm/drm_probe_helper.c | 9 +- + drivers/gpu/drm/drm_rect.c | 140 + + drivers/gpu/drm/drm_stub.c | 805 ------ + drivers/gpu/drm/drm_sysfs.c | 92 +- + drivers/gpu/drm/exynos/Kconfig | 1 + + drivers/gpu/drm/exynos/exynos_dp_core.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_connector.c | 21 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 15 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.h | 7 + + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 12 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 272 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 277 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 29 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 - + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 259 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.h | 4 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 38 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 57 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 4 +- + drivers/gpu/drm/gma500/framebuffer.c | 5 +- + drivers/gpu/drm/gma500/gtt.c | 2 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 4 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 4 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 4 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 390 ++- + drivers/gpu/drm/i915/Kconfig | 12 - + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 3 + + drivers/gpu/drm/i915/i915_debugfs.c | 425 +-- + drivers/gpu/drm/i915/i915_dma.c | 73 +- + drivers/gpu/drm/i915/i915_drv.c | 74 +- + drivers/gpu/drm/i915/i915_drv.h | 189 +- + drivers/gpu/drm/i915/i915_gem.c | 93 +- + drivers/gpu/drm/i915/i915_gem_context.c | 149 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 312 +-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 55 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 161 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 104 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 149 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 89 +- + drivers/gpu/drm/i915/i915_irq.c | 624 +++-- + drivers/gpu/drm/i915/i915_params.c | 15 +- + drivers/gpu/drm/i915/i915_reg.h | 500 ++-- + drivers/gpu/drm/i915/i915_sysfs.c | 57 +- + drivers/gpu/drm/i915/intel_bios.c | 3 +- + drivers/gpu/drm/i915/intel_crt.c | 38 +- + drivers/gpu/drm/i915/intel_ddi.c | 474 ++-- + drivers/gpu/drm/i915/intel_display.c | 1465 ++++++++--- + drivers/gpu/drm/i915/intel_dp.c | 678 +++-- + drivers/gpu/drm/i915/intel_dp_mst.c | 548 ++++ + drivers/gpu/drm/i915/intel_drv.h | 154 +- + drivers/gpu/drm/i915/intel_dsi.c | 28 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 8 +- + drivers/gpu/drm/i915/intel_dvo.c | 10 +- + drivers/gpu/drm/i915/intel_fbdev.c | 37 +- + drivers/gpu/drm/i915/intel_hdmi.c | 102 +- + drivers/gpu/drm/i915/intel_i2c.c | 54 - + drivers/gpu/drm/i915/intel_lvds.c | 20 +- + drivers/gpu/drm/i915/intel_opregion.c | 3 +- + drivers/gpu/drm/i915/intel_overlay.c | 22 +- + drivers/gpu/drm/i915/intel_panel.c | 160 +- + drivers/gpu/drm/i915/intel_pm.c | 897 +++++-- + drivers/gpu/drm/i915/intel_renderstate.h | 2 - + drivers/gpu/drm/i915/intel_renderstate_gen6.c | 1 + + drivers/gpu/drm/i915/intel_renderstate_gen7.c | 1 + + drivers/gpu/drm/i915/intel_renderstate_gen8.c | 1 + + drivers/gpu/drm/i915/intel_ringbuffer.c | 444 ++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 90 +- + drivers/gpu/drm/i915/intel_sdvo.c | 10 +- + drivers/gpu/drm/i915/intel_sprite.c | 36 +- + drivers/gpu/drm/i915/intel_tv.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 212 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 16 +- + drivers/gpu/drm/msm/Kconfig | 1 - + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 58 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 296 ++- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 7 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 5 + + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 56 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 14 +- + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 239 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 4 +- + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 4 +- + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 4 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 69 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 1 + + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 109 +- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 27 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 377 ++- + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 4 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 4 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 25 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 1 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 431 ++-- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 159 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 25 + + drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 4 +- + drivers/gpu/drm/msm/msm_drv.c | 91 +- + drivers/gpu/drm/msm/msm_fbdev.c | 49 +- + drivers/gpu/drm/msm/msm_gem.c | 17 +- + drivers/gpu/drm/msm/msm_gpu.c | 12 +- + drivers/gpu/drm/msm/msm_iommu.c | 31 +- + drivers/gpu/drm/msm/msm_mmu.h | 8 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 + + drivers/gpu/drm/omapdrm/omap_connector.c | 4 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 7 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 33 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 21 +- + drivers/gpu/drm/qxl/qxl_display.c | 4 +- + drivers/gpu/drm/qxl/qxl_fb.c | 7 +- + drivers/gpu/drm/qxl/qxl_object.h | 4 +- + drivers/gpu/drm/radeon/Makefile | 2 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 16 +- + drivers/gpu/drm/radeon/ci_dpm.c | 13 +- + drivers/gpu/drm/radeon/ci_smc.c | 39 +- + drivers/gpu/drm/radeon/cik.c | 722 ++++-- + drivers/gpu/drm/radeon/cik_sdma.c | 247 +- + drivers/gpu/drm/radeon/dce6_afmt.c | 16 +- + drivers/gpu/drm/radeon/evergreen.c | 18 +- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 4 +- + drivers/gpu/drm/radeon/ni.c | 1 - + drivers/gpu/drm/radeon/ni_dma.c | 178 +- + drivers/gpu/drm/radeon/r100.c | 62 +- + drivers/gpu/drm/radeon/r300.c | 13 +- + drivers/gpu/drm/radeon/r600.c | 24 +- + drivers/gpu/drm/radeon/r600_cs.c | 6 +- + drivers/gpu/drm/radeon/radeon.h | 127 +- + drivers/gpu/drm/radeon/radeon_asic.c | 79 +- + drivers/gpu/drm/radeon/radeon_asic.h | 77 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 83 +- + drivers/gpu/drm/radeon/radeon_benchmark.c | 4 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 388 ++- + drivers/gpu/drm/radeon/radeon_cs.c | 3 +- + drivers/gpu/drm/radeon/radeon_device.c | 87 +- + drivers/gpu/drm/radeon/radeon_display.c | 72 +- + drivers/gpu/drm/radeon/radeon_drv.c | 14 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 4 +- + drivers/gpu/drm/radeon/radeon_fb.c | 9 +- + drivers/gpu/drm/radeon/radeon_gart.c | 38 +- + drivers/gpu/drm/radeon/radeon_gem.c | 58 +- + drivers/gpu/drm/radeon/radeon_ib.c | 319 +++ + drivers/gpu/drm/radeon/radeon_kms.c | 13 +- + drivers/gpu/drm/radeon/radeon_mode.h | 4 +- + drivers/gpu/drm/radeon/radeon_object.c | 63 +- + drivers/gpu/drm/radeon/radeon_object.h | 6 +- + drivers/gpu/drm/radeon/radeon_pm.c | 16 +- + drivers/gpu/drm/radeon/radeon_prime.c | 2 +- + drivers/gpu/drm/radeon/radeon_ring.c | 287 +-- + drivers/gpu/drm/radeon/radeon_sa.c | 4 +- + drivers/gpu/drm/radeon/radeon_test.c | 12 +- + drivers/gpu/drm/radeon/radeon_trace.h | 22 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 10 +- + drivers/gpu/drm/radeon/radeon_ucode.c | 167 ++ + drivers/gpu/drm/radeon/radeon_ucode.h | 71 + + drivers/gpu/drm/radeon/radeon_uvd.c | 6 +- + drivers/gpu/drm/radeon/radeon_vce.c | 2 +- + drivers/gpu/drm/radeon/radeon_vm.c | 278 +- + drivers/gpu/drm/radeon/rs400.c | 14 +- + drivers/gpu/drm/radeon/rs600.c | 17 +- + drivers/gpu/drm/radeon/rv770.c | 1 - + drivers/gpu/drm/radeon/si.c | 460 +++- + drivers/gpu/drm/radeon/si_dma.c | 172 +- + drivers/gpu/drm/radeon/si_dpm.c | 152 +- + drivers/gpu/drm/radeon/si_dpm.h | 5 + + drivers/gpu/drm/radeon/si_smc.c | 62 +- + drivers/gpu/drm/radeon/sislands_smc.h | 3 + + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 +- + drivers/gpu/drm/sti/Kconfig | 14 + + drivers/gpu/drm/sti/Makefile | 21 + + drivers/gpu/drm/sti/NOTES | 58 + + drivers/gpu/drm/sti/sti_compositor.c | 281 ++ + drivers/gpu/drm/sti/sti_compositor.h | 90 + + drivers/gpu/drm/sti/sti_drm_crtc.c | 421 +++ + drivers/gpu/drm/sti/sti_drm_crtc.h | 22 + + drivers/gpu/drm/sti/sti_drm_drv.c | 241 ++ + drivers/gpu/drm/sti/sti_drm_drv.h | 29 + + drivers/gpu/drm/sti/sti_drm_plane.c | 195 ++ + drivers/gpu/drm/sti/sti_drm_plane.h | 18 + + drivers/gpu/drm/sti/sti_gdp.c | 549 ++++ + drivers/gpu/drm/sti/sti_gdp.h | 16 + + drivers/gpu/drm/sti/sti_hda.c | 794 ++++++ + drivers/gpu/drm/sti/sti_hdmi.c | 810 ++++++ + drivers/gpu/drm/sti/sti_hdmi.h | 88 + + drivers/gpu/drm/sti/sti_hdmi_tx3g0c55phy.c | 336 +++ + drivers/gpu/drm/sti/sti_hdmi_tx3g0c55phy.h | 14 + + drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c | 211 ++ + drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.h | 14 + + drivers/gpu/drm/sti/sti_layer.c | 197 ++ + drivers/gpu/drm/sti/sti_layer.h | 123 + + drivers/gpu/drm/sti/sti_mixer.c | 249 ++ + drivers/gpu/drm/sti/sti_mixer.h | 54 + + drivers/gpu/drm/sti/sti_tvout.c | 648 +++++ + drivers/gpu/drm/sti/sti_vid.c | 138 + + drivers/gpu/drm/sti/sti_vid.h | 12 + + drivers/gpu/drm/sti/sti_vtac.c | 215 ++ + drivers/gpu/drm/sti/sti_vtg.c | 366 +++ + drivers/gpu/drm/sti/sti_vtg.h | 28 + + drivers/gpu/drm/tegra/drm.c | 8 +- + drivers/gpu/drm/tegra/drm.h | 1 + + drivers/gpu/drm/tegra/fb.c | 53 +- + drivers/gpu/drm/tegra/output.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 15 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 1 - + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 41 +- + drivers/gpu/drm/tilcdc/tilcdc_slave.c | 29 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 37 +- + drivers/gpu/drm/ttm/ttm_bo.c | 20 +- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 3 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- + drivers/gpu/drm/ttm/ttm_module.c | 2 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 31 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 34 +- + drivers/gpu/drm/udl/udl_connector.c | 13 +- + drivers/gpu/drm/udl/udl_fb.c | 5 +- + drivers/gpu/drm/udl/udl_gem.c | 8 +- + drivers/gpu/drm/udl/udl_main.c | 15 + + drivers/gpu/drm/udl/udl_modeset.c | 21 + + drivers/gpu/drm/vmwgfx/Makefile | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 341 +++ + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 38 +- + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 74 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 227 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 396 +-- + drivers/gpu/vga/vgaarb.c | 40 +- + drivers/staging/imx-drm/imx-drm-core.c | 8 +- + include/drm/drmP.h | 108 +- + include/drm/drm_crtc.h | 36 +- + include/drm/drm_dp_mst_helper.h | 509 ++++ + include/drm/drm_fb_helper.h | 8 +- + include/drm/drm_of.h | 18 + + include/drm/drm_rect.h | 6 + + include/drm/ttm/ttm_bo_driver.h | 14 +- + include/uapi/drm/drm.h | 2 +- + include/uapi/drm/drm_mode.h | 5 + + include/uapi/drm/radeon_drm.h | 4 +- + include/video/samsung_fimd.h | 3 +- + 323 files changed, 25781 insertions(+), 7336 deletions(-) + create mode 100644 Documentation/devicetree/bindings/drm/armada/marvell,dove-lcd.txt + create mode 100644 Documentation/devicetree/bindings/drm/msm/gpu.txt + create mode 100644 Documentation/devicetree/bindings/drm/msm/hdmi.txt + create mode 100644 Documentation/devicetree/bindings/drm/msm/mdp.txt + create mode 100644 Documentation/devicetree/bindings/gpu/st,stih4xx.txt + create mode 100644 drivers/gpu/drm/drm_dp_mst_topology.c + create mode 100644 drivers/gpu/drm/drm_legacy.h + create mode 100644 drivers/gpu/drm/drm_of.c + delete mode 100644 drivers/gpu/drm/drm_stub.c + create mode 100644 drivers/gpu/drm/i915/intel_dp_mst.c + create mode 100644 drivers/gpu/drm/radeon/radeon_ib.c + create mode 100644 drivers/gpu/drm/radeon/radeon_ucode.c + create mode 100644 drivers/gpu/drm/sti/Kconfig + create mode 100644 drivers/gpu/drm/sti/Makefile + create mode 100644 drivers/gpu/drm/sti/NOTES + create mode 100644 drivers/gpu/drm/sti/sti_compositor.c + create mode 100644 drivers/gpu/drm/sti/sti_compositor.h + create mode 100644 drivers/gpu/drm/sti/sti_drm_crtc.c + create mode 100644 drivers/gpu/drm/sti/sti_drm_crtc.h + create mode 100644 drivers/gpu/drm/sti/sti_drm_drv.c + create mode 100644 drivers/gpu/drm/sti/sti_drm_drv.h + create mode 100644 drivers/gpu/drm/sti/sti_drm_plane.c + create mode 100644 drivers/gpu/drm/sti/sti_drm_plane.h + create mode 100644 drivers/gpu/drm/sti/sti_gdp.c + create mode 100644 drivers/gpu/drm/sti/sti_gdp.h + create mode 100644 drivers/gpu/drm/sti/sti_hda.c + create mode 100644 drivers/gpu/drm/sti/sti_hdmi.c + create mode 100644 drivers/gpu/drm/sti/sti_hdmi.h + create mode 100644 drivers/gpu/drm/sti/sti_hdmi_tx3g0c55phy.c + create mode 100644 drivers/gpu/drm/sti/sti_hdmi_tx3g0c55phy.h + create mode 100644 drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c + create mode 100644 drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.h + create mode 100644 drivers/gpu/drm/sti/sti_layer.c + create mode 100644 drivers/gpu/drm/sti/sti_layer.h + create mode 100644 drivers/gpu/drm/sti/sti_mixer.c + create mode 100644 drivers/gpu/drm/sti/sti_mixer.h + create mode 100644 drivers/gpu/drm/sti/sti_tvout.c + create mode 100644 drivers/gpu/drm/sti/sti_vid.c + create mode 100644 drivers/gpu/drm/sti/sti_vid.h + create mode 100644 drivers/gpu/drm/sti/sti_vtac.c + create mode 100644 drivers/gpu/drm/sti/sti_vtg.c + create mode 100644 drivers/gpu/drm/sti/sti_vtg.h + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c + create mode 100644 include/drm/drm_dp_mst_helper.h + create mode 100644 include/drm/drm_of.h +$ git am -3 ../patches/0001-ARM-dts-exynos5420-remove-disp_pd.patch +Applying: ARM: dts: exynos5420: remove disp_pd +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/boot/dts/exynos5420.dtsi +$ git add -A . +$ git commit -v -a --amend +[master eb52361f96a9] Merge remote-tracking branch 'drm/drm-next' +Merging drm-panel/drm/panel/for-next (77df01dcd304 drm/dsi: Replace upcasting macro by function) +$ git merge drm-panel/drm/panel/for-next +Auto-merging drivers/gpu/drm/tegra/output.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dsi.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dpi.c +Auto-merging drivers/gpu/drm/exynos/exynos_dp_core.c +Auto-merging drivers/gpu/drm/exynos/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/panel/auo,b133htn01.txt | 7 + + .../bindings/panel/foxlink,fl500wvr00-a0t.txt | 7 + + .../devicetree/bindings/panel/innolux,n116bge.txt | 7 + + .../bindings/panel/innolux,n156bge-l21.txt | 7 + + drivers/gpu/drm/drm_mipi_dsi.c | 14 +- + drivers/gpu/drm/exynos/Kconfig | 1 + + drivers/gpu/drm/exynos/exynos_dp_core.c | 112 +++++++++--- + drivers/gpu/drm/exynos/exynos_dp_core.h | 3 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 13 +- + drivers/gpu/drm/panel/Kconfig | 7 +- + drivers/gpu/drm/panel/panel-ld9040.c | 21 ++- + drivers/gpu/drm/panel/panel-s6e8aa0.c | 29 +++- + drivers/gpu/drm/panel/panel-simple.c | 191 ++++++++++++++++++++- + drivers/gpu/drm/tegra/output.c | 2 + + include/drm/drm_mipi_dsi.h | 21 ++- + include/drm/drm_panel.h | 58 +++++++ + 17 files changed, 442 insertions(+), 66 deletions(-) + create mode 100644 Documentation/devicetree/bindings/panel/auo,b133htn01.txt + create mode 100644 Documentation/devicetree/bindings/panel/foxlink,fl500wvr00-a0t.txt + create mode 100644 Documentation/devicetree/bindings/panel/innolux,n116bge.txt + create mode 100644 Documentation/devicetree/bindings/panel/innolux,n156bge-l21.txt +Merging drm-intel/for-linux-next (96d56d71a3bc drm/i915: Fix crash when failing to parse MIPI VBT) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. +Merging drm-tegra/drm/tegra/for-next (ef70728c7a65 drm/tegra: add MODULE_DEVICE_TABLEs) +$ git merge drm-tegra/drm/tegra/for-next +Auto-merging drivers/gpu/drm/tegra/sor.c +Auto-merging drivers/gpu/drm/tegra/gr3d.c +Auto-merging drivers/gpu/drm/tegra/gem.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 123 ++++++++++++++++++++++--- + drivers/gpu/drm/tegra/dc.h | 5 + + drivers/gpu/drm/tegra/dpaux.c | 1 + + drivers/gpu/drm/tegra/drm.c | 208 ++++++++++++++++++++++++++++++++++++++---- + drivers/gpu/drm/tegra/drm.h | 10 +- + drivers/gpu/drm/tegra/dsi.c | 4 +- + drivers/gpu/drm/tegra/fb.c | 13 ++- + drivers/gpu/drm/tegra/gem.c | 5 +- + drivers/gpu/drm/tegra/gem.h | 16 +++- + drivers/gpu/drm/tegra/gr2d.c | 1 + + drivers/gpu/drm/tegra/gr3d.c | 1 + + drivers/gpu/drm/tegra/hdmi.c | 1 + + drivers/gpu/drm/tegra/sor.c | 21 ++++- + drivers/gpu/host1x/job.c | 22 ++--- + include/linux/host1x.h | 15 +-- + include/uapi/drm/tegra_drm.h | 46 ++++++++++ + 16 files changed, 425 insertions(+), 67 deletions(-) +Merging sound/for-next (a509574e5ea7 ALSA: usb-audio: Whitespace cleanups for sound/usb/midi.*) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (1714b73910ed Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/soc/intel/sst-acpi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging modules/modules-next (ba987e9b8ab1 arch/powerpc/platforms/powernv/opal-elog.c: fix world-writable sysfs files) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging include/linux/kernel.h +Auto-merging arch/powerpc/platforms/powernv/opal-elog.c +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/powernv/opal-elog.c | 4 +-- + drivers/video/fbdev/s3c2410fb.c | 2 +- + include/linux/kernel.h | 2 ++ + include/linux/module.h | 11 ++++-- + include/linux/moduleloader.h | 6 ++-- + kernel/module.c | 14 ++++---- + scripts/mod/modpost.c | 58 ++++++++---------------------- + 7 files changed, 38 insertions(+), 59 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 6c996b58ea12 Merge remote-tracking branch 'sound-asoc/for-next' +Merging next-20140725 version of modules +$ git merge -m next-20140725/modules 4982223e51e8ea9d09bb33c8323b5ec1877b2b51 +Already up-to-date. +Merging virtio/virtio-next (eeec626366ff Revert "hwrng: virtio - ensure reads happen after successful probe") +$ git merge virtio/virtio-next +Auto-merging drivers/char/hw_random/core.c +Merge made by the 'recursive' strategy. + drivers/char/hw_random/core.c | 6 ------ + drivers/char/hw_random/virtio-rng.c | 39 ++++++++++++++++--------------------- + drivers/char/virtio_console.c | 6 ++---- + drivers/virtio/virtio_pci.c | 2 +- + 4 files changed, 20 insertions(+), 33 deletions(-) +Merging input/next (62238f3aadc9 Input: hyperv-keyboard - register as a wakeup source) +$ git merge input/next +Auto-merging arch/arm/boot/dts/am43x-epos-evm.dts +Auto-merging arch/arm/boot/dts/am437x-gp-evm.dts +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/atmel,maxtouch.txt | 25 + + .../devicetree/bindings/input/cap1106.txt | 53 + + .../bindings/input/touchscreen/pixcir_i2c_ts.txt | 26 + + .../bindings/input/touchscreen/zforce_ts.txt | 4 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 7 + + arch/arm/boot/dts/am437x-gp-evm.dts | 4 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 4 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/cap1106.c | 335 +++++ + drivers/input/keyboard/imx_keypad.c | 6 +- + drivers/input/keyboard/max7359_keypad.c | 45 +- + drivers/input/misc/keyspan_remote.c | 1 - + drivers/input/misc/soc_button_array.c | 3 + + drivers/input/misc/uinput.c | 47 +- + drivers/input/mouse/alps.c | 691 ++++++---- + drivers/input/mouse/alps.h | 60 +- + drivers/input/serio/hyperv-keyboard.c | 13 + + drivers/input/tablet/Kconfig | 10 + + drivers/input/tablet/Makefile | 1 + + drivers/input/tablet/wacom_serial4.c | 620 +++++++++ + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ads7846.c | 6 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 1315 +++++++++++++++----- + drivers/input/touchscreen/edt-ft5x06.c | 3 +- + drivers/input/touchscreen/ipaq-micro-ts.c | 166 +++ + drivers/input/touchscreen/jornada720_ts.c | 70 +- + drivers/input/touchscreen/mcs5000_ts.c | 6 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 250 +++- + drivers/input/touchscreen/s3c2410_ts.c | 4 +- + drivers/input/touchscreen/zforce_ts.c | 31 + + drivers/platform/chrome/chromeos_laptop.c | 4 - + include/linux/i2c/atmel_mxt_ts.h | 3 - + include/linux/input/pixcir_ts.h | 12 + + include/uapi/linux/serio.h | 1 + + include/uapi/linux/uinput.h | 9 + + 38 files changed, 3132 insertions(+), 728 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/atmel,maxtouch.txt + create mode 100644 Documentation/devicetree/bindings/input/cap1106.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/pixcir_i2c_ts.txt + create mode 100644 drivers/input/keyboard/cap1106.c + create mode 100644 drivers/input/tablet/wacom_serial4.c + create mode 100644 drivers/input/touchscreen/ipaq-micro-ts.c +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (69c04606d985 Merge branch 'for-3.17/core' into for-next) +$ git merge block/for-next +Auto-merging drivers/block/drbd/drbd_nl.c +Auto-merging block/compat_ioctl.c +Merge made by the 'recursive' strategy. + block/bio-integrity.c | 12 +- + block/blk-core.c | 13 +- + block/blk-mq.c | 81 ++-- + block/blk-mq.h | 2 +- + block/blk-sysfs.c | 2 +- + block/compat_ioctl.c | 6 +- + block/ioctl.c | 5 +- + block/partitions/aix.c | 4 +- + block/partitions/amiga.c | 12 +- + block/partitions/efi.c | 46 +- + block/partitions/msdos.c | 13 +- + block/scsi_ioctl.c | 20 +- + drivers/block/drbd/Makefile | 1 + + drivers/block/drbd/drbd_actlog.c | 518 ++++++++------------ + drivers/block/drbd/drbd_bitmap.c | 150 ++---- + drivers/block/drbd/drbd_debugfs.c | 958 +++++++++++++++++++++++++++++++++++++ + drivers/block/drbd/drbd_debugfs.h | 39 ++ + drivers/block/drbd/drbd_int.h | 383 ++++++++++----- + drivers/block/drbd/drbd_interval.h | 4 +- + drivers/block/drbd/drbd_main.c | 302 +++++------- + drivers/block/drbd/drbd_nl.c | 110 +++-- + drivers/block/drbd/drbd_proc.c | 125 +++-- + drivers/block/drbd/drbd_receiver.c | 316 ++++++++---- + drivers/block/drbd/drbd_req.c | 527 +++++++++++++------- + drivers/block/drbd/drbd_req.h | 1 + + drivers/block/drbd/drbd_state.c | 90 ++-- + drivers/block/drbd/drbd_worker.c | 348 +++++++++++--- + drivers/block/virtio_blk.c | 104 +++- + drivers/md/bcache/alloc.c | 2 +- + drivers/md/bcache/bcache.h | 4 + + drivers/md/bcache/bset.c | 2 +- + drivers/md/bcache/bset.h | 2 +- + drivers/md/bcache/btree.c | 50 +- + drivers/md/bcache/btree.h | 5 +- + drivers/md/bcache/extents.c | 13 +- + drivers/md/bcache/extents.h | 1 + + drivers/md/bcache/journal.c | 24 +- + drivers/md/bcache/request.c | 3 +- + drivers/md/bcache/super.c | 57 ++- + drivers/md/bcache/util.h | 4 +- + drivers/md/bcache/writeback.c | 14 +- + drivers/md/bcache/writeback.h | 3 +- + include/linux/bio.h | 1 + + include/linux/blkdev.h | 4 +- + include/linux/drbd.h | 4 +- + include/linux/drbd_genl.h | 4 + + include/linux/drbd_limits.h | 6 + + include/scsi/sg.h | 3 + + include/trace/events/bcache.h | 21 +- + include/uapi/linux/bsg.h | 11 +- + include/uapi/linux/virtio_blk.h | 5 + + lib/lru_cache.c | 23 +- + 52 files changed, 3038 insertions(+), 1420 deletions(-) + create mode 100644 drivers/block/drbd/drbd_debugfs.c + create mode 100644 drivers/block/drbd/drbd_debugfs.h +Merging device-mapper/for-next (18debb0e53f5 dm crypt: sort writes) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/switch.txt | 12 + + block/bio.c | 3 +- + drivers/md/dm-cache-metadata.c | 4 +- + drivers/md/dm-cache-metadata.h | 8 +- + drivers/md/dm-cache-target.c | 128 +++++++---- + drivers/md/dm-crypt.c | 401 +++++++++++++++++---------------- + drivers/md/dm-io.c | 77 ++++--- + drivers/md/dm-mpath.c | 6 +- + drivers/md/dm-switch.c | 67 +++++- + drivers/md/dm-table.c | 73 +++--- + drivers/md/dm-thin.c | 181 ++++++++++----- + drivers/md/dm.h | 1 - + 12 files changed, 577 insertions(+), 384 deletions(-) +Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (25f7dadbd982 mmc: dw_mmc: change to use recommended reset procedure) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 4 +- + .../devicetree/bindings/mmc/renesas,mmcif.txt | 32 +++ + .../devicetree/bindings/mmc/sdhci-msm.txt | 8 +- + Documentation/devicetree/bindings/mmc/sdhci-st.txt | 33 +++ + .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 54 ++++ + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + + drivers/mmc/card/block.c | 6 +- + drivers/mmc/core/bus.c | 10 +- + drivers/mmc/core/core.c | 3 +- + drivers/mmc/core/mmc.c | 11 +- + drivers/mmc/core/quirks.c | 2 +- + drivers/mmc/core/sd_ops.c | 3 + + drivers/mmc/host/Kconfig | 28 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/dw_mmc.c | 86 +++++-- + drivers/mmc/host/dw_mmc.h | 5 + + drivers/mmc/host/mmci.c | 127 ++++++++- + drivers/mmc/host/mmci.h | 20 ++ + drivers/mmc/host/moxart-mmc.c | 1 - + drivers/mmc/host/mxs-mmc.c | 3 +- + drivers/mmc/host/omap_hsmmc.c | 283 +++++++++++++++++++-- + drivers/mmc/host/s3cmci.c | 186 ++++---------- + drivers/mmc/host/s3cmci.h | 4 +- + drivers/mmc/host/sdhci-acpi.c | 4 +- + drivers/mmc/host/sdhci-msm.c | 1 - + drivers/mmc/host/sdhci-pci.c | 38 +-- + drivers/mmc/host/sdhci-pci.h | 1 + + drivers/mmc/host/sdhci-pxav3.c | 12 +- + drivers/mmc/host/sdhci-st.c | 176 +++++++++++++ + drivers/mmc/host/sdhci-tegra.c | 2 - + drivers/mmc/host/sdhci.c | 144 +++++------ + drivers/mmc/host/sh_mmcif.c | 96 +++---- + drivers/mmc/host/tmio_mmc_dma.c | 2 + + drivers/mmc/host/wmt-sdmmc.c | 33 ++- + include/linux/mmc/sdhci.h | 3 - + include/linux/platform_data/mmc-omap.h | 1 + + 36 files changed, 998 insertions(+), 426 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/renesas,mmcif.txt + create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-st.txt + create mode 100644 drivers/mmc/host/sdhci-st.c +$ git reset --hard HEAD^ +HEAD is now at 4fa67caf9087 Merge remote-tracking branch 'device-mapper/for-next' +Merging next-20140725 version of mmc-uh +$ git merge -m next-20140725/mmc-uh f25c33724d1512a72554c0ad4cb70b43ba15374e +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 4 +- + Documentation/devicetree/bindings/mmc/sdhci-st.txt | 33 +++ + .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 54 ++++ + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + + drivers/mmc/core/bus.c | 10 +- + drivers/mmc/core/mmc.c | 11 +- + drivers/mmc/core/quirks.c | 2 +- + drivers/mmc/core/sd_ops.c | 3 + + drivers/mmc/host/Kconfig | 26 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/mmci.c | 127 ++++++++- + drivers/mmc/host/mmci.h | 20 ++ + drivers/mmc/host/moxart-mmc.c | 1 - + drivers/mmc/host/mxs-mmc.c | 3 +- + drivers/mmc/host/omap_hsmmc.c | 283 +++++++++++++++++++-- + drivers/mmc/host/s3cmci.c | 186 ++++---------- + drivers/mmc/host/s3cmci.h | 4 +- + drivers/mmc/host/sdhci-acpi.c | 4 +- + drivers/mmc/host/sdhci-pci.c | 15 +- + drivers/mmc/host/sdhci-pci.h | 1 + + drivers/mmc/host/sdhci-st.c | 176 +++++++++++++ + drivers/mmc/host/sdhci-tegra.c | 2 - + drivers/mmc/host/sdhci.c | 144 +++++------ + drivers/mmc/host/sh_mmcif.c | 83 ++---- + drivers/mmc/host/wmt-sdmmc.c | 33 ++- + include/linux/mmc/sdhci.h | 3 - + include/linux/platform_data/mmc-omap.h | 1 + + 27 files changed, 867 insertions(+), 364 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-st.txt + create mode 100644 drivers/mmc/host/sdhci-st.c +Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (1bdb20e16166 md: check for bitmap compatability when changing raid levels.) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 10 ++++++++-- + drivers/md/raid1.c | 8 ++++---- + drivers/md/raid10.c | 11 +++++------ + 3 files changed, 17 insertions(+), 12 deletions(-) +Merging mfd/for-mfd-next (7caa79917ad4 MAINTAINERS: Update MFD repo location) +$ git merge mfd/for-mfd-next +Auto-merging sound/soc/codecs/arizona.c +Auto-merging include/linux/mfd/arizona/core.h +Auto-merging drivers/regulator/s2mps11.c +Removing drivers/mfd/max77686-irq.c +Auto-merging drivers/mfd/cros_ec_spi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/arizona.txt | 10 + + Documentation/devicetree/bindings/mfd/as3722.txt | 8 + + Documentation/devicetree/bindings/mfd/s2mps11.txt | 11 +- + .../devicetree/bindings/mfd/sun6i-prcm.txt | 2 +- + .../bindings/regulator/s5m8767-regulator.txt | 2 +- + MAINTAINERS | 3 +- + drivers/gpio/Kconfig | 13 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-crystalcove.c | 380 ++++++++++ + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 17 +- + drivers/input/keyboard/cros_ec_keyb.c | 70 +- + drivers/mfd/88pm805.c | 2 +- + drivers/mfd/88pm860x-core.c | 37 +- + drivers/mfd/88pm860x-i2c.c | 3 +- + drivers/mfd/Kconfig | 25 +- + drivers/mfd/Makefile | 5 +- + drivers/mfd/aat2870-core.c | 5 +- + drivers/mfd/ab3100-core.c | 54 +- + drivers/mfd/ab8500-core.c | 49 +- + drivers/mfd/ab8500-debugfs.c | 308 ++++---- + drivers/mfd/arizona-core.c | 53 +- + drivers/mfd/arizona-i2c.c | 5 +- + drivers/mfd/arizona-irq.c | 29 +- + drivers/mfd/arizona-spi.c | 3 +- + drivers/mfd/arizona.h | 5 +- + drivers/mfd/asic3.c | 12 +- + drivers/mfd/cros_ec.c | 97 +-- + drivers/mfd/cros_ec_i2c.c | 44 +- + drivers/mfd/cros_ec_spi.c | 56 +- + drivers/mfd/da9063-core.c | 6 +- + drivers/mfd/da9063-i2c.c | 134 +++- + drivers/mfd/dm355evm_msp.c | 2 +- + drivers/mfd/ezx-pcap.c | 3 +- + drivers/mfd/htc-i2cpld.c | 5 - + drivers/mfd/intel_soc_pmic_core.c | 170 +++++ + drivers/mfd/intel_soc_pmic_core.h | 32 + + drivers/mfd/intel_soc_pmic_crc.c | 158 +++++ + drivers/mfd/ipaq-micro.c | 8 +- + drivers/mfd/kempld-core.c | 10 +- + drivers/mfd/lp8788-irq.c | 2 + + drivers/mfd/max77686-irq.c | 319 --------- + drivers/mfd/max77686.c | 329 ++++++++- + drivers/mfd/max8925-core.c | 2 + + drivers/mfd/max8925-i2c.c | 2 + + drivers/mfd/mc13xxx-core.c | 310 ++------ + drivers/mfd/mc13xxx.h | 11 +- + drivers/mfd/mcp-core.c | 1 + + drivers/mfd/omap-usb-host.c | 2 +- + drivers/mfd/pcf50633-core.c | 18 +- + drivers/mfd/pm8921-core.c | 4 - + drivers/mfd/rtsx_pcr.c | 76 +- + drivers/mfd/sec-core.c | 82 ++- + drivers/mfd/sec-irq.c | 110 ++- + drivers/mfd/si476x-cmd.c | 12 +- + drivers/mfd/stmpe-i2c.c | 4 +- + drivers/mfd/stmpe.c | 2 +- + drivers/mfd/stmpe.h | 2 +- + drivers/mfd/sun6i-prcm.c | 30 + + drivers/mfd/tc3589x.c | 2 +- + drivers/mfd/tc6387xb.c | 7 +- + drivers/mfd/tps6105x.c | 17 +- + drivers/mfd/tps65910.c | 10 +- + drivers/mfd/tps65912-spi.c | 3 +- + drivers/mfd/twl4030-irq.c | 6 +- + drivers/mfd/twl6030-irq.c | 4 +- + drivers/mfd/twl6040.c | 2 +- + drivers/mfd/wm5102-tables.c | 8 +- + drivers/mfd/wm5110-tables.c | 245 ++++++- + drivers/mfd/wm8350-i2c.c | 8 +- + drivers/mfd/wm8350-irq.c | 3 +- + drivers/mfd/wm8994-regmap.c | 64 ++ + drivers/mfd/wm8997-tables.c | 16 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 133 +++- + drivers/regulator/s2mps11.c | 321 ++++++++- + drivers/rtc/rtc-da9063.c | 54 +- + drivers/rtc/rtc-max77686.c | 27 +- + include/dt-bindings/mfd/as3722.h | 2 +- + include/linux/mfd/abx500/ab8500.h | 1 + + include/linux/mfd/arizona/core.h | 35 +- + include/linux/mfd/arizona/registers.h | 785 +++++++++++++++++++-- + include/linux/mfd/cros_ec.h | 110 +-- + include/linux/mfd/da9063/core.h | 3 +- + include/linux/mfd/da9063/registers.h | 129 ++-- + include/linux/mfd/intel_soc_pmic.h | 30 + + include/linux/mfd/max77686-private.h | 239 ++++++- + include/linux/mfd/max77686.h | 59 +- + include/linux/mfd/mc13783.h | 1 - + include/linux/mfd/mc13xxx.h | 23 +- + include/linux/mfd/rtsx_pci.h | 6 + + include/linux/mfd/samsung/core.h | 1 + + include/linux/mfd/samsung/irq.h | 24 + + include/linux/mfd/samsung/s2mpu02.h | 201 ++++++ + include/linux/mfd/tps65910.h | 2 +- + sound/soc/codecs/arizona.c | 10 +- + 94 files changed, 4309 insertions(+), 1437 deletions(-) + create mode 100644 drivers/gpio/gpio-crystalcove.c + create mode 100644 drivers/mfd/intel_soc_pmic_core.c + create mode 100644 drivers/mfd/intel_soc_pmic_core.h + create mode 100644 drivers/mfd/intel_soc_pmic_crc.c + delete mode 100644 drivers/mfd/max77686-irq.c + create mode 100644 include/linux/mfd/intel_soc_pmic.h + create mode 100644 include/linux/mfd/samsung/s2mpu02.h +Merging backlight/for-backlight-next (2188a988bb87 backlight: Add driver for iPAQ micro backlight) +$ git merge backlight/for-backlight-next +Auto-merging drivers/video/backlight/Makefile +Auto-merging drivers/video/backlight/Kconfig +Merge made by the 'recursive' strategy. + drivers/macintosh/via-pmu-backlight.c | 6 --- + drivers/platform/x86/samsung-q10.c | 6 --- + drivers/video/backlight/Kconfig | 9 ++++ + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/aat2870_bl.c | 6 --- + drivers/video/backlight/ams369fg06.c | 6 --- + drivers/video/backlight/backlight.c | 2 + + drivers/video/backlight/bd6107.c | 6 --- + drivers/video/backlight/gpio_backlight.c | 6 --- + drivers/video/backlight/ipaq_micro_bl.c | 83 ++++++++++++++++++++++++++++++ + drivers/video/backlight/jornada720_lcd.c | 37 ++++++------- + drivers/video/backlight/ld9040.c | 6 --- + drivers/video/backlight/lp855x_bl.c | 6 --- + drivers/video/backlight/lp8788_bl.c | 6 --- + drivers/video/backlight/lv5207lp.c | 6 --- + drivers/video/backlight/pandora_bl.c | 6 --- + drivers/video/backlight/pwm_bl.c | 13 +---- + drivers/video/backlight/s6e63m0.c | 6 --- + drivers/video/backlight/tps65217_bl.c | 6 --- + drivers/video/fbdev/aty/aty128fb.c | 6 --- + drivers/video/fbdev/aty/atyfb_base.c | 6 --- + drivers/video/fbdev/aty/radeon_backlight.c | 6 --- + drivers/video/fbdev/exynos/s6e8ax0.c | 6 --- + drivers/video/fbdev/nvidia/nv_backlight.c | 6 --- + drivers/video/fbdev/riva/fbdev.c | 6 --- + 25 files changed, 116 insertions(+), 143 deletions(-) + create mode 100644 drivers/video/backlight/ipaq_micro_bl.c +Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning) +$ git merge battery/master +Auto-merging drivers/power/reset/Makefile +Auto-merging drivers/power/reset/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/rx51-battery.txt | 25 ++ + Documentation/power/power_supply_class.txt | 6 + + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/bq2415x_charger.c | 8 +- + drivers/power/bq27x00_battery.c | 28 +- + drivers/power/ipaq_micro_battery.c | 290 +++++++++++++++++++++ + drivers/power/power_supply_core.c | 3 +- + drivers/power/power_supply_sysfs.c | 4 + + drivers/power/reset/Kconfig | 11 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/brcmstb-reboot.c | 120 +++++++++ + drivers/power/reset/gpio-poweroff.c | 52 ++-- + drivers/power/reset/restart-poweroff.c | 2 +- + drivers/power/rx51_battery.c | 90 +++++-- + drivers/power/tps65090-charger.c | 76 ++++-- + drivers/power/twl4030_charger.c | 44 +++- + include/linux/power_supply.h | 4 + + 18 files changed, 673 insertions(+), 99 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/rx51-battery.txt + create mode 100644 drivers/power/ipaq_micro_battery.c + create mode 100644 drivers/power/reset/brcmstb-reboot.c +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (be92abea827b Merge branch '3.17/hdmi-infoframe' into for-next) +$ git merge omap_dss2/for-next +Auto-merging drivers/video/fbdev/atmel_lcdfb.c +Auto-merging drivers/video/fbdev/Makefile +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/gpu/drm/omapdrm/omap_drv.h +Auto-merging drivers/gpu/drm/omapdrm/omap_connector.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/video/arm,pl11x.txt | 109 ++++++ + .../devicetree/bindings/video/atmel,lcdc.txt | 1 + + .../bindings/video/cirrus,clps711x-fb.txt | 47 +++ + MAINTAINERS | 74 ++-- + drivers/gpu/drm/omapdrm/omap_connector.c | 12 + + drivers/gpu/drm/omapdrm/omap_drv.h | 1 + + drivers/gpu/drm/omapdrm/omap_encoder.c | 27 ++ + drivers/video/fbdev/68328fb.c | 8 +- + drivers/video/fbdev/Kconfig | 23 +- + drivers/video/fbdev/Makefile | 3 +- + drivers/video/fbdev/amba-clcd.c | 263 ++++++++++++++ + drivers/video/fbdev/atmel_lcdfb.c | 3 +- + drivers/video/fbdev/clps711x-fb.c | 397 +++++++++++++++++++++ + drivers/video/fbdev/da8xx-fb.c | 9 +- + drivers/video/fbdev/hyperv_fb.c | 62 +++- + drivers/video/fbdev/mbx/mbxfb.c | 4 +- + drivers/video/fbdev/msm/mddi_client_dummy.c | 19 +- + .../fbdev/omap2/displays-new/connector-hdmi.c | 19 + + .../fbdev/omap2/displays-new/encoder-tpd12s015.c | 20 ++ + .../omap2/displays-new/panel-sony-acx565akm.c | 5 + + drivers/video/fbdev/omap2/dss/Kconfig | 1 + + drivers/video/fbdev/omap2/dss/dispc.c | 22 +- + drivers/video/fbdev/omap2/dss/hdmi.h | 107 +----- + drivers/video/fbdev/omap2/dss/hdmi4.c | 53 ++- + drivers/video/fbdev/omap2/dss/hdmi4_core.c | 164 ++------- + drivers/video/fbdev/omap2/dss/hdmi4_core.h | 1 + + drivers/video/fbdev/omap2/dss/hdmi5.c | 53 ++- + drivers/video/fbdev/omap2/dss/hdmi5_core.c | 124 +++---- + drivers/video/fbdev/omap2/dss/hdmi_common.c | 316 ---------------- + drivers/video/fbdev/s3c2410fb.c | 10 +- + drivers/video/fbdev/sis/init.c | 2 +- + drivers/video/fbdev/sis/sis_main.c | 4 - + include/linux/fb.h | 2 +- + include/video/omapdss.h | 9 + + 34 files changed, 1193 insertions(+), 781 deletions(-) + create mode 100644 Documentation/devicetree/bindings/video/arm,pl11x.txt + create mode 100644 Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt + create mode 100644 drivers/video/fbdev/clps711x-fb.c +Merging regulator/for-next (1390d0ecf318 Merge remote-tracking branch 'regulator/fix/tps65090' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/regulator/tps65090.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging security/next (478d085524c5 Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (e27319cdf468 ima: provide double buffering for hash calculation) +$ git merge integrity/next +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Resolved 'crypto/asymmetric_keys/x509_public_key.c' using previous resolution. +Resolved 'include/linux/key.h' using previous resolution. +Auto-merging include/linux/key.h +CONFLICT (content): Merge conflict in include/linux/key.h +Auto-merging crypto/asymmetric_keys/x509_public_key.c +CONFLICT (content): Merge conflict in crypto/asymmetric_keys/x509_public_key.c +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ef7f526f28cb] Merge remote-tracking branch 'integrity/next' +$ git diff -M --stat --summary HEAD^.. +Merging selinux/next (aa9e0de81b5b Merge tag 'v3.16' into next) +$ git merge selinux/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lblnet/next (d8ec26d7f828 Linux 3.13) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (8083baba5e9c wdt: sunxi: Move restart code to the watchdog driver) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/fsl-imx-wdt.txt | 5 ++++ + Documentation/watchdog/watchdog-api.txt | 2 +- + drivers/watchdog/dw_wdt.c | 3 --- + drivers/watchdog/imx2_wdt.c | 7 ++++++ + drivers/watchdog/lantiq_wdt.c | 5 ---- + drivers/watchdog/shwdt.c | 5 +--- + drivers/watchdog/sunxi_wdt.c | 29 ++++++++++++++++++++++ + 7 files changed, 43 insertions(+), 13 deletions(-) +Merging iommu/next (4c5e9d9f0ddf Merge branches 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu', 'arm/smmu', 'arm/exynos' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (1860e379875d Linux 3.15) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (fd49c81f080a drivers/vfio/pci: Fix wrong MSI interrupt count) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (51a7097426f2 doc: fix two typos in watchdog-api.txt) +$ git merge trivial/for-next +Resolved 'Documentation/laptops/freefall.c' using previous resolution. +Resolved 'arch/arm/mach-msm/Kconfig' using previous resolution. +Auto-merging fs/befs/linuxvfs.c +Auto-merging drivers/usb/phy/phy.c +Auto-merging drivers/irqchip/irq-gic.c +Auto-merging drivers/cpuidle/governors/menu.c +Auto-merging arch/sh/boards/Kconfig +Auto-merging arch/arm/mach-msm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-msm/Kconfig +Auto-merging Documentation/laptops/freefall.c +CONFLICT (content): Merge conflict in Documentation/laptops/freefall.c +Auto-merging Documentation/SubmittingPatches +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b8fa78cba770] Merge remote-tracking branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/MSI-HOWTO.txt | 2 +- + Documentation/SubmittingDrivers | 4 ---- + Documentation/SubmittingPatches | 4 ++-- + Documentation/laptops/freefall.c | 1 + + Documentation/scsi/ncr53c8xx.txt | 2 +- + Documentation/security/LSM.txt | 2 +- + Documentation/zh_CN/SubmittingDrivers | 4 ---- + arch/arm/mach-msm/Kconfig | 3 --- + arch/hexagon/include/asm/cache.h | 2 +- + arch/sh/boards/Kconfig | 2 +- + drivers/cpuidle/governors/menu.c | 2 +- + drivers/gpu/drm/gma500/mid_bios.c | 1 - + drivers/irqchip/irq-gic.c | 2 -- + drivers/mfd/intel_msic.c | 2 +- + drivers/scsi/mvsas/mv_sas.c | 24 ++++++++++++++---------- + drivers/usb/phy/phy.c | 2 +- + fs/befs/linuxvfs.c | 2 -- + scripts/Makefile.modinst | 2 +- + 18 files changed, 26 insertions(+), 37 deletions(-) +Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface) +$ git merge audit/master +Resolved 'arch/mips/include/asm/syscall.h' using previous resolution. +Resolved 'arch/mips/kernel/ptrace.c' using previous resolution. +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'kernel/audit.c' using previous resolution. +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +CONFLICT (content): Merge conflict in kernel/audit.c +Auto-merging include/uapi/linux/audit.h +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/entry_64.S +Auto-merging arch/x86/kernel/entry_32.S +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/um/kernel/ptrace.c +Auto-merging arch/s390/kernel/ptrace.c +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging arch/mips/kernel/ptrace.c +CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c +Auto-merging arch/mips/include/asm/syscall.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h +Auto-merging arch/arm/kernel/ptrace.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bf3f64c3bf06] Merge remote-tracking branch 'audit/master' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/syscall.h | 11 +++++++++++ + arch/alpha/kernel/ptrace.c | 2 +- + arch/arm/kernel/ptrace.c | 4 ++-- + arch/ia64/include/asm/syscall.h | 6 ++++++ + arch/ia64/kernel/ptrace.c | 2 +- + arch/microblaze/include/asm/syscall.h | 5 +++++ + arch/microblaze/kernel/ptrace.c | 3 +-- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/kernel/ptrace.c | 4 +--- + arch/openrisc/include/asm/syscall.h | 5 +++++ + arch/openrisc/kernel/ptrace.c | 3 +-- + arch/parisc/include/asm/syscall.h | 11 +++++++++++ + arch/parisc/kernel/ptrace.c | 9 +++------ + arch/powerpc/include/asm/syscall.h | 6 ++++++ + arch/powerpc/kernel/ptrace.c | 7 ++----- + arch/s390/kernel/ptrace.c | 4 +--- + arch/sh/include/asm/syscall_32.h | 10 ++++++++++ + arch/sh/include/asm/syscall_64.h | 14 ++++++++++++++ + arch/sh/kernel/ptrace_32.c | 14 +------------- + arch/sh/kernel/ptrace_64.c | 17 +---------------- + arch/sparc/include/asm/syscall.h | 7 +++++++ + arch/sparc/include/asm/thread_info_32.h | 2 ++ + arch/sparc/include/asm/thread_info_64.h | 2 ++ + arch/sparc/kernel/ptrace_64.c | 9 ++------- + arch/um/kernel/ptrace.c | 3 +-- + arch/x86/ia32/ia32entry.S | 12 ++++++------ + arch/x86/kernel/entry_32.S | 11 +++++------ + arch/x86/kernel/entry_64.S | 11 +++++------ + arch/x86/kernel/ptrace.c | 8 ++------ + arch/x86/um/asm/ptrace.h | 4 ---- + arch/x86/um/asm/syscall.h | 15 +++++++++++++++ + arch/xtensa/kernel/ptrace.c | 2 +- + include/asm-generic/syscall.h | 2 +- + include/linux/audit.h | 11 ++++++----- + include/uapi/linux/audit.h | 14 +------------- + kernel/auditsc.c | 17 +++++++---------- + 36 files changed, 147 insertions(+), 122 deletions(-) + create mode 100644 arch/alpha/include/asm/syscall.h + create mode 100644 arch/x86/um/asm/syscall.h +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (6a31c02b3311 Merge branch 'devicetree/next-overlay' into devicetree/next) +$ git merge devicetree/devicetree/next +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/tty/serial/pmac_zilog.c +Removing drivers/of/testcase-data/testcases.dtsi +Auto-merging drivers/of/fdt.c +Auto-merging drivers/crypto/nx/nx-842.c +Auto-merging arch/powerpc/platforms/pseries/setup.c +Auto-merging arch/powerpc/platforms/powermac/feature.c +Auto-merging arch/powerpc/kernel/prom.c +Auto-merging arch/arm/boot/dts/versatile-pb.dts +Auto-merging arch/arm/boot/dts/versatile-ab.dts +Merge made by the 'recursive' strategy. + Documentation/devicetree/changesets.txt | 40 ++ + Documentation/devicetree/todo.txt | 11 + + arch/arm/boot/dts/versatile-ab.dts | 4 + + arch/arm/boot/dts/versatile-pb.dts | 2 - + arch/powerpc/kernel/prom.c | 70 --- + arch/powerpc/platforms/powermac/feature.c | 20 +- + arch/powerpc/platforms/powermac/pci.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/powermac/udbg_adb.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 3 +- + drivers/cpufreq/pmac64-cpufreq.c | 3 +- + drivers/crypto/nx/nx-842.c | 30 +- + drivers/edac/cell_edac.c | 3 +- + drivers/of/Kconfig | 3 +- + drivers/of/Makefile | 4 +- + drivers/of/base.c | 451 +++++----------- + drivers/of/device.c | 4 +- + drivers/of/dynamic.c | 660 ++++++++++++++++++++++++ + drivers/of/fdt.c | 22 +- + drivers/of/of_private.h | 59 ++- + drivers/of/of_reserved_mem.c | 70 +++ + drivers/of/platform.c | 32 +- + drivers/of/selftest.c | 235 +++++++++ + drivers/of/testcase-data/testcases.dts | 15 + + drivers/of/testcase-data/testcases.dtsi | 4 - + drivers/pci/hotplug/rpaphp_core.c | 4 +- + drivers/tty/ehv_bytechan.c | 43 +- + drivers/tty/hvc/hvc_opal.c | 15 +- + drivers/tty/hvc/hvc_vio.c | 29 +- + drivers/tty/serial/pmac_zilog.c | 9 +- + drivers/tty/serial/serial_core.c | 3 + + include/linux/of.h | 87 +++- + include/linux/of_platform.h | 7 +- + include/linux/of_reserved_mem.h | 7 + + sound/ppc/pmac.c | 6 +- + 36 files changed, 1382 insertions(+), 581 deletions(-) + create mode 100644 Documentation/devicetree/changesets.txt + create mode 100644 Documentation/devicetree/todo.txt + create mode 100644 drivers/of/dynamic.c + create mode 100644 drivers/of/testcase-data/testcases.dts + delete mode 100644 drivers/of/testcase-data/testcases.dtsi +Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/for-next (663f6e708538 Merge remote-tracking branch 'spi/fix/rspi' into spi-linus) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-rspi.c | 94 ++++++++++++++++++++++++++++------------------ + drivers/spi/spi-sh-msiof.c | 71 ++++++++++++++++++---------------- + 2 files changed, 96 insertions(+), 69 deletions(-) +Merging tip/auto-latest (9c467de3b4eb Merge branch 'x86/xsave') +$ git merge tip/auto-latest +Recorded preimage for 'kernel/trace/trace.c' +Auto-merging kernel/trace/trace.c +CONFLICT (content): Merge conflict in kernel/trace/trace.c +Auto-merging arch/x86/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/trace/trace.c'. +[master 2fe6bf7d3e0c] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 15 + + arch/x86/Kconfig | 4 +- + arch/x86/include/asm/alternative.h | 14 + + arch/x86/include/asm/apic.h | 46 +- + arch/x86/include/asm/fpu-internal.h | 9 +- + arch/x86/include/asm/hardirq.h | 3 - + arch/x86/include/asm/i8259.h | 5 + + arch/x86/include/asm/io_apic.h | 56 +- + arch/x86/include/asm/mpspec.h | 15 - + arch/x86/include/asm/processor.h | 4 +- + arch/x86/include/asm/prom.h | 2 - + arch/x86/include/asm/smpboot_hooks.h | 10 +- + arch/x86/include/asm/xsave.h | 223 ++++-- + arch/x86/kernel/acpi/boot.c | 400 ++++++----- + arch/x86/kernel/apic/apic.c | 75 +- + arch/x86/kernel/apic/apic_flat_64.c | 16 - + arch/x86/kernel/apic/apic_noop.c | 23 +- + arch/x86/kernel/apic/apic_numachip.c | 8 - + arch/x86/kernel/apic/bigsmp_32.c | 14 - + arch/x86/kernel/apic/io_apic.c | 759 +++++++++++++-------- + arch/x86/kernel/apic/probe_32.c | 33 +- + arch/x86/kernel/apic/x2apic_cluster.c | 8 - + arch/x86/kernel/apic/x2apic_phys.c | 8 - + arch/x86/kernel/apic/x2apic_uv_x.c | 8 - + arch/x86/kernel/cpu/common.c | 8 + + arch/x86/kernel/devicetree.c | 207 ++---- + arch/x86/kernel/i387.c | 2 +- + arch/x86/kernel/irqinit.c | 12 +- + arch/x86/kernel/mpparse.c | 111 +-- + arch/x86/kernel/process.c | 1 + + arch/x86/kernel/smpboot.c | 8 - + arch/x86/kernel/vsmp_64.c | 4 +- + arch/x86/kernel/xsave.c | 118 +++- + arch/x86/pci/acpi.c | 6 +- + arch/x86/pci/intel_mid_pci.c | 27 +- + arch/x86/pci/irq.c | 15 +- + arch/x86/pci/xen.c | 7 +- + arch/x86/platform/ce4100/ce4100.c | 11 +- + .../platform/intel-mid/device_libs/platform_wdt.c | 22 +- + arch/x86/platform/intel-mid/sfi.c | 56 +- + arch/x86/platform/sfi/sfi.c | 10 +- + drivers/acpi/pci_irq.c | 3 +- + 42 files changed, 1238 insertions(+), 1148 deletions(-) +Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems) +$ git merge edac/linux_next +Auto-merging drivers/edac/Kconfig +Merge made by the 'recursive' strategy. + drivers/edac/Kconfig | 4 +- + drivers/edac/edac_mc_sysfs.c | 4 +- + drivers/edac/sb_edac.c | 810 +++++++++++++++++++++++++++++-------------- + include/linux/edac.h | 5 + + 4 files changed, 551 insertions(+), 272 deletions(-) +Merging edac-amd/for-next (eba4bfb34d45 EDAC, MCE, AMD: Add MCE decoding for F15h M60h) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (c115d15552c0 Merge branch 'irqchip/atmel-aic' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Resolved 'Documentation/devicetree/bindings/arm/gic.txt' using previous resolution. +Resolved 'arch/arm64/Kconfig' using previous resolution. +Resolved 'drivers/irqchip/irq-gic.c' using previous resolution. +Auto-merging drivers/irqchip/irq-gic.c +CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c +Auto-merging drivers/irqchip/Kconfig +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging Documentation/devicetree/bindings/arm/gic.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/gic.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fb1b47b3410f] Merge remote-tracking branch 'irqchip/irqchip/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/gic.txt | 20 +- + arch/arm64/Kconfig | 3 +- + drivers/irqchip/Kconfig | 7 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-gic-v2m.c | 251 ++++++++++++++++++++++++++ + drivers/irqchip/irq-gic-v2m.h | 13 ++ + drivers/irqchip/irq-gic.c | 87 +++++---- + drivers/irqchip/irq-gic.h | 67 +++++++ + 8 files changed, 408 insertions(+), 41 deletions(-) + create mode 100644 drivers/irqchip/irq-gic-v2m.c + create mode 100644 drivers/irqchip/irq-gic-v2m.h + create mode 100644 drivers/irqchip/irq-gic.h +Merging ftrace/for-next (6386b361ccf0 Merge branch 'trace/ftrace/core' into trace/for-next) +$ git merge ftrace/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rcu/rcu/next (1c91efb24799 rcutorture: Specify CONFIG_CPUMASK_OFFSTACK=y for TREE07) +$ git merge rcu/rcu/next +Auto-merging kernel/rcu/rcutorture.c +Merge made by the 'recursive' strategy. + Documentation/memory-barriers.txt | 20 +- + include/linux/rcupdate.h | 46 +--- + init/main.c | 1 + + kernel/rcu/rcutorture.c | 2 +- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tree.c | 38 ++- + kernel/rcu/tree.h | 5 +- + kernel/rcu/tree_plugin.h | 273 ++++++++++++++------- + kernel/rcu/update.c | 32 +++ + .../selftests/rcutorture/bin/config2frag.sh | 4 +- + .../selftests/rcutorture/bin/configcheck.sh | 4 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 4 +- + .../testing/selftests/rcutorture/bin/functions.sh | 20 ++ + .../testing/selftests/rcutorture/bin/kvm-build.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 3 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +- + .../selftests/rcutorture/bin/parse-build.sh | 5 +- + .../selftests/rcutorture/bin/parse-console.sh | 5 +- + .../selftests/rcutorture/bin/parse-torture.sh | 5 +- + .../selftests/rcutorture/configs/rcu/TREE01 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE01.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE07 | 3 +- + .../selftests/rcutorture/configs/rcu/TREE07.boot | 1 + + tools/testing/selftests/rcutorture/doc/initrd.txt | 1 + + 27 files changed, 326 insertions(+), 170 deletions(-) + mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/config2frag.sh + mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/kvm.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE07.boot +Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (c77dcacb3975 KVM: Move more code under CONFIG_HAVE_KVM_IRQFD) +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Removing arch/powerpc/kvm/44x_tlb.h +Removing arch/powerpc/kvm/44x_tlb.c +Removing arch/powerpc/kvm/44x_emulate.c +Removing arch/powerpc/kvm/44x.c +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/reg.h +Auto-merging arch/powerpc/include/asm/ppc-opcode.h +Auto-merging arch/powerpc/include/asm/kvm_asm.h +Removing arch/powerpc/include/asm/kvm_44x.h +Auto-merging arch/arm/kvm/init.S +Auto-merging arch/arm/kvm/guest.c +Auto-merging arch/arm/kernel/hyp-stub.S +Removing Documentation/powerpc/kvm_440.txt +Merge made by the 'recursive' strategy. + Documentation/arm64/booting.txt | 8 + + Documentation/devicetree/bindings/arm/gic-v3.txt | 79 +++ + Documentation/powerpc/00-INDEX | 2 - + Documentation/powerpc/kvm_440.txt | 41 -- + Documentation/virtual/kvm/api.txt | 60 ++- + arch/arm/include/asm/kvm_asm.h | 18 + + arch/arm/include/asm/kvm_emulate.h | 22 +- + arch/arm/include/asm/kvm_host.h | 8 +- + arch/arm/include/asm/kvm_mmu.h | 12 + + arch/arm/kernel/asm-offsets.c | 14 +- + arch/arm/kernel/hyp-stub.S | 4 +- + arch/arm/kvm/Kconfig | 2 +- + arch/arm/kvm/Makefile | 1 + + arch/arm/kvm/arm.c | 39 +- + arch/arm/kvm/coproc.c | 88 +++- + arch/arm/kvm/guest.c | 10 - + arch/arm/kvm/init.S | 4 +- + arch/arm/kvm/interrupts.S | 9 +- + arch/arm/kvm/interrupts_head.S | 48 +- + arch/arm/kvm/mmu.c | 214 +++++--- + arch/arm64/include/asm/debug-monitors.h | 19 +- + arch/arm64/include/asm/kvm_arm.h | 5 +- + arch/arm64/include/asm/kvm_asm.h | 53 +- + arch/arm64/include/asm/kvm_coproc.h | 3 +- + arch/arm64/include/asm/kvm_emulate.h | 22 + + arch/arm64/include/asm/kvm_host.h | 48 +- + arch/arm64/include/asm/kvm_mmu.h | 15 + + arch/arm64/include/asm/virt.h | 4 + + arch/arm64/kernel/asm-offsets.c | 26 +- + arch/arm64/kernel/debug-monitors.c | 9 - + arch/arm64/kvm/Makefile | 4 + + arch/arm64/kvm/guest.c | 68 ++- + arch/arm64/kvm/handle_exit.c | 4 +- + arch/arm64/kvm/hyp.S | 600 +++++++++++++++++++---- + arch/arm64/kvm/sys_regs.c | 546 ++++++++++++++++++--- + arch/arm64/kvm/vgic-v2-switch.S | 133 +++++ + arch/arm64/kvm/vgic-v3-switch.S | 267 ++++++++++ + arch/ia64/kvm/Kconfig | 1 + + arch/ia64/kvm/kvm-ia64.c | 2 +- + arch/mips/kvm/mips.c | 2 +- + arch/powerpc/Kconfig.debug | 4 +- + arch/powerpc/configs/ppc44x_defconfig | 1 - + arch/powerpc/include/asm/asm-compat.h | 4 + + arch/powerpc/include/asm/cache.h | 7 + + arch/powerpc/include/asm/hvcall.h | 6 + + arch/powerpc/include/asm/kvm_44x.h | 67 --- + arch/powerpc/include/asm/kvm_asm.h | 2 +- + arch/powerpc/include/asm/kvm_book3s.h | 51 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 29 +- + arch/powerpc/include/asm/kvm_booke.h | 15 +- + arch/powerpc/include/asm/kvm_host.h | 28 +- + arch/powerpc/include/asm/kvm_ppc.h | 116 ++++- + arch/powerpc/include/asm/mmu-book3e.h | 8 +- + arch/powerpc/include/asm/ppc-opcode.h | 17 + + arch/powerpc/include/asm/reg.h | 13 +- + arch/powerpc/include/asm/time.h | 9 + + arch/powerpc/include/uapi/asm/kvm.h | 2 + + arch/powerpc/kernel/asm-offsets.c | 2 + + arch/powerpc/kvm/44x.c | 237 --------- + arch/powerpc/kvm/44x_emulate.c | 194 -------- + arch/powerpc/kvm/44x_tlb.c | 528 -------------------- + arch/powerpc/kvm/44x_tlb.h | 86 ---- + arch/powerpc/kvm/Kconfig | 20 +- + arch/powerpc/kvm/Makefile | 18 +- + arch/powerpc/kvm/book3s.c | 156 +++--- + arch/powerpc/kvm/book3s_32_mmu.c | 2 +- + arch/powerpc/kvm/book3s_32_mmu_host.c | 7 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 5 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 145 +++--- + arch/powerpc/kvm/book3s_emulate.c | 28 +- + arch/powerpc/kvm/book3s_hv.c | 271 ++++++++-- + arch/powerpc/kvm/book3s_hv_builtin.c | 13 + + arch/powerpc/kvm/book3s_hv_ras.c | 6 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 146 +++--- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 5 + + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 70 ++- + arch/powerpc/kvm/book3s_paired_singles.c | 38 +- + arch/powerpc/kvm/book3s_pr.c | 223 ++++++--- + arch/powerpc/kvm/book3s_pr_papr.c | 92 +++- + arch/powerpc/kvm/book3s_xics.c | 55 ++- + arch/powerpc/kvm/book3s_xics.h | 2 + + arch/powerpc/kvm/booke.c | 225 +++++---- + arch/powerpc/kvm/booke.h | 7 - + arch/powerpc/kvm/booke_emulate.c | 8 +- + arch/powerpc/kvm/booke_interrupts.S | 5 - + arch/powerpc/kvm/bookehv_interrupts.S | 60 +-- + arch/powerpc/kvm/e500_emulate.c | 12 + + arch/powerpc/kvm/e500_mmu_host.c | 102 ++++ + arch/powerpc/kvm/e500mc.c | 28 +- + arch/powerpc/kvm/emulate.c | 206 +------- + arch/powerpc/kvm/emulate_loadstore.c | 272 ++++++++++ + arch/powerpc/kvm/mpic.c | 4 +- + arch/powerpc/kvm/powerpc.c | 181 ++++++- + arch/powerpc/kvm/timing.c | 1 - + arch/powerpc/kvm/timing.h | 3 - + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/interrupt.c | 3 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/irq.c | 2 +- + arch/x86/kvm/lapic.c | 52 +- + arch/x86/kvm/vmx.c | 4 +- + arch/x86/kvm/x86.c | 2 +- + include/kvm/arm_arch_timer.h | 14 + + include/kvm/arm_vgic.h | 115 ++++- + include/linux/kvm_host.h | 47 +- + include/trace/events/kvm.h | 8 +- + include/uapi/linux/kvm.h | 6 +- + virt/kvm/Kconfig | 3 + + virt/kvm/arm/vgic-v2.c | 265 ++++++++++ + virt/kvm/arm/vgic-v3.c | 247 ++++++++++ + virt/kvm/arm/vgic.c | 389 ++++++++------- + virt/kvm/eventfd.c | 134 +++-- + virt/kvm/irq_comm.c | 24 +- + virt/kvm/irqchip.c | 98 ++-- + virt/kvm/kvm_main.c | 62 +-- + 116 files changed, 5010 insertions(+), 2825 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/gic-v3.txt + delete mode 100644 Documentation/powerpc/kvm_440.txt + create mode 100644 arch/arm64/kvm/vgic-v2-switch.S + create mode 100644 arch/arm64/kvm/vgic-v3-switch.S + delete mode 100644 arch/powerpc/include/asm/kvm_44x.h + delete mode 100644 arch/powerpc/kvm/44x.c + delete mode 100644 arch/powerpc/kvm/44x_emulate.c + delete mode 100644 arch/powerpc/kvm/44x_tlb.c + delete mode 100644 arch/powerpc/kvm/44x_tlb.h + create mode 100644 arch/powerpc/kvm/emulate_loadstore.c + create mode 100644 virt/kvm/arm/vgic-v2.c + create mode 100644 virt/kvm/arm/vgic-v3.c +Merging kvm-arm/next (dedf97e8ff2c arm64: KVM: fix 64bit CP15 VM access for 32bit guests) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (8e6afa36e754 KVM: PPC: PR: Handle FSCR feature deselects) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen-tip/linux-next (e38230eb3789 xen/pciback: Remove tons of dereferences) +$ git merge xen-tip/linux-next +Resolved 'arch/x86/xen/grant-table.c' using previous resolution. +Resolved 'drivers/xen/grant-table.c' using previous resolution. +Resolved 'include/xen/grant_table.h' using previous resolution. +Auto-merging include/xen/grant_table.h +CONFLICT (content): Merge conflict in include/xen/grant_table.h +Auto-merging include/linux/device.h +Auto-merging drivers/xen/grant-table.c +CONFLICT (content): Merge conflict in drivers/xen/grant-table.c +Auto-merging arch/x86/xen/grant-table.c +CONFLICT (content): Merge conflict in arch/x86/xen/grant-table.c +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/arm/xen/grant-table.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 91bc8c984bbe] Merge remote-tracking branch 'xen-tip/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-pciback | 13 ++ + Documentation/kernel-parameters.txt | 4 + + MAINTAINERS | 7 + + arch/arm/xen/enlighten.c | 6 +- + arch/arm/xen/grant-table.c | 6 +- + arch/x86/xen/enlighten.c | 13 ++ + arch/x86/xen/grant-table.c | 60 +---- + arch/x86/xen/p2m.c | 5 +- + drivers/xen/events/events_base.c | 2 +- + drivers/xen/events/events_fifo.c | 55 +++-- + drivers/xen/grant-table.c | 309 +------------------------ + drivers/xen/xen-pciback/passthrough.c | 14 +- + drivers/xen/xen-pciback/pci_stub.c | 42 ++-- + drivers/xen/xen-pciback/pciback.h | 7 +- + drivers/xen/xen-pciback/vpci.c | 14 +- + drivers/xen/xen-pciback/xenbus.c | 5 +- + include/linux/device.h | 5 + + include/xen/grant_table.h | 30 +-- + 18 files changed, 144 insertions(+), 453 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-pciback +Merging percpu/for-next (a46e532a9145 Merge branch 'for-3.16-fixes' into for-next) +$ git merge percpu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (ebb48ccd98d1 Merge branch 'for-3.17' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/linux-next (f82bdd0d77b6 hp-wmi: Enable hotkeys on some systems) +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) +$ git merge chrome-platform/for-next +Auto-merging drivers/platform/chrome/chromeos_laptop.c +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_laptop.c | 140 +++++++++++++++++++++++++++--- + drivers/platform/chrome/chromeos_pstore.c | 14 +-- + 2 files changed, 132 insertions(+), 22 deletions(-) +Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (19583ca584d6 Linux 3.16) +$ git merge regmap/for-next +Already up-to-date. +Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl()) +$ git merge hsi/for-next +Auto-merging drivers/hsi/clients/ssi_protocol.c +Merge made by the 'recursive' strategy. + drivers/hsi/clients/ssi_protocol.c | 2 +- + drivers/hsi/controllers/omap_ssi.c | 14 +++++++------- + drivers/hsi/controllers/omap_ssi_port.c | 15 ++++++++------- + 3 files changed, 16 insertions(+), 15 deletions(-) +Merging leds/for-next (e661c8978e48 leds: ipaq-micro: fix sparse non static symbol warning) +$ git merge leds/for-next +Resolved 'drivers/hid/hid-gt683r.c' using previous resolution. +Auto-merging drivers/leds/Makefile +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/hid/hid-gt683r.c +CONFLICT (add/add): Merge conflict in drivers/hid/hid-gt683r.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b2d8e5cc9efa] Merge remote-tracking branch 'leds/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-leds-gt683r | 16 +++ + Documentation/devicetree/bindings/leds/pca963x.txt | 9 +- + Documentation/devicetree/bindings/leds/tca6507.txt | 2 +- + drivers/hid/hid-gt683r.c | 42 +++--- + drivers/input/keyboard/lm8323.c | 22 ++-- + drivers/leds/Kconfig | 7 + + drivers/leds/Makefile | 1 + + drivers/leds/led-class.c | 19 +-- + drivers/leds/led-core.c | 11 +- + drivers/leds/leds-ipaq-micro.c | 141 +++++++++++++++++++++ + drivers/leds/leds-lm3530.c | 20 +-- + drivers/leds/leds-lm3533.c | 20 ++- + drivers/leds/leds-lm355x.c | 21 ++- + drivers/leds/leds-lm3642.c | 30 ++--- + drivers/leds/leds-lp55xx-common.c | 20 +-- + drivers/leds/leds-max8997.c | 16 +-- + drivers/leds/leds-netxbig.c | 31 ++--- + drivers/leds/leds-ns2.c | 16 +-- + drivers/leds/leds-pca963x.c | 28 ++-- + drivers/leds/leds-ss4200.c | 14 +- + drivers/leds/leds-wm831x-status.c | 23 ++-- + include/linux/leds.h | 5 +- + 22 files changed, 332 insertions(+), 182 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-leds-gt683r + create mode 100644 drivers/leds/leds-ipaq-micro.c +Merging driver-core/driver-core-next (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (8346b33fad01 Documentation: DocBook: elieminate doc build break) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (5bc9e5933a41 USB: kl5kusb105: Remove klsi_105_tiocmset function) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (abdfd21809f2 Merge branch 'for-3.17' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (ae87e8b212ed Merge remote-tracking branch 'scsi-queue/drivers-for-3.17' into for-next) +$ git merge scsi/for-next +Resolved 'drivers/scsi/cxgbi/libcxgbi.h' using previous resolution. +Resolved 'include/scsi/sg.h' using previous resolution. +Auto-merging include/scsi/sg.h +CONFLICT (content): Merge conflict in include/scsi/sg.h +Removing include/scsi/scsi_tgt_if.h +Removing include/scsi/scsi_tgt.h +Removing include/scsi/libsrp.h +Auto-merging drivers/usb/storage/Kconfig +Auto-merging drivers/staging/rts5208/rtsx.c +Removing drivers/scsi/scsi_transport_srp_internal.h +Auto-merging drivers/scsi/scsi_transport_srp.c +Removing drivers/scsi/scsi_transport_fc_internal.h +Removing drivers/scsi/scsi_tgt_priv.h +Removing drivers/scsi/scsi_tgt_lib.c +Removing drivers/scsi/scsi_tgt_if.c +Removing drivers/scsi/libsrp.c +Removing drivers/scsi/ibmvscsi/ibmvstgt.c +Auto-merging drivers/scsi/cxgbi/libcxgbi.h +CONFLICT (content): Merge conflict in drivers/scsi/cxgbi/libcxgbi.h +Auto-merging drivers/scsi/cxgbi/libcxgbi.c +Auto-merging arch/mips/configs/loongson3_defconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master dcf594d1d68b] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/scsi/tmscsim.txt | 2 - + MAINTAINERS | 5 +- + arch/arm/configs/msm_defconfig | 1 - + arch/arm/configs/s3c2410_defconfig | 1 - + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/mips/configs/db1xxx_defconfig | 1 - + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/ip22_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/jazz_defconfig | 1 - + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/malta_kvm_guest_defconfig | 1 - + arch/mips/configs/markeins_defconfig | 1 - + arch/mips/configs/nlm_xlp_defconfig | 3 - + arch/mips/configs/nlm_xlr_defconfig | 3 - + arch/mips/configs/rm200_defconfig | 1 - + arch/mips/configs/tb0226_defconfig | 1 - + arch/mips/configs/tb0287_defconfig | 1 - + arch/powerpc/configs/52xx/motionpro_defconfig | 1 - + arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 1 - + arch/powerpc/configs/mpc5200_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 2 - + arch/s390/configs/default_defconfig | 2 - + arch/s390/configs/gcov_defconfig | 2 - + arch/s390/configs/performance_defconfig | 2 - + arch/sh/configs/sh2007_defconfig | 1 - + arch/tile/configs/tilegx_defconfig | 1 - + arch/tile/configs/tilepro_defconfig | 1 - + drivers/ata/libata-scsi.c | 2 +- + drivers/ata/libata.h | 2 +- + drivers/message/fusion/mptbase.c | 23 +- + drivers/message/fusion/mptbase.h | 4 +- + drivers/message/fusion/mptctl.c | 18 +- + drivers/message/fusion/mptfc.c | 9 +- + drivers/message/fusion/mptsas.c | 76 +- + drivers/message/fusion/mptsas.h | 2 +- + drivers/message/fusion/mptscsih.c | 31 +- + drivers/message/fusion/mptscsih.h | 4 +- + drivers/message/fusion/mptspi.c | 5 +- + drivers/message/i2o/i2o_scsi.c | 11 +- + drivers/s390/scsi/zfcp_dbf.c | 3 +- + drivers/s390/scsi/zfcp_unit.c | 4 +- + drivers/scsi/3w-xxxx.h | 4 +- + drivers/scsi/53c700.c | 7 +- + drivers/scsi/Kconfig | 61 +- + drivers/scsi/Makefile | 5 - + drivers/scsi/NCR5380.c | 31 +- + drivers/scsi/NCR53c406a.c | 4 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/advansys.c | 6 +- + drivers/scsi/aha152x.c | 6 +- + drivers/scsi/aic7xxx/aic7770_osm.c | 3 +- + drivers/scsi/aic7xxx/aic79xx.h | 2 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 6 +- + drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 3 +- + drivers/scsi/aic7xxx/aic79xx_proc.c | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 11 +- + drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 3 +- + drivers/scsi/aic7xxx/aic7xxx_proc.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/arm/acornscsi.c | 14 +- + drivers/scsi/arm/fas216.c | 11 +- + drivers/scsi/arm/queue.c | 3 +- + drivers/scsi/atari_NCR5380.c | 62 +- + drivers/scsi/be2iscsi/be_iscsi.c | 2 +- + drivers/scsi/be2iscsi/be_mgmt.c | 20 +- + drivers/scsi/bfa/bfa_fcs.c | 6 +- + drivers/scsi/bfa/bfa_ioc.h | 2 +- + drivers/scsi/bfa/bfad.c | 62 +- + drivers/scsi/bfa/bfad_bsg.c | 16 +- + drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 13 + + drivers/scsi/bnx2fc/Kconfig | 4 +- + drivers/scsi/bnx2fc/bnx2fc.h | 7 +- + drivers/scsi/bnx2fc/bnx2fc_constants.h | 13 + + drivers/scsi/bnx2fc/bnx2fc_debug.c | 13 + + drivers/scsi/bnx2fc/bnx2fc_debug.h | 13 + + drivers/scsi/bnx2fc/bnx2fc_els.c | 3 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 11 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 3 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 7 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 3 +- + drivers/scsi/bnx2i/57xx_iscsi_constants.h | 6 +- + drivers/scsi/bnx2i/57xx_iscsi_hsi.h | 6 +- + drivers/scsi/bnx2i/Kconfig | 4 +- + drivers/scsi/bnx2i/bnx2i.h | 6 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 6 +- + drivers/scsi/bnx2i/bnx2i_init.c | 14 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 15 +- + drivers/scsi/bnx2i/bnx2i_sysfs.c | 6 +- + drivers/scsi/ch.c | 30 +- + drivers/scsi/csiostor/csio_scsi.c | 24 +- + drivers/scsi/cxgbi/libcxgbi.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.h | 2 +- + drivers/scsi/dc395x.c | 51 +- + drivers/scsi/dpt_i2o.c | 38 +- + drivers/scsi/dpti.h | 6 +- + drivers/scsi/eata.c | 4 +- + drivers/scsi/fnic/fnic_isr.c | 4 +- + drivers/scsi/fnic/fnic_scsi.c | 20 +- + drivers/scsi/g_NCR5380.c | 2 +- + drivers/scsi/hosts.c | 50 +- + drivers/scsi/hpsa.c | 37 +- + drivers/scsi/hptiop.c | 2 +- + drivers/scsi/ibmvscsi/Makefile | 1 - + drivers/scsi/ibmvscsi/ibmvfc.c | 477 +++---- + drivers/scsi/ibmvscsi/ibmvfc.h | 268 ++-- + drivers/scsi/ibmvscsi/ibmvstgt.c | 1001 --------------- + drivers/scsi/in2000.c | 6 +- + drivers/scsi/isci/init.c | 2 +- + drivers/scsi/libiscsi.c | 14 +- + drivers/scsi/libsas/sas_scsi_host.c | 16 +- + drivers/scsi/libsrp.c | 447 ------- + drivers/scsi/lpfc/lpfc_attr.c | 10 +- + drivers/scsi/lpfc/lpfc_init.c | 9 +- + drivers/scsi/lpfc/lpfc_scsi.c | 36 +- + drivers/scsi/megaraid.c | 6 +- + drivers/scsi/megaraid/mega_common.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 4 +- + drivers/scsi/mesh.c | 2 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 75 +- + drivers/scsi/mpt2sas/mpt2sas_base.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 83 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 75 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 92 +- + drivers/scsi/ncr53c8xx.c | 2 +- + drivers/scsi/ncr53c8xx.h | 4 - + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/pas16.c | 2 - + drivers/scsi/pcmcia/nsp_cs.c | 2 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 2 +- + drivers/scsi/pm8001/pm8001_ctl.c | 151 ++- + drivers/scsi/pm8001/pm8001_hwi.c | 69 +- + drivers/scsi/pm8001/pm8001_init.c | 79 +- + drivers/scsi/pm8001/pm8001_sas.c | 38 +- + drivers/scsi/pm8001/pm8001_sas.h | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 48 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/ps3rom.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 6 +- + drivers/scsi/qla2xxx/qla_gbl.h | 18 +- + drivers/scsi/qla2xxx/qla_init.c | 10 +- + drivers/scsi/qla2xxx/qla_iocb.c | 11 +- + drivers/scsi/qla2xxx/qla_isr.c | 4 +- + drivers/scsi/qla2xxx/qla_mbx.c | 12 +- + drivers/scsi/qla2xxx/qla_mr.c | 8 +- + drivers/scsi/qla2xxx/qla_os.c | 48 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 4 +- + drivers/scsi/qla4xxx/ql4_init.c | 6 + + drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- + drivers/scsi/qla4xxx/ql4_isr.c | 22 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 20 +- + drivers/scsi/qla4xxx/ql4_nx.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 36 +- + drivers/scsi/qlogicfas.c | 2 - + drivers/scsi/qlogicpti.c | 2 +- + drivers/scsi/scsi.c | 132 +- + drivers/scsi/scsi_debug.c | 1483 +++++++++++++++------- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/scsi_error.c | 186 +-- + drivers/scsi/scsi_ioctl.c | 17 +- + drivers/scsi/scsi_lib.c | 935 ++++++++++---- + drivers/scsi/scsi_priv.h | 5 +- + drivers/scsi/scsi_proc.c | 2 +- + drivers/scsi/scsi_scan.c | 187 ++- + drivers/scsi/scsi_sysfs.c | 45 +- + drivers/scsi/scsi_tgt_if.c | 399 ------ + drivers/scsi/scsi_tgt_lib.c | 661 ---------- + drivers/scsi/scsi_tgt_priv.h | 32 - + drivers/scsi/scsi_transport_fc.c | 20 +- + drivers/scsi/scsi_transport_fc_internal.h | 26 - + drivers/scsi/scsi_transport_iscsi.c | 14 +- + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/scsi_transport_srp.c | 18 - + drivers/scsi/scsi_transport_srp_internal.h | 25 - + drivers/scsi/sd.c | 220 ++-- + drivers/scsi/sd.h | 3 + + drivers/scsi/sg.c | 657 +++++----- + drivers/scsi/sr.c | 70 +- + drivers/scsi/sr.h | 5 + + drivers/scsi/sr_ioctl.c | 26 +- + drivers/scsi/sr_vendor.c | 36 +- + drivers/scsi/st.c | 605 ++++----- + drivers/scsi/storvsc_drv.c | 123 +- + drivers/scsi/sun3_NCR5380.c | 57 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 +- + drivers/scsi/tmscsim.c | 6 +- + drivers/scsi/u14-34f.c | 12 +- + drivers/scsi/ufs/ufs.h | 38 +- + drivers/scsi/ufs/ufshcd-pci.c | 26 - + drivers/scsi/ufs/ufshcd.c | 427 +++++-- + drivers/scsi/ufs/ufshci.h | 5 + + drivers/scsi/virtio_scsi.c | 75 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/scsi/wd33c93.c | 33 +- + drivers/staging/rts5208/rtsx.c | 4 +- + drivers/target/loopback/tcm_loop.c | 2 +- + drivers/target/target_core_pscsi.c | 12 +- + drivers/usb/storage/Kconfig | 4 +- + drivers/usb/storage/sddr09.c | 4 +- + drivers/usb/storage/usb.c | 10 +- + include/linux/moduleparam.h | 5 + + include/linux/scatterlist.h | 6 +- + include/scsi/iscsi_if.h | 1 + + include/scsi/libsrp.h | 78 -- + include/scsi/scsi.h | 3 +- + include/scsi/scsi_cmnd.h | 3 - + include/scsi/scsi_device.h | 39 +- + include/scsi/scsi_devinfo.h | 5 + + include/scsi/scsi_driver.h | 3 - + include/scsi/scsi_host.h | 68 +- + include/scsi/scsi_tcq.h | 28 +- + include/scsi/scsi_tgt.h | 21 - + include/scsi/scsi_tgt_if.h | 108 -- + include/scsi/scsi_transport.h | 2 +- + include/scsi/scsi_transport_fc.h | 4 + + include/scsi/sg.h | 91 +- + kernel/params.c | 1 + + lib/scatterlist.c | 25 +- + 234 files changed, 5057 insertions(+), 6376 deletions(-) + delete mode 100644 drivers/scsi/ibmvscsi/ibmvstgt.c + delete mode 100644 drivers/scsi/libsrp.c + delete mode 100644 drivers/scsi/scsi_tgt_if.c + delete mode 100644 drivers/scsi/scsi_tgt_lib.c + delete mode 100644 drivers/scsi/scsi_tgt_priv.h + delete mode 100644 drivers/scsi/scsi_transport_fc_internal.h + delete mode 100644 drivers/scsi/scsi_transport_srp_internal.h + delete mode 100644 include/scsi/libsrp.h + delete mode 100644 include/scsi/scsi_tgt.h + delete mode 100644 include/scsi/scsi_tgt_if.h +Merging target-updates/for-next (45f6c5b576b9 target/configfs: Remove unnecessary null test) +$ git merge target-updates/for-next +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/isert/ib_isert.c | 9 +++++---- + drivers/target/target_core_fabric_configfs.c | 3 +-- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (e1ee5c578fb1 pinctrl: baytrail: Convert to use gpiolib irqchip) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c +Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.h +Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c +Auto-merging drivers/pinctrl/samsung/pinctrl-exynos5440.c +Auto-merging drivers/pinctrl/samsung/pinctrl-exynos.c +Auto-merging drivers/pinctrl/qcom/pinctrl-msm8x74.c +Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c +Auto-merging drivers/pinctrl/qcom/pinctrl-ipq8064.c +Auto-merging drivers/pinctrl/qcom/pinctrl-apq8064.c +Auto-merging drivers/pinctrl/pinctrl-st.c +Auto-merging drivers/pinctrl/nomadik/pinctrl-nomadik.c +Auto-merging drivers/pinctrl/nomadik/pinctrl-abx500.c +Auto-merging drivers/pinctrl/Makefile +Auto-merging drivers/pinctrl/Kconfig +Auto-merging arch/arm/mach-sunxi/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 + + .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 2 +- + .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 2 +- + .../bindings/pinctrl/qcom,msm8960-pinctrl.txt | 181 +++ + .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 2 +- + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 + + .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +- + .../bindings/pinctrl/samsung-pinctrl.txt | 24 +- + arch/arm/boot/dts/imx27-pinfunc.h | 46 - + arch/arm/mach-sunxi/Kconfig | 1 - + drivers/pinctrl/Kconfig | 117 +- + drivers/pinctrl/Makefile | 24 +- + drivers/pinctrl/core.c | 24 +- + drivers/pinctrl/nomadik/Kconfig | 51 + + drivers/pinctrl/nomadik/Makefile | 10 + + drivers/pinctrl/{ => nomadik}/pinctrl-ab8500.c | 0 + drivers/pinctrl/{ => nomadik}/pinctrl-ab8505.c | 0 + drivers/pinctrl/{ => nomadik}/pinctrl-ab8540.c | 0 + drivers/pinctrl/{ => nomadik}/pinctrl-ab9540.c | 0 + drivers/pinctrl/{ => nomadik}/pinctrl-abx500.c | 19 +- + drivers/pinctrl/{ => nomadik}/pinctrl-abx500.h | 0 + .../pinctrl/{ => nomadik}/pinctrl-nomadik-db8500.c | 0 + .../pinctrl/{ => nomadik}/pinctrl-nomadik-db8540.c | 0 + .../{ => nomadik}/pinctrl-nomadik-stn8815.c | 0 + drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.c | 18 +- + drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.h | 0 + drivers/pinctrl/pinctrl-adi2.c | 41 +- + drivers/pinctrl/pinctrl-as3722.c | 11 +- + drivers/pinctrl/pinctrl-at91.c | 27 +- + drivers/pinctrl/pinctrl-baytrail.c | 103 +- + drivers/pinctrl/pinctrl-bcm281xx.c | 2 +- + drivers/pinctrl/pinctrl-bcm2835.c | 11 - + drivers/pinctrl/pinctrl-coh901.c | 10 +- + drivers/pinctrl/pinctrl-imx.c | 2 +- + drivers/pinctrl/pinctrl-imx1-core.c | 2 +- + drivers/pinctrl/pinctrl-imx1.c | 279 +++++ + drivers/pinctrl/pinctrl-imx27.c | 52 - + drivers/pinctrl/pinctrl-rockchip.c | 401 ++++-- + drivers/pinctrl/pinctrl-single.c | 61 +- + drivers/pinctrl/pinctrl-st.c | 15 +- + drivers/pinctrl/pinctrl-tb10x.c | 17 - + drivers/pinctrl/pinctrl-tegra.c | 13 - + drivers/pinctrl/pinctrl-tz1090-pdc.c | 28 - + drivers/pinctrl/pinctrl-tz1090.c | 58 - + drivers/pinctrl/pinctrl-u300.c | 14 - + drivers/pinctrl/pinmux.c | 4 - + drivers/pinctrl/qcom/Kconfig | 42 + + drivers/pinctrl/qcom/Makefile | 6 + + drivers/pinctrl/{ => qcom}/pinctrl-apq8064.c | 19 +- + drivers/pinctrl/{ => qcom}/pinctrl-ipq8064.c | 17 +- + drivers/pinctrl/{ => qcom}/pinctrl-msm.c | 42 +- + drivers/pinctrl/{ => qcom}/pinctrl-msm.h | 0 + drivers/pinctrl/qcom/pinctrl-msm8960.c | 1282 ++++++++++++++++++++ + drivers/pinctrl/{ => qcom}/pinctrl-msm8x74.c | 29 +- + drivers/pinctrl/samsung/Kconfig | 28 + + drivers/pinctrl/samsung/Makefile | 7 + + drivers/pinctrl/{ => samsung}/pinctrl-exynos.c | 307 +---- + drivers/pinctrl/{ => samsung}/pinctrl-exynos.h | 0 + drivers/pinctrl/{ => samsung}/pinctrl-exynos5440.c | 10 +- + drivers/pinctrl/{ => samsung}/pinctrl-s3c24xx.c | 0 + drivers/pinctrl/{ => samsung}/pinctrl-s3c64xx.c | 0 + drivers/pinctrl/{ => samsung}/pinctrl-samsung.c | 728 ++++++----- + drivers/pinctrl/{ => samsung}/pinctrl-samsung.h | 18 +- + drivers/pinctrl/sh-pfc/gpio.c | 9 +- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 417 +++++++ + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 11 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 22 - + drivers/pinctrl/sirf/pinctrl-sirf.c | 10 - + drivers/pinctrl/spear/Kconfig | 1 + + drivers/pinctrl/spear/pinctrl-plgpio.c | 84 +- + drivers/pinctrl/spear/pinctrl-spear.c | 7 - + drivers/pinctrl/sunxi/Kconfig | 24 +- + drivers/pinctrl/sunxi/Makefile | 2 + + drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 + + drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 1 + + drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 4 +- + drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 1 + + drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 217 ++-- + drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 1 + + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 142 +++ + drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 593 +++++++++ + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 187 ++- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 44 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 21 +- + include/linux/pinctrl/pinmux.h | 2 - + 85 files changed, 4411 insertions(+), 1604 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt + create mode 100644 drivers/pinctrl/nomadik/Kconfig + create mode 100644 drivers/pinctrl/nomadik/Makefile + rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8500.c (100%) + rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8505.c (100%) + rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8540.c (100%) + rename drivers/pinctrl/{ => nomadik}/pinctrl-ab9540.c (100%) + rename drivers/pinctrl/{ => nomadik}/pinctrl-abx500.c (98%) + rename drivers/pinctrl/{ => nomadik}/pinctrl-abx500.h (100%) + rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-db8500.c (100%) + rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-db8540.c (100%) + rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-stn8815.c (100%) + rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.c (99%) + rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.h (100%) + create mode 100644 drivers/pinctrl/pinctrl-imx1.c + create mode 100644 drivers/pinctrl/qcom/Kconfig + create mode 100644 drivers/pinctrl/qcom/Makefile + rename drivers/pinctrl/{ => qcom}/pinctrl-apq8064.c (95%) + rename drivers/pinctrl/{ => qcom}/pinctrl-ipq8064.c (95%) + rename drivers/pinctrl/{ => qcom}/pinctrl-msm.c (96%) + rename drivers/pinctrl/{ => qcom}/pinctrl-msm.h (100%) + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8960.c + rename drivers/pinctrl/{ => qcom}/pinctrl-msm8x74.c (95%) + create mode 100644 drivers/pinctrl/samsung/Kconfig + create mode 100644 drivers/pinctrl/samsung/Makefile + rename drivers/pinctrl/{ => samsung}/pinctrl-exynos.c (79%) + rename drivers/pinctrl/{ => samsung}/pinctrl-exynos.h (100%) + rename drivers/pinctrl/{ => samsung}/pinctrl-exynos5440.c (99%) + rename drivers/pinctrl/{ => samsung}/pinctrl-s3c24xx.c (100%) + rename drivers/pinctrl/{ => samsung}/pinctrl-s3c64xx.c (100%) + rename drivers/pinctrl/{ => samsung}/pinctrl-samsung.c (71%) + rename drivers/pinctrl/{ => samsung}/pinctrl-samsung.h (93%) + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c +Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) +$ git merge vhost/linux-next +Resolved 'drivers/vhost/net.c' using previous resolution. +Auto-merging drivers/vhost/net.c +CONFLICT (content): Merge conflict in drivers/vhost/net.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b9879aba47f8] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (39b2bbe3d715 gpio: add flags argument to gpiod_get*() functions) +$ git merge gpio/for-next +Resolved 'arch/arm/mach-tegra/board-paz00.c' using previous resolution. +Auto-merging drivers/gpio/gpio-rcar.c +Auto-merging drivers/gpio/gpio-mcp23s08.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/arm/mach-tegra/board-paz00.c +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 12688bd7b01c] Merge remote-tracking branch 'gpio/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/gpio-zynq.txt | 26 + + Documentation/gpio/board.txt | 2 +- + Documentation/gpio/consumer.txt | 26 +- + Documentation/gpio/driver.txt | 25 +- + MAINTAINERS | 4 +- + arch/arm/mach-at91/at91rm9200_devices.c | 2 +- + arch/arm/mach-tegra/board-paz00.c | 2 +- + arch/mips/jz4740/board-qi_lb60.c | 1 + + drivers/gpio/Kconfig | 10 +- + drivers/gpio/Makefile | 3 + + drivers/gpio/devres.c | 40 +- + drivers/gpio/gpio-74x164.c | 8 +- + drivers/gpio/gpio-adnp.c | 9 +- + drivers/gpio/gpio-adp5520.c | 8 +- + drivers/gpio/gpio-adp5588.c | 6 +- + drivers/gpio/gpio-amd8111.c | 3 +- + drivers/gpio/gpio-arizona.c | 3 +- + drivers/gpio/gpio-cs5535.c | 8 +- + drivers/gpio/gpio-da9052.c | 3 +- + drivers/gpio/gpio-da9055.c | 3 +- + drivers/gpio/gpio-dwapb.c | 2 +- + drivers/gpio/gpio-em.c | 5 +- + drivers/gpio/gpio-f7188x.c | 18 +- + drivers/gpio/gpio-generic.c | 3 +- + drivers/gpio/gpio-grgpio.c | 4 +- + drivers/gpio/gpio-ich.c | 9 +- + drivers/gpio/gpio-intel-mid.c | 86 +- + drivers/gpio/gpio-it8761e.c | 6 +- + drivers/gpio/gpio-janz-ttl.c | 8 +- + drivers/gpio/gpio-kempld.c | 3 +- + drivers/gpio/gpio-lp3943.c | 3 +- + drivers/gpio/gpio-lpc32xx.c | 2 +- + drivers/gpio/gpio-lynxpoint.c | 98 +- + drivers/gpio/gpio-max730x.c | 13 +- + drivers/gpio/gpio-max732x.c | 7 +- + drivers/gpio/gpio-mc33880.c | 11 +- + drivers/gpio/gpio-mc9s08dz60.c | 3 +- + drivers/gpio/gpio-mcp23s08.c | 26 +- + drivers/gpio/gpio-ml-ioh.c | 8 +- + drivers/gpio/gpio-msm-v2.c | 5 +- + drivers/gpio/gpio-mxc.c | 2 +- + drivers/gpio/gpio-octeon.c | 3 +- + drivers/gpio/gpio-omap.c | 275 ++-- + drivers/gpio/gpio-palmas.c | 3 +- + drivers/gpio/gpio-pca953x.c | 7 +- + drivers/gpio/gpio-pcf857x.c | 4 +- + drivers/gpio/gpio-pch.c | 10 +- + drivers/gpio/gpio-pxa.c | 7 +- + drivers/gpio/gpio-rc5t583.c | 3 +- + drivers/gpio/gpio-rcar.c | 9 +- + drivers/gpio/gpio-rdc321x.c | 7 +- + drivers/gpio/gpio-sch.c | 16 +- + drivers/gpio/gpio-sch311x.c | 6 +- + drivers/gpio/gpio-sodaville.c | 4 +- + drivers/gpio/gpio-stmpe.c | 119 +- + drivers/gpio/gpio-sx150x.c | 7 +- + drivers/gpio/gpio-syscon.c | 3 +- + drivers/gpio/gpio-tb10x.c | 5 +- + drivers/gpio/gpio-tc3589x.c | 8 +- + drivers/gpio/gpio-timberdale.c | 5 +- + drivers/gpio/gpio-tps6586x.c | 3 +- + drivers/gpio/gpio-tps65910.c | 3 +- + drivers/gpio/gpio-tps65912.c | 3 +- + drivers/gpio/gpio-ts5500.c | 6 +- + drivers/gpio/gpio-twl4030.c | 6 +- + drivers/gpio/gpio-twl6040.c | 3 +- + drivers/gpio/gpio-ucb1400.c | 4 +- + drivers/gpio/gpio-viperboard.c | 10 +- + drivers/gpio/gpio-vr41xx.c | 8 +- + drivers/gpio/gpio-vx855.c | 3 +- + drivers/gpio/gpio-wm831x.c | 3 +- + drivers/gpio/gpio-wm8350.c | 3 +- + drivers/gpio/gpio-wm8994.c | 3 +- + drivers/gpio/gpio-zynq.c | 692 ++++++++++ + drivers/gpio/gpiolib-acpi.c | 44 +- + drivers/gpio/gpiolib-legacy.c | 102 ++ + drivers/gpio/gpiolib-of.c | 10 +- + drivers/gpio/gpiolib-sysfs.c | 827 ++++++++++++ + drivers/gpio/gpiolib.c | 1421 +++----------------- + drivers/gpio/gpiolib.h | 105 +- + include/asm-generic/gpio.h | 3 - + include/linux/gpio/consumer.h | 81 +- + include/linux/gpio/driver.h | 66 +- + include/linux/gpio/machine.h | 58 + + 84 files changed, 2480 insertions(+), 2002 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-zynq.txt + create mode 100644 drivers/gpio/gpio-zynq.c + create mode 100644 drivers/gpio/gpiolib-legacy.c + create mode 100644 drivers/gpio/gpiolib-sysfs.c + create mode 100644 include/linux/gpio/machine.h +$ git am -3 ../patches/gpio__add_missing_includes_in_machine.h.patch +Applying: gpio: add missing includes in machine.h +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/gpio/machine.h +$ git add -A . +$ git commit -v -a --amend +[master bf050b8ce8ae] Merge remote-tracking branch 'gpio/for-next' +Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (eae266a284f3 pwm: rockchip: document device tree bindings) +$ git merge pwm/for-next +Auto-merging drivers/pwm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-rockchip.txt | 17 ++ + drivers/pwm/Kconfig | 7 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-rockchip.c | 177 +++++++++++++++++++++ + 4 files changed, 202 insertions(+) + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-rockchip.txt + create mode 100644 drivers/pwm/pwm-rockchip.c +Merging dma-buf/for-next (b23b35445ec8 Documentation: devres: Add devm_kmalloc() et al) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (344470cac42e proc: Point /proc/mounts at /proc/thread-self/mounts instead of /proc/self/mounts) +$ git merge userns/for-next +Auto-merging tools/testing/selftests/Makefile +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/client.c +Merge made by the 'recursive' strategy. + fs/namespace.c | 65 +++++- + fs/nfs/client.c | 95 ++++---- + fs/nfs/inode.c | 3 +- + fs/nfs/internal.h | 9 + + fs/nfs/netns.h | 3 + + fs/proc/Makefile | 1 + + fs/proc/base.c | 18 +- + fs/proc/inode.c | 7 +- + fs/proc/internal.h | 6 + + fs/proc/proc_net.c | 6 +- + fs/proc/root.c | 5 +- + fs/proc/thread_self.c | 85 ++++++++ + fs/proc_namespace.c | 8 +- + include/linux/mount.h | 9 +- + include/linux/nsproxy.h | 16 +- + include/linux/pid_namespace.h | 1 + + ipc/namespace.c | 6 +- + kernel/nsproxy.c | 15 +- + kernel/utsname.c | 6 +- + net/core/net_namespace.c | 10 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/mount/Makefile | 17 ++ + .../selftests/mount/unprivileged-remount-test.c | 242 +++++++++++++++++++++ + 23 files changed, 537 insertions(+), 97 deletions(-) + create mode 100644 fs/proc/thread_self.c + create mode 100644 tools/testing/selftests/mount/Makefile + create mode 100644 tools/testing/selftests/mount/unprivileged-remount-test.c +Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (b11a6face1b6 clk: Add missing of_clk_set_defaults export) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (e02b87659777 hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Auto-merging lib/lzo/lzo1x_decompress_safe.c +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging aio/master (00fefb9cf2b5 aio: use iovec array rather than the single one) +$ git merge aio/master +Auto-merging fs/aio.c +Merge made by the 'recursive' strategy. + fs/aio.c | 86 ++++++++++++++++++++++------------------------------------------ + 1 file changed, 30 insertions(+), 56 deletions(-) +Merging llvmlinux/for-next (7380100aa7ce arm64: LLVMLinux: Use current_stack_pointer in kernel/traps.c) +$ git merge llvmlinux/for-next +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/include/asm/thread_info.h +Auto-merging arch/arm/kernel/unwind.c +Auto-merging arch/arm/include/asm/thread_info.h +Auto-merging arch/arm/include/asm/ptrace.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/ptrace.h | 5 ++--- + arch/arm/include/asm/thread_info.h | 9 +++++++-- + arch/arm/kernel/return_address.c | 3 +-- + arch/arm/kernel/stacktrace.c | 4 +--- + arch/arm/kernel/unwind.c | 3 +-- + arch/arm64/include/asm/thread_info.h | 9 +++++++-- + arch/arm64/kernel/stacktrace.c | 3 +-- + arch/arm64/kernel/traps.c | 3 +-- + 8 files changed, 21 insertions(+), 18 deletions(-) +Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) +$ git merge powernv-cpuidle/powernv-cpuidle +Already up-to-date. +Merging rd-docs/master (da8a7613e7ef Maintainers often repeat the same feedback on poorly written changelogs - describe the problem, justify your changes, quantify optimizations, describe user-visible changes - but our documentation on writing changelogs doesn't include these things. Fix that.) +$ git merge rd-docs/master +Resolved 'Documentation/laptops/freefall.c' using previous resolution. +Auto-merging Documentation/laptops/freefall.c +CONFLICT (content): Merge conflict in Documentation/laptops/freefall.c +Auto-merging Documentation/SubmittingPatches +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 945d96f6ef2c] Merge branch 'rd-docs/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/SubmittingPatches | 38 ++++- + Documentation/ioctl/00-INDEX | 2 + + Documentation/ioctl/botching-up-ioctls.txt | 219 +++++++++++++++++++++++++++++ + Documentation/laptops/freefall.c | 6 +- + 4 files changed, 253 insertions(+), 12 deletions(-) + create mode 100644 Documentation/ioctl/botching-up-ioctls.txt +Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp()) +$ git merge signal-cleanup/signal_v4 +Auto-merging kernel/signal.c +Auto-merging include/linux/sched.h +Auto-merging arch/arm64/kernel/signal32.c +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/signal32.h | 11 ++-- + arch/arm64/kernel/signal.c | 58 +++++++------------ + arch/arm64/kernel/signal32.c | 24 +++----- + arch/avr32/kernel/signal.c | 50 +++++++--------- + arch/blackfin/kernel/signal.c | 51 ++++++---------- + arch/c6x/kernel/signal.c | 53 +++++++---------- + arch/cris/arch-v10/kernel/signal.c | 89 +++++++++++----------------- + arch/cris/arch-v32/kernel/signal.c | 89 +++++++++++----------------- + arch/frv/kernel/signal.c | 112 ++++++++++++++---------------------- + arch/hexagon/kernel/signal.c | 57 +++++++----------- + arch/ia64/kernel/signal.c | 46 +++++++-------- + arch/m32r/kernel/signal.c | 57 +++++++----------- + arch/m68k/kernel/signal.c | 75 +++++++++--------------- + arch/metag/kernel/signal.c | 10 +--- + arch/microblaze/kernel/signal.c | 55 ++++++------------ + arch/mips/include/asm/abi.h | 10 ++-- + arch/mips/kernel/signal-common.h | 2 +- + arch/mips/kernel/signal.c | 72 +++++++++-------------- + arch/mips/kernel/signal32.c | 39 +++++-------- + arch/mips/kernel/signal_n32.c | 20 +++---- + arch/mn10300/kernel/signal.c | 102 ++++++++++++-------------------- + arch/openrisc/kernel/signal.c | 20 +------ + arch/parisc/kernel/signal.c | 58 ++++++++----------- + arch/powerpc/kernel/signal.c | 41 +++++-------- + arch/powerpc/kernel/signal.h | 14 ++--- + arch/powerpc/kernel/signal_32.c | 36 ++++++------ + arch/powerpc/kernel/signal_64.c | 28 +++++---- + arch/s390/kernel/compat_signal.c | 79 +++++++++++-------------- + arch/s390/kernel/entry.h | 4 +- + arch/s390/kernel/signal.c | 78 +++++++++++-------------- + arch/score/kernel/signal.c | 43 ++++++-------- + arch/sh/kernel/signal_32.c | 79 +++++++++++-------------- + arch/sh/kernel/signal_64.c | 82 +++++++++++--------------- + arch/tile/include/asm/compat.h | 3 +- + arch/tile/kernel/compat_signal.c | 29 +++++----- + arch/tile/kernel/signal.c | 54 ++++++++--------- + arch/um/include/shared/frame_kern.h | 12 ++-- + arch/um/kernel/signal.c | 27 ++++----- + arch/unicore32/kernel/signal.c | 48 +++++++--------- + arch/x86/um/signal.c | 45 +++++++-------- + arch/xtensa/kernel/signal.c | 43 ++++++-------- + include/linux/sched.h | 6 +- + include/linux/signal.h | 15 +---- + include/linux/tracehook.h | 8 +-- + kernel/signal.c | 46 +++++++-------- + 45 files changed, 772 insertions(+), 1208 deletions(-) +Merging akpm-current/current (929c76e4e629 fs/dlm/debug_fs.c: remove unnecessary null test before debugfs_remove) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'net/batman-adv/fragmentation.c' +Resolved 'arch/arm64/Kconfig' using previous resolution. +Resolved 'drivers/rapidio/devices/tsi721_dma.c' using previous resolution. +Resolved 'kernel/kexec.c' using previous resolution. +Auto-merging net/bridge/br_multicast.c +Auto-merging net/batman-adv/fragmentation.c +CONFLICT (content): Merge conflict in net/batman-adv/fragmentation.c +Auto-merging mm/shmem.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page-writeback.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/hugetlb.c +Auto-merging mm/filemap.c +Auto-merging lib/scatterlist.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/kexec.c +CONFLICT (content): Merge conflict in kernel/kexec.c +Auto-merging kernel/fork.c +Auto-merging kernel/acct.c +Auto-merging init/Kconfig +Auto-merging include/scsi/scsi.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/scatterlist.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/fs.h +Auto-merging fs/reiserfs/lbalance.c +Auto-merging fs/reiserfs/do_balan.c +Auto-merging fs/proc/root.c +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/base.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/namespace.c +Auto-merging fs/fscache/main.c +Auto-merging fs/exec.c +Auto-merging fs/cifs/smb2pdu.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/cifs/smb2misc.c +Auto-merging fs/cifs/sess.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/cifssmb.c +Auto-merging drivers/video/backlight/backlight.c +Auto-merging drivers/staging/lustre/lustre/libcfs/hash.c +Auto-merging drivers/staging/android/binder.c +Auto-merging drivers/rapidio/devices/tsi721_dma.c +CONFLICT (content): Merge conflict in drivers/rapidio/devices/tsi721_dma.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_ethtool.c +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/base/Kconfig +Auto-merging drivers/ata/Kconfig +Auto-merging block/bio-integrity.c +Auto-merging arch/x86/mm/fault.c +Removing arch/x86/include/asm/scatterlist.h +Auto-merging arch/x86/Kconfig +Removing arch/sparc/include/asm/scatterlist.h +Auto-merging arch/sparc/Kconfig +Removing arch/score/include/asm/scatterlist.h +Removing arch/s390/include/asm/scatterlist.h +Auto-merging arch/s390/Kconfig +Removing arch/powerpc/kvm/book3s_hv_cma.h +Removing arch/powerpc/kvm/book3s_hv_cma.c +Auto-merging arch/powerpc/kvm/book3s_hv_builtin.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c +Auto-merging arch/powerpc/kvm/Makefile +Removing arch/powerpc/include/asm/scatterlist.h +Removing arch/mn10300/include/asm/scatterlist.h +Removing arch/microblaze/include/asm/scatterlist.h +Removing arch/m32r/include/asm/scatterlist.h +Auto-merging arch/ia64/kernel/time.c +Removing arch/ia64/include/asm/scatterlist.h +Auto-merging arch/ia64/Kconfig +Removing arch/frv/include/asm/scatterlist.h +Removing arch/cris/include/asm/scatterlist.h +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging arch/arm/mm/dma-mapping.c +Removing arch/arm/include/asm/scatterlist.h +Auto-merging arch/arm/Kconfig +Removing arch/alpha/include/asm/scatterlist.h +Auto-merging Makefile +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'net/batman-adv/fragmentation.c'. +[master e2ea6c3da34f] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-nilfs2 | 269 +++ + Documentation/RCU/whatisRCU.txt | 2 +- + Documentation/cgroups/memcg_test.txt | 160 +- + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + Documentation/kernel-parameters.txt | 8 +- + Documentation/leds/leds-class.txt | 3 - + Documentation/oops-tracing.txt | 2 + + Documentation/printk-formats.txt | 6 + + Documentation/rapidio/tsi721.txt | 19 +- + Documentation/sysctl/kernel.txt | 1 + + .../trace/postprocess/trace-vmscan-postprocess.pl | 53 + + Makefile | 19 + + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/scatterlist.h | 6 - + arch/arm/Kconfig | 1 + + arch/arm/include/asm/Kbuild | 1 + + arch/arm/include/asm/scatterlist.h | 12 - + arch/arm/mm/dma-mapping.c | 1 + + arch/arm64/Kconfig | 1 + + arch/cris/include/asm/Kbuild | 1 + + arch/cris/include/asm/scatterlist.h | 6 - + arch/frv/include/asm/Kbuild | 1 + + arch/frv/include/asm/scatterlist.h | 6 - + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/include/asm/scatterlist.h | 7 - + arch/ia64/kernel/time.c | 15 - + arch/ia64/mm/init.c | 3 +- + arch/m32r/include/asm/Kbuild | 1 + + arch/m32r/include/asm/scatterlist.h | 6 - + arch/m68k/kernel/sys_m68k.c | 18 +- + arch/microblaze/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/scatterlist.h | 1 - + arch/mn10300/include/asm/Kbuild | 1 + + arch/mn10300/include/asm/scatterlist.h | 16 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/scatterlist.h | 17 - + arch/powerpc/kvm/Makefile | 1 - + arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 19 +- + arch/powerpc/kvm/book3s_hv_cma.c | 240 --- + arch/powerpc/kvm/book3s_hv_cma.h | 27 - + arch/powerpc/mm/dma-noncoherent.c | 1 + + arch/powerpc/mm/mem.c | 3 +- + arch/powerpc/platforms/44x/warp.c | 1 + + arch/powerpc/platforms/52xx/efika.c | 1 + + arch/powerpc/platforms/amigaone/setup.c | 1 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/scatterlist.h | 3 - + arch/score/include/asm/Kbuild | 1 + + arch/score/include/asm/scatterlist.h | 6 - + arch/score/include/uapi/asm/ptrace.h | 11 - + arch/sh/drivers/dma/Kconfig | 5 +- + arch/sh/include/cpu-sh4/cpu/dma-register.h | 1 - + arch/sh/include/cpu-sh4a/cpu/dma.h | 3 +- + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 4 +- + arch/sh/kernel/time.c | 4 +- + arch/sh/mm/asids-debugfs.c | 4 +- + arch/sh/mm/init.c | 5 +- + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/scatterlist.h | 8 - + arch/tile/include/asm/hardwall.h | 2 +- + arch/tile/kernel/hardwall.c | 6 +- + arch/tile/kernel/module.c | 2 +- + arch/um/include/asm/Kbuild | 1 + + arch/x86/Kconfig | 1 + + arch/x86/include/asm/Kbuild | 3 +- + arch/x86/include/asm/numa.h | 1 - + arch/x86/include/asm/pgtable_64.h | 3 +- + arch/x86/include/asm/scatterlist.h | 8 - + arch/x86/mm/fault.c | 5 +- + arch/x86/mm/init_32.c | 3 +- + arch/x86/mm/init_64.c | 39 +- + arch/x86/mm/numa.c | 34 +- + arch/x86/platform/efi/efi-bgrt.c | 36 +- + block/bio-integrity.c | 2 - + block/genhd.c | 2 +- + crypto/zlib.c | 8 +- + drivers/ata/Kconfig | 1 + + drivers/ata/libata-core.c | 72 +- + drivers/base/Kconfig | 10 - + drivers/base/dma-contiguous.c | 220 +-- + drivers/base/memory.c | 30 +- + drivers/base/node.c | 2 +- + drivers/block/zram/zram_drv.c | 71 +- + drivers/block/zram/zram_drv.h | 29 +- + drivers/firmware/memmap.c | 6 +- + drivers/gpu/drm/drm_hashtab.c | 2 +- + drivers/hwmon/asus_atk0110.c | 2 +- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 6 + + drivers/input/leds.c | 249 +++ + drivers/leds/Kconfig | 3 - + drivers/lguest/core.c | 7 +- + drivers/misc/ti-st/st_core.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 +- + drivers/net/irda/donauboe.c | 15 +- + drivers/parport/parport_ip32.c | 2 +- + drivers/rapidio/devices/tsi721.h | 12 +- + drivers/rapidio/devices/tsi721_dma.c | 718 ++++---- + drivers/rapidio/rio.c | 66 +- + drivers/rtc/Kconfig | 29 +- + drivers/rtc/Makefile | 5 + + drivers/rtc/class.c | 16 +- + drivers/rtc/interface.c | 2 + + drivers/rtc/rtc-ds1343.c | 75 +- + drivers/rtc/rtc-ds1742.c | 2 +- + drivers/rtc/rtc-efi-platform.c | 31 + + drivers/rtc/rtc-efi.c | 32 +- + drivers/rtc/rtc-isl12022.c | 12 + + drivers/rtc/rtc-pcf85063.c | 204 +++ + drivers/rtc/rtc-pcf8563.c | 231 ++- + drivers/staging/android/binder.c | 4 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 4 +- + drivers/tty/Kconfig | 4 + + drivers/tty/sysrq.c | 2 +- + drivers/tty/vt/keyboard.c | 110 +- + drivers/video/backlight/backlight.c | 2 - + fs/adfs/adfs.h | 1 + + fs/adfs/dir.c | 2 +- + fs/adfs/dir_fplus.c | 9 +- + fs/autofs4/autofs_i.h | 63 - + fs/autofs4/expire.c | 1 - + fs/autofs4/root.c | 10 +- + fs/bfs/bfs.h | 1 + + fs/bfs/dir.c | 4 +- + fs/bfs/inode.c | 8 +- + fs/binfmt_elf.c | 21 +- + fs/cachefiles/bind.c | 6 +- + fs/cachefiles/daemon.c | 6 +- + fs/cifs/cifsacl.c | 2 +- + fs/cifs/cifssmb.c | 20 +- + fs/cifs/file.c | 4 +- + fs/cifs/sess.c | 2 +- + fs/cifs/smb2file.c | 4 +- + fs/cifs/smb2misc.c | 38 +- + fs/cifs/smb2ops.c | 2 +- + fs/cifs/smb2pdu.c | 2 +- + fs/cifs/smb2pdu.h | 28 +- + fs/coda/cache.c | 2 +- + fs/coda/coda_linux.c | 2 +- + fs/coda/dir.c | 3 +- + fs/coda/file.c | 2 +- + fs/coda/inode.c | 4 +- + fs/coda/pioctl.c | 2 +- + fs/coda/psdev.c | 2 +- + fs/coda/upcall.c | 2 +- + fs/compat.c | 2 +- + fs/cramfs/inode.c | 45 +- + fs/cramfs/uncompress.c | 10 +- + fs/dlm/debug_fs.c | 15 +- + fs/efs/namei.c | 11 +- + fs/exec.c | 4 - + fs/exofs/ore_raid.c | 2 +- + fs/ext4/fsync.c | 5 +- + fs/fscache/main.c | 4 +- + fs/hfsplus/catalog.c | 89 +- + fs/hfsplus/dir.c | 11 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/super.c | 4 +- + fs/hpfs/dnode.c | 17 +- + fs/isofs/Makefile | 2 + + fs/isofs/compress.c | 10 +- + fs/isofs/export.c | 11 +- + fs/isofs/inode.c | 88 +- + fs/isofs/namei.c | 5 +- + fs/isofs/rock.c | 44 +- + fs/jffs2/compr_zlib.c | 7 +- + fs/logfs/readwrite.c | 15 +- + fs/mpage.c | 23 +- + fs/namespace.c | 2 +- + fs/nilfs2/Makefile | 2 +- + fs/nilfs2/nilfs.h | 8 + + fs/nilfs2/super.c | 11 +- + fs/nilfs2/sysfs.c | 1137 +++++++++++++ + fs/nilfs2/sysfs.h | 176 ++ + fs/nilfs2/the_nilfs.c | 17 +- + fs/nilfs2/the_nilfs.h | 20 +- + fs/notify/inode_mark.c | 2 +- + fs/notify/vfsmount_mark.c | 2 +- + fs/ntfs/file.c | 3 - + fs/ocfs2/alloc.c | 43 +- + fs/ocfs2/alloc.h | 2 +- + fs/ocfs2/aops.c | 37 +- + fs/ocfs2/cluster/quorum.c | 13 +- + fs/ocfs2/cluster/tcp.c | 45 +- + fs/ocfs2/cluster/tcp.h | 1 + + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmdomain.c | 5 +- + fs/ocfs2/dlm/dlmmaster.c | 26 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/file.c | 2 +- + fs/ocfs2/inode.c | 10 +- + fs/ocfs2/ioctl.c | 129 +- + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ocfs2/slot_map.c | 2 +- + fs/omfs/inode.c | 2 +- + fs/proc/base.c | 181 +- + fs/proc/fd.c | 2 +- + fs/proc/generic.c | 32 +- + fs/proc/internal.h | 9 +- + fs/proc/kcore.c | 2 +- + fs/proc/meminfo.c | 2 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc/proc_tty.c | 4 +- + fs/proc/root.c | 4 +- + fs/proc/vmcore.c | 82 +- + fs/pstore/ram_core.c | 2 +- + fs/qnx6/Makefile | 1 + + fs/qnx6/dir.c | 26 +- + fs/qnx6/inode.c | 99 +- + fs/qnx6/namei.c | 6 +- + fs/qnx6/qnx6.h | 12 +- + fs/qnx6/super_mmi.c | 22 +- + fs/ramfs/file-nommu.c | 2 +- + fs/reiserfs/dir.c | 2 +- + fs/reiserfs/do_balan.c | 2 +- + fs/reiserfs/file.c | 2 +- + fs/reiserfs/ibalance.c | 2 +- + fs/reiserfs/inode.c | 2 +- + fs/reiserfs/ioctl.c | 2 +- + fs/reiserfs/item_ops.c | 4 +- + fs/reiserfs/lbalance.c | 2 +- + fs/reiserfs/prints.c | 4 +- + fs/reiserfs/procfs.c | 2 +- + fs/reiserfs/stree.c | 2 +- + fs/reiserfs/super.c | 9 +- + fs/reiserfs/xattr.c | 22 +- + fs/reiserfs/xattr_acl.c | 2 +- + fs/reiserfs/xattr_security.c | 2 +- + fs/reiserfs/xattr_trusted.c | 2 +- + fs/reiserfs/xattr_user.c | 2 +- + fs/romfs/super.c | 23 +- + fs/squashfs/file_direct.c | 2 +- + fs/squashfs/super.c | 5 +- + fs/ufs/Makefile | 1 + + fs/ufs/inode.c | 32 +- + fs/ufs/super.c | 304 ++-- + fs/ufs/ufs.h | 10 +- + include/linux/bitmap.h | 62 +- + include/linux/byteorder/generic.h | 2 +- + include/linux/cma.h | 27 + + include/linux/crc64_ecma.h | 56 + + include/linux/decompress/bunzip2.h | 8 +- + include/linux/decompress/generic.h | 10 +- + include/linux/decompress/inflate.h | 8 +- + include/linux/decompress/unlz4.h | 8 +- + include/linux/decompress/unlzma.h | 8 +- + include/linux/decompress/unlzo.h | 8 +- + include/linux/decompress/unxz.h | 8 +- + include/linux/dma-contiguous.h | 11 +- + include/linux/fs.h | 2 +- + include/linux/gfp.h | 2 +- + include/linux/glob.h | 10 + + include/linux/huge_mm.h | 4 - + include/linux/hugetlb.h | 1 - + include/linux/input.h | 21 + + include/linux/kernel.h | 38 +- + include/linux/klist.h | 2 +- + include/linux/list.h | 14 +- + include/linux/memblock.h | 4 +- + include/linux/memcontrol.h | 98 +- + include/linux/memory_hotplug.h | 10 +- + include/linux/mm_types.h | 1 + + include/linux/mmdebug.h | 2 + + include/linux/mmzone.h | 219 +-- + include/linux/nodemask.h | 11 +- + include/linux/oom.h | 4 +- + include/linux/page-flags.h | 21 +- + include/linux/page_cgroup.h | 70 +- + include/linux/pagemap.h | 3 + + include/linux/printk.h | 2 +- + include/linux/rculist.h | 8 +- + include/linux/rio_drv.h | 5 + + include/linux/scatterlist.h | 2 +- + include/linux/sched.h | 13 +- + include/linux/shm.h | 18 +- + include/linux/string.h | 1 + + include/linux/swap.h | 16 +- + include/linux/sysctl.h | 2 - + include/linux/user_namespace.h | 6 +- + include/linux/vmalloc.h | 2 +- + include/linux/zbud.h | 2 +- + include/linux/zlib.h | 122 +- + include/linux/zpool.h | 106 ++ + include/scsi/scsi.h | 2 +- + include/trace/events/migrate.h | 1 + + include/trace/events/pagemap.h | 16 +- + init/Kconfig | 46 +- + init/do_mounts.c | 12 +- + init/do_mounts_rd.c | 10 +- + init/initramfs.c | 60 +- + ipc/shm.c | 75 +- + kernel/acct.c | 30 +- + kernel/auditfilter.c | 4 +- + kernel/bounds.c | 2 - + kernel/events/uprobes.c | 15 +- + kernel/exit.c | 50 +- + kernel/fork.c | 77 +- + kernel/gcov/fs.c | 3 +- + kernel/kallsyms.c | 2 +- + kernel/panic.c | 1 + + kernel/printk/printk.c | 157 +- + kernel/sysctl.c | 9 +- + kernel/test_kprobes.c | 87 +- + kernel/user_namespace.c | 6 +- + kernel/watchdog.c | 11 +- + lib/Kconfig | 47 + + lib/Kconfig.debug | 2 +- + lib/Makefile | 3 + + lib/bitmap.c | 111 +- + lib/cmdline.c | 15 +- + lib/crc64_ecma.c | 341 ++++ + lib/decompress.c | 2 +- + lib/decompress_bunzip2.c | 26 +- + lib/decompress_inflate.c | 12 +- + lib/decompress_unlz4.c | 83 +- + lib/decompress_unlzma.c | 28 +- + lib/decompress_unlzo.c | 12 +- + lib/decompress_unxz.c | 10 +- + lib/glob.c | 287 ++++ + lib/idr.c | 25 +- + lib/kfifo.c | 6 +- + lib/klist.c | 6 +- + lib/list_sort.c | 71 +- + lib/rbtree.c | 2 +- + lib/scatterlist.c | 4 +- + lib/string_helpers.c | 15 +- + lib/test-kstrtox.c | 2 +- + lib/vsprintf.c | 20 +- + lib/zlib_deflate/deflate.c | 143 -- + lib/zlib_inflate/inflate.c | 132 -- + mm/Kconfig | 54 +- + mm/Makefile | 2 + + mm/cma.c | 335 ++++ + mm/compaction.c | 17 +- + mm/filemap.c | 52 +- + mm/gup.c | 18 +- + mm/huge_memory.c | 89 +- + mm/hugetlb.c | 129 +- + mm/hwpoison-inject.c | 3 +- + mm/internal.h | 2 +- + mm/madvise.c | 3 - + mm/memcontrol.c | 1781 ++++++++------------ + mm/memory-failure.c | 10 + + mm/memory.c | 91 +- + mm/memory_hotplug.c | 45 +- + mm/migrate.c | 38 +- + mm/mlock.c | 9 +- + mm/mmap.c | 5 + + mm/oom_kill.c | 38 +- + mm/page-writeback.c | 5 +- + mm/page_alloc.c | 161 +- + mm/readahead.c | 3 +- + mm/rmap.c | 20 - + mm/shmem.c | 84 +- + mm/slab.c | 514 +++--- + mm/slab.h | 22 +- + mm/slab_common.c | 101 ++ + mm/slub.c | 221 +-- + mm/swap.c | 54 +- + mm/swap_state.c | 8 +- + mm/swapfile.c | 21 +- + mm/truncate.c | 9 - + mm/util.c | 132 +- + mm/vmalloc.c | 30 +- + mm/vmscan.c | 264 ++- + mm/vmstat.c | 150 +- + mm/zbud.c | 98 +- + mm/zpool.c | 364 ++++ + mm/zsmalloc.c | 86 +- + mm/zswap.c | 81 +- + net/batman-adv/fragmentation.c | 2 +- + net/bridge/br_multicast.c | 2 +- + net/ipv4/fib_trie.c | 2 +- + net/ipv6/addrlabel.c | 2 +- + net/xfrm/xfrm_policy.c | 4 +- + scripts/checkpatch.pl | 570 +++++-- + scripts/checkstack.pl | 12 +- + scripts/coccinelle/free/ifnullfree.cocci | 54 + + scripts/tags.sh | 2 + + 387 files changed, 9680 insertions(+), 6073 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-fs-nilfs2 + delete mode 100644 arch/alpha/include/asm/scatterlist.h + delete mode 100644 arch/arm/include/asm/scatterlist.h + delete mode 100644 arch/cris/include/asm/scatterlist.h + delete mode 100644 arch/frv/include/asm/scatterlist.h + delete mode 100644 arch/ia64/include/asm/scatterlist.h + delete mode 100644 arch/m32r/include/asm/scatterlist.h + delete mode 100644 arch/microblaze/include/asm/scatterlist.h + delete mode 100644 arch/mn10300/include/asm/scatterlist.h + delete mode 100644 arch/powerpc/include/asm/scatterlist.h + delete mode 100644 arch/powerpc/kvm/book3s_hv_cma.c + delete mode 100644 arch/powerpc/kvm/book3s_hv_cma.h + delete mode 100644 arch/s390/include/asm/scatterlist.h + delete mode 100644 arch/score/include/asm/scatterlist.h + delete mode 100644 arch/sparc/include/asm/scatterlist.h + delete mode 100644 arch/x86/include/asm/scatterlist.h + create mode 100644 drivers/input/leds.c + create mode 100644 drivers/rtc/rtc-efi-platform.c + create mode 100644 drivers/rtc/rtc-pcf85063.c + create mode 100644 fs/nilfs2/sysfs.c + create mode 100644 fs/nilfs2/sysfs.h + create mode 100644 include/linux/cma.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/glob.h + create mode 100644 include/linux/zpool.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/glob.c + create mode 100644 mm/cma.c + create mode 100644 mm/zpool.c + create mode 100644 scripts/coccinelle/free/ifnullfree.cocci +$ 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: drivers/gpio/gpio-zevio.c: fix build +Applying: x86, vdso: fix vdso2c's special_pages error checking +Applying: arm64,ia64,ppc,s390,sh,tile,um,x86,mm: remove default gate area +Applying: init/main.c: code clean-up +Applying: Update Roland McGrath's mail +Applying: MAINTAINERS: remove two ancient EATA sections +Applying: MAINTAINERS: update IBM ServeRAID RAID info +Applying: arch/arm/mach-omap2: replace strict_strto* with kstrto* +Applying: arch/arm/mach-pxa: replace strict_strto call with kstrto +Applying: arch/arm/mach-s3c24xx/mach-jive.c: replace strict_strto* with kstrto* +Applying: arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto +Applying: arch/powerpc: replace obsolete strict_strto* calls +Applying: arch/x86: replace strict_strto calls +Applying: drivers/scsi: replace strict_strto calls +Applying: include/linux: remove strict_strto* definitions +Applying: pci-dma-compat: add pci_zalloc_consistent helper +Applying: atm: use pci_zalloc_consistent +Applying: block: use pci_zalloc_consistent +Applying: crypto: use pci_zalloc_consistent +Applying: infiniband: use pci_zalloc_consistent +Applying: i810: use pci_zalloc_consistent +Applying: media: use pci_zalloc_consistent +Applying: amd: use pci_zalloc_consistent +Applying: atl1e: use pci_zalloc_consistent +Applying: enic: use pci_zalloc_consistent +Applying: sky2: use pci_zalloc_consistent +Applying: micrel: use pci_zalloc_consistent +Applying: qlogic: use pci_zalloc_consistent +Applying: irda: use pci_zalloc_consistent +Applying: ipw2100: use pci_zalloc_consistent +Applying: mwl8k: use pci_zalloc_consistent +Applying: rtl818x: use pci_zalloc_consistent +Applying: rtlwifi: use pci_zalloc_consistent +Applying: scsi: use pci_zalloc_consistent +Applying: staging: use pci_zalloc_consistent +Applying: synclink_gt: use pci_zalloc_consistent +Applying: vme: bridges: use pci_zalloc_consistent +Applying: drivers/net/ethernet/amd/pcnet32.c: neaten and remove unnecessary OOM messages +Applying: kernel/posix-timers.c: code clean-up +Applying: kernel-posix-timersc-code-clean-up-checkpatch-fixes +Applying: MAINTAINERS: update microcode patterns +Applying: MAINTAINERS: update cifs location +Applying: MAINTAINERS: use the correct efi-stub location +Applying: MAINTAINERS: update clk/sirf patterns +Applying: MAINTAINERS: fix ssbi pattern +Applying: MAINTAINERS: use correct filename for sdhci-bcm-kona +Applying: MAINTAINERS: fix PXA3xx NAND FLASH DRIVER pattern +Applying: MAINTAINERS: update picoxcell patterns +Applying: MAINTAINERS: remove section CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER +Applying: MAINTAINERS: remove METAG imgdafs pattern +Applying: MAINTAINERS: remove unused radeon drm pattern +Applying: MAINTAINERS: remove unusd ARM/QUALCOMM MSM pattern +Applying: MAINTAINERS: remove unused NFSD pattern +Applying: mm: allow drivers to prevent new writable mappings +Applying: shm: add sealing API +Applying: shm: add memfd_create() syscall +Applying: selftests: add memfd_create() + sealing tests +Applying: selftests: add memfd/sealing page-pinning tests +Applying: shm: wait for pins to be released when sealing +Applying: bin2c: move bin2c in scripts/basic +Applying: kernel: build bin2c based on config option CONFIG_BUILD_BIN2C +Applying: kexec: rename unusebale_pages to unusable_pages +Applying: kexec: move segment verification code in a separate function +Applying: kexec: use common function for kimage_normal_alloc() and kimage_crash_alloc() +Applying: resource: provide new functions to walk through resources +Applying: kexec: make kexec_segment user buffer pointer a union +Applying: kexec: new syscall kexec_file_load() declaration +Applying: kexec: implementation of new syscall kexec_file_load +Applying: kexec-implementation-of-new-syscall-kexec_file_load-checkpatch-fixes +Applying: kexec: return error if file bytes are less then file size +Applying: purgatory/sha256: provide implementation of sha256 in purgaotory context +Applying: purgatory: core purgatory functionality +Applying: purgatory: run host built programs from objtree +Applying: kexec: load and relocate purgatory at kernel load time +Applying: kexec-load-and-relocate-purgatory-at-kernel-load-time-fix +Applying: kexec-bzImage64: support for loading bzImage using 64bit entry +Applying: kexec: fix freeing up for image loader data loading +Applying: kexec: support for kexec on panic using new system call +Applying: kexec-bzimage64: fix the ordering of registers +Applying: kexec: support kexec/kdump on EFI systems +Applying: kexec-support-kexec-kdump-on-efi-systems-fix +Applying: kexec: verify the signature of signed PE bzImage +Applying: fs.h: remove unnecessary extern prototypes +Applying: fs.h: whitespace neatening +Applying: fs.h: a few more whitespace neatenings +Applying: fs.h: add argument names to struct file_lock_operations (*funcs) +Applying: fs.h: add member argument descriptions to lock_manager_operations +Applying: fs/dlm/plock.c: add argument descriptions to notify +Applying: dlm, lockd: remove unused conf from lm_grant +Applying: dlm: plock: reduce indentation by rearranging order +Applying: timer: provide an api for deferrable timeout +Applying: ksm: provide support to use deferrable timers for scanner thread +Applying: ksm-provide-support-to-use-deferrable-timers-for-scanner-thread-fix +Applying: ksm-provide-support-to-use-deferrable-timers-for-scanner-thread-fix-fix-2 +Applying: MAINTAINERS: update DMA BUFFER SHARING patterns +Applying: MAINTAINERS: update usb/gadget patterns +Applying: MAINTAINERS: update nomadik patterns +Applying: kernel/kprobes.c: convert printk to pr_foo() +Applying: mm: replace remap_file_pages() syscall with emulation +Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix +Applying: mm: remap_file_pages: initialize populate before usage +Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping +Applying: fat: add i_disksize to represent uninitialized size +Applying: fat: add fat_fallocate operation +Applying: fat: zero out seek range on _fat_get_block +Applying: fat: fallback to buffered write in case of fallocated region on direct IO +Applying: fat: permit to return phy block number by fibmap in fallocated region +Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 9a02812951ef...af86fefe413b akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (af86fefe413b mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Auto-merging scripts/basic/bin2c.c +Removing mm/fremap.c +Merge made by the 'recursive' strategy. + CREDITS | 7 + + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/filesystems/vfat.txt | 10 + + Documentation/vm/ksm.txt | 7 + + Documentation/vm/remap_file_pages.txt | 7 +- + MAINTAINERS | 73 +- + arch/arm/Kconfig | 2 + + arch/arm/mach-omap2/board-omap3touchbook.c | 2 +- + arch/arm/mach-omap2/mux.c | 22 +- + arch/arm/mach-pxa/balloon3.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-s3c24xx/mach-jive.c | 2 +- + arch/arm/mach-w90x900/cpu.c | 3 +- + arch/arm64/include/asm/page.h | 3 - + arch/arm64/kernel/vdso.c | 19 - + arch/ia64/Kconfig | 2 + + arch/ia64/include/asm/page.h | 2 + + arch/ia64/mm/init.c | 31 + + arch/m68k/Kconfig | 2 + + arch/mips/Kconfig | 2 + + arch/powerpc/Kconfig | 2 + + arch/powerpc/include/asm/page.h | 3 - + arch/powerpc/kernel/setup_64.c | 6 +- + arch/powerpc/kernel/vdso.c | 16 - + arch/powerpc/kernel/vio.c | 2 +- + arch/powerpc/platforms/pseries/dlpar.c | 4 +- + arch/powerpc/platforms/pseries/mobility.c | 2 +- + arch/s390/Kconfig | 2 + + arch/s390/include/asm/page.h | 2 - + arch/s390/kernel/vdso.c | 15 - + arch/sh/Kconfig | 2 + + arch/sh/include/asm/page.h | 5 - + arch/sh/kernel/vsyscall/vsyscall.c | 15 - + arch/tile/Kconfig | 2 + + arch/tile/include/asm/page.h | 6 - + arch/tile/kernel/vdso.c | 15 - + arch/um/include/asm/page.h | 5 + + arch/x86/Kbuild | 4 + + arch/x86/Kconfig | 25 + + arch/x86/Makefile | 8 + + arch/x86/include/asm/crash.h | 9 + + arch/x86/include/asm/kexec-bzimage64.h | 6 + + arch/x86/include/asm/kexec.h | 45 + + arch/x86/include/asm/page.h | 1 - + arch/x86/include/asm/page_64.h | 2 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- + arch/x86/kernel/cpu/mcheck/mce.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +- + arch/x86/kernel/crash.c | 563 +++++++++ + arch/x86/kernel/kexec-bzimage64.c | 553 ++++++++ + arch/x86/kernel/machine_kexec_64.c | 239 ++++ + arch/x86/kvm/mmu_audit.c | 2 +- + arch/x86/platform/uv/tlb_uv.c | 2 +- + arch/x86/purgatory/Makefile | 30 + + arch/x86/purgatory/entry64.S | 101 ++ + arch/x86/purgatory/purgatory.c | 72 ++ + arch/x86/purgatory/setup-x86_64.S | 58 + + arch/x86/purgatory/sha256.c | 283 +++++ + arch/x86/purgatory/sha256.h | 22 + + arch/x86/purgatory/stack.S | 19 + + arch/x86/purgatory/string.c | 13 + + arch/x86/syscalls/syscall_32.tbl | 1 + + arch/x86/syscalls/syscall_64.tbl | 2 + + arch/x86/um/asm/elf.h | 1 - + arch/x86/um/mem_64.c | 15 - + arch/x86/vdso/vdso2c.h | 12 +- + arch/x86/vdso/vdso32-setup.c | 19 +- + drivers/atm/he.c | 31 +- + drivers/atm/idt77252.c | 15 +- + drivers/block/DAC960.c | 18 +- + drivers/block/cciss.c | 11 +- + drivers/block/skd_main.c | 25 +- + drivers/crypto/hifn_795x.c | 5 +- + drivers/firmware/efi/runtime-map.c | 21 + + drivers/gpio/gpio-zevio.c | 4 + + drivers/gpu/drm/i810/i810_dma.c | 5 +- + drivers/infiniband/hw/amso1100/c2.c | 6 +- + drivers/infiniband/hw/nes/nes_hw.c | 12 +- + drivers/infiniband/hw/nes/nes_verbs.c | 5 +- + drivers/media/common/saa7146/saa7146_core.c | 15 +- + drivers/media/common/saa7146/saa7146_fops.c | 5 +- + drivers/media/pci/bt8xx/bt878.c | 16 +- + drivers/media/pci/ngene/ngene-core.c | 7 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 11 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 11 +- + drivers/net/ethernet/amd/pcnet32.c | 45 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 7 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 8 +- + drivers/net/ethernet/marvell/sky2.c | 5 +- + drivers/net/ethernet/micrel/ksz884x.c | 7 +- + .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 4 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 11 +- + drivers/net/irda/vlsi_ir.c | 4 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 16 +- + drivers/net/wireless/mwl8k.c | 6 +- + drivers/net/wireless/rtl818x/rtl8180/dev.c | 11 +- + drivers/net/wireless/rtlwifi/pci.c | 17 +- + drivers/scsi/3w-sas.c | 5 +- + drivers/scsi/a100u2w.c | 8 +- + drivers/scsi/be2iscsi/be_main.c | 10 +- + drivers/scsi/be2iscsi/be_mgmt.c | 3 +- + drivers/scsi/csiostor/csio_wr.c | 8 +- + drivers/scsi/eata.c | 5 +- + drivers/scsi/hpsa.c | 8 +- + drivers/scsi/megaraid/megaraid_mbox.c | 16 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 8 +- + drivers/scsi/mesh.c | 6 +- + drivers/scsi/mvumi.c | 9 +- + drivers/scsi/pm8001/pm8001_sas.c | 5 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/scsi_sysfs.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 15 +- + drivers/staging/rtl8192ee/pci.c | 37 +- + drivers/staging/rtl8821ae/pci.c | 36 +- + drivers/staging/slicoss/slicoss.c | 9 +- + drivers/staging/vt6655/device_main.c | 40 +- + drivers/tty/synclink_gt.c | 5 +- + drivers/vme/bridges/vme_ca91cx42.c | 6 +- + drivers/vme/bridges/vme_tsi148.c | 6 +- + drivers/w1/w1_int.c | 3 +- + fs/dlm/plock.c | 34 +- + fs/fat/cache.c | 70 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 78 +- + fs/fat/inode.c | 87 +- + fs/fcntl.c | 5 + + fs/inode.c | 1 + + fs/lockd/svclock.c | 12 +- + include/asm-generic/pci-dma-compat.h | 8 + + include/linux/efi.h | 19 + + include/linux/fs.h | 1238 +++++++++--------- + include/linux/ioport.h | 6 + + include/linux/kernel.h | 4 - + include/linux/kexec.h | 104 +- + include/linux/mm.h | 17 +- + include/linux/sched.h | 2 + + include/linux/shmem_fs.h | 17 + + include/linux/syscalls.h | 5 + + include/uapi/linux/fcntl.h | 15 + + include/uapi/linux/kexec.h | 11 + + include/uapi/linux/memfd.h | 8 + + init/Kconfig | 5 + + init/main.c | 23 +- + kernel/Makefile | 2 +- + kernel/fork.c | 2 +- + kernel/kexec.c | 1335 +++++++++++++++++--- + kernel/kprobes.c | 36 +- + kernel/resource.c | 101 +- + kernel/sys_ni.c | 2 + + kernel/time/posix-timers.c | 57 +- + kernel/time/timer.c | 27 +- + mm/Makefile | 2 +- + mm/backing-dev.c | 35 + + mm/fremap.c | 283 ----- + mm/ksm.c | 41 +- + mm/memory.c | 38 - + mm/mmap.c | 99 +- + mm/nommu.c | 13 - + mm/shmem.c | 324 +++++ + mm/swap_state.c | 1 + + scripts/.gitignore | 1 - + scripts/Makefile | 1 - + scripts/basic/.gitignore | 1 + + scripts/basic/Makefile | 1 + + scripts/{ => basic}/bin2c.c | 7 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/memfd/.gitignore | 4 + + tools/testing/selftests/memfd/Makefile | 41 + + tools/testing/selftests/memfd/fuse_mnt.c | 110 ++ + tools/testing/selftests/memfd/fuse_test.c | 311 +++++ + tools/testing/selftests/memfd/memfd_test.c | 913 +++++++++++++ + tools/testing/selftests/memfd/run_fuse_test.sh | 14 + + 173 files changed, 6808 insertions(+), 1824 deletions(-) + create mode 100644 arch/x86/include/asm/crash.h + create mode 100644 arch/x86/include/asm/kexec-bzimage64.h + create mode 100644 arch/x86/kernel/kexec-bzimage64.c + create mode 100644 arch/x86/purgatory/Makefile + create mode 100644 arch/x86/purgatory/entry64.S + create mode 100644 arch/x86/purgatory/purgatory.c + create mode 100644 arch/x86/purgatory/setup-x86_64.S + create mode 100644 arch/x86/purgatory/sha256.c + create mode 100644 arch/x86/purgatory/sha256.h + create mode 100644 arch/x86/purgatory/stack.S + create mode 100644 arch/x86/purgatory/string.c + create mode 100644 include/uapi/linux/memfd.h + delete mode 100644 mm/fremap.c + rename scripts/{ => basic}/bin2c.c (88%) + create mode 100644 tools/testing/selftests/memfd/.gitignore + create mode 100644 tools/testing/selftests/memfd/Makefile + create mode 100644 tools/testing/selftests/memfd/fuse_mnt.c + create mode 100644 tools/testing/selftests/memfd/fuse_test.c + create mode 100644 tools/testing/selftests/memfd/memfd_test.c + create mode 100644 tools/testing/selftests/memfd/run_fuse_test.sh diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..cb21af3c9510 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.16-rc5 +Unchanged quilt series rd-docs diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..1775c26ef90b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20140807 |