diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-11 15:42:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-11 15:42:42 +1000 |
| commit | aae7e72770e75daae4a713c3a4ef127a8480ba61 (patch) | |
| tree | 7db2efe21c10efac1c14a43dc907690cc693a576 | |
| parent | a156ad5e71cdaad0e761a046a935bfd710543885 (diff) | |
Add linux-next specific files for 20140811next-20140811
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 222 | ||||
| -rw-r--r-- | Next/Trees | 224 | ||||
| -rw-r--r-- | Next/merge.log | 5482 | ||||
| -rw-r--r-- | Next/quilt-import.log | 5 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5934 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..24f2eac9e327 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,222 @@ +Name SHA1 +---- ---- +origin 58d08e3b2c2033354b91467da33deffa06360c28 +fixes 23cf8d3ca0fd2cabd0e441fe09a4e8c58b9a0563 +kbuild-current dd5a6752ae7df4e0ba6ce3bcd0c3b4489bb3537f +arc-current 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd +arm-current e57e41931134e09fc6c03c8d4eb19d516cc6e59b +m68k-current 9117710a5997eb078035052800a31b77d47e0e5a +metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1 +mips-fixes 08a9c3c9afcf6e8975fc1c9a97e871e6a039c25a +powerpc-merge 396a34340cdf7373c00e3977db27d1a20ea65ebc +sparc caa9199b0efda9fb45f6cf5b5dd5d1be79337d7e +net 2b162928afeac2448c790bdf46f9f7f88ac8f3f4 +ipsec a0e5ef53aac8e5049f9344857d8ec5237d31e58b +sound-current e24aa0a4c5ac92a171d9dd74a8d3dbf652990d36 +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 c309bfa9b481e7dbd3e1ab819271bf3009f44859 +char-misc.current c489d98c8c81a898cfed6bec193cca2006f956aa +input-current c704b4ef1a819b053fd33617e861da1932077314 +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 2a5e95d4181c3f177a41b7c141a816859478c4d7 +arm e57e41931134e09fc6c03c8d4eb19d516cc6e59b +arm-perf 4c834452aad01531db949414f94f817a86348d59 +arm-soc 74f9f3185b8022259d65869289c637c548c4b058 +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 5676d5bfb93b3b8278f1e7e6b8776bac35d82465 +mips 475d5928b79bb78326a645863d46ff95c5e25e5a +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 64aa90f26c06e1cb2aacfb98a7d0eccfbd6c1a91 +powerpc 537e5400a0a05c4efe70e7b372c19cfcd0179362 +fsl 78eb9094ca08a40b8f9d3e113a2b88e0b7dbad1d +mpc5xxx bc75059422338197ce487d338ac9c898761e1e61 +s390 36e7fdaa1a04fcf65b864232e1af56a51c7814d6 +sparc-next 85417aef44fc58b08773117ceb1bc6ca5684e973 +tile ed93567c6fbcd2265ccbf5beea5aacf6c2f83d0f +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 4ed2ad38b3b4c45a5a5999454b02d3c21e75af5a +btrfs c7548af69d9ef71512eb52d8009521eba3e768fd +ceph d1a5fb9fecd4692e78bbf9452b73f4e5c35de4ab +cifs db238230875a6cf1ab0485d7ede4906d609abe18 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 04ec5f5c0022ee941615e304bc75853fe1bc94ba +ext3 20601c5299c88d96cd4e68b0d9d2bafeece16be1 +ext4 86f0afd463215fc3e58020493482faa4ac3a4d69 +f2fs 7f0d32e0c1a7a23216a0f2694ec841f60e9dddfd +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 c7f3888ad7f0932a87fb76e6e4edff2a90cc7920 +pci 981c191778a4f92bc82456205a444d522843a630 +hid 71095593b5d890f733c27b150ca0c78ac4696d3a +i2c 88a469fec24cd8dd071ad1f92290dc7bc98b667d +jdelvare-hwmon c7208164e66f63e3ec1759b98087849286410741 +hwmon-staging 6ddd855c13bcd324a2d9756134e6b57c659cfde6 +v4l-dvb d1352f268415182f9bfc06b142fb50083e5f6479 +kbuild 0eaeb361a8942eafa6028b0bf47ea3a9b3651a21 +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata 1824be15f7a41e539bbc34c0b3708100d9aa4825 +pm c6465dedd6f9f29a7899ad26402ba64b83fae45d +idle 5f08abf265fe9b229c5c0c4bda81e616ba930409 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 47d104ba5879790c7c91c3390b0b08399e168efe +ieee1394 d584a66279949561418c82b12bb4c055e6c25836 +dlm 883854c5457a97190f7b0ee20f03bcd9664fc0c2 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma a0bbe990c161ddf56444efe80d9d6e15fdc47aca +dmaengine fbeec99ad5c03060ba71c470ac373e24e23a80e0 +net-next 33caee39925b887a99a2400dc5c980097c3573f9 +ipsec-next 1759389e8af46d724220785bf710b7bdbebdfa48 +wireless-next dc6be9f54a4ecb0a09765d1f515ed947d86b7528 +bluetooth 37d4f72d76c801111e4beacba3463c1d33a61ef6 +infiniband 18e11d8d330b92b1546aff8e9403818f80c41520 +mtd 2a500afe1e0e84c7a126df693dbd01353756dcfa +l2-mtd 2a500afe1e0e84c7a126df693dbd01353756dcfa +crypto ce5481d01f67ad304908ec2113515440c0fa86eb +drm 7963e9db1b1f842fdc53309baa8714d38e9f5681 +drm-panel 9746c61960b63d2cea41333bca00c60f032052bb +drm-intel be71eabebaf9f142612d34d42292b454e984dcb5 +drm-tegra ef70728c7a6571a1a7115031e932b811f1740b2e +sound e24aa0a4c5ac92a171d9dd74a8d3dbf652990d36 +sound-asoc 1714b73910eda0a72b8fa5bd5bd83f1bb759e9bc +modules 76215b04fd297c008b91ece732ed36e67e0181fa +virtio eeec626366ffe558fc3d5685bd2b49a962acf57d +input 23526d94977af1b006bb8d14639f2f33a444db7b +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block 69c04606d9855732fc3b947a6af8bb52c734f9b3 +device-mapper de766aa201655ef8c4b272f8e352ec09d2daa608 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh f25c33724d1512a72554c0ad4cb70b43ba15374e +kgdb 6bedf31c25dd93c4f70a28e9ab94a239a5fb592c +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md d66b1b395a59027a1c054e1fc57d582cb4194491 +mfd 7caa79917ad4c1f91366b11f18e48623554aaa52 +backlight 87464cdba2aeec196e75908fbbeaf4a26753637a +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 9b936c960f22954bfb89f2fefd8f96916bb42908 +osd ce5d36aac26cc395fe3bc45525cdbad3644f01e5 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 51a7097426f2243e192df4979c2bf197e6f2ce61 +audit 3efe33f5d2da8bb38f4ca93d12ae4f69fedde32a +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree 6a31c02b33116cf2f06c45ccd94a75332d258f22 +dt-rh 99de64984c3a7c9bf56a50e6dcc51006c9485620 +spi 663f6e70853839f1e231d6356316854553c8824a +tip c3b35bef240a6f8e606de35aa0af65b4dd15c829 +clockevents 3252a646aa2cf706b2a26433a8bd9cb2e5dce410 +edac 50d1bb93672fa2f42cec6e06ce799fbe864f57e9 +edac-amd eba4bfb34d45a2219d1d7534905c026eea6fcd49 +irqchip c115d15552c011fdf3caf15792ce0c62e8837470 +ftrace 45ed695ac10a23cb4e60a3e0b68b3f21a8670670 +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 c309bfa9b481e7dbd3e1ab819271bf3009f44859 +char-misc c489d98c8c81a898cfed6bec193cca2006f956aa +cgroup abdfd21809f27c20720c10eeffb14b8fcf320ed3 +scsi ae87e8b212eda02503418657530a266ecb4a7180 +target-updates 4ca7ea3ceeb94819b01988d94ab593e07485b444 +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl e1ee5c578fb1fa24b7ccaf1a11237a2bd70b6f9a +vhost 970379f59d81edf78a319f9cdc1234730bcbe6b2 +remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323 +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio bdc6e95e1273b5cef01590273c1a240c53ceeea0 +dma-mapping f70e3c4f8b6ab61f713e040822ec51f5de498146 +pwm f6306299080bbb1a77ad39494203f5397a5c2630 +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 1795cd9b3a91d4b5473c97f491d63892442212ab +signal-cleanup b9f0fb2d4a7a034ee24f0a3d596fb731eb9bba72 +akpm-current 929c76e4e6292770322822a50e08b8feaa4afbbf +akpm 08a36266333be88de80e07b2e043ff8f3690f2ac diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2efcd1d01e95 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,224 @@ +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 +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..99464336c610 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5482 @@ +$ date +Monday 11 August 10:29:38 AEST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 66bb0aa07797 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm +Merging origin/master (58d08e3b2c20 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform) +$ git merge origin/master +Updating 66bb0aa07797..58d08e3b2c20 +Fast-forward + CREDITS | 7 + + Documentation/ABI/testing/sysfs-class-leds-gt683r | 16 + + Documentation/ABI/testing/sysfs-class-mtd | 38 + + Documentation/ABI/testing/sysfs-driver-tegra-fuse | 11 + + Documentation/ABI/testing/sysfs-driver-wacom | 70 +- + Documentation/ABI/testing/sysfs-fs-nilfs2 | 269 ++ + Documentation/DocBook/drm.tmpl | 89 +- + Documentation/SubmittingPatches | 38 +- + Documentation/arm/CCN.txt | 52 + + Documentation/arm/Marvell/README | 23 +- + Documentation/arm/Samsung/Overview.txt | 11 - + .../arm/Samsung/clksrc-change-registers.awk | 1 - + Documentation/cgroups/memcg_test.txt | 160 +- + 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/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 + + .../bindings/fuse/nvidia,tegra20-fuse.txt | 40 + + .../devicetree/bindings/gpio/gpio-zynq.txt | 26 + + .../devicetree/bindings/gpu/nvidia,gk20a.txt | 43 + + .../devicetree/bindings/gpu/st,stih4xx.txt | 189 ++ + .../devicetree/bindings/i2c/i2c-efm32.txt | 4 +- + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + .../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 + + Documentation/devicetree/bindings/leds/pca963x.txt | 9 +- + Documentation/devicetree/bindings/leds/tca6507.txt | 2 +- + 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/misc/nvidia,tegra20-apbmisc.txt | 13 + + .../devicetree/bindings/mtd/gpmi-nand.txt | 10 + + .../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 + + .../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 + + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 + + .../pinctrl/nvidia,tegra124-xusb-padctl.txt | 127 + + .../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 +- + .../devicetree/bindings/pwm/pwm-rockchip.txt | 20 + + Documentation/devicetree/bindings/pwm/pwm-st.txt | 41 + + .../bindings/regulator/s5m8767-regulator.txt | 2 +- + .../devicetree/bindings/serial/cdns,uart.txt | 20 + + .../devicetree/bindings/spi/spi-samsung.txt | 1 - + .../devicetree/bindings/vendor-prefixes.txt | 4 + + .../devicetree/bindings/video/arm,pl11x.txt | 109 + + .../devicetree/bindings/video/atmel,lcdc.txt | 1 + + .../bindings/video/cirrus,clps711x-fb.txt | 47 + + .../devicetree/bindings/video/exynos_dsim.txt | 4 +- + .../devicetree/bindings/video/exynos_mixer.txt | 5 +- + .../devicetree/bindings/video/samsung-fimd.txt | 30 +- + Documentation/filesystems/cifs/AUTHORS | 1 + + Documentation/filesystems/cifs/TODO | 97 +- + Documentation/gpio/board.txt | 2 +- + Documentation/gpio/consumer.txt | 26 +- + Documentation/gpio/driver.txt | 25 +- + Documentation/i2c/busses/i2c-i801 | 1 + + Documentation/i2c/i2c-stub | 23 +- + Documentation/ioctl/00-INDEX | 2 + + Documentation/ioctl/botching-up-ioctls.txt | 219 ++ + Documentation/laptops/freefall.c | 6 +- + Documentation/oops-tracing.txt | 2 + + Documentation/rapidio/tsi721.txt | 19 +- + Documentation/sysctl/kernel.txt | 1 + + MAINTAINERS | 190 +- + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/scatterlist.h | 6 - + 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 - + arch/arm/Kconfig | 98 +- + arch/arm/Kconfig.debug | 80 +- + arch/arm/Makefile | 10 +- + 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 | 75 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 613 ++++ + arch/arm/boot/dts/am43x-epos-evm.dts | 63 +- + 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 | 31 + + 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/exynos5.dtsi | 1 + + 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 | 25 +- + 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-pinfunc.h | 46 - + 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/Kbuild | 1 + + arch/arm/include/asm/gpio.h | 7 - + arch/arm/include/asm/scatterlist.h | 12 - + arch/arm/include/asm/unistd.h | 2 +- + arch/arm/include/debug/clps711x.S | 38 + + .../mach/debug-macro.S => include/debug/s5pv210.S} | 23 +- + arch/arm/include/uapi/asm/unistd.h | 2 + + arch/arm/kernel/calls.S | 2 + + arch/arm/kernel/smp.c | 70 +- + arch/arm/lib/delay.c | 26 +- + arch/arm/mach-at91/Kconfig | 4 - + arch/arm/mach-at91/at91rm9200.c | 6 +- + arch/arm/mach-at91/at91rm9200_devices.c | 2 +- + 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 | 279 +- + 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/board-omap3touchbook.c | 2 +- + 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 | 126 +- + 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 | 66 +- + 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 | 20 +- + 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/mux.c | 22 +- + 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/balloon3.c | 2 +- + 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-pxa/viper.c | 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 | 3 +- + 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 | 9 +- + 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/mach-w90x900/cpu.c | 3 +- + arch/arm/mm/Kconfig | 2 +- + arch/arm/mm/proc-v7-3level.S | 7 +- + 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/arm64/Kconfig | 1 + + arch/arm64/include/asm/page.h | 3 - + arch/arm64/include/asm/signal32.h | 11 +- + arch/arm64/kernel/signal.c | 58 +- + arch/arm64/kernel/signal32.c | 24 +- + arch/arm64/kernel/smp.c | 65 +- + arch/arm64/kernel/vdso.c | 19 - + 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/kernel/signal.c | 50 +- + arch/avr32/mach-at32ap/at32ap700x.c | 7 +- + 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/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/frv/kernel/signal.c | 112 +- + arch/hexagon/kernel/signal.c | 57 +- + arch/ia64/Kconfig | 3 + + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/include/asm/page.h | 2 + + arch/ia64/include/asm/scatterlist.h | 7 - + arch/ia64/include/asm/unistd.h | 2 +- + arch/ia64/include/uapi/asm/unistd.h | 1 + + arch/ia64/kernel/entry.S | 1 + + arch/ia64/kernel/signal.c | 46 +- + arch/ia64/kernel/time.c | 15 - + arch/ia64/mm/init.c | 31 + + arch/m32r/include/asm/Kbuild | 1 + + arch/m32r/include/asm/scatterlist.h | 6 - + arch/m32r/kernel/signal.c | 57 +- + arch/m68k/Kconfig | 2 + + arch/m68k/kernel/signal.c | 75 +- + arch/metag/kernel/signal.c | 10 +- + arch/microblaze/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/scatterlist.h | 1 - + arch/microblaze/kernel/signal.c | 55 +- + arch/mips/Kconfig | 2 + + arch/mips/include/asm/abi.h | 10 +- + arch/mips/jz4740/board-qi_lb60.c | 1 + + 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/include/asm/Kbuild | 1 + + arch/mn10300/include/asm/scatterlist.h | 16 - + arch/mn10300/kernel/signal.c | 102 +- + arch/openrisc/kernel/signal.c | 20 +- + arch/parisc/kernel/signal.c | 58 +- + arch/powerpc/Kconfig | 3 + + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/page.h | 3 - + arch/powerpc/include/asm/scatterlist.h | 17 - + arch/powerpc/kernel/setup_64.c | 6 +- + 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/powerpc/kernel/vdso.c | 16 - + arch/powerpc/kernel/vio.c | 2 +- + arch/powerpc/mm/dma-noncoherent.c | 1 + + arch/powerpc/platforms/44x/warp.c | 1 + + arch/powerpc/platforms/52xx/efika.c | 1 + + arch/powerpc/platforms/amigaone/setup.c | 1 + + arch/powerpc/platforms/pseries/dlpar.c | 4 +- + arch/powerpc/platforms/pseries/mobility.c | 2 +- + arch/s390/Kconfig | 3 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/page.h | 2 - + arch/s390/include/asm/scatterlist.h | 3 - + arch/s390/kernel/compat_signal.c | 79 +- + arch/s390/kernel/entry.h | 4 +- + arch/s390/kernel/signal.c | 78 +- + arch/s390/kernel/vdso.c | 15 - + arch/score/include/asm/Kbuild | 1 + + arch/score/include/asm/scatterlist.h | 6 - + arch/score/kernel/signal.c | 43 +- + arch/sh/Kconfig | 2 + + arch/sh/include/asm/page.h | 5 - + arch/sh/kernel/signal_32.c | 79 +- + arch/sh/kernel/signal_64.c | 82 +- + arch/sh/kernel/vsyscall/vsyscall.c | 15 - + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/scatterlist.h | 8 - + arch/tile/Kconfig | 2 + + arch/tile/include/asm/compat.h | 3 +- + arch/tile/include/asm/hardwall.h | 2 +- + arch/tile/include/asm/page.h | 6 - + arch/tile/kernel/compat_signal.c | 29 +- + arch/tile/kernel/hardwall.c | 6 +- + arch/tile/kernel/signal.c | 54 +- + arch/tile/kernel/vdso.c | 15 - + arch/um/include/asm/Kbuild | 1 + + arch/um/include/asm/page.h | 5 + + arch/um/include/shared/frame_kern.h | 12 +- + arch/um/kernel/signal.c | 27 +- + arch/unicore32/kernel/signal.c | 48 +- + arch/x86/Kbuild | 4 + + arch/x86/Kconfig | 26 + + arch/x86/Makefile | 8 + + arch/x86/include/asm/Kbuild | 3 +- + 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/include/asm/scatterlist.h | 8 - + 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/um/signal.c | 45 +- + arch/x86/vdso/vdso32-setup.c | 19 +- + arch/xtensa/kernel/signal.c | 43 +- + crypto/zlib.c | 8 +- + drivers/amba/tegra-ahb.c | 3 +- + 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/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/char/agp/frontend.c | 15 - + 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-exynos.c | 25 +- + drivers/cpuidle/cpuidle-mvebu-v7.c | 150 + + drivers/crypto/hifn_795x.c | 5 +- + drivers/firmware/efi/runtime-map.c | 21 + + drivers/gpio/Kconfig | 23 +- + drivers/gpio/Makefile | 4 + + 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-crystalcove.c | 380 +++ + 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-samsung.c | 965 ------ + 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 +- + 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 | 604 +++- + 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 | 1190 +++++--- + 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 | 85 +- + 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 | 1 + + drivers/gpu/drm/drm_mipi_dsi.c | 14 +- + 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 | 2 + + drivers/gpu/drm/exynos/exynos_dp_core.c | 117 +- + drivers/gpu/drm/exynos/exynos_dp_core.h | 3 +- + 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 | 12 +- + 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 | 285 +- + 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/i810/i810_dma.c | 5 +- + 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 | 70 +- + drivers/gpu/drm/i915/i915_drv.h | 190 +- + drivers/gpu/drm/i915/i915_gem.c | 95 +- + drivers/gpu/drm/i915/i915_gem_context.c | 149 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 308 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 64 +- + 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 | 122 +- + drivers/gpu/drm/i915/i915_irq.c | 639 +++- + drivers/gpu/drm/i915/i915_params.c | 11 + + drivers/gpu/drm/i915/i915_reg.h | 550 ++-- + drivers/gpu/drm/i915/i915_sysfs.c | 57 +- + drivers/gpu/drm/i915/intel_bios.c | 5 +- + drivers/gpu/drm/i915/intel_crt.c | 38 +- + drivers/gpu/drm/i915/intel_ddi.c | 474 ++- + drivers/gpu/drm/i915/intel_display.c | 1469 +++++++--- + drivers/gpu/drm/i915/intel_dp.c | 743 +++-- + drivers/gpu/drm/i915/intel_dp_mst.c | 548 ++++ + drivers/gpu/drm/i915/intel_drv.h | 155 +- + drivers/gpu/drm/i915/intel_dsi.c | 57 +- + drivers/gpu/drm/i915/intel_dsi.h | 1 + + drivers/gpu/drm/i915/intel_dsi_cmd.c | 16 + + drivers/gpu/drm/i915/intel_dsi_cmd.h | 1 + + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 8 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 81 + + 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 | 938 ++++-- + 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 | 491 +++- + drivers/gpu/drm/i915/intel_ringbuffer.h | 92 +- + 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/Kconfig | 12 +- + drivers/gpu/drm/nouveau/Makefile | 25 +- + drivers/gpu/drm/nouveau/core/core/client.c | 162 +- + drivers/gpu/drm/nouveau/core/core/event.c | 176 +- + drivers/gpu/drm/nouveau/core/core/handle.c | 115 +- + drivers/gpu/drm/nouveau/core/core/ioctl.c | 531 ++++ + drivers/gpu/drm/nouveau/core/core/notify.c | 167 ++ + drivers/gpu/drm/nouveau/core/core/object.c | 154 +- + drivers/gpu/drm/nouveau/core/core/parent.c | 33 + + drivers/gpu/drm/nouveau/core/engine/copy/nva3.c | 1 - + drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c | 2 - + drivers/gpu/drm/nouveau/core/engine/copy/nve0.c | 1 - + drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c | 1 - + drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c | 1 - + drivers/gpu/drm/nouveau/core/engine/device/acpi.c | 59 + + drivers/gpu/drm/nouveau/core/engine/device/acpi.h | 9 + + drivers/gpu/drm/nouveau/core/engine/device/base.c | 396 ++- + drivers/gpu/drm/nouveau/core/engine/device/ctrl.c | 153 +- + drivers/gpu/drm/nouveau/core/engine/device/gm100.c | 10 +- + drivers/gpu/drm/nouveau/core/engine/device/nv04.c | 4 +- + drivers/gpu/drm/nouveau/core/engine/device/nv10.c | 16 +- + drivers/gpu/drm/nouveau/core/engine/device/nv20.c | 8 +- + drivers/gpu/drm/nouveau/core/engine/device/nv30.c | 10 +- + drivers/gpu/drm/nouveau/core/engine/device/nv40.c | 32 +- + drivers/gpu/drm/nouveau/core/engine/device/nv50.c | 36 +- + drivers/gpu/drm/nouveau/core/engine/device/nvc0.c | 54 +- + drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 49 +- + drivers/gpu/drm/nouveau/core/engine/disp/base.c | 96 +- + drivers/gpu/drm/nouveau/core/engine/disp/conn.c | 63 +- + drivers/gpu/drm/nouveau/core/engine/disp/conn.h | 5 +- + drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 85 +- + drivers/gpu/drm/nouveau/core/engine/disp/dport.c | 8 +- + drivers/gpu/drm/nouveau/core/engine/disp/gm107.c | 16 +- + drivers/gpu/drm/nouveau/core/engine/disp/hdanva3.c | 28 +- + drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c | 28 +- + .../gpu/drm/nouveau/core/engine/disp/hdminv84.c | 31 +- + .../gpu/drm/nouveau/core/engine/disp/hdminva3.c | 33 +- + .../gpu/drm/nouveau/core/engine/disp/hdminvd0.c | 30 +- + drivers/gpu/drm/nouveau/core/engine/disp/nv04.c | 137 +- + drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 477 ++- + drivers/gpu/drm/nouveau/core/engine/disp/nv50.h | 131 +- + drivers/gpu/drm/nouveau/core/engine/disp/nv84.c | 30 +- + drivers/gpu/drm/nouveau/core/engine/disp/nv94.c | 31 +- + drivers/gpu/drm/nouveau/core/engine/disp/nva0.c | 16 +- + drivers/gpu/drm/nouveau/core/engine/disp/nva3.c | 32 +- + drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 380 +-- + drivers/gpu/drm/nouveau/core/engine/disp/nve0.c | 16 +- + drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c | 16 +- + drivers/gpu/drm/nouveau/core/engine/disp/outp.c | 1 + + drivers/gpu/drm/nouveau/core/engine/disp/outp.h | 1 + + drivers/gpu/drm/nouveau/core/engine/disp/outpdp.c | 100 +- + drivers/gpu/drm/nouveau/core/engine/disp/outpdp.h | 5 +- + .../gpu/drm/nouveau/core/engine/disp/piornv50.c | 56 +- + drivers/gpu/drm/nouveau/core/engine/disp/priv.h | 5 + + drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c | 88 +- + drivers/gpu/drm/nouveau/core/engine/disp/sornv94.c | 1 - + drivers/gpu/drm/nouveau/core/engine/disp/sornvd0.c | 1 - + drivers/gpu/drm/nouveau/core/engine/dmaobj/base.c | 157 +- + drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c | 160 +- + drivers/gpu/drm/nouveau/core/engine/dmaobj/nv50.c | 210 +- + drivers/gpu/drm/nouveau/core/engine/dmaobj/nvc0.c | 170 +- + drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c | 157 +- + drivers/gpu/drm/nouveau/core/engine/dmaobj/priv.h | 30 + + drivers/gpu/drm/nouveau/core/engine/fifo/base.c | 113 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c | 32 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c | 30 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c | 30 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c | 30 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c | 58 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c | 83 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c | 58 +- + drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c | 64 +- + .../gpu/drm/nouveau/core/engine/graph/ctxgk110b.c | 104 + + .../gpu/drm/nouveau/core/engine/graph/ctxgk20a.c | 12 +- + .../gpu/drm/nouveau/core/engine/graph/ctxgm107.c | 121 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnv108.c | 56 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvc0.c | 123 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvc0.h | 65 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvc1.c | 64 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvc4.c | 8 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvc8.c | 8 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvd7.c | 81 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvd9.c | 10 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnve4.c | 85 +- + .../gpu/drm/nouveau/core/engine/graph/ctxnvf0.c | 74 +- + drivers/gpu/drm/nouveau/core/engine/graph/gk110b.c | 117 + + drivers/gpu/drm/nouveau/core/engine/graph/gk20a.c | 7 +- + drivers/gpu/drm/nouveau/core/engine/graph/gm107.c | 8 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv04.c | 1 - + drivers/gpu/drm/nouveau/core/engine/graph/nv10.c | 1 - + drivers/gpu/drm/nouveau/core/engine/graph/nv108.c | 3 +- + drivers/gpu/drm/nouveau/core/engine/graph/nv20.c | 1 - + drivers/gpu/drm/nouveau/core/engine/graph/nv25.c | 1 - + drivers/gpu/drm/nouveau/core/engine/graph/nv2a.c | 1 - + drivers/gpu/drm/nouveau/core/engine/graph/nv30.c | 1 - + drivers/gpu/drm/nouveau/core/engine/graph/nv34.c | 1 - + drivers/gpu/drm/nouveau/core/engine/graph/nv35.c | 1 - + drivers/gpu/drm/nouveau/core/engine/graph/nv40.c | 1 - + drivers/gpu/drm/nouveau/core/engine/graph/nv50.c | 1 - + drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | 265 +- + drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h | 40 +- + drivers/gpu/drm/nouveau/core/engine/graph/nvc1.c | 6 +- + drivers/gpu/drm/nouveau/core/engine/graph/nvc8.c | 8 +- + drivers/gpu/drm/nouveau/core/engine/graph/nvd7.c | 1 + + drivers/gpu/drm/nouveau/core/engine/graph/nve4.c | 39 +- + drivers/gpu/drm/nouveau/core/engine/graph/nvf0.c | 17 +- + drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c | 1 - + drivers/gpu/drm/nouveau/core/engine/mpeg/nv40.c | 1 - + drivers/gpu/drm/nouveau/core/engine/mpeg/nv44.c | 1 - + drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c | 1 - + drivers/gpu/drm/nouveau/core/engine/mpeg/nv84.c | 1 - + drivers/gpu/drm/nouveau/core/engine/perfmon/base.c | 128 +- + .../gpu/drm/nouveau/core/engine/software/nv04.c | 1 - + .../gpu/drm/nouveau/core/engine/software/nv10.c | 1 - + .../gpu/drm/nouveau/core/engine/software/nv50.c | 39 +- + .../gpu/drm/nouveau/core/engine/software/nv50.h | 5 +- + .../gpu/drm/nouveau/core/engine/software/nvc0.c | 10 +- + drivers/gpu/drm/nouveau/core/include/core/class.h | 470 --- + drivers/gpu/drm/nouveau/core/include/core/client.h | 11 + + drivers/gpu/drm/nouveau/core/include/core/device.h | 18 +- + drivers/gpu/drm/nouveau/core/include/core/event.h | 51 +- + drivers/gpu/drm/nouveau/core/include/core/handle.h | 8 + + drivers/gpu/drm/nouveau/core/include/core/ioctl.h | 6 + + drivers/gpu/drm/nouveau/core/include/core/notify.h | 36 + + drivers/gpu/drm/nouveau/core/include/core/object.h | 29 +- + drivers/gpu/drm/nouveau/core/include/core/parent.h | 1 + + drivers/gpu/drm/nouveau/core/include/core/printk.h | 1 + + drivers/gpu/drm/nouveau/core/include/engine/disp.h | 11 +- + .../gpu/drm/nouveau/core/include/engine/dmaobj.h | 27 +- + drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 11 +- + .../gpu/drm/nouveau/core/include/engine/graph.h | 1 + + .../gpu/drm/nouveau/core/include/engine/perfmon.h | 1 - + drivers/gpu/drm/nouveau/core/include/nvif/class.h | 1 + + drivers/gpu/drm/nouveau/core/include/nvif/event.h | 1 + + drivers/gpu/drm/nouveau/core/include/nvif/ioctl.h | 1 + + drivers/gpu/drm/nouveau/core/include/nvif/unpack.h | 1 + + drivers/gpu/drm/nouveau/core/include/subdev/bar.h | 4 + + .../gpu/drm/nouveau/core/include/subdev/clock.h | 30 +- + drivers/gpu/drm/nouveau/core/include/subdev/gpio.h | 16 +- + drivers/gpu/drm/nouveau/core/include/subdev/i2c.h | 23 +- + drivers/gpu/drm/nouveau/core/include/subdev/ltc.h | 35 + + drivers/gpu/drm/nouveau/core/include/subdev/ltcg.h | 41 - + drivers/gpu/drm/nouveau/core/include/subdev/mc.h | 31 +- + drivers/gpu/drm/nouveau/core/include/subdev/pwr.h | 43 +- + drivers/gpu/drm/nouveau/core/os.h | 2 + + drivers/gpu/drm/nouveau/core/subdev/bar/gk20a.c | 54 + + drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c | 6 +- + drivers/gpu/drm/nouveau/core/subdev/bar/priv.h | 6 + + drivers/gpu/drm/nouveau/core/subdev/clock/base.c | 197 +- + drivers/gpu/drm/nouveau/core/subdev/clock/gk20a.c | 665 +++++ + drivers/gpu/drm/nouveau/core/subdev/clock/nv04.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/clock/nv40.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/clock/nv50.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/clock/nvaa.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/clock/nve0.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c | 11 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c | 9 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c | 10 +- + drivers/gpu/drm/nouveau/core/subdev/gpio/base.c | 50 +- + drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | 45 +- + drivers/gpu/drm/nouveau/core/subdev/ltc/base.c | 126 + + .../drm/nouveau/core/subdev/{ltcg => ltc}/gf100.c | 165 +- + drivers/gpu/drm/nouveau/core/subdev/ltc/gk104.c | 58 + + .../drm/nouveau/core/subdev/{ltcg => ltc}/gm107.c | 121 +- + drivers/gpu/drm/nouveau/core/subdev/ltc/priv.h | 69 + + drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.h | 21 - + drivers/gpu/drm/nouveau/core/subdev/mc/base.c | 12 +- + drivers/gpu/drm/nouveau/core/subdev/mc/gk20a.c | 38 + + drivers/gpu/drm/nouveau/core/subdev/mc/nv04.h | 2 +- + drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c | 9 +- + drivers/gpu/drm/nouveau/core/subdev/mc/nvc3.c | 1 + + drivers/gpu/drm/nouveau/core/subdev/mc/priv.h | 38 + + drivers/gpu/drm/nouveau/core/subdev/pwr/base.c | 33 +- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/macros.fuc | 2 +- + .../drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h | 658 ++--- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h | 222 +- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h | 222 +- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h | 222 +- + drivers/gpu/drm/nouveau/core/subdev/pwr/gk104.c | 69 + + drivers/gpu/drm/nouveau/core/subdev/pwr/memx.c | 3 +- + drivers/gpu/drm/nouveau/core/subdev/pwr/nv108.c | 43 +- + drivers/gpu/drm/nouveau/core/subdev/pwr/nva3.c | 51 +- + drivers/gpu/drm/nouveau/core/subdev/pwr/nvc0.c | 43 +- + drivers/gpu/drm/nouveau/core/subdev/pwr/nvd0.c | 43 +- + drivers/gpu/drm/nouveau/core/subdev/pwr/priv.h | 44 + + drivers/gpu/drm/nouveau/core/subdev/vm/nvc0.c | 8 +- + drivers/gpu/drm/nouveau/dispnv04/arb.c | 12 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 42 +- + drivers/gpu/drm/nouveau/dispnv04/cursor.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/dac.c | 54 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 14 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 12 +- + drivers/gpu/drm/nouveau/dispnv04/disp.h | 8 +- + drivers/gpu/drm/nouveau/dispnv04/hw.c | 114 +- + drivers/gpu/drm/nouveau/dispnv04/hw.h | 84 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 120 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 6 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 27 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.h | 8 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 246 +- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_agp.c | 33 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 57 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 41 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 149 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 246 +- + drivers/gpu/drm/nouveau/nouveau_chan.h | 21 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 80 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 10 +- + drivers/gpu/drm/nouveau/nouveau_crtc.h | 5 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 289 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 10 +- + drivers/gpu/drm/nouveau/nouveau_dma.c | 13 +- + drivers/gpu/drm/nouveau/nouveau_dma.h | 21 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 5 - + drivers/gpu/drm/nouveau/nouveau_drm.c | 307 +- + drivers/gpu/drm/nouveau/nouveau_drm.h | 70 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 142 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 11 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 37 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 88 +- + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 58 +- + drivers/gpu/drm/nouveau/nouveau_nvif.c | 136 + + drivers/gpu/drm/nouveau/nouveau_platform.c | 182 ++ + drivers/gpu/drm/nouveau/nouveau_platform.h | 49 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_sysfs.c | 88 +- + drivers/gpu/drm/nouveau/nouveau_sysfs.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 41 +- + drivers/gpu/drm/nouveau/nouveau_usif.c | 384 +++ + drivers/gpu/drm/nouveau/nouveau_usif.h | 9 + + drivers/gpu/drm/nouveau/nouveau_vga.c | 14 +- + drivers/gpu/drm/nouveau/nv04_fbcon.c | 59 +- + drivers/gpu/drm/nouveau/nv04_fence.c | 4 +- + drivers/gpu/drm/nouveau/nv10_fence.c | 9 +- + drivers/gpu/drm/nouveau/nv10_fence.h | 3 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 28 +- + drivers/gpu/drm/nouveau/nv50_display.c | 920 +++--- + drivers/gpu/drm/nouveau/nv50_fbcon.c | 13 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 31 +- + drivers/gpu/drm/nouveau/nv84_fence.c | 36 +- + drivers/gpu/drm/nouveau/nvc0_fbcon.c | 7 +- + drivers/gpu/drm/nouveau/nvc0_fence.c | 6 - + drivers/gpu/drm/nouveau/nvif/class.h | 558 ++++ + drivers/gpu/drm/nouveau/nvif/client.c | 129 + + drivers/gpu/drm/nouveau/nvif/client.h | 39 + + drivers/gpu/drm/nouveau/nvif/device.c | 78 + + drivers/gpu/drm/nouveau/nvif/device.h | 62 + + drivers/gpu/drm/nouveau/nvif/driver.h | 21 + + drivers/gpu/drm/nouveau/nvif/event.h | 62 + + drivers/gpu/drm/nouveau/nvif/ioctl.h | 128 + + drivers/gpu/drm/nouveau/nvif/list.h | 353 +++ + drivers/gpu/drm/nouveau/nvif/notify.c | 237 ++ + drivers/gpu/drm/nouveau/nvif/notify.h | 39 + + drivers/gpu/drm/nouveau/nvif/object.c | 302 ++ + drivers/gpu/drm/nouveau/nvif/object.h | 75 + + drivers/gpu/drm/nouveau/nvif/os.h | 1 + + drivers/gpu/drm/nouveau/nvif/unpack.h | 24 + + drivers/gpu/drm/omapdrm/omap_connector.c | 16 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 8 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 27 + + 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/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 | 203 +- + 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/dc.c | 123 +- + drivers/gpu/drm/tegra/dc.h | 5 + + drivers/gpu/drm/tegra/dpaux.c | 1 + + drivers/gpu/drm/tegra/drm.c | 216 +- + drivers/gpu/drm/tegra/drm.h | 11 +- + drivers/gpu/drm/tegra/dsi.c | 4 +- + drivers/gpu/drm/tegra/fb.c | 66 +- + 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 | 4 +- + drivers/gpu/drm/tegra/hdmi.c | 1 + + drivers/gpu/drm/tegra/output.c | 6 +- + drivers/gpu/drm/tegra/sor.c | 24 +- + 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 | 36 +- + drivers/gpu/drm/ttm/ttm_tt.c | 13 +- + 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 | 9 +- + 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/host1x/job.c | 22 +- + drivers/gpu/vga/vgaarb.c | 40 +- + drivers/hid/Kconfig | 27 +- + drivers/hid/Makefile | 5 +- + drivers/hid/hid-core.c | 13 +- + drivers/hid/hid-gt683r.c | 321 ++ + drivers/hid/hid-ids.h | 2 +- + drivers/hid/hid-wacom.c | 973 ------ + drivers/hid/usbhid/hid-quirks.c | 2 +- + drivers/{input/tablet => hid}/wacom.h | 27 +- + drivers/{input/tablet => hid}/wacom_sys.c | 1229 ++++---- + drivers/{input/tablet => hid}/wacom_wac.c | 1176 +++++--- + drivers/{input/tablet => hid}/wacom_wac.h | 22 +- + 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-cros-ec-tunnel.c | 17 +- + 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-mpc.c | 3 +- + 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-rk3x.c | 2 +- + 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 + + drivers/infiniband/hw/amso1100/c2.c | 6 +- + drivers/infiniband/hw/nes/nes_hw.c | 12 +- + drivers/infiniband/hw/nes/nes_verbs.c | 5 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/cap1106.c | 335 +++ + drivers/input/keyboard/cros_ec_keyb.c | 70 +- + drivers/input/keyboard/imx_keypad.c | 6 +- + drivers/input/keyboard/lm8323.c | 22 +- + 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 | 18 +- + drivers/input/tablet/Makefile | 4 +- + 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/iommu/tegra-smmu.c | 3 +- + drivers/irqchip/Kconfig | 1 - + drivers/irqchip/irq-versatile-fpga.c | 18 +- + drivers/leds/Kconfig | 15 +- + drivers/leds/Makefile | 2 +- + drivers/leds/led-class.c | 19 +- + drivers/leds/led-core.c | 11 +- + drivers/leds/leds-atmel-pwm.c | 149 - + 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 +- + drivers/macintosh/via-pmu-backlight.c | 6 - + 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/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/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/misc/Kconfig | 10 - + drivers/misc/Makefile | 1 - + drivers/misc/atmel_pwm.c | 402 --- + drivers/misc/fuse/Makefile | 1 + + drivers/mmc/host/rtsx_pci_sdmmc.c | 133 +- + 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/onenand/Kconfig | 4 +- + drivers/mtd/onenand/samsung.c | 25 +- + drivers/mtd/spi-nor/spi-nor.c | 53 + + 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/parport/parport_ip32.c | 2 +- + 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 | 36 +- + drivers/phy/Makefile | 5 +- + 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 | 123 +- + drivers/pinctrl/Makefile | 25 +- + 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-xusb.c | 973 ++++++ + 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 +- + drivers/platform/chrome/chromeos_laptop.c | 144 +- + drivers/platform/chrome/chromeos_pstore.c | 14 +- + drivers/platform/x86/samsung-q10.c | 6 - + drivers/power/reset/Kconfig | 6 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/hisi-reboot.c | 67 + + drivers/pwm/Kconfig | 19 +- + drivers/pwm/Makefile | 2 + + drivers/pwm/pwm-imx.c | 1 + + drivers/pwm/pwm-lpss.c | 32 +- + drivers/pwm/pwm-rockchip.c | 264 ++ + drivers/pwm/pwm-sti.c | 418 +++ + drivers/pwm/pwm-tipwmss.c | 4 +- + drivers/rapidio/devices/tsi721.h | 12 +- + drivers/rapidio/devices/tsi721_dma.c | 718 ++--- + drivers/rapidio/rio.c | 66 +- + drivers/regulator/s2mps11.c | 321 +- + drivers/rtc/Kconfig | 29 +- + drivers/rtc/Makefile | 5 + + drivers/rtc/class.c | 16 +- + drivers/rtc/interface.c | 2 + + drivers/rtc/rtc-da9063.c | 54 +- + 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-max77686.c | 27 +- + drivers/rtc/rtc-pcf85063.c | 204 ++ + drivers/rtc/rtc-pcf8563.c | 231 +- + drivers/rtc/rtc-tps65910.c | 4 +- + 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/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/staging/imx-drm/imx-drm-core.c | 6 +- + 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/serial/samsung.c | 4 - + drivers/tty/synclink_gt.c | 5 +- + drivers/video/backlight/Kconfig | 20 +- + drivers/video/backlight/Makefile | 2 +- + drivers/video/backlight/aat2870_bl.c | 6 - + drivers/video/backlight/ams369fg06.c | 6 - + drivers/video/backlight/atmel-pwm-bl.c | 223 -- + 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/68328fb.c | 8 +- + drivers/video/fbdev/Kconfig | 33 +- + drivers/video/fbdev/Makefile | 4 +- + .../video/fbdev/amba-clcd-versatile.c | 2 +- + drivers/video/fbdev/amba-clcd.c | 263 ++ + drivers/video/fbdev/atmel_lcdfb.c | 3 +- + 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/clps711x-fb.c | 397 +++ + drivers/video/fbdev/da8xx-fb.c | 9 +- + drivers/video/fbdev/exynos/s6e8ax0.c | 6 - + drivers/video/fbdev/hyperv_fb.c | 62 +- + drivers/video/fbdev/mbx/mbxfb.c | 4 +- + drivers/video/fbdev/msm/mddi_client_dummy.c | 19 +- + drivers/video/fbdev/nvidia/nv_backlight.c | 6 - + .../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/dsi.c | 9 +- + 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/riva/fbdev.c | 6 - + drivers/video/fbdev/s3c-fb.c | 65 - + drivers/video/fbdev/s3c2410fb.c | 10 +- + drivers/video/fbdev/sis/init.c | 2 +- + drivers/video/fbdev/sis/sis_main.c | 4 - + drivers/vme/bridges/vme_ca91cx42.c | 6 +- + drivers/vme/bridges/vme_tsi148.c | 6 +- + 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/befs/linuxvfs.c | 6 +- + fs/bfs/bfs.h | 1 + + fs/bfs/dir.c | 4 +- + fs/bfs/inode.c | 8 +- + 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 +- + 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/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/fcntl.c | 5 + + fs/hpfs/dnode.c | 17 +- + fs/inode.c | 1 + + fs/isofs/compress.c | 4 +- + fs/jffs2/acl.c | 3 +- + fs/jffs2/compr_zlib.c | 7 +- + fs/jffs2/xattr.c | 3 +- + fs/minix/bitmap.c | 2 +- + fs/minix/inode.c | 4 +- + 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/nfsd/acl.h | 2 +- + fs/nfsd/auth.c | 2 +- + fs/nfsd/export.c | 6 +- + 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 | 9 +- + 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 +- + fs/nilfs2/Makefile | 2 +- + fs/nilfs2/nilfs.h | 8 + + fs/nilfs2/super.c | 9 +- + fs/nilfs2/sysfs.c | 1137 +++++++ + fs/nilfs2/sysfs.h | 176 ++ + fs/nilfs2/the_nilfs.c | 17 +- + fs/nilfs2/the_nilfs.h | 20 +- + fs/omfs/inode.c | 2 +- + fs/proc/Makefile | 1 + + fs/proc/base.c | 199 +- + fs/proc/fd.c | 2 +- + fs/proc/generic.c | 32 +- + fs/proc/inode.c | 7 +- + fs/proc/internal.h | 15 +- + fs/proc/kcore.c | 2 +- + fs/proc/proc_net.c | 6 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc/proc_tty.c | 4 +- + fs/proc/root.c | 9 +- + fs/proc/thread_self.c | 85 + + fs/proc/vmcore.c | 82 +- + fs/proc_namespace.c | 8 +- + 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/ufs/Makefile | 1 + + fs/ufs/inode.c | 32 +- + fs/ufs/super.c | 304 +- + fs/ufs/ufs.h | 10 +- + include/asm-generic/gpio.h | 3 - + include/asm-generic/pci-dma-compat.h | 8 + + include/drm/drmP.h | 89 +- + include/drm/drm_crtc.h | 36 +- + include/drm/drm_dp_mst_helper.h | 509 ++++ + include/drm/drm_fb_helper.h | 8 +- + include/drm/drm_mipi_dsi.h | 21 +- + include/drm/drm_of.h | 18 + + include/drm/drm_panel.h | 58 + + include/drm/drm_rect.h | 6 + + include/drm/ttm/ttm_bo_driver.h | 16 +- + 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/mfd/as3722.h | 2 +- + include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h | 7 + + include/linux/acpi.h | 11 + + include/linux/atmel-pwm-bl.h | 43 - + include/linux/atmel_pwm.h | 70 - + include/linux/cred.h | 9 + + 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/efi.h | 19 + + include/linux/fb.h | 2 +- + include/linux/fs.h | 29 +- + include/linux/ftrace_event.h | 34 - + include/linux/gpio/consumer.h | 81 +- + include/linux/gpio/driver.h | 66 +- + include/linux/gpio/machine.h | 61 + + include/linux/hid.h | 5 + + include/linux/host1x.h | 15 +- + include/linux/i2c.h | 12 + + include/linux/i2c/atmel_mxt_ts.h | 3 - + include/linux/i2c/s6000.h | 10 - + include/linux/input/pixcir_ts.h | 12 + + include/linux/ioport.h | 6 + + include/linux/kernel.h | 1 + + include/linux/kexec.h | 104 +- + include/linux/leds.h | 5 +- + include/linux/memcontrol.h | 98 +- + 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 +- + include/linux/mm.h | 17 +- + include/linux/mm_types.h | 1 + + include/linux/mount.h | 9 +- + include/linux/mtd/mtd.h | 2 + + include/linux/mtd/nand.h | 53 + + include/linux/mtd/spi-nor.h | 4 + + include/linux/mvebu-pmsu.h | 20 + + include/linux/nsproxy.h | 16 +- + include/linux/omap-dma.h | 1 + + include/linux/page_cgroup.h | 70 +- + include/linux/pid_namespace.h | 1 + + include/linux/pinctrl/pinmux.h | 2 - + 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/rio_drv.h | 5 + + include/linux/scatterlist.h | 2 +- + include/linux/sched.h | 19 +- + include/linux/shm.h | 18 +- + include/linux/shmem_fs.h | 17 + + include/linux/signal.h | 15 +- + include/linux/sunrpc/svc.h | 4 +- + include/linux/sunrpc/svc_rdma.h | 3 +- + include/linux/sunrpc/svc_xprt.h | 2 + + include/linux/swap.h | 15 +- + include/linux/syscalls.h | 5 + + include/linux/sysctl.h | 2 - + include/linux/tegra-soc.h | 22 - + include/linux/tracehook.h | 8 +- + include/linux/tracepoint.h | 44 + + include/linux/user_namespace.h | 6 +- + include/linux/zlib.h | 4 +- + include/net/netlabel.h | 8 +- + include/scsi/scsi.h | 2 +- + 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/trace/events/ipi.h | 89 + + include/uapi/drm/drm.h | 2 +- + include/uapi/drm/drm_mode.h | 5 + + include/uapi/drm/nouveau_drm.h | 11 + + include/uapi/drm/radeon_drm.h | 4 +- + include/uapi/drm/tegra_drm.h | 46 + + include/uapi/linux/fcntl.h | 15 + + include/uapi/linux/kexec.h | 11 + + include/uapi/linux/memfd.h | 8 + + include/uapi/linux/serio.h | 1 + + include/uapi/linux/uinput.h | 9 + + include/video/omapdss.h | 9 + + include/video/samsung_fimd.h | 5 +- + init/Kconfig | 5 + + init/calibrate.c | 11 + + init/do_mounts.c | 12 +- + init/do_mounts_rd.c | 10 +- + init/initramfs.c | 60 +- + init/main.c | 23 +- + ipc/namespace.c | 6 +- + ipc/shm.c | 75 +- + kernel/Makefile | 2 +- + kernel/acct.c | 30 +- + kernel/bounds.c | 2 - + kernel/events/uprobes.c | 15 +- + kernel/exit.c | 49 +- + kernel/fork.c | 79 +- + kernel/gcov/fs.c | 3 +- + kernel/kallsyms.c | 2 +- + kernel/kexec.c | 1335 ++++++++- + kernel/nsproxy.c | 15 +- + kernel/panic.c | 1 + + kernel/resource.c | 101 +- + kernel/signal.c | 46 +- + kernel/sys_ni.c | 2 + + kernel/test_kprobes.c | 87 +- + kernel/trace/ring_buffer.c | 31 +- + kernel/user_namespace.c | 6 +- + kernel/utsname.c | 6 +- + kernel/watchdog.c | 1 + + lib/Kconfig | 7 + + 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/idr.c | 25 +- + lib/kfifo.c | 6 +- + lib/rbtree.c | 2 +- + lib/scatterlist.c | 4 +- + mm/filemap.c | 25 +- + mm/huge_memory.c | 57 +- + mm/memcontrol.c | 1496 ++++------ + mm/memory.c | 81 +- + mm/migrate.c | 38 +- + mm/mmap.c | 30 +- + mm/nommu.c | 5 - + mm/rmap.c | 20 - + mm/shmem.c | 369 ++- + mm/slab.c | 4 +- + mm/swap.c | 36 + + mm/swap_state.c | 9 +- + mm/swapfile.c | 21 +- + mm/truncate.c | 9 - + mm/util.c | 9 +- + mm/vmscan.c | 12 +- + mm/zswap.c | 6 +- + net/core/net_namespace.c | 10 +- + 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 +- + scripts/.gitignore | 1 - + scripts/Makefile | 1 - + scripts/basic/.gitignore | 1 + + scripts/basic/Makefile | 1 + + scripts/{ => basic}/bin2c.c | 7 +- + scripts/checkstack.pl | 12 +- + scripts/coccinelle/free/ifnullfree.cocci | 53 + + scripts/tags.sh | 2 + + security/selinux/netif.c | 4 +- + security/selinux/netnode.c | 3 +- + security/selinux/netport.c | 3 +- + sound/soc/codecs/arizona.c | 10 +- + sound/soc/samsung/goni_wm8994.c | 2 +- + tools/testing/selftests/Makefile | 2 + + 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 + + tools/testing/selftests/mount/Makefile | 17 + + .../selftests/mount/unprivileged-remount-test.c | 242 ++ + tools/testing/selftests/ptrace/peeksiginfo.c | 4 + + 2573 files changed, 115857 insertions(+), 73663 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-leds-gt683r + create mode 100644 Documentation/ABI/testing/sysfs-driver-tegra-fuse + create mode 100644 Documentation/ABI/testing/sysfs-fs-nilfs2 + 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/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/fuse/nvidia,tegra20-fuse.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-zynq.txt + create mode 100644 Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt + create mode 100644 Documentation/devicetree/bindings/gpu/st,stih4xx.txt + 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 Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt + 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 + 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/pinctrl/qcom,msm8960-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-rockchip.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-st.txt + create mode 100644 Documentation/devicetree/bindings/serial/cdns,uart.txt + create mode 100644 Documentation/devicetree/bindings/video/arm,pl11x.txt + create mode 100644 Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt + create mode 100644 Documentation/ioctl/botching-up-ioctls.txt + delete mode 100644 arch/alpha/include/asm/scatterlist.h + delete mode 100644 arch/arc/plat-arcfpga/irq.c + 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 + delete mode 100644 arch/arm/include/asm/scatterlist.h + 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 + 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/s390/include/asm/scatterlist.h + delete mode 100644 arch/score/include/asm/scatterlist.h + delete mode 100644 arch/sparc/include/asm/scatterlist.h + create mode 100644 arch/x86/include/asm/crash.h + create mode 100644 arch/x86/include/asm/kexec-bzimage64.h + delete mode 100644 arch/x86/include/asm/scatterlist.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 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 + create mode 100644 drivers/gpio/gpio-crystalcove.c + 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 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/nouveau/core/core/ioctl.c + create mode 100644 drivers/gpu/drm/nouveau/core/core/notify.c + create mode 100644 drivers/gpu/drm/nouveau/core/engine/device/acpi.c + create mode 100644 drivers/gpu/drm/nouveau/core/engine/device/acpi.h + create mode 100644 drivers/gpu/drm/nouveau/core/engine/dmaobj/priv.h + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/ctxgk110b.c + create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/gk110b.c + delete mode 100644 drivers/gpu/drm/nouveau/core/include/core/class.h + create mode 100644 drivers/gpu/drm/nouveau/core/include/core/ioctl.h + create mode 100644 drivers/gpu/drm/nouveau/core/include/core/notify.h + create mode 120000 drivers/gpu/drm/nouveau/core/include/nvif/class.h + create mode 120000 drivers/gpu/drm/nouveau/core/include/nvif/event.h + create mode 120000 drivers/gpu/drm/nouveau/core/include/nvif/ioctl.h + create mode 120000 drivers/gpu/drm/nouveau/core/include/nvif/unpack.h + create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/ltc.h + delete mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/ltcg.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bar/gk20a.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/clock/gk20a.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/ltc/base.c + rename drivers/gpu/drm/nouveau/core/subdev/{ltcg => ltc}/gf100.c (61%) + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/ltc/gk104.c + rename drivers/gpu/drm/nouveau/core/subdev/{ltcg => ltc}/gm107.c (57%) + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/ltc/priv.h + delete mode 100644 drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/mc/gk20a.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/mc/priv.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/pwr/gk104.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/pwr/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nouveau_nvif.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_platform.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_platform.h + create mode 100644 drivers/gpu/drm/nouveau/nouveau_usif.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_usif.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/class.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/client.c + create mode 100644 drivers/gpu/drm/nouveau/nvif/client.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/device.c + create mode 100644 drivers/gpu/drm/nouveau/nvif/device.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/driver.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/event.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/ioctl.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/list.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/notify.c + create mode 100644 drivers/gpu/drm/nouveau/nvif/notify.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/object.c + create mode 100644 drivers/gpu/drm/nouveau/nvif/object.h + create mode 120000 drivers/gpu/drm/nouveau/nvif/os.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/unpack.h + 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 drivers/hid/hid-gt683r.c + delete mode 100644 drivers/hid/hid-wacom.c + rename drivers/{input/tablet => hid}/wacom.h (89%) + rename drivers/{input/tablet => hid}/wacom_sys.c (51%) + rename drivers/{input/tablet => hid}/wacom_wac.c (74%) + rename drivers/{input/tablet => hid}/wacom_wac.h (88%) + 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 + 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 + delete mode 100644 drivers/leds/leds-atmel-pwm.c + create mode 100644 drivers/leds/leds-ipaq-micro.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 + 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 + delete mode 100644 drivers/misc/atmel_pwm.c + create mode 100644 drivers/misc/fuse/Makefile + create mode 100644 drivers/mtd/nand/nand_timings.c + 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/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/pinctrl-tegra-xusb.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 + create mode 100644 drivers/power/reset/hisi-reboot.c + create mode 100644 drivers/pwm/pwm-rockchip.c + create mode 100644 drivers/pwm/pwm-sti.c + create mode 100644 drivers/rtc/rtc-efi-platform.c + create mode 100644 drivers/rtc/rtc-pcf85063.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 + create mode 100644 drivers/video/backlight/ipaq_micro_bl.c + rename arch/arm/plat-versatile/clcd.c => drivers/video/fbdev/amba-clcd-versatile.c (98%) + create mode 100644 drivers/video/fbdev/clps711x-fb.c + create mode 100644 fs/nilfs2/sysfs.c + create mode 100644 fs/nilfs2/sysfs.h + create mode 100644 fs/proc/thread_self.c + create mode 100644 include/drm/drm_dp_mst_helper.h + create mode 100644 include/drm/drm_of.h + 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/gpio/machine.h + delete mode 100644 include/linux/i2c/s6000.h + create mode 100644 include/linux/mfd/intel_soc_pmic.h + create mode 100644 include/linux/mfd/samsung/s2mpu02.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%) + create mode 100644 include/trace/events/ipi.h + create mode 100644 include/uapi/linux/memfd.h + rename scripts/{ => basic}/bin2c.c (88%) + create mode 100644 scripts/coccinelle/free/ifnullfree.cocci + 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 + create mode 100644 tools/testing/selftests/mount/Makefile + create mode 100644 tools/testing/selftests/mount/unprivileged-remount-test.c +Merging fixes/master (23cf8d3ca0fd powerpc: Fix "attempt to move .org backwards" error) +$ git merge fixes/master +Updating 58d08e3b2c20..23cf8d3ca0fd +Fast-forward + arch/powerpc/kernel/exceptions-64s.S | 110 +++++++++++++++++------------------ + 1 file changed, 55 insertions(+), 55 deletions(-) +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 (e57e41931134 ARM: wire up memfd_create syscall) +$ 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/scall64-o32.S | 12 ++++-- + 6 files changed, 89 insertions(+), 18 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 (2b162928afea dm9000: Remove typedef board_info_t) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/atm/atmtcp.c | 1 + + drivers/atm/solos-pci.c | 1 + + drivers/net/ethernet/8390/axnet_cs.c | 26 +-- + drivers/net/ethernet/8390/pcnet_cs.c | 68 +++--- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 1 - + drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 11 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 260 +++++++++++++++------ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 10 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 12 +- + drivers/net/ethernet/davicom/dm9000.c | 92 ++++---- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 3 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 16 +- + drivers/net/ethernet/freescale/ucc_geth.c | 24 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 34 +-- + drivers/net/ethernet/marvell/mvneta.c | 9 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 3 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +- + drivers/net/xen-netback/netback.c | 10 +- + net/6lowpan/Kconfig | 2 +- + net/batman-adv/multicast.c | 1 - + net/core/rtnetlink.c | 3 +- + net/ipv4/route.c | 2 - + net/netlink/af_netlink.c | 2 +- + net/openvswitch/datapath.c | 2 - + 27 files changed, 379 insertions(+), 227 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 (e24aa0a4c5ac ALSA: hda/ca0132 - Don't try loading firmware at resume when already failed) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/oss/uart401.c | 40 ++++++----- + sound/oss/waveartist.c | 157 ++++++++++++++++++++++++------------------ + sound/pci/hda/hda_intel.c | 7 ++ + sound/pci/hda/patch_ca0132.c | 7 +- + sound/pci/hda/patch_cmedia.c | 47 +++++++++++++ + sound/pci/hda/patch_realtek.c | 35 +++++++++- + sound/usb/quirks-table.h | 29 ++++++++ + 7 files changed, 233 insertions(+), 89 deletions(-) +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 b4a9ebf8f18e] 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 (c309bfa9b481 Merge tag 'for-linus-20140808' of git://git.infradead.org/linux-mtd) +$ 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 (c704b4ef1a81 Input: wacom - update the ABI doc according to latest changes) +$ 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. +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 (2a5e95d4181c mm, arc: remove obsolete pagefault oom killer comment) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (e57e41931134 ARM: wire up memfd_create syscall) +$ 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 (74f9f3185b80 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 268 +++++++++++++++++++++++++++++++++ + 1 file changed, 268 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +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/mach-imx/Kconfig +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 c4335e26bbde] 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 (5676d5bfb93b microblaze: Wire-up getrandom syscall) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/uapi/asm/unistd.h | 2 ++ + arch/microblaze/kernel/syscall_table.S | 2 ++ + 2 files changed, 4 insertions(+) +Merging mips/mips-for-linux-next (475d5928b79b Merge branch '3.16-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Already up-to-date. +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 (537e5400a0a0 powerpc/eeh: Export eeh_iommu_group_to_pe()) +$ git merge powerpc/next +Already up-to-date. +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 +Already up-to-date. +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 +Recorded preimage for 'arch/um/include/asm/Kbuild' +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 +Recorded resolution for 'arch/um/include/asm/Kbuild'. +[master a2ecab912bfe] 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 (db238230875a cifs: remove unused function cifs_oplock_break_wait) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/misc.c | 7 ------- + 1 file changed, 7 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 (20601c5299c8 reiserfs: Fix use after free in journal teardown) +$ git merge ext3/for_next +Auto-merging fs/reiserfs/super.c +Auto-merging fs/reiserfs/lbalance.c +Auto-merging fs/reiserfs/do_balan.c +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/journal.c | 22 ++++-- + fs/reiserfs/lbalance.c | 5 +- + fs/reiserfs/namei.c | 41 ++++++----- + fs/reiserfs/reiserfs.h | 9 +-- + fs/reiserfs/super.c | 6 +- + 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 - + 18 files changed, 214 insertions(+), 212 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 (7f0d32e0c1a7 Merge tag 'microblaze-3.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze) +$ 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 net/sunrpc/xprt.c +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 +Auto-merging fs/nfs/client.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 55309db68764] 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 +Merge made by the 'recursive' strategy. + fs/nfsd/export.c | 1 + + fs/nfsd/nfs3proc.c | 8 ++++++++ + include/uapi/linux/nfsd/export.h | 5 +++-- + 3 files changed, 12 insertions(+), 2 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 (c7f3888ad7f0 switch iov_iter_get_pages() to passing maximal number of pages) +$ git merge vfs/for-next +Resolved 'kernel/acct.c' using previous resolution. +Auto-merging mm/shmem.c +Auto-merging kernel/acct.c +CONFLICT (content): Merge conflict in kernel/acct.c +Auto-merging include/linux/mount.h +Auto-merging include/linux/fs.h +Auto-merging fs/super.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/namespace.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/cifsfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 57af0c26f992] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/nfs/Exporting | 38 +-- + Documentation/filesystems/vfs.txt | 3 +- + fs/Makefile | 2 +- + 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/direct-io.c | 2 +- + fs/ext4/namei.c | 1 - + fs/fs_pin.c | 78 ++++++ + fs/fuse/dir.c | 7 - + fs/fuse/file.c | 4 +- + fs/hostfs/hostfs.h | 1 + + fs/hostfs/hostfs_kern.c | 30 ++- + fs/hostfs/hostfs_user.c | 28 ++ + fs/internal.h | 7 +- + fs/mount.h | 2 +- + fs/namei.c | 34 ++- + fs/namespace.c | 36 +-- + fs/nfs/getroot.c | 2 +- + fs/nilfs2/super.c | 2 +- + fs/super.c | 19 +- + include/linux/acct.h | 4 - + include/linux/dcache.h | 1 + + include/linux/fs.h | 2 + + include/linux/fs_pin.h | 17 ++ + include/linux/mount.h | 4 +- + include/linux/uio.h | 2 +- + kernel/acct.c | 456 ++++++++++++++------------------ + mm/iov_iter.c | 17 +- + mm/shmem.c | 32 ++- + 35 files changed, 620 insertions(+), 457 deletions(-) + create mode 100644 fs/fs_pin.c + create mode 100644 include/linux/fs_pin.h +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 +Resolved 'drivers/hid/hid-gt683r.c' using previous resolution. +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 bb36a449e8e1] Merge remote-tracking branch 'hid/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-hid-driver-gt683r | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r +Merging i2c/i2c/for-next (88a469fec24c Merge branch 'i2c/for-3.17' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (6ddd855c13bc hwmon: (tmp103) Remove duplicate test for I2C_FUNC_SMBUS_BYTE_DATA functionality) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/adm1025.c | 3 +++ + drivers/hwmon/adm1026.c | 3 +++ + drivers/hwmon/ads1015.c | 2 ++ + drivers/hwmon/asb100.c | 4 ++++ + drivers/hwmon/dme1737.c | 33 ++++++++++++++++++--------------- + drivers/hwmon/emc6w201.c | 4 ++-- + drivers/hwmon/hih6130.c | 3 +++ + drivers/hwmon/lm87.c | 4 ++++ + drivers/hwmon/lm92.c | 13 ++++++------- + drivers/hwmon/pc87360.c | 3 +++ + drivers/hwmon/tmp103.c | 7 ------- + drivers/hwmon/vt1211.c | 3 +++ + drivers/hwmon/w83627hf.c | 3 +++ + drivers/hwmon/w83791d.c | 3 +++ + drivers/hwmon/w83793.c | 3 +++ + 15 files changed, 60 insertions(+), 31 deletions(-) +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 (0eaeb361a894 Merge branches 'kbuild/kbuild' and '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 | 49 +++++- + arch/ia64/Makefile | 2 +- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 +++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 26 +++- + scripts/Kbuild.include | 14 +- + 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 +- + 23 files changed, 706 insertions(+), 141 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 (c6465dedd6f9 Merge branch 'pm-tools') +$ git merge pm/linux-next +Recorded preimage for 'arch/arm/mach-imx/pm-imx6.c' +Auto-merging include/linux/sched.h +Auto-merging drivers/cpuidle/governors/menu.c +Auto-merging arch/powerpc/platforms/pseries/suspend.c +Auto-merging arch/mips/loongson/common/pm.c +Auto-merging arch/mips/alchemy/devboards/pm.c +Auto-merging arch/arm/mach-tegra/pm.c +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +Auto-merging arch/arm/mach-pxa/pxa3xx.c +Auto-merging arch/arm/mach-pxa/pxa27x.c +Auto-merging arch/arm/mach-pxa/pxa25x.c +CONFLICT (modify/delete): arch/arm/mach-kirkwood/pm.c deleted in HEAD and modified in pm/linux-next. Version pm/linux-next of arch/arm/mach-kirkwood/pm.c left in tree. +Auto-merging arch/arm/mach-imx/pm-imx6.c +CONFLICT (content): Merge conflict in arch/arm/mach-imx/pm-imx6.c +Auto-merging arch/arm/mach-imx/pm-imx5.c +Auto-merging arch/arm/mach-exynos/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-kirkwood/pm.c +arch/arm/mach-kirkwood/pm.c: needs merge +rm 'arch/arm/mach-kirkwood/pm.c' +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-imx/pm-imx6.c'. +[master 7777cae508f0] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-at91/pm.c | 10 +- + arch/arm/mach-davinci/pm.c | 6 +- + arch/arm/mach-exynos/pm.c | 2 +- + arch/arm/mach-highbank/pm.c | 2 +- + arch/arm/mach-imx/mach-mx31ads.c | 8 +- + arch/arm/mach-imx/pm-imx27.c | 4 +- + arch/arm/mach-imx/pm-imx5.c | 12 +- + arch/arm/mach-imx/pm-imx6.c | 6 +- + arch/arm/mach-lpc32xx/pm.c | 2 +- + arch/arm/mach-mmp/pm-mmp2.c | 2 +- + arch/arm/mach-mmp/pm-pxa910.c | 2 +- + arch/arm/mach-mvebu/kirkwood-pm.c | 4 +- + arch/arm/mach-mxs/pm.c | 4 +- + arch/arm/mach-omap1/pm.c | 6 +- + arch/arm/mach-omap2/pm.c | 6 +- + arch/arm/mach-prima2/pm.c | 4 +- + arch/arm/mach-pxa/pm.c | 4 +- + arch/arm/mach-pxa/pxa25x.c | 4 +- + arch/arm/mach-pxa/pxa27x.c | 8 +- + arch/arm/mach-pxa/pxa3xx.c | 6 +- + arch/arm/mach-pxa/sharpsl_pm.c | 2 +- + arch/arm/mach-pxa/z2.c | 2 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- + arch/arm/mach-sa1100/pm.c | 2 +- + arch/arm/mach-shmobile/suspend.c | 2 +- + arch/arm/mach-tegra/pm.c | 2 +- + arch/arm/mach-ux500/pm.c | 2 +- + arch/arm/plat-samsung/pm.c | 2 +- + arch/avr32/mach-at32ap/pm-at32ap700x.S | 2 +- + arch/avr32/mach-at32ap/pm.c | 8 +- + arch/blackfin/mach-bf609/pm.c | 2 +- + arch/blackfin/mach-common/pm.c | 12 +- + arch/mips/alchemy/devboards/pm.c | 2 +- + arch/mips/jz4740/pm.c | 2 +- + arch/mips/loongson/common/pm.c | 4 +- + arch/powerpc/platforms/52xx/lite5200_pm.c | 12 +- + arch/powerpc/platforms/52xx/mpc52xx_pm.c | 2 +- + arch/powerpc/platforms/83xx/suspend.c | 10 +- + arch/powerpc/platforms/pseries/suspend.c | 6 +- + arch/powerpc/sysdev/fsl_pmc.c | 2 +- + arch/powerpc/sysdev/ppc4xx_cpm.c | 8 +- + arch/sh/boards/mach-hp6xx/pm.c | 2 +- + arch/sh/kernel/cpu/shmobile/pm.c | 2 +- + arch/unicore32/kernel/pm.c | 4 +- + arch/unicore32/kernel/puv3-core.c | 4 +- + arch/x86/platform/olpc/olpc-xo1-pm.c | 4 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/processor_driver.c | 1 + + drivers/acpi/scan.c | 3 +- + drivers/acpi/sleep.c | 24 +- + drivers/base/power/wakeup.c | 4 +- + drivers/char/apm-emulation.c | 6 +- + drivers/cpufreq/arm_big_little.c | 5 + + drivers/cpufreq/arm_big_little_dt.c | 2 +- + drivers/cpufreq/cpufreq-cpu0.c | 2 +- + drivers/cpufreq/cpufreq_opp.c | 2 +- + drivers/cpufreq/integrator-cpufreq.c | 10 +- + drivers/cpufreq/speedstep-smi.c | 4 +- + drivers/cpuidle/governors/menu.c | 43 +- + drivers/macintosh/via-pmu.c | 4 +- + drivers/regulator/core.c | 4 +- + include/linux/pm.h | 4 +- + include/linux/sched.h | 3 +- + include/linux/suspend.h | 26 +- + kernel/power/hibernate.c | 2 +- + kernel/power/snapshot.c | 21 +- + kernel/power/suspend.c | 82 +- + kernel/power/suspend_test.c | 6 +- + kernel/power/user.c | 2 +- + kernel/sched/core.c | 7 + + kernel/sched/proc.c | 7 - + scripts/analyze_suspend.py | 3817 ++++++++++++++++++++++------- + 72 files changed, 3236 insertions(+), 1063 deletions(-) +$ git am -3 ../patches/0001-PM-sleep-fix-for-Rename-symbols-functions-and-variab.patch +Applying: PM / sleep: fix for Rename symbols, functions and variables related to sleep +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/mfd/sec-core.c +$ git add -A . +$ git commit -v -a --amend +[master 1107a509fff7] Merge remote-tracking branch 'pm/linux-next' + Date: Mon Aug 11 11:43:07 2014 +1000 +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 (a0bbe990c161 dmaengine: sun6i: depends on RESET_CONTROLLER) +$ 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 b8b73916555c] 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 | 17 + + drivers/dma/Makefile | 6 +- + drivers/dma/TODO | 1 - + drivers/dma/amba-pl08x.c | 6 +- + drivers/dma/at_hdmac.c | 15 +- + 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, 3808 insertions(+), 847 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 (33caee39925b Merge branch 'akpm' (patchbomb from Andrew Morton)) +$ 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 (37d4f72d76c8 Add a new PID/VID 0227/0930 for AR3012.) +$ git merge bluetooth/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 +- + drivers/bluetooth/ath3k.c | 2 + + drivers/bluetooth/btusb.c | 1 + + drivers/bluetooth/hci_h5.c | 2 +- + include/net/bluetooth/hci_core.h | 8 +- + include/net/bluetooth/l2cap.h | 28 +++- + net/bluetooth/6lowpan.c | 10 +- + net/bluetooth/hci_core.c | 71 +++++++--- + net/bluetooth/hci_event.c | 11 +- + net/bluetooth/l2cap_core.c | 261 ++++++++++++++++------------------ + net/bluetooth/l2cap_sock.c | 15 +- + net/bluetooth/mgmt.c | 124 ++++++----------- + net/bluetooth/smp.c | 293 +++++++++++++++++++++++++++++++-------- + net/bluetooth/smp.h | 9 +- + 14 files changed, 516 insertions(+), 328 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/scsi/scsi_transport_srp.c +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 a176b76337fe] 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 (2a500afe1e0e mtd: gpmi: make blockmark swapping optional) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (2a500afe1e0e mtd: gpmi: make blockmark swapping optional) +$ git merge l2-mtd/master +Already up-to-date. +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 (7963e9db1b1f Revert "drm: drop redundant drm_file->is_master") +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (9746c61960b6 drm/panel: simple: Use devm_gpiod_get_optional()) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (be71eabebaf9 Revert "drm/i915: Enable semaphores on BDW") +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (ef70728c7a65 drm/tegra: add MODULE_DEVICE_TABLEs) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging sound/for-next (e24aa0a4c5ac ALSA: hda/ca0132 - Don't try loading firmware at resume when already failed) +$ 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 (76215b04fd29 arch/powerpc/platforms/powernv/opal-dump.c: fix world-writable sysfs files) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging include/linux/kernel.h +Auto-merging drivers/video/fbdev/s3c2410fb.c +Auto-merging arch/powerpc/platforms/powernv/opal-elog.c +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/powernv/opal-dump.c | 4 +-- + 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 ++++++++---------------------- + 8 files changed, 40 insertions(+), 61 deletions(-) +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 (23526d94977a Input: cap1106 - allow changing key mapping from userspace) +$ git merge input/next +Auto-merging drivers/input/mouse/synaptics.c +Merge made by the 'recursive' strategy. + drivers/input/input-mt.c | 38 ++++++++++++----- + drivers/input/keyboard/cap1106.c | 8 +++- + drivers/input/mouse/synaptics.c | 72 ++++++++++++++++++++++++++++++-- + drivers/input/touchscreen/atmel_mxt_ts.c | 8 ++-- + include/linux/input/mt.h | 1 + + 5 files changed, 109 insertions(+), 18 deletions(-) +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 +Resolved 'include/scsi/sg.h' using previous resolution. +Auto-merging include/scsi/sg.h +CONFLICT (content): Merge conflict in include/scsi/sg.h +Auto-merging drivers/block/drbd/drbd_nl.c +Auto-merging block/compat_ioctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f1a43eb11fef] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + 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 | 4 +- + 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(+), 1421 deletions(-) + create mode 100644 drivers/block/drbd/drbd_debugfs.c + create mode 100644 drivers/block/drbd/drbd_debugfs.h +Merging device-mapper/for-next (de766aa20165 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 | 84 ++++--- + drivers/md/dm-thin.c | 181 ++++++++++----- + drivers/md/dm.h | 1 - + 12 files changed, 588 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 6106d59e78b8 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 (d66b1b395a59 md: don't allow bitmap file to be added to raid0/linear.) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 13 +++++++------ + drivers/md/raid0.c | 6 ++++++ + drivers/md/raid1.c | 8 ++++---- + drivers/md/raid10.c | 11 +++++------ + 4 files changed, 22 insertions(+), 16 deletions(-) +Merging mfd/for-mfd-next (7caa79917ad4 MAINTAINERS: Update MFD repo location) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (87464cdba2ae backlight: ipaq_micro: Fix sparse non static symbol warning) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning) +$ git merge battery/master +Already up-to-date. +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 +Already up-to-date. +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 6ad8e7b0ab4b] 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. +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 (9b936c960f22 drivers/vfio: Enable VFIO if EEH is not supported) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/Kconfig | 6 ++ + drivers/vfio/Makefile | 2 +- + drivers/vfio/pci/vfio_pci.c | 161 ++++++++++++++++++++++++++++++++---- + drivers/vfio/pci/vfio_pci_private.h | 3 +- + drivers/vfio/vfio_spapr_eeh.c | 17 +++- + include/linux/vfio.h | 6 +- + 6 files changed, 170 insertions(+), 25 deletions(-) +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 +Already up-to-date. +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 ab8b55e90c82] 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 (c3b35bef240a Merge branch 'x86/xsave') +$ git merge tip/auto-latest +Resolved 'kernel/trace/trace.c' using previous resolution. +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 +[master 09c7ab548561] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 15 + + Documentation/x86/tlb.txt | 2 +- + 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/mm/tlb.c | 10 +- + arch/x86/pci/acpi.c | 6 +- + arch/x86/pci/intel_mid_pci.c | 27 +- + arch/x86/pci/irq.c | 16 +- + 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 | 7 +- + include/linux/jump_label.h | 17 +- + kernel/kprobes.c | 13 +- + 46 files changed, 1272 insertions(+), 1161 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 be138238254e] 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 (45ed695ac10a ARM64: add IPI tracepoints) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (1c91efb24799 rcutorture: Specify CONFIG_CPUMASK_OFFSTACK=y for TREE07) +$ git merge rcu/rcu/next +Auto-merging kernel/rcu/rcutorture.c +Auto-merging init/main.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 +Already up-to-date. +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 +Auto-merging include/linux/device.h +Merge made by the 'recursive' strategy. + 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 | 4 ++-- + include/linux/device.h | 5 +++++ + 6 files changed, 56 insertions(+), 30 deletions(-) +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 +Already up-to-date. +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 +Already up-to-date. +Merging leds/for-next (e661c8978e48 leds: ipaq-micro: fix sparse non static symbol warning) +$ git merge leds/for-next +Already up-to-date. +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 (c309bfa9b481 Merge tag 'for-linus-20140808' of git://git.infradead.org/linux-mtd) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/scsi/libiscsi.c | 2 +- + drivers/scsi/pm8001/pm8001_ctl.c | 144 ++++++++++++++++++------------------ + drivers/scsi/pm8001/pm8001_hwi.c | 4 +- + drivers/scsi/pm8001/pm8001_init.c | 39 +++++----- + drivers/scsi/qla4xxx/ql4_init.c | 6 ++ + drivers/scsi/qla4xxx/ql4_mbx.c | 14 ++-- + drivers/scsi/qla4xxx/ql4_nx.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 16 ++-- + drivers/scsi/scsi_transport_iscsi.c | 6 +- + drivers/scsi/u14-34f.c | 4 +- + include/scsi/iscsi_if.h | 1 + + 12 files changed, 125 insertions(+), 114 deletions(-) +Merging target-updates/for-next (4ca7ea3ceeb9 iscsi-target: Ignore ICF_GOT_LAST_DATAOUT during Data-Out ITT lookup) +$ git merge target-updates/for-next +Auto-merging drivers/target/iscsi/iscsi_target_util.c +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/isert/ib_isert.c | 20 +++++++++++--------- + drivers/target/iscsi/iscsi_target_util.c | 2 ++ + drivers/target/target_core_fabric_configfs.c | 3 +-- + 3 files changed, 14 insertions(+), 11 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 +Already up-to-date. +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 6b456c278507] 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 (bdc6e95e1273 MAINTAINERS: update GPIO include files) +$ git merge gpio/for-next +Already up-to-date. +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 (f6306299080b pwm: rockchip: Added to support for RK3288 SoC) +$ git merge pwm/for-next +Already up-to-date. +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 +Already up-to-date. +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 (1795cd9b3a91 Linux 3.16-rc5) +$ git merge rd-docs/master +Already up-to-date. +Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp()) +$ git merge signal-cleanup/signal_v4 +Merge made by the 'recursive' strategy. +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 'arch/arm64/Kconfig' +Recorded preimage for 'kernel/fork.c' +Recorded preimage for 'mm/memcontrol.c' +Recorded preimage for 'mm/slab.c' +Resolved 'include/linux/glob.h' using previous resolution. +Resolved 'kernel/acct.c' using previous resolution. +Resolved 'kernel/kexec.c' using previous resolution. +Resolved 'mm/memory.c' using previous resolution. +Resolved 'mm/oom_kill.c' using previous resolution. +Resolved 'net/batman-adv/fragmentation.c' using previous resolution. +Auto-merging scripts/coccinelle/free/ifnullfree.cocci +CONFLICT (add/add): Merge conflict in scripts/coccinelle/free/ifnullfree.cocci +Auto-merging net/batman-adv/fragmentation.c +CONFLICT (content): Merge conflict in net/batman-adv/fragmentation.c +Auto-merging mm/vmstat.c +Auto-merging mm/util.c +Auto-merging mm/slab.c +CONFLICT (content): Merge conflict in mm/slab.c +Auto-merging mm/page_alloc.c +Auto-merging mm/oom_kill.c +CONFLICT (content): Merge conflict in mm/oom_kill.c +Auto-merging mm/memory.c +CONFLICT (content): Merge conflict in mm/memory.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging kernel/kexec.c +CONFLICT (content): Merge conflict in kernel/kexec.c +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging kernel/acct.c +CONFLICT (content): Merge conflict in kernel/acct.c +Auto-merging include/linux/kernel.h +Auto-merging include/linux/glob.h +CONFLICT (add/add): Merge conflict in include/linux/glob.h +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/ocfs2/alloc.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/isofs/compress.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/leds/Kconfig +Auto-merging block/bio-integrity.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm64/Kconfig'. +Recorded resolution for 'kernel/fork.c'. +Recorded resolution for 'mm/memcontrol.c'. +Recorded resolution for 'mm/slab.c'. +Recorded resolution for 'scripts/coccinelle/free/ifnullfree.cocci'. +[master f50a47e7106b] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/leds/leds-class.txt | 3 - + Documentation/printk-formats.txt | 6 + + arch/m68k/kernel/sys_m68k.c | 18 +- + arch/x86/include/asm/numa.h | 1 - + arch/x86/include/asm/pgtable_64.h | 3 +- + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/init_64.c | 36 ++-- + arch/x86/mm/numa.c | 34 ++-- + arch/x86/platform/efi/efi-bgrt.c | 36 +++- + block/bio-integrity.c | 2 - + block/genhd.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/misc/ti-st/st_core.c | 2 +- + drivers/net/irda/donauboe.c | 15 +- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 +++++++++--- + drivers/video/backlight/backlight.c | 2 - + 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/compat.c | 2 +- + fs/ext4/fsync.c | 5 +- + fs/hfsplus/catalog.c | 89 +++++++--- + fs/hfsplus/dir.c | 11 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/super.c | 4 +- + fs/isofs/Makefile | 2 + + fs/isofs/compress.c | 6 +- + fs/isofs/export.c | 11 +- + fs/isofs/inode.c | 88 +++++----- + fs/isofs/namei.c | 5 +- + fs/isofs/rock.c | 44 ++--- + fs/mpage.c | 23 ++- + fs/nilfs2/super.c | 2 +- + fs/ocfs2/alloc.c | 28 ++- + 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/dlmmaster.c | 22 +-- + fs/ocfs2/dlm/dlmthread.c | 10 ++ + fs/ocfs2/file.c | 2 +- + fs/ocfs2/inode.c | 10 +- + fs/ocfs2/ioctl.c | 129 +++++--------- + include/linux/crc64_ecma.h | 56 ++++++ + include/linux/input.h | 21 +++ + include/linux/kernel.h | 32 +--- + include/linux/string.h | 1 + + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++++++++++++++++++++++++++++++ + lib/vsprintf.c | 20 ++- + mm/compaction.c | 17 +- + mm/memory.c | 8 + + mm/oom_kill.c | 4 +- + mm/page_alloc.c | 2 + + mm/util.c | 30 ++++ + mm/vmstat.c | 141 ++++++++++++--- + 73 files changed, 1469 insertions(+), 490 deletions(-) + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/gpio/gpio-zevio.c: fix build +Applying: x86, vdso: fix vdso2c's special_pages error checking +Applying: include/linux: remove strict_strto* definitions +Applying: kernel/posix-timers.c: code clean-up +Applying: kernel-posix-timersc-code-clean-up-checkpatch-fixes +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: 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 + + fe6140d1e451...08a36266333b akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (08a36266333b mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Removing mm/fremap.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/filesystems/vfat.txt | 10 + + Documentation/vm/ksm.txt | 7 + + Documentation/vm/remap_file_pages.txt | 7 +- + arch/x86/vdso/vdso2c.h | 12 +- + drivers/gpio/gpio-zevio.c | 4 + + 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/lockd/svclock.c | 12 +- + include/linux/fs.h | 1211 +++++++++++++++-------------- + include/linux/kernel.h | 4 - + include/linux/sched.h | 2 + + kernel/kprobes.c | 36 +- + 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/mmap.c | 69 ++ + mm/nommu.c | 8 - + 25 files changed, 1110 insertions(+), 1003 deletions(-) + delete mode 100644 mm/fremap.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..1448b078fbe3 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,5 @@ +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.16-rc5 + quilt series is empty +$ git branch -f rd-docs/master 1795cd9b3a91d4b5473c97f491d63892442212ab diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..4e78f799a716 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20140811 |